parent
a7503615a6
commit
edd3fb784b
|
@ -31,7 +31,6 @@
|
|||
#define X11APPLICATION_H 1
|
||||
|
||||
#if __OBJC__
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import "X11Controller.h"
|
||||
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -134,7 +134,7 @@ extern int ChangeWindowAttributes(
|
|||
/* Quartz support on Mac OS X uses the HIToolbox
|
||||
framework whose GetWindowAttributes function conflicts here. */
|
||||
#ifdef __APPLE__
|
||||
#define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x)
|
||||
#define GetWindowAttributes(w,c) Darwin_X_GetWindowAttributes(w,c)
|
||||
extern void Darwin_X_GetWindowAttributes(
|
||||
#else
|
||||
extern void GetWindowAttributes(
|
||||
|
|
|
@ -1427,7 +1427,7 @@ RootlessReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
|
|||
|
||||
pWin->rootlessUnhittable = FALSE;
|
||||
|
||||
DeleteProperty (pWin, xa_native_window_id ());
|
||||
DeleteProperty (serverClient, pWin, xa_native_window_id ());
|
||||
|
||||
if (WINREC(pTopWin) != NULL) {
|
||||
/* We're screwed. */
|
||||
|
|
Loading…
Reference in New Issue