From 4788a34c1037b23fd3201281678473d95ab8a444 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 28 Mar 2008 16:47:55 -0700 Subject: [PATCH] XQuartz: Fixed names of enums to be more consistent --- hw/xquartz/X11Application.m | 12 ++++---- hw/xquartz/X11Controller.m | 30 ++++++++++---------- hw/xquartz/darwin.c | 6 ++-- hw/xquartz/darwin.h | 34 +++++++++++----------- hw/xquartz/darwinEvents.c | 13 ++++----- hw/xquartz/darwinKeyboard.c | 4 +-- hw/xquartz/quartz.c | 56 ++++++++++++++++++------------------- hw/xquartz/quartzKeyboard.h | 1 - hw/xquartz/xpr/xprScreen.c | 8 +++--- 9 files changed, 81 insertions(+), 83 deletions(-) diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 561059278..7266be913 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -163,7 +163,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) { tem = [infoDict objectForKey:@"CFBundleShortVersionString"]; - [dict setObject:[NSString stringWithFormat:@"XQuartz %@ - (xorg-server %s)", tem, XSERVER_VERSION] + [dict setObject:[NSString stringWithFormat:@"Xquartz %@ - (xorg-server %s)", tem, XSERVER_VERSION] forKey:@"ApplicationVersion"]; [self orderFrontStandardAboutPanelWithOptions: dict]; @@ -176,7 +176,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) { static TSMDocumentID x11_document; if (state) { - QuartzMessageServerThread (kXDarwinActivate, 0); + QuartzMessageServerThread (kXquartzActivate, 0); if (!_x_active) { if (x11_document == 0 && darwinKeymapFile == NULL) { @@ -188,7 +188,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) { if (x11_document != 0) ActivateTSMDocument (x11_document); } } else { - QuartzMessageServerThread (kXDarwinDeactivate, 0); + QuartzMessageServerThread (kXquartzDeactivate, 0); if (_x_active && x11_document != 0) DeactivateTSMDocument (x11_document); @@ -256,7 +256,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) { swallow_up = 0; for_x = NO; #ifdef DARWIN_DDX_MISSING - QuartzMessageServerThread (kXDarwinToggleFullscreen, 0); + QuartzMessageServerThread (kXquartzToggleFullscreen, 0); #endif } } else { @@ -664,7 +664,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) { /* This will end up at the end of the responder chain. */ - (void) copy:sender { - QuartzMessageServerThread (kXDarwinPasteboardNotify, 1, + QuartzMessageServerThread (kXquartzPasteboardNotify, 1, AppleWMCopyToPasteboard); } @@ -1002,7 +1002,7 @@ static void send_nsevent (NSEventType type, NSEvent *e) { break; case NSFlagsChanged: - xe.u.u.type = kXDarwinUpdateModifiers; + xe.u.u.type = kXquartzUpdateModifiers; xe.u.clientMessage.u.l.longs0 = [e modifierFlags]; DarwinEQEnqueue (&xe); break; diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index dfa2074fd..aa9fa94be 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -103,7 +103,7 @@ { [NSApp activateIgnoringOtherApps:YES]; - QuartzMessageServerThread (kXDarwinControllerNotify, 2, + QuartzMessageServerThread (kXquartzControllerNotify, 2, AppleWMWindowMenuItem, [sender tag]); } @@ -254,7 +254,7 @@ [self remove_window_menu]; [self install_window_menu:list]; - QuartzMessageServerThread (kXDarwinControllerNotify, 1, + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMWindowMenuNotify); } @@ -539,20 +539,20 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row - (void) hide_window:sender { if ([X11App x_active]) - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMHideWindow); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMHideWindow); else NSBeep (); /* FIXME: something here */ } - (IBAction)bring_to_front:sender { - QuartzMessageServerThread(kXDarwinControllerNotify, 1, AppleWMBringAllToFront); + QuartzMessageServerThread(kXquartzControllerNotify, 1, AppleWMBringAllToFront); } - (IBAction)close_window:sender { if ([X11App x_active]) - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMCloseWindow); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMCloseWindow); else [[NSApp keyWindow] performClose:sender]; } @@ -560,7 +560,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row - (IBAction)minimize_window:sender { if ([X11App x_active]) - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMMinimizeWindow); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMMinimizeWindow); else [[NSApp keyWindow] performMiniaturize:sender]; } @@ -568,19 +568,19 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row - (IBAction)zoom_window:sender { if ([X11App x_active]) - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMZoomWindow); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMZoomWindow); else [[NSApp keyWindow] performZoom:sender]; } - (IBAction) next_window:sender { - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMNextWindow); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMNextWindow); } - (IBAction) previous_window:sender { - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMPreviousWindow); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMPreviousWindow); } - (IBAction) enable_fullscreen_changed:sender @@ -588,7 +588,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row int value = ![enable_fullscreen intValue]; #ifdef DARWIN_DDX_MISSING - QuartzMessageServerThread (kXDarwinSetRootless, 1, value); + QuartzMessageServerThread (kXquartzSetRootless, 1, value); #endif [NSApp prefs_set_boolean:@PREFS_ROOTLESS value:value]; @@ -598,7 +598,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row - (IBAction) toggle_fullscreen:sender { #ifdef DARWIN_DDX_MISSING - QuartzMessageServerThread (kXDarwinToggleFullscreen, 0); + QuartzMessageServerThread (kXquartzToggleFullscreen, 0); #endif } @@ -661,7 +661,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row - (IBAction) quit:sender { - QuartzMessageServerThread (kXDarwinQuit, 0); + QuartzMessageServerThread (kXquartzQuit, 0); } - (IBAction) x11_help:sender @@ -684,12 +684,12 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row - (void) applicationDidHide:(NSNotification *)notify { - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMHideAll); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMHideAll); } - (void) applicationDidUnhide:(NSNotification *)notify { - QuartzMessageServerThread (kXDarwinControllerNotify, 1, AppleWMShowAll); + QuartzMessageServerThread (kXquartzControllerNotify, 1, AppleWMShowAll); } - (NSApplicationTerminateReply) applicationShouldTerminate:sender @@ -717,7 +717,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row [X11App prefs_synchronize]; /* shutdown the X server, it will exit () for us. */ - QuartzMessageServerThread (kXDarwinQuit, 0); + QuartzMessageServerThread (kXquartzQuit, 0); /* In case it doesn't, exit anyway after a while. */ while (sleep (10) != 0) ; diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 88c33f774..9616c2c02 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -150,7 +150,7 @@ void DarwinPrintBanner(void) { // this should change depending on which specific server we are building - ErrorF("XQuartz starting:\n"); + ErrorF("Xquartz starting:\n"); ErrorF("X.org Release 7.2\n"); // This is here to help fink until they fix their packages. ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE ); } @@ -828,7 +828,7 @@ int ddxProcessArgument( int argc, char *argv[], int i ) exit(0); } - // XDarwinStartup uses this argument to indicate the IOKit X server + // XquartzStartup uses this argument to indicate the IOKit X server // should be started. Ignore it here. if ( !strcmp( argv[i], "-iokit" ) ) { return 1; @@ -875,7 +875,7 @@ void ddxUseMsg( void ) */ void ddxGiveUp( void ) { - ErrorF( "Quitting XQuartz...\n" ); + ErrorF( "Quitting Xquartz...\n" ); //if (!quartzRootless) // quartzProcs->ReleaseScreens(); diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h index 6a95e2bb7..5cd79dd41 100644 --- a/hw/xquartz/darwin.h +++ b/hw/xquartz/darwin.h @@ -90,33 +90,33 @@ extern int darwinMainScreenY; * Special ddx events understood by the X server */ enum { - kXDarwinUpdateModifiers // update all modifier keys + kXquartzUpdateModifiers // update all modifier keys = LASTEvent+1, // (from X.h list of event names) - kXDarwinUpdateButtons, // update state of mouse buttons 2 and up + kXquartzUpdateButtons, // update state of mouse buttons 2 and up /* * Quartz-specific events -- not used in IOKit mode */ - kXDarwinActivate, // restore X drawing and cursor - kXDarwinDeactivate, // clip X drawing and switch to Aqua cursor - kXDarwinSetRootClip, // enable or disable drawing to the X screen - kXDarwinQuit, // kill the X server and release the display - kXDarwinReadPasteboard, // copy Mac OS X pasteboard into X cut buffer - kXDarwinWritePasteboard, // copy X cut buffer onto Mac OS X pasteboard - kXDarwinBringAllToFront, // bring all X windows to front - kXDarwinToggleFullscreen, // Enable/Disable fullscreen mode - kXDarwinSetRootless, // Set rootless mode - kXDarwinSpaceChanged, // Spaces changed + kXquartzActivate, // restore X drawing and cursor + kXquartzDeactivate, // clip X drawing and switch to Aqua cursor + kXquartzSetRootClip, // enable or disable drawing to the X screen + kXquartzQuit, // kill the X server and release the display + kXquartzReadPasteboard, // copy Mac OS X pasteboard into X cut buffer + kXquartzWritePasteboard, // copy X cut buffer onto Mac OS X pasteboard + kXquartzBringAllToFront, // bring all X windows to front + kXquartzToggleFullscreen, // Enable/Disable fullscreen mode + kXquartzSetRootless, // Set rootless mode + kXquartzSpaceChanged, // Spaces changed /* * AppleWM events */ - kXDarwinControllerNotify, // send an AppleWMControllerNotify event - kXDarwinPasteboardNotify, // notify the WM to copy or paste + kXquartzControllerNotify, // send an AppleWMControllerNotify event + kXquartzPasteboardNotify, // notify the WM to copy or paste /* * Xplugin notification events */ - kXDarwinDisplayChanged, // display configuration has changed - kXDarwinWindowState, // window visibility state has changed - kXDarwinWindowMoved, // window has moved on screen + kXquartzDisplayChanged, // display configuration has changed + kXquartzWindowState, // window visibility state has changed + kXquartzWindowMoved, // window has moved on screen }; #define ENABLE_DEBUG_LOG 1 diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index 381f2e1c5..fe31e2170 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -229,7 +229,7 @@ static void DarwinUpdateModifiers( /* * DarwinReleaseModifiers * This hacky function releases all modifier keys. It should be called when X11.app - * is deactivated (kXDarwinDeactivate) to prevent modifiers from getting stuck if they + * is deactivated (kXquartzDeactivate) to prevent modifiers from getting stuck if they * are held down during a "context" switch -- otherwise, we would miss the KeyUp. */ void DarwinReleaseModifiers(void) { @@ -527,13 +527,12 @@ void ProcessInputEvents(void) xe.u.keyButtonPointer.time); break; - case kXDarwinUpdateModifiers: + case kXquartzUpdateModifiers: { // Update modifier state. // Any amount of modifiers may have changed. unsigned int flags = xe.u.clientMessage.u.l.longs0 & ~NX_NONCOALSESCEDMASK; // ignore that one - DEBUG_LOG("kxDarwinUpdateModifiers(%x, %x, %s)\n", old_flags, flags, decode_event_flags(flags)); - // DEBUG_LOG("Ignoring these flags: %x %s\n", flags & ~KEYBOARD_MASK, decode_event_flags(flags & ~KEYBOARD_MASK)); + DEBUG_LOG("kXquartzUpdateModifiers(%x, %x, %s)\n", old_flags, flags, decode_event_flags(flags)); flags &= KEYBOARD_MASK; if (old_flags & ~flags) DarwinUpdateModifiers(&xe, KeyRelease, old_flags & ~flags); @@ -543,7 +542,7 @@ void ProcessInputEvents(void) break; } - case kXDarwinUpdateButtons: + case kXquartzUpdateButtons: { long hwDelta = xe.u.clientMessage.u.l.longs0; long hwButtons = xe.u.clientMessage.u.l.longs1; @@ -572,8 +571,8 @@ void ProcessInputEvents(void) break; } - case kXDarwinDeactivate: - DEBUG_LOG("kxDarwinDeactivate\n"); + case kXquartzDeactivate: + DEBUG_LOG("kXquartzDeactivate\n"); DarwinReleaseModifiers(); old_flags=0; // fall through diff --git a/hw/xquartz/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c index 6ad280268..483d0be23 100644 --- a/hw/xquartz/darwinKeyboard.c +++ b/hw/xquartz/darwinKeyboard.c @@ -372,10 +372,10 @@ Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) { if (strncmp( inBuffer, "KYM1", 4 ) == 0) { // Magic number OK. } else if (strncmp( inBuffer, "KYMP", 4 ) == 0) { - ErrorF("Keymapping file '%s' is intended for use with the original NeXT keyboards and cannot be used by XDarwin.\n", darwinKeymapFile); + ErrorF("Keymapping file '%s' is intended for use with the original NeXT keyboards and cannot be used by Xquartz.\n", darwinKeymapFile); return FALSE; } else { - ErrorF("Keymapping file '%s' has a bad magic number and cannot be used by XDarwin.\n", darwinKeymapFile); + ErrorF("Keymapping file '%s' has a bad magic number and cannot be used by Xquartz.\n", darwinKeymapFile); return FALSE; } diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index aa5c0adee..65be72cfb 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -419,24 +419,24 @@ QuartzMessageServerThread( */ void QuartzProcessEvent(xEvent *xe) { switch (xe->u.u.type) { - case kXDarwinControllerNotify: - DEBUG_LOG("kXDarwinControllerNotify\n"); + case kXquartzControllerNotify: + DEBUG_LOG("kXquartzControllerNotify\n"); AppleWMSendEvent(AppleWMControllerNotify, AppleWMControllerNotifyMask, xe->u.clientMessage.u.l.longs0, xe->u.clientMessage.u.l.longs1); break; - case kXDarwinPasteboardNotify: - DEBUG_LOG("kXDarwinPasteboardNotify\n"); + case kXquartzPasteboardNotify: + DEBUG_LOG("kXquartzPasteboardNotify\n"); AppleWMSendEvent(AppleWMPasteboardNotify, AppleWMPasteboardNotifyMask, xe->u.clientMessage.u.l.longs0, xe->u.clientMessage.u.l.longs1); break; - case kXDarwinActivate: - DEBUG_LOG("kXDarwinActivate\n"); + case kXquartzActivate: + DEBUG_LOG("kXquartzActivate\n"); QuartzShow(xe->u.keyButtonPointer.rootX, xe->u.keyButtonPointer.rootY); AppleWMSendEvent(AppleWMActivationNotify, @@ -444,74 +444,74 @@ void QuartzProcessEvent(xEvent *xe) { AppleWMIsActive, 0); break; - case kXDarwinDeactivate: - DEBUG_LOG("kXDarwinDeactivate\n"); + case kXquartzDeactivate: + DEBUG_LOG("kXquartzDeactivate\n"); AppleWMSendEvent(AppleWMActivationNotify, AppleWMActivationNotifyMask, AppleWMIsInactive, 0); QuartzHide(); break; - case kXDarwinDisplayChanged: - DEBUG_LOG("kXDarwinDisplayChanged\n"); + case kXquartzDisplayChanged: + DEBUG_LOG("kXquartzDisplayChanged\n"); QuartzUpdateScreens(); break; - case kXDarwinWindowState: - DEBUG_LOG("kXDarwinWindowState\n"); + case kXquartzWindowState: + DEBUG_LOG("kXquartzWindowState\n"); RootlessNativeWindowStateChanged(xe->u.clientMessage.u.l.longs0, xe->u.clientMessage.u.l.longs1); break; - case kXDarwinWindowMoved: - DEBUG_LOG("kXDarwinWindowMoved\n"); + case kXquartzWindowMoved: + DEBUG_LOG("kXquartzWindowMoved\n"); RootlessNativeWindowMoved ((WindowPtr)xe->u.clientMessage.u.l.longs0); break; - case kXDarwinToggleFullscreen: - DEBUG_LOG("kXDarwinToggleFullscreen\n"); + case kXquartzToggleFullscreen: + DEBUG_LOG("kXquartzToggleFullscreen\n"); #ifdef DARWIN_DDX_MISSING if (quartzEnableRootless) QuartzSetFullscreen(!quartzHasRoot); else if (quartzHasRoot) QuartzHide(); else QuartzShow(); #else - // ErrorF("kXDarwinToggleFullscreen not implemented\n"); + // ErrorF("kXquartzToggleFullscreen not implemented\n"); #endif break; - case kXDarwinSetRootless: - DEBUG_LOG("kXDarwinSetRootless\n"); + case kXquartzSetRootless: + DEBUG_LOG("kXquartzSetRootless\n"); #ifdef DARWIN_DDX_MISSING QuartzSetRootless(xe->u.clientMessage.u.l.longs0); if (!quartzEnableRootless && !quartzHasRoot) QuartzHide(); #else - // ErrorF("kXDarwinSetRootless not implemented\n"); + // ErrorF("kXquartzSetRootless not implemented\n"); #endif break; - case kXDarwinSetRootClip: + case kXquartzSetRootClip: QuartzSetRootClip((BOOL)xe->u.clientMessage.u.l.longs0); break; - case kXDarwinQuit: + case kXquartzQuit: GiveUp(0); break; - case kXDarwinReadPasteboard: + case kXquartzReadPasteboard: QuartzReadPasteboard(); break; - case kXDarwinWritePasteboard: + case kXquartzWritePasteboard: QuartzWritePasteboard(); break; - case kXDarwinBringAllToFront: - DEBUG_LOG("kXDarwinBringAllToFront\n"); + case kXquartzBringAllToFront: + DEBUG_LOG("kXquartzBringAllToFront\n"); RootlessOrderAllWindows(); break; - case kXDarwinSpaceChanged: - DEBUG_LOG("kXDarwinSpaceChanged\n"); + case kXquartzSpaceChanged: + DEBUG_LOG("kXquartzSpaceChanged\n"); QuartzSpaceChanged(xe->u.clientMessage.u.l.longs0); break; default: diff --git a/hw/xquartz/quartzKeyboard.h b/hw/xquartz/quartzKeyboard.h index 0c7e70e48..73adeda70 100644 --- a/hw/xquartz/quartzKeyboard.h +++ b/hw/xquartz/quartzKeyboard.h @@ -45,7 +45,6 @@ typedef struct darwinKeyboardInfo_struct { unsigned char modifierKeycodes[32][2]; } darwinKeyboardInfo; -/* These functions need to be implemented by XQuartz, XDarwin, etc. */ void DarwinKeyboardReload(DeviceIntPtr pDev); Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info); unsigned int QuartzSystemKeymapSeed(void); diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 4dc5846d5..b653a6e3b 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -67,7 +67,7 @@ static void eventHandler(unsigned int type, const void *arg, switch (type) { case XP_EVENT_DISPLAY_CHANGED: DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n"); - QuartzMessageServerThread(kXDarwinDisplayChanged, 0); + QuartzMessageServerThread(kXquartzDisplayChanged, 0); break; case XP_EVENT_WINDOW_STATE_CHANGED: @@ -75,7 +75,7 @@ static void eventHandler(unsigned int type, const void *arg, const xp_window_state_event *ws_arg = arg; DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n", ws_arg->id, ws_arg->state); - QuartzMessageServerThread(kXDarwinWindowState, 2, + QuartzMessageServerThread(kXquartzWindowState, 2, ws_arg->id, ws_arg->state); } else { DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n"); @@ -87,7 +87,7 @@ static void eventHandler(unsigned int type, const void *arg, if (arg_size == sizeof(xp_window_id)) { xp_window_id id = * (xp_window_id *) arg; WindowPtr pWin = xprGetXWindow(id); - QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin); + QuartzMessageServerThread(kXquartzWindowMoved, 1, pWin); } break; @@ -110,7 +110,7 @@ static void eventHandler(unsigned int type, const void *arg, ErrorF("XP_EVENT_SPACE_CHANGED\n"); if(arg_size == sizeof(uint32_t)) { uint32_t space_id = *(uint32_t *)arg; - QuartzMessageServerThread(kXDarwinSpaceChanged, 1, space_id); + QuartzMessageServerThread(kXquartzSpaceChanged, 1, space_id); } break; default: