diff options
| author | Ben Byer <bbyer@bbyer.local> | 2008-04-18 17:17:01 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-04-18 20:07:41 -0700 |
| commit | edd3fb784bad893550ee270e0a09f22f99783cf5 (patch) | |
| tree | e93aa2fda602c9016f68929bf358f2dac9ce06be /hw/xquartz | |
| parent | a7503615a6893749d512f75d37646273f31b9dbf (diff) | |
random flailing
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
Diffstat (limited to 'hw/xquartz')
| -rw-r--r-- | hw/xquartz/X11Application.h | 1 | ||||
| -rw-r--r-- | hw/xquartz/X11Application.m | 20 | ||||
| -rw-r--r-- | hw/xquartz/quartzCommon.h | 1 | ||||
| -rw-r--r-- | hw/xquartz/quartzKeyboard.c | 3 |
4 files changed, 13 insertions, 12 deletions
diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h index ea9a6b758..9d1ee4177 100644 --- a/hw/xquartz/X11Application.h +++ b/hw/xquartz/X11Application.h @@ -31,7 +31,6 @@ #define X11APPLICATION_H 1 #if __OBJC__ - #import <Cocoa/Cocoa.h> #import "X11Controller.h" diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 31ac563a7..6691a2527 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -26,16 +26,19 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ +#include <Carbon/Carbon.h> +#include "quartzCommon.h" #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif +#define BOOL X_BOOL +//#undef GetWindowAttributes +//#undef ChangeWindowAttributes +#undef BOOL -#include "quartzCommon.h" #include "quartzForeground.h" - #import "X11Application.h" -#include <Carbon/Carbon.h> /* ouch! */ #define BOOL X_BOOL @@ -45,8 +48,6 @@ # define _APPLEWM_SERVER_ # include "X11/extensions/applewm.h" # include "micmap.h" -#undef BOOL - #include <mach/mach.h> #include <unistd.h> #include <pthread.h> @@ -188,10 +189,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) { } - (void) sendEvent:(NSEvent *)e { - NSEventType type; - BOOL for_appkit, for_x; - - type = [e type]; NSEventType type; BOOL for_appkit, for_x; @@ -242,6 +239,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) { || [e keyCode] == 53 /*Esc*/)) { swallow_up = 0; for_x = NO; + } } else { /* If we saw a key equivalent on the down, don't pass the up through to X. */ @@ -641,8 +639,8 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) { if(darwinDesiredDepth == 8) darwinDesiredDepth = -1; - enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO - default:false]; +// enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO +// default:false]; } /* This will end up at the end of the responder chain. */ diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h index c4bd2d803..40675bc5a 100644 --- a/hw/xquartz/quartzCommon.h +++ b/hw/xquartz/quartzCommon.h @@ -43,6 +43,7 @@ #define WindowPtr QD_WindowPtr #define Picture QD_Picture #include <ApplicationServices/ApplicationServices.h> +#include <Carbon/Carbon.h> #undef Cursor #undef WindowPtr #undef Picture diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index e8d99682e..fd0c3ccb3 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -52,6 +52,9 @@ #include "quartzCommon.h" +#undef GetWindowAttributes +#undef ChangeWindowAttributes + #include <CoreServices/CoreServices.h> #include <Carbon/Carbon.h> #include <IOKit/hidsystem/event_status_driver.h> |