Fixes reported issues with the mouse pointer.

This commit is contained in:
hordepfo 2014-05-01 18:13:17 +01:00 committed by Clement Lefebvre
parent 6a7cf3fcd3
commit 6a81d20019

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,15 +53,11 @@ 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: 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: else:
# Is outside, so activate # Is outside, so activate
GLib.idle_add(self.idle) GLib.idle_add(self.idle)