Merge pull request #89 from hordepfo/pointer-fix

Fixes reported issues with the mouse pointer

usr/lib/linuxmint/mintMenu/mintMenu.py

@@ -506,6 +506,8 @@ class MenuWin( object ):
         self.mainwin = MainWindow( self.button_box, self.settings, self.keybinder )
         self.mainwin.window.connect( "map-event", self.onWindowMap )
         self.mainwin.window.connect( "unmap-event", self.onWindowUnmap )
+        self.mainwin.window.connect( "enter-notify-event", self.onWindowEnter )
+        self.mainwin.window.connect( "leave-notify-event", self.onWindowLeave )
         self.mainwin.window.connect( "realize", self.onRealize )
         self.mainwin.window.connect( "size-allocate", lambda *args: self.positionMenu() )
 
@@ -534,6 +536,14 @@ class MenuWin( object ):
         self.pointerMonitor.ungrabPointer()
         return False
         
+    def onWindowEnter(self, applet, event):
+        self.pointerMonitor.ungrabPointer()
+        return False
+
+    def onWindowLeave(self, applet, event):
+        self.pointerMonitor.grabPointer()
+        return False
+        
     def onRealize( self, *args):
         self.pointerMonitor.addWindowToMonitor( self.mainwin.window.window )
         self.pointerMonitor.addWindowToMonitor( self.applet.window )

usr/lib/linuxmint/mintMenu/pointerMonitor.py

@@ -25,20 +25,11 @@ class PointerMonitor(GObject.GObject, threading.Thread):
         self.display = Display()
         self.root = self.display.screen().root
         self.windows = []
-        self.topWindows = []
         
     # Receives GDK windows
     def addWindowToMonitor(self, window):
         xWindow = self.display.create_resource_object("window", gdk.gdk_x11_drawable_get_xid(hash(window)))
         self.windows.append(xWindow)
-        self.topWindows.append(self.getToplevelParent(xWindow))
-        
-    def getToplevelParent(self, window):
-        parent = window.query_tree().parent
-        if parent == self.root:
-            return window
-        else:
-            return self.getToplevelParent(parent)
             
     def grabPointer(self):
         self.root.grab_button(X.AnyButton, X.AnyModifier, True, X.ButtonPressMask, X.GrabModeSync, X.GrabModeAsync, 0, 0)
@@ -62,20 +53,17 @@ class PointerMonitor(GObject.GObject, threading.Thread):
             try:
                 if event.type == X.ButtonPress:
                     # Check if pointer is inside monitored windows
-                    for w, topW  in zip(self.windows, self.topWindows):
+                    for w in self.windows:
-                        if event.child == topW:
+                        p = w.query_pointer()
-                            if topW == w:
+                        g = w.get_geometry()
-                                break
+                        if p.win_x >= 0 and p.win_y >= 0 and p.win_x <= g.width and p.win_y <= g.height:
-                            else:
+                            break
-                                p = w.query_pointer()
-                                g = w.get_geometry()
-                                if p.win_x >= 0 and p.win_y >= 0 and p.win_x <= g.width and p.win_y <= g.height:
-                                    break
                     else:
                         # Is outside, so activate
                         GLib.idle_add(self.idle)
-                        
+                    self.display.allow_events(X.ReplayPointer, event.time)
-                self.display.allow_events(X.ReplayPointer, event.time)
+                else:        
+                    self.display.allow_events(X.ReplayPointer, X.CurrentTime)
             except Exception as e:
                 print "Unexpected error: " + str(e)