summaryrefslogtreecommitdiff
path: root/hw/darwin/quartz/XServer.h
diff options
context:
space:
mode:
Diffstat (limited to 'hw/darwin/quartz/XServer.h')
-rw-r--r--hw/darwin/quartz/XServer.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h
index 5fef683a8..dc6701b22 100644
--- a/hw/darwin/quartz/XServer.h
+++ b/hw/darwin/quartz/XServer.h
@@ -29,7 +29,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.1.4.2.4.2 2004/03/04 20:16:11 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */
#define BOOL xBOOL
@@ -39,7 +39,7 @@
#import <Cocoa/Cocoa.h>
@interface XServer : NSObject {
- // server state
+ // Server state
int serverState;
NSRecursiveLock *serverLock;
NSMutableArray *pendingClients;
@@ -49,6 +49,7 @@
BOOL quitWithoutQuery;
BOOL pendingAppQuitReply;
UInt32 mouseState;
+ unsigned short swallowedKey;
BOOL sendServerEvents;
BOOL x11Active;
@@ -73,7 +74,7 @@
- (BOOL)translateEvent:(NSEvent *)anEvent;
- (BOOL)getMousePosition:(xEvent *)xe fromEvent:(NSEvent *)anEvent;
-+ (void)append:(NSString *)value toEnv:(NSString *)name;
+- (NSString *)makeSafePath:(NSString *)path;
- (BOOL)loadDisplayBundle;
- (void)startX;