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

Merge remote-tracking branch 'jeremyhu/master'

This commit is contained in:
Adam Jackson 2015-10-19 12:23:22 -04:00
parent 1d4aa67242 27ad21254f
commit 5b582a4a03
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xquartz/darwinEvents.c
View File

@ -178,7 +178,7 @@ static int darwin_x11_modifier_mask_list[] = {
0 0
}; };
static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, }; static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, 0 };
static void static void
DarwinUpdateModifiers(int pressed, // KeyPress or KeyRelease DarwinUpdateModifiers(int pressed, // KeyPress or KeyRelease
@ -367,14 +367,12 @@ DarwinEQInit(void)
{ {
int *p; int *p;
for (p = darwin_x11_modifier_mask_list, darwin_all_modifier_mask = 0; *p; for (p = darwin_x11_modifier_mask_list; *p; p++) {
p++) {
darwin_x11_modifier_mask |= *p; darwin_x11_modifier_mask |= *p;
} }
for (p = darwin_all_modifier_mask_additions, darwin_all_modifier_mask = darwin_x11_modifier_mask;
darwin_all_modifier_mask = darwin_x11_modifier_mask; for (p = darwin_all_modifier_mask_additions; *p; p++) {
*p; p++) {
darwin_all_modifier_mask |= *p; darwin_all_modifier_mask |= *p;
} }
@ -387,7 +385,6 @@ DarwinEQInit(void)
*/ */
if (!darwinEvents) { if (!darwinEvents) {
darwinEvents = InitEventList(GetMaximumEventsNum()); darwinEvents = InitEventList(GetMaximumEventsNum());
;
if (!darwinEvents) if (!darwinEvents)
FatalError("Couldn't allocate event buffer\n"); FatalError("Couldn't allocate event buffer\n");