jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89 from hordepfo/pointer-fix

Browse Source 
Fixes reported issues with the mouse pointer
This commit is contained in:
Clement Lefebvre 2014-05-22 10:41:36 +01:00
commit 251f1c80a7
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr/lib/linuxmint/mintMenu/mintMenu.py
View File

@ -506,6 +506,8 @@ class MenuWin( object ):
self.mainwin = MainWindow( self.button_box, self.settings, self.keybinder ) self.mainwin = MainWindow( self.button_box, self.settings, self.keybinder )
self.mainwin.window.connect( "map-event", self.onWindowMap ) self.mainwin.window.connect( "map-event", self.onWindowMap )
self.mainwin.window.connect( "unmap-event", self.onWindowUnmap ) 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( "realize", self.onRealize )
self.mainwin.window.connect( "size-allocate", lambda *args: self.positionMenu() ) self.mainwin.window.connect( "size-allocate", lambda *args: self.positionMenu() )
@ -534,6 +536,14 @@ class MenuWin( object ):
self.pointerMonitor.ungrabPointer() self.pointerMonitor.ungrabPointer()
return False 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): def onRealize( self, *args):
self.pointerMonitor.addWindowToMonitor( self.mainwin.window.window ) self.pointerMonitor.addWindowToMonitor( self.mainwin.window.window )
self.pointerMonitor.addWindowToMonitor( self.applet.window ) self.pointerMonitor.addWindowToMonitor( self.applet.window )

18
usr/lib/linuxmint/mintMenu/pointerMonitor.py
View File

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