fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-30 05:00:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: More progress towards fullscreen...

Browse source
This commit is contained in:
Jeremy Huddleston 2008-10-19 13:54:32 -07:00
parent 2c4b0f9615
commit 628cae86b4
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/xquartz/X11Application.m
View file

@ -237,14 +237,12 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
/* Override to force sending to Appkit */
swallow_up = [e keyCode];
for_x = NO;
#if 0
} else if(!quartzEnableRootless
&& ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)
&& ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {
swallow_up = [e keyCode];
for_x = NO;
DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
#endif
#if XPLUGIN_VERSION >= 1
} else if(X11EnableKeyEquivalents &&
xp_is_symbolic_hotkey_event([e eventRef])) {
@ -624,13 +622,11 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
quartzUseSysBeep = [self prefs_get_boolean:@PREFS_SYSBEEP
default:quartzUseSysBeep];
#if 0
quartzEnableRootless = [self prefs_get_boolean:@PREFS_ROOTLESS
default:quartzEnableRootless];
quartzFullscreenDisableHotkeys = ![self prefs_get_boolean:
@PREFS_FULLSCREEN_HOTKEYS default:
!quartzFullscreenDisableHotkeys];
#endif
darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
default: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]];
[enable_fullscreen setIntValue:!quartzEnableRootless];
// TODO: Add fullscreen support
[enable_fullscreen setEnabled:NO];
[prefs_panel makeKeyAndOrderFront:sender];
}

12
miext/rootless/rootlessWindow.c
View file

@ -1546,10 +1546,12 @@ void
RootlessPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, int what)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
if (IsRoot(pWin))
return;
if(pWin->drawable.type == UNDRAWABLE_WINDOW)
return;
SCREEN_UNWRAP(pScreen, PaintWindowBackground);
RL_DEBUG_MSG("paintwindowbackground start (win 0x%x, framed %i) ",
pWin, IsFramedWindow(pWin));
@ -1562,10 +1564,10 @@ RootlessPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, int what)
if (pWin->backgroundState == ParentRelative) {
SetPixmapOfAncestors(pWin);
}
pScreen->PaintWindowBackground(pWin, pRegion, what);
}
SCREEN_UNWRAP(pScreen, PaintWindowBackground);
pScreen->PaintWindowBackground(pWin, pRegion, what);
SCREEN_WRAP(pScreen, PaintWindowBackground);
RL_DEBUG_MSG("paintwindowbackground end\n");