summaryrefslogtreecommitdiff
path: root/hw/xquartz/X11Controller.m
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-01-28 23:11:44 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-01-29 14:27:09 -0800
commit47b457541b33f00807fd495f5b0b24d5f143bf84 (patch)
tree1e6506c147110964743ed872bf7108414ab0fe54 /hw/xquartz/X11Controller.m
parentc2ba3f339f089c595386c4c579935c7984a2a545 (diff)
XQuartz: Toggle off fullscreen mode when XQuartz is hidden
http://xquartz.macosforge.org/trac/ticket/478 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'hw/xquartz/X11Controller.m')
-rw-r--r--hw/xquartz/X11Controller.m7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 01526b7d0..3de4e139d 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -773,6 +773,13 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
- (void) applicationDidHide:(NSNotification *)notify
{
DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll);
+
+ /* Toggle off fullscreen mode to leave our non-default video
+ * mode and hide our guard window.
+ */
+ if (!XQuartzIsRootless && XQuartzFullscreenVisible) {
+ DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+ }
}
- (void) applicationDidUnhide:(NSNotification *)notify