[mousetrap/gnome3-wip] BUG 723381: Fix error with point mapper when enabled.

[Heidi Ellis <heidiellis src gnome org>]

commit 79f3165ba206a74124b6cb97f30e7df6ef6e0af9
Author: Logan Hotchkiss <lhotchkiss17 gmail com>
Date:   Fri Jan 31 15:36:23 2014 -0500

    BUG 723381: Fix error with point mapper when enabled.

 src/mousetrap/app/ui/main.py             |    2 +-
 src/mousetrap/app/ui/scripts/joystick.py |   26 ++++++-----
 src/mousetrap/app/ui/scripts/screen.py   |   14 +++---
 src/mousetrap/app/ui/widgets.py          |   73 +++++++++---------------------
 4 files changed, 44 insertions(+), 71 deletions(-)
---
diff --git a/src/mousetrap/app/ui/main.py b/src/mousetrap/app/ui/main.py
index a082383..936657a 100644
--- a/src/mousetrap/app/ui/main.py
+++ b/src/mousetrap/app/ui/main.py
@@ -53,7 +53,7 @@ class MainGui( Gtk.Window ):
         self.ctr    = controller
         self.cfg    = controller.cfg
         self.script = self.ctr.script()
-        self.set_default_size(200, 400)
+        self.set_default_size(200, 500)
 
     def setWindowsIcon( self ):
         '''
diff --git a/src/mousetrap/app/ui/scripts/joystick.py b/src/mousetrap/app/ui/scripts/joystick.py
index 23d12e4..cec625c 100644
--- a/src/mousetrap/app/ui/scripts/joystick.py
+++ b/src/mousetrap/app/ui/scripts/joystick.py
@@ -53,8 +53,7 @@ class ScriptClass(Mapper):
         self.point       = None
         self.border_width = 0
 
-        #FIXME: uncommenting this results in tracebacks and the window not showing.
-        #self.connect("expose_event", self.expose_event)
+        self.connect("draw", self.expose_event)
 
     def update_items(self, point):
         self.point = point
@@ -62,18 +61,20 @@ class ScriptClass(Mapper):
         self.queue_draw()
 
     def expose_event(self, widget, event):
-        self.width, self.height = self.allocation[2], self.allocation[3]
+        self.width, self.height = self.allocation.width, self.allocation.height
+        self.width, self.height = 200,160
 
-#        self.draw_rectangle(0,
-#                            0,
-#                            self.width,
-#                            self.height,
-#                            self.style.fg[self.state],
-#                            5.0)
+        #self.draw_rectangle(0,
+        #                    0,
+        #                    self.width,
+        #                    self.height,
+        #                    self.get_style_context(),
+        #                    5.0)
 
         self.center = { "x" : self.width / 2,
                         "y" : self.height / 2 }
 
+
         self.safe_area = { "x" : self.center["x"] - 10,
                          "y" : self.center["y"] - 10,
                          "width"  : 20,
@@ -81,11 +82,12 @@ class ScriptClass(Mapper):
 
         self.draw_rectangle( self.safe_area["x"], self.safe_area["y"],
                              self.safe_area["width"], self.safe_area["height"],
-                             self.style.fg[self.state], 1.0)
+                             self.get_style_context(),  #self.style.fg[self.state],
+                             1.0)
 
         if hasattr(self.point, "abs_diff"):
-            self.vpoint = { "x" : self.center["x"] - self.point.abs_diff.x,
-                            "y" : self.center["y"] + self.point.abs_diff.y }
+            self.vpoint = { "x" : self.center["x"] - self.point.abs_diff[0],
+                            "y" : self.center["y"] + self.point.abs_diff[1]}
 
             self.draw_point( self.vpoint["x"], self.vpoint["y"], 2)
 
diff --git a/src/mousetrap/app/ui/scripts/screen.py b/src/mousetrap/app/ui/scripts/screen.py
index d6ebfc2..35d29fa 100644
--- a/src/mousetrap/app/ui/scripts/screen.py
+++ b/src/mousetrap/app/ui/scripts/screen.py
@@ -53,7 +53,7 @@ class ScriptClass(Mapper):
         self.point       = None
         self.border_with = 0
 
-        self.connect("expose_event", self.expose_event)
+        self.connect("draw", self.expose_event)
 
     def update_items(self, point):
         self.point = point
@@ -61,13 +61,14 @@ class ScriptClass(Mapper):
         self.queue_draw()
 
     def expose_event(self, widget, event):
-        self.width, self.height = self.allocation[2], self.allocation[3]
+        self.width, self.height = self.allocation.width, self.allocation.height
+        self.width, self.height = 200,160
 
         self.draw_rectangle(self.border_with,
                             self.border_with,
                             self.width - 2*self.border_with,
                             self.height - 2*self.border_with,
-                            self.style.fg[self.state],
+                            self.get_style_context(),
                             5.0)
 
         self.center = { "x" : self.width / 2,
@@ -80,11 +81,12 @@ class ScriptClass(Mapper):
 
         self.draw_rectangle( self.vscreen["x"], self.vscreen["y"],
                              self.vscreen["width"], self.vscreen["height"],
-                             self.style.fg[self.state], 5.0)
+                             self.get_style_context(),  #self.style.fg[self.state]
+                             5.0)
 
         if hasattr(self.point, "abs_diff"):
-            self.vpoint = { "x" : self.center["x"] - self.point.abs_diff.x,
-                            "y" : self.center["y"] + self.point.abs_diff.y }
+            self.vpoint = { "x" : self.center["x"] - self.point.abs_diff[0],
+                            "y" : self.center["y"] + self.point.abs_diff[1] }
 
             self.draw_point( self.vpoint["x"], self.vpoint["y"], 2)
 
diff --git a/src/mousetrap/app/ui/widgets.py b/src/mousetrap/app/ui/widgets.py
index 55dbf7e..e388b71 100644
--- a/src/mousetrap/app/ui/widgets.py
+++ b/src/mousetrap/app/ui/widgets.py
@@ -47,6 +47,7 @@ class Mapper(Gtk.Widget):
         self.height  = height
         self.events  = { "motion" : [],
                          "click"  : []}
+        self.set_size_request(width, height)
 #         self._layout = self.create_pango_layout(text)
 #         self._layout.set_font_description(pango.FontDescription("Sans Serif 16"))
 
@@ -64,24 +65,27 @@ class Mapper(Gtk.Widget):
         # Mapper.do_realize: Class 'style' has no 'fg_gc' member
 
         # First set an internal flag telling that we're realized
-        #self.set_flags(self.flags() | Gtk.REALIZED)
         self.set_realized(True)
 
         # Create a new gdk.Window which we can draw on.
         # Also say that we want to receive exposure events
         # and button click and button press events
 
-        self.window = Gdk.Window(
-                self.get_parent_window(),
-                width=self.allocation.width,
-                height=self.allocation.height,
-                window_type=Gdk.WINDOW_CHILD,
-                event_mask=self.get_events() | Gdk.EventMask.EXPOSURE_MASK
-                        | Gdk.EventMask.BUTTON1_MOTION_MASK | Gdk.EventMask.BUTTON_PRESS_MASK
-                        | Gdk.EventMask.POINTER_MOTION_MASK
-                        | Gdk.EventMask.POINTER_MOTION_HINT_MASK,
-                wclass=Gdk.INPUT_OUTPUT
-        )
+        attr = Gdk.WindowAttr()
+        attr.window_type = Gdk.WindowType.CHILD
+        attr.wclass = Gdk.WindowWindowClass.INPUT_OUTPUT
+        attr.event_mask = self.get_events() | Gdk.EventMask.EXPOSURE_MASK | 
Gdk.EventMask.BUTTON1_MOTION_MASK | \
+                 Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK | \
+                 Gdk.EventMask.POINTER_MOTION_HINT_MASK
+        attr.width = self.width #self.allocation.width
+        attr.height = self.height #self.allocation.height
+        attr.visual = self.get_visual()
+
+        mask = Gdk.WindowAttributesType.VISUAL | \
+            Gdk.WindowAttributesType.X | \
+            Gdk.WindowAttributesType.Y
+
+        self.window = Gdk.Window.new(self.get_parent_window(), attr, mask)
 
         # Associate the gdk.Window with ourselves, Gtk+ needs a reference
         # between the widget and the gdk window
@@ -89,20 +93,11 @@ class Mapper(Gtk.Widget):
 
         # Attach the style to the gdk.Window, a style contains colors and
         # GC contextes used for drawing
-        self.style.attach(self.window)
+        self.set_window(self.window)    #LMH 12/15/13
 
         # The default color of the background should be what
         # the style (theme engine) tells us.
-        self.style.set_background(self.window, Gtk.StateType.NORMAL)
-        self.window.move_resize(*self.allocation)
-
-        # self.style is a gtk.Style object, self.style.fg_gc is
-        # an array or graphic contexts used for drawing the forground
-        # colours
-        self.gc = self.style.fg_gc[Gtk.StateType.NORMAL]
-        # pylint: enable-msg=E1101
-
-        #self.connect("motion_notify_event", self.motion_notify_event)
+        self.window.move_resize(self.allocation.x,self.allocation.y, self.allocation.width, 
self.allocation.height)
 
     def do_unrealize(self):
         # The do_unrealized method is responsible for freeing the GDK resources
@@ -124,6 +119,8 @@ class Mapper(Gtk.Widget):
 
         # Save the allocated space
         self.allocation = allocation
+        #FIXME: Shouldn't need to set x manually
+        self.allocation.x = 50
 
         # If we're realized, move and resize the window to the
         # requested coordinates/positions
@@ -131,7 +128,7 @@ class Mapper(Gtk.Widget):
         # Mapper.do_size_allocate: Used * or ** magic
         # WE DO NEED THE *
         if self.get_realized():
-            self.window.move_resize(*allocation)
+            self.window.move_resize(self.allocation.x,self.allocation.y, self.allocation.width, 
self.allocation.height)
         # pylint: enable-msg=W0142
 
     def expose_event(self, widget, event):
@@ -143,42 +140,14 @@ class Mapper(Gtk.Widget):
         # a good idea to write this code as optimized as it can be, don't
         # Create any resources in here.
 
-#         x, y, self.width, self.height = self.allocation
-#         self.draw_rectangle(BORDER_WIDTH,
-#                             BORDER_WIDTH,
-#                             self.width - 2*BORDER_WIDTH,
-#                             self.height - 2*BORDER_WIDTH,
-#                             self.style.fg[self.state],
-#                             5.0)
-#
-#         w = self.width / 2
-#         h = self.height / 2
-#
-#         self.draw_rectangle(60, 50, 80, 60, self.style.fg[self.state], 5.0)
-#         self.draw_point( w + point.abs_diff.x, h - point.abs_diff.y, 2)
-
-#         x, y, w, h = self.allocation
-#         self.draw_rectangle(200,
-#                             160,
-#                             100,
-#                             ,
-#                             self.style.fg[self.state],
-#                             5.0)
         return True
 
-#         And draw the text in the middle of the allocated space
-#         fontw, fonth = self._layout.get_pixel_size()
-#         cr.move_to((w - fontw)/2, (h - fonth)/2)
-#         cr.update_layout(self._layout)
-#         cr.show_layout(self._layout)
-
     def draw_rectangle(self, x, y, width, height, color, line):
         """
         A Method to draw rectangles.
         """
 
         cr = self.window.cairo_create()
-        cr.set_source_color(color)
         cr.rectangle(x, y, width, height)
         cr.set_line_width(line)
         cr.set_line_join(cairo.LINE_JOIN_ROUND)