frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting changes.

This commit is contained in:
Ben Byer 2007-11-07 01:56:37 -08:00 committed by Ben Byer
parent 50dac9b2cb
commit b34d2ffc38
1 changed files with 129 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/darwin/apple/X11Application.m
View File

@ -196,20 +196,18 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown: case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:
case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp: case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:
if ([e window] != nil) { if ([e window] != nil) {
/* Pointer event has a window. Probably something for the kit. */ /* Pointer event has an (AppKit) window. Probably something for the kit. */
for_x = NO; for_x = NO;
if (_x_active) [self activateX:NO]; if (_x_active) [self activateX:NO];
} else if ([self modalWindow] == nil) { } else if ([self modalWindow] == nil) {
/* Must be an X window. Tell appkit it doesn't have focus. */ /* Must be an X window. Tell appkit it doesn't have focus. */
for_appkit = NO; for_appkit = NO;
if ([self isActive]) { if ([self isActive]) {
[self deactivate]; [self deactivate];
if (!_x_active && quartzProcs->IsX11Window([e window], [e windowNumber])) if (!_x_active && quartzProcs->IsX11Window([e window],
[e windowNumber]))
[self activateX:YES]; [self activateX:YES];
} }
} }
@ -220,9 +218,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
static int swallow_up; static int swallow_up;
/* No kit window is focused, so send it to X. */ /* No kit window is focused, so send it to X. */
for_appkit = NO; for_appkit = NO;
if (type == NSKeyDown) { if (type == NSKeyDown) {
/* Before that though, see if there are any global /* Before that though, see if there are any global
shortcuts bound to it. */ shortcuts bound to it. */
@ -251,14 +247,12 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
for_x = NO; for_x = NO;
} }
} }
} } else for_x = NO;
else for_x = NO;
break; break;
case NSFlagsChanged: case NSFlagsChanged:
/* For the l33t X users who remap modifier keys to normal keysyms. */ /* For the l33t X users who remap modifier keys to normal keysyms. */
if (!_x_active) if (!_x_active) for_x = NO;
for_x = NO;
break; break;
case NSAppKitDefined: case NSAppKitDefined:
@ -292,6 +286,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
} }
if (for_appkit) [super sendEvent:e]; if (for_appkit) [super sendEvent:e];
if (for_x) send_nsevent (type, e); if (for_x) send_nsevent (type, e);
} }
@ -596,7 +591,8 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication); CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);
} }
- (void) read_defaults { - (void) read_defaults
{
const char *tem; const char *tem;
quartzUseSysBeep = [self prefs_get_boolean:@PREFS_SYSBEEP quartzUseSysBeep = [self prefs_get_boolean:@PREFS_SYSBEEP
@ -623,7 +619,6 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2); if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2);
if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3); if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3);
} }
X11EnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS X11EnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
@ -633,7 +628,6 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
default:darwinSyncKeymap]; default:darwinSyncKeymap];
tem = [self prefs_get_string:@PREFS_KEYMAP_FILE default:NULL]; tem = [self prefs_get_string:@PREFS_KEYMAP_FILE default:NULL];
if (tem != NULL) darwinKeymapFile = strdup (tem); if (tem != NULL) darwinKeymapFile = strdup (tem);
else darwinKeymapFile = NULL; else darwinKeymapFile = NULL;