Merge lp:~brian-murray/xpresser/xpresser-right-click into lp:~niemeyer/xpresser/trunk

[Brian Murray]

[lp:~brian-murray/xpresser/xpresser-right-click]

8. By Brian Murray on 2010-11-05

add in a test for right clicking

[Brian Murray (brian-murray)]

I've added a test_right_click to test_xutils. I ran the test after setting right_click to MOUSE_B1C and it failed. After restoring it to MOUSE_B3C the test passed so I think its good to go.

[Gustavo Niemeyer (niemeyer)]

That's been merged, thanks Brian.

I'm going to add an additional method to the Xpresser class as well, so that we can use xp.right_click() with it.

review: Approve

=== modified file 'xpresser/tests/test_xutils.py'
--- xpresser/tests/test_xutils.py	2010-05-18 20:27:10 +0000
+++ xpresser/tests/test_xutils.py	2010-11-05 17:52:54 +0000
@@ -149,16 +149,20 @@
         self.window = self.create_button_window()
         self.button = self.window.get_child()
         self.button_clicked = False
+        self.button_rclicked = False
         self.button_hovered = False
 
-        def clicked(widget):
+        def clicked(widget, event):
+            if event.button == 1:
+                self.button_clicked = True
+            elif event.button == 3:
+                self.button_rclicked = True
             self.window.destroy()
-            self.button_clicked = True
 
         def entered(widget):
             self.button_hovered = True
 
-        self.button.connect("clicked", clicked)
+        self.button.connect("button_press_event", clicked)
         self.button.connect("enter", entered)
 
         self.flush_gtk()
@@ -176,6 +180,11 @@
         self.flush_gtk()
         self.assertTrue(self.button_clicked)
 
+    def test_right_click(self):
+        xutils.right_click(*self.get_button_center())
+        self.flush_gtk()
+        self.assertTrue(self.button_rclicked)
+
     def test_hover(self):
         xutils.hover(*self.get_button_center())
         self.flush_gtk()

=== modified file 'xpresser/xutils.py'
--- xpresser/xutils.py	2010-05-18 20:27:10 +0000
+++ xpresser/xutils.py	2010-11-05 17:52:54 +0000
@@ -31,6 +31,9 @@
 def click(x, y):
     pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_B1C)
 
+def right_click(x, y):
+    pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_B3C)
+
 def hover(x, y):
     pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_ABS)