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

XQuartz: More progress towards fullscreen... 

(cherry picked from commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649)
(cherry picked from commit b47b7ab6d6d0a7f6cbf678a5755124d6b7516d3e)
This commit is contained in:
Jeremy Huddleston 2008-10-21 09:29:37 -07:00
parent d434ed4009
commit f67cd31d2c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/X11Application.m
View File

@ -238,14 +238,12 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
/* Override to force sending to Appkit */ /* Override to force sending to Appkit */
swallow_up = [e keyCode]; swallow_up = [e keyCode];
for_x = NO; for_x = NO;
#if 0
} else if(!quartzEnableRootless } else if(!quartzEnableRootless
&& ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask) && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)
&& ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) { && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {
swallow_up = [e keyCode]; swallow_up = [e keyCode];
for_x = NO; for_x = NO;
DarwinSendDDXEvent(kXquartzToggleFullscreen, 0); DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
#endif
#if XPLUGIN_VERSION >= 1 #if XPLUGIN_VERSION >= 1
} else if(X11EnableKeyEquivalents && } else if(X11EnableKeyEquivalents &&
xp_is_symbolic_hotkey_event([e eventRef])) { xp_is_symbolic_hotkey_event([e eventRef])) {
@ -625,13 +623,11 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
quartzUseSysBeep = [self prefs_get_boolean:@PREFS_SYSBEEP quartzUseSysBeep = [self prefs_get_boolean:@PREFS_SYSBEEP
default:quartzUseSysBeep]; default:quartzUseSysBeep];
#if 0
quartzEnableRootless = [self prefs_get_boolean:@PREFS_ROOTLESS quartzEnableRootless = [self prefs_get_boolean:@PREFS_ROOTLESS
default:quartzEnableRootless]; default:quartzEnableRootless];
quartzFullscreenDisableHotkeys = ![self prefs_get_boolean: quartzFullscreenDisableHotkeys = ![self prefs_get_boolean:
@PREFS_FULLSCREEN_HOTKEYS default: @PREFS_FULLSCREEN_HOTKEYS default:
!quartzFullscreenDisableHotkeys]; !quartzFullscreenDisableHotkeys];
#endif
darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
default:darwinFakeButtons]; default:darwinFakeButtons];
if (darwinFakeButtons) { if (darwinFakeButtons) {

2
hw/xquartz/X11Controller.m
View File

@ -688,8 +688,6 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
[sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]]; [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
[enable_fullscreen setIntValue:!quartzEnableRootless]; [enable_fullscreen setIntValue:!quartzEnableRootless];
// TODO: Add fullscreen support
[enable_fullscreen setEnabled:NO];
[prefs_panel makeKeyAndOrderFront:sender]; [prefs_panel makeKeyAndOrderFront:sender];
} }