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

XQuartz: Do translation and handoff of NSEvent to X11 in a separate serial queue 

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2011-04-22 01:23:09 -07:00
parent 72bd232b11
commit 5f496bc919
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xquartz/X11Application.m
View File

@ -61,6 +61,12 @@ extern int xpbproxy_run (void);
#define XSERVER_VERSION "?" #define XSERVER_VERSION "?"
#endif #endif
#ifdef HAVE_LIBDISPATCH
#include <dispatch/dispatch.h>
static dispatch_queue_t eventTranslationQueue;
#endif
/* Stuck modifier / button state... force release when we context switch */ /* Stuck modifier / button state... force release when we context switch */
static NSEventType keyState[NUM_KEYCODES]; static NSEventType keyState[NUM_KEYCODES];
@ -385,7 +391,15 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
if (for_appkit) [super sendEvent:e]; if (for_appkit) [super sendEvent:e];
if (for_x) [self sendX11NSEvent:e]; if (for_x) {
#ifdef HAVE_LIBDISPATCH
dispatch_async(eventTranslationQueue, ^{
#endif
[self sendX11NSEvent:e];
#ifdef HAVE_LIBDISPATCH
});
#endif
}
} }
- (void) set_window_menu:(NSArray *)list { - (void) set_window_menu:(NSArray *)list {
@ -999,6 +1013,11 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) - aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
NSMaxY([[NSScreen mainScreen] visibleFrame]); NSMaxY([[NSScreen mainScreen] visibleFrame]);
#ifdef HAVE_LIBDISPATCH
eventTranslationQueue = dispatch_queue_create(LAUNCHD_ID_PREFIX".X11.NSEventsToX11EventsQueue", NULL);
assert(eventTranslationQueue != NULL);
#endif
/* Set the key layout seed before we start the server */ /* Set the key layout seed before we start the server */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
last_key_layout = TISCopyCurrentKeyboardLayoutInputSource(); last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();