summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-04-11 16:53:59 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-04-11 17:26:27 -0700
commit140463a197fb93d0a4bfad924efc35b860e8cc54 (patch)
tree3667a6e61acfe3dac8f388505b8a9112e5926da7
parent80a7bb2605f9b439d6221c0495a629a39177a018 (diff)
XQuartz: Use correct values for ProximityIn and ProximityOut
This was the other underlying cause of teh 100% CPU tablet issue. (cherry picked from commit a9cecf34c23fbcd59b56b380c51d31a9fabc3eb7)
-rw-r--r--hw/xquartz/X11Application.m4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 7bac8db20..0445b8e29 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -44,6 +44,7 @@
#define _APPLEWM_SERVER_
#include "X11/extensions/applewm.h"
#include "micmap.h"
+#include "exglobals.h"
#include <mach/mach.h>
#include <unistd.h>
@@ -60,9 +61,6 @@ extern BOOL xpbproxy_init (void);
#define XSERVER_VERSION "?"
#endif
-#define ProximityIn 0
-#define ProximityOut 1
-
/* Stuck modifier / button state... force release when we context switch */
static NSEventType keyState[NUM_KEYCODES];