Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflavio <fdanesse@gmail.com>2012-07-10 21:57:43 (GMT)
committer flavio <fdanesse@gmail.com>2012-07-10 21:57:43 (GMT)
commit48f5913a4677aac173771735ef4ad7965fc0920f (patch)
tree268d3f2791cd4853a905dcde647550e915ccdffd
parent4281808b1e911a43ceaaade9ade8f4a7ac9de4f0 (diff)
Correcciones en Eventos
-rw-r--r--olpcgames/gtkEvent.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/olpcgames/gtkEvent.py b/olpcgames/gtkEvent.py
index 6be38ca..202b54c 100644
--- a/olpcgames/gtkEvent.py
+++ b/olpcgames/gtkEvent.py
@@ -63,15 +63,15 @@ class Translator(GObject.Object):
# Need to set our X event masks so we see mouse motion and stuff --
mainwindow.set_events(
- Gdk.EventMask.KEY_PRESS_MASK | \
- Gdk.EventMask.KEY_RELEASE_MASK \
+ Gdk.EventMask.KEY_PRESS_MASK |
+ Gdk.EventMask.KEY_RELEASE_MASK
)
self._inner_evb.set_events(
- Gdk.EventMask.POINTER_MOTION_MASK | \
- Gdk.EventMask.POINTER_MOTION_HINT_MASK | \
- Gdk.EventMask.BUTTON_MOTION_MASK | \
- Gdk.EventMask.BUTTON_PRESS_MASK | \
+ Gdk.EventMask.POINTER_MOTION_MASK |
+ Gdk.EventMask.POINTER_MOTION_HINT_MASK |
+ Gdk.EventMask.BUTTON_MOTION_MASK |
+ Gdk.EventMask.BUTTON_PRESS_MASK |
Gdk.EventMask.BUTTON_RELEASE_MASK
)
@@ -137,7 +137,7 @@ class Translator(GObject.Object):
eventwrap.post(eventwrap.Event(pygame.QUIT))
def _keydown(self, widget, event):
- key = event.keyval
+ key = event.get_keyval()
log.debug( 'key down: %s', key )
if key in self.__held:
return True
@@ -150,7 +150,7 @@ class Translator(GObject.Object):
return self._keyevent(widget, event, pygame.KEYDOWN)
def _keyup(self, widget, event):
- key = event.keyval
+ key = event.get_keyval()
if self.__repeat[0] is not None:
if key in self.__held:
# This is possibly false if set_repeat() is called with a key held
@@ -219,9 +219,8 @@ class Translator(GObject.Object):
def _mouseevent(self, widget, event, type):
- evt = eventwrap.Event(type,
- button=event.button,
- pos=(event.x, event.y))
+ evt = eventwrap.Event(type, button=event.button,
+ pos=(event.x, event.y))
self._post(evt)
return True
@@ -280,6 +279,7 @@ class Translator(GObject.Object):
def _post(self, evt):
try:
eventwrap.post(evt)
+ pass
except pygame.error, e:
if str(e) == 'Event queue full':
print "Event queue full!"