Merge pull request #572 from ederag/bypass-dbus

Store _window as soon as possible.
Wrong branch name: should have been realize-fix.

Author: ederag

src/hamster/lib/graphics.py

@@ -1869,6 +1869,8 @@ def __init__(self, interactive = True, framerate = 60,
 
         self.__last_mouse_move = None
 
+        self.connect("realize", self.__on_realize)
+
         if interactive:
             self.set_can_focus(True)
             self.set_events(gdk.EventMask.POINTER_MOTION_MASK
@@ -1983,7 +1985,6 @@ def do_draw(self, context):
             context.scale(aspect_x, aspect_y)
 
         if self.fps is None:
-            self._window = self.get_window()
             self.emit("on-first-frame", context)
 
         cursor, self.mouse_x, self.mouse_y, mods = self._window.get_pointer()
@@ -2241,6 +2242,10 @@ def __on_button_release(self, scene, event):
         self.__check_mouse(event.x, event.y)
         return True
 
+    def __on_realize(self, widget):
+        # Store as soon as available. Maybe for performance reasons,
+        # to avoid get_window() calls in __on_mouse_move ?
+        self._window = self.get_window()
 
     def __on_scroll(self, scene, event):
         target = self.get_sprite_at_position(event.x, event.y)