andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Only call DarwinUpdateModKeys when needed

Browse Source 
Previously, we were calling it on almost every itteration through sendX11Event
(cherry picked from commit 6461729647)
This commit is contained in:
Jeremy Huddleston 2009-01-11 14:49:39 -08:00
parent f7b6c1907c
commit 48a2210439
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xquartz/X11Application.m
View File

@ -65,6 +65,7 @@ extern BOOL xpbproxy_init (void);
/* Stuck modifier / button state... force release when we context switch */
static NSEventType keyState[NUM_KEYCODES];
static int modifierFlagsMask;
int X11EnableKeyEquivalents = TRUE, quartzFullscreenMenu = FALSE;
int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
@ -200,7 +201,8 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
}
} else {
DarwinUpdateModKeys(0);
if(darwin_modifier_flags)
DarwinUpdateModKeys(0);
for(i=0; i < NUM_KEYCODES; i++) {
if(keyState[i] == NSKeyDown) {
DarwinSendKeyboardEvents(KeyRelease, i);
@ -872,6 +874,7 @@ environment the next time you start X11?", @"Startup xinitrc dialog");
void X11ApplicationMain (int argc, char **argv, char **envp) {
NSAutoreleasePool *pool;
int *p;
#ifdef DEBUG
while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
@ -916,6 +919,10 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n");
}
for(p=darwin_modifier_mask_list, modifierFlagsMask=0; *p; p++) {
modifierFlagsMask |= *p;
}
/* Tell the server thread that it can proceed */
QuartzInitServer(argc, argv, envp);
@ -932,7 +939,6 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
}
@implementation X11Application (Private)
extern int darwin_modifier_flags; // darwinEvents.c
#ifdef NX_DEVICELCMDKEYMASK
/* This is to workaround a bug in the VNC server where we sometimes see the L
@ -987,6 +993,8 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK, NX_DEVICELALTKEYMASK);
#endif
modifierFlags &= modifierFlagsMask;
/* We don't receive modifier key events while out of focus, and 3button
* emulation mucks this up, so we need to check our modifier flag state
* on every event... ugg

4
hw/xquartz/darwinEvents.c
View File

@ -146,7 +146,7 @@ static void DarwinPressModifierKey(int pressed, int key) {
* Send events to update the modifier state.
*/
static int modifier_mask_list[] = {
int darwin_modifier_mask_list[] = {
#ifdef NX_DEVICELCMDKEYMASK
NX_DEVICELCTLKEYMASK, NX_DEVICERCTLKEYMASK,
NX_DEVICELSHIFTKEYMASK, NX_DEVICERSHIFTKEYMASK,
@ -173,7 +173,7 @@ static void DarwinUpdateModifiers(
DarwinPressModifierKey(KeyRelease, NX_MODIFIERKEY_ALPHALOCK);
}
for(f=modifier_mask_list; *f; f++)
for(f=darwin_modifier_mask_list; *f; f++)
if(*f & flags) {
key = DarwinModifierNXMaskToNXKey(*f);
if(key == -1)

3
hw/xquartz/darwinEvents.h
View File

@ -78,4 +78,7 @@ enum {
/* Send one of the above events to the server thread. */
void DarwinSendDDXEvent(int type, int argc, ...);
extern int darwin_modifier_mask_list[];
extern int darwin_modifier_flags;
#endif /* _DARWIN_EVENTS_H */