xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun Oct 19 13:54:53 PDT 2008
hw/xquartz/X11Application.m | 4 ----
hw/xquartz/X11Controller.m | 2 --
miext/rootless/rootlessWindow.c | 12 +++++++-----
3 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sun Oct 19 13:54:32 2008 -0700
XQuartz: More progress towards fullscreen...
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 982df39..5df3a08 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -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) {
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 8513386..d4958b5 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -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];
}
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 5bba1d2..e55cb32 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -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");
More information about the xorg-commit
mailing list