Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugargame/event.py
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2014-01-17 23:10:47 (GMT)
committer Walter Bender <walter@sugarlabs.org>2014-01-17 23:10:47 (GMT)
commitee2aa6ae2beda3d4182470a3d6796d64e9bd791d (patch)
tree7d85ea647e6cde041ad061fc7eb68b441afb844e /sugargame/event.py
parente374a52b347a704742b6cb7071e34edb31bb78ec (diff)
merge ignacio's gtk3 branchv14
Diffstat (limited to 'sugargame/event.py')
-rw-r--r--sugargame/event.py110
1 files changed, 61 insertions, 49 deletions
diff --git a/sugargame/event.py b/sugargame/event.py
index 2ee2bed..f6a69b9 100644
--- a/sugargame/event.py
+++ b/sugargame/event.py
@@ -1,8 +1,8 @@
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GObject
import pygame
import pygame.event
-import logging
class _MockEvent(object):
def __init__(self, keyval):
@@ -28,7 +28,7 @@ class Translator(object):
'KP_Right' : pygame.K_KP6,
}
-
+
mod_map = {
pygame.K_LALT: pygame.KMOD_LALT,
pygame.K_RALT: pygame.KMOD_RALT,
@@ -37,7 +37,7 @@ class Translator(object):
pygame.K_LSHIFT: pygame.KMOD_LSHIFT,
pygame.K_RSHIFT: pygame.KMOD_RSHIFT,
}
-
+
def __init__(self, mainwindow, inner_evb):
"""Initialise the Translator with the windows to which to listen"""
self._mainwindow = mainwindow
@@ -46,31 +46,34 @@ class Translator(object):
# Enable events
# (add instead of set here because the main window is already realized)
self._mainwindow.add_events(
- gtk.gdk.KEY_PRESS_MASK | \
- gtk.gdk.KEY_RELEASE_MASK \
+ Gdk.EventMask.KEY_PRESS_MASK | \
+ Gdk.EventMask.KEY_RELEASE_MASK | \
+ Gdk.EventMask.VISIBILITY_NOTIFY_MASK
)
-
+
self._inner_evb.set_events(
- gtk.gdk.POINTER_MOTION_MASK | \
- gtk.gdk.POINTER_MOTION_HINT_MASK | \
- gtk.gdk.BUTTON_MOTION_MASK | \
- gtk.gdk.BUTTON_PRESS_MASK | \
- gtk.gdk.BUTTON_RELEASE_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
)
- self._mainwindow.set_flags(gtk.CAN_FOCUS)
- self._inner_evb.set_flags(gtk.CAN_FOCUS)
-
+ self._mainwindow.set_can_focus(True)
+ self._inner_evb.set_can_focus(True)
+
# Callback functions to link the event systems
self._mainwindow.connect('unrealize', self._quit_cb)
+ self._mainwindow.connect('visibility_notify_event', self._visibility_cb)
self._inner_evb.connect('key_press_event', self._keydown_cb)
self._inner_evb.connect('key_release_event', self._keyup_cb)
self._inner_evb.connect('button_press_event', self._mousedown_cb)
self._inner_evb.connect('button_release_event', self._mouseup_cb)
self._inner_evb.connect('motion-notify-event', self._mousemove_cb)
- self._inner_evb.connect('expose-event', self._expose_cb)
+ self._inner_evb.connect('draw', self._draw_cb)
self._inner_evb.connect('configure-event', self._resize_cb)
-
+ self._inner_evb.connect('screen-changed', self._screen_changed_cb)
+
# Internal data
self.__stopped = False
self.__keystate = [0] * 323
@@ -87,8 +90,11 @@ class Translator(object):
pygame.key.set_repeat = self._set_repeat
pygame.mouse.get_pressed = self._get_mouse_pressed
pygame.mouse.get_pos = self._get_mouse_pos
-
- def _expose_cb(self, event, widget):
+
+ def update_display(self):
+ pygame.event.post(pygame.event.Event(pygame.VIDEOEXPOSE))
+
+ def _draw_cb(self, widget, event):
if pygame.display.get_init():
pygame.event.post(pygame.event.Event(pygame.VIDEOEXPOSE))
return True
@@ -99,12 +105,18 @@ class Translator(object):
pygame.event.post(evt)
return False # continue processing
+ def _screen_changed_cb(self, widget, previous_screen):
+ if pygame.display.get_init():
+ self.update_display()
+
def _quit_cb(self, data=None):
self.__stopped = True
- try:
- pygame.event.post(pygame.event.Event(pygame.QUIT))
- except pygame.error, e:
- logging.error('pygame already stopped? %s' % (e))
+ pygame.event.post(pygame.event.Event(pygame.QUIT))
+
+ def _visibility_cb(self, widget, event):
+ if pygame.display.get_init():
+ self.update_display()
+ return False
def _keydown_cb(self, widget, event):
key = event.keyval
@@ -115,9 +127,9 @@ class Translator(object):
self.__held_last_time[key] = pygame.time.get_ticks()
self.__held_time_left[key] = self.__repeat[0]
self.__held.add(key)
-
+
return self._keyevent(widget, event, pygame.KEYDOWN)
-
+
def _keyup_cb(self, widget, event):
key = event.keyval
if self.__repeat[0] is not None:
@@ -128,19 +140,19 @@ class Translator(object):
self.__held.discard(key)
return self._keyevent(widget, event, pygame.KEYUP)
-
+
def _keymods(self):
mod = 0
for key_val, mod_val in self.mod_map.iteritems():
mod |= self.__keystate[key_val] and mod_val
return mod
-
+
def _keyevent(self, widget, event, type):
- key = gtk.gdk.keyval_name(event.keyval)
+ key = Gdk.keyval_name(event.keyval)
if key is None:
# No idea what this key is.
return False
-
+
keycode = None
if key in self.key_trans:
keycode = self.key_trans[key]
@@ -153,19 +165,19 @@ class Translator(object):
self._mainwindow.view_source()
else:
print 'Key %s unrecognized' % key
-
+
if keycode is not None:
if type == pygame.KEYDOWN:
mod = self._keymods()
self.__keystate[keycode] = type == pygame.KEYDOWN
if type == pygame.KEYUP:
mod = self._keymods()
- ukey = unichr(gtk.gdk.keyval_to_unicode(event.keyval))
+ ukey = unichr(Gdk.keyval_to_unicode(event.keyval))
if ukey == '\000':
ukey = ''
evt = pygame.event.Event(type, key=keycode, unicode=ukey, mod=mod)
self._post(evt)
-
+
return True
def _get_pressed(self):
@@ -181,57 +193,57 @@ class Translator(object):
def _mouseup_cb(self, widget, event):
self.__button_state[event.button-1] = 0
return self._mouseevent(widget, event, pygame.MOUSEBUTTONUP)
-
+
def _mouseevent(self, widget, event, type):
evt = pygame.event.Event(type, button=event.button, pos=(event.x, event.y))
self._post(evt)
return True
-
+
def _mousemove_cb(self, widget, event):
# From http://www.learningpython.com/2006/07/25/writing-a-custom-widget-using-pygtk/
# if this is a hint, then let's get all the necessary
# information, if not it's all we need.
if event.is_hint:
- x, y, state = event.window.get_pointer()
+ win, x, y, state = event.window.get_device_position(event.device)
else:
x = event.x
y = event.y
- state = event.state
+ state = event.get_state()
rel = (x - self.__mouse_pos[0], y - self.__mouse_pos[1])
self.__mouse_pos = (x, y)
-
+
self.__button_state = [
- state & gtk.gdk.BUTTON1_MASK and 1 or 0,
- state & gtk.gdk.BUTTON2_MASK and 1 or 0,
- state & gtk.gdk.BUTTON3_MASK and 1 or 0,
+ state & Gdk.ModifierType.BUTTON1_MASK and 1 or 0,
+ state & Gdk.ModifierType.BUTTON2_MASK and 1 or 0,
+ state & Gdk.ModifierType.BUTTON3_MASK and 1 or 0,
]
-
+
evt = pygame.event.Event(pygame.MOUSEMOTION,
pos=self.__mouse_pos, rel=rel, buttons=self.__button_state)
self._post(evt)
return True
-
+
def _tick_cb(self):
cur_time = pygame.time.get_ticks()
for key in self.__held:
delta = cur_time - self.__held_last_time[key]
self.__held_last_time[key] = cur_time
-
+
self.__held_time_left[key] -= delta
if self.__held_time_left[key] <= 0:
self.__held_time_left[key] = self.__repeat[1]
self._keyevent(None, _MockEvent(key), pygame.KEYDOWN)
-
+
return True
-
+
def _set_repeat(self, delay=None, interval=None):
if delay is not None and self.__repeat[0] is None:
- self.__tick_id = gobject.timeout_add(10, self._tick_cb)
+ self.__tick_id = GObject.timeout_add(10, self._tick_cb)
elif delay is None and self.__repeat[0] is not None:
- gobject.source_remove(self.__tick_id)
+ GObject.source_remove(self.__tick_id)
self.__repeat = (delay, interval)
-
+
def _get_mouse_pos(self):
return self.__mouse_pos