frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread 

(cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
This commit is contained in:
Jeremy Huddleston 2008-04-15 12:06:07 -07:00
parent 35982bc109
commit 9e7ced94a5
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xquartz/X11Application.m
View File

@ -51,10 +51,6 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include "rootlessCommon.h"
WindowPtr xprGetXWindowFromAppKit(int windowNumber); // xpr/xprFrame.c
#define DEFAULTS_FILE "/usr/X11/lib/X11/xserver/Xquartz.plist" #define DEFAULTS_FILE "/usr/X11/lib/X11/xserver/Xquartz.plist"
int X11EnableKeyEquivalents = TRUE; int X11EnableKeyEquivalents = TRUE;
@ -195,6 +191,10 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
NSEventType type; NSEventType type;
BOOL for_appkit, for_x; BOOL for_appkit, for_x;
type = [e type];
NSEventType type;
BOOL for_appkit, for_x;
type = [e type]; type = [e type];
/* By default pass down the responder chain and to X. */ /* By default pass down the responder chain and to X. */
@ -210,8 +210,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
if (_x_active) [self activateX:NO]; if (_x_active) [self activateX:NO];
} else if ([self modalWindow] == nil) { } else if ([self modalWindow] == nil) {
/* Must be an X window. Tell appkit it doesn't have focus. */ /* Must be an X window. Tell appkit it doesn't have focus. */
WindowPtr pWin = xprGetXWindowFromAppKit([e windowNumber]);
if (pWin) RootlessReorderWindow(pWin);
for_appkit = NO; for_appkit = NO;
if ([self isActive]) { if ([self isActive]) {
@ -244,10 +242,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
|| [e keyCode] == 53 /*Esc*/)) { || [e keyCode] == 53 /*Esc*/)) {
swallow_up = 0; swallow_up = 0;
for_x = NO; for_x = NO;
#ifdef DARWIN_DDX_MISSING
DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
#endif
}
} else { } else {
/* If we saw a key equivalent on the down, don't pass /* If we saw a key equivalent on the down, don't pass
the up through to X. */ the up through to X. */

2
hw/xquartz/xpr/dri.h
View File

@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "scrnintstr.h" #include "scrnintstr.h"
#define _APPLEDRI_SERVER_ #define _APPLEDRI_SERVER_
#include "appledri.h" #include "appledri.h"
#include "Xplugin.h" #include <Xplugin.h>
typedef void (*ClipNotifyPtr)( WindowPtr, int, int ); typedef void (*ClipNotifyPtr)( WindowPtr, int, int );

2
hw/xquartz/xpr/xprAppleWM.c
View File

@ -34,7 +34,7 @@
#include "xpr.h" #include "xpr.h"
#include "applewmExt.h" #include "applewmExt.h"
#include "rootless.h" #include "rootless.h"
#include "Xplugin.h" #include <Xplugin.h>
#include <X11/X.h> #include <X11/X.h>
static int xprSetWindowLevel( static int xprSetWindowLevel(

2
hw/xquartz/xpr/xprCursor.c
View File

@ -37,7 +37,7 @@
#include "xpr.h" #include "xpr.h"
#include "darwin.h" #include "darwin.h"
#include "darwinEvents.h" #include "darwinEvents.h"
#include "Xplugin.h" #include <Xplugin.h>
#include "mi.h" #include "mi.h"
#include "scrnintstr.h" #include "scrnintstr.h"

2
hw/xquartz/xpr/xprFrame.c
View File

@ -33,7 +33,7 @@
#include "xpr.h" #include "xpr.h"
#include "rootlessCommon.h" #include "rootlessCommon.h"
#include "Xplugin.h" #include <Xplugin.h>
#include "x-hash.h" #include "x-hash.h"
#include "x-list.h" #include "x-list.h"
#include "applewmExt.h" #include "applewmExt.h"

2
hw/xquartz/xpr/xprScreen.c
View File

@ -40,7 +40,7 @@
#include "rootless.h" #include "rootless.h"
#include "dri.h" #include "dri.h"
#include "globals.h" #include "globals.h"
#include "Xplugin.h" #include <Xplugin.h>
#include "applewmExt.h" #include "applewmExt.h"
#include "micmap.h" #include "micmap.h"