diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-08 17:02:56 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-08 17:03:18 -0700 |
| commit | 3f51f493b6daf2464e6c2ba5a924219b88a9e57e (patch) | |
| tree | cc906272192effaa60d04c6a43cfb27afa34be76 /hw/xquartz | |
| parent | 08073862f8c4e1219b6459708ffd28e2bc35885f (diff) | |
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
Diffstat (limited to 'hw/xquartz')
| -rw-r--r-- | hw/xquartz/darwinEvents.c | 6 | ||||
| -rw-r--r-- | hw/xquartz/quartz.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index 3afbaf890..410acdd76 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -56,6 +56,10 @@ in this Software without prior written authorization from The Open Group. #include "applewmExt.h" #include <X11/extensions/applewm.h> +/* FIXME: Abstract this away into xpr */ +#include <Xplugin.h> +#include "rootlessWindow.h" +WindowPtr xprGetXWindow(xp_window_id wid); /* Fake button press/release for scroll wheel move. */ #define SCROLLWHEELUPFAKE 4 @@ -228,7 +232,7 @@ void DarwinEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int neven case kXquartzWindowState: DEBUG_LOG("kXquartzWindowState\n"); - RootlessNativeWindowStateChanged(xe[i].u.clientMessage.u.l.longs0, + RootlessNativeWindowStateChanged(xprGetXWindow(xe[i].u.clientMessage.u.l.longs0), xe[i].u.clientMessage.u.l.longs1); break; diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 96dc021a6..6a8cf7c12 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -52,7 +52,6 @@ #include "windowstr.h" #include "colormapst.h" #include "globals.h" -#include "rootlessWindow.h" // System headers #include <sys/types.h> |