diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-15 11:59:19 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-15 11:59:19 -0700 |
commit | cb27d5ca8230707b276763c0ec20e586203144c9 (patch) | |
tree | f4de99434edea1cd2c452e13ea7db781596c0bec | |
parent | 68bb258fcaa59479f39eafab9c4b2bed37a553de (diff) |
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
-rw-r--r-- | hw/xquartz/X11Application.m | 6 | ||||
-rw-r--r-- | hw/xquartz/xpr/dri.h | 2 | ||||
-rw-r--r-- | hw/xquartz/xpr/xprAppleWM.c | 2 | ||||
-rw-r--r-- | hw/xquartz/xpr/xprCursor.c | 2 | ||||
-rw-r--r-- | hw/xquartz/xpr/xprFrame.c | 2 | ||||
-rw-r--r-- | hw/xquartz/xpr/xprScreen.c | 2 |
6 files changed, 5 insertions, 11 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 7266be913..21463755e 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -51,10 +51,6 @@ #include <unistd.h> #include <pthread.h> -#include "rootlessCommon.h" - -WindowPtr xprGetXWindowFromAppKit(int windowNumber); // xpr/xprFrame.c - #define DEFAULTS_FILE "/usr/X11/lib/X11/xserver/Xquartz.plist" /* Fake button press/release for scroll wheel move. */ @@ -220,8 +216,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) { if (_x_active) [self activateX:NO]; } else if ([self modalWindow] == nil) { /* Must be an X window. Tell appkit it doesn't have focus. */ - WindowPtr pWin = xprGetXWindowFromAppKit([e windowNumber]); - if (pWin) RootlessReorderWindow(pWin); for_appkit = NO; if ([self isActive]) { diff --git a/hw/xquartz/xpr/dri.h b/hw/xquartz/xpr/dri.h index cf2638a9f..8bb2e9e80 100644 --- a/hw/xquartz/xpr/dri.h +++ b/hw/xquartz/xpr/dri.h @@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "scrnintstr.h" #define _APPLEDRI_SERVER_ #include "appledri.h" -#include "Xplugin.h" +#include <Xplugin.h> typedef void (*ClipNotifyPtr)( WindowPtr, int, int ); diff --git a/hw/xquartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c index bd82df03c..aa5f29159 100644 --- a/hw/xquartz/xpr/xprAppleWM.c +++ b/hw/xquartz/xpr/xprAppleWM.c @@ -34,7 +34,7 @@ #include "xpr.h" #include "applewmExt.h" #include "rootless.h" -#include "Xplugin.h" +#include <Xplugin.h> #include <X11/X.h> static int xprSetWindowLevel( diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index dc7a73eab..d41fdd5c4 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -37,7 +37,7 @@ #include "xpr.h" #include "darwin.h" #include "darwinEvents.h" -#include "Xplugin.h" +#include <Xplugin.h> #include "mi.h" #include "scrnintstr.h" diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c index 4f05f8490..266bbfd49 100644 --- a/hw/xquartz/xpr/xprFrame.c +++ b/hw/xquartz/xpr/xprFrame.c @@ -34,7 +34,7 @@ #include <unistd.h> #include "xpr.h" #include "rootlessCommon.h" -#include "Xplugin.h" +#include <Xplugin.h> #include "x-hash.h" #include "x-list.h" #include "applewmExt.h" diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 1b4506d55..fc66bedfb 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -39,7 +39,7 @@ #include "rootless.h" #include "dri.h" #include "globals.h" -#include "Xplugin.h" +#include <Xplugin.h> #include "applewmExt.h" #include "micmap.h" |