aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-01-15 17:09:21 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-01-15 17:09:21 +0100
commit3523d15e2a9f84e2136e3370129a9bea0e16e072 (patch)
tree966779d6cdbb3a6b78194b2cf6037974b99e25fb /nx-X11/programs/Xserver/hw/nxagent/Screen.c
parent1257561577cd8227f3534fc44b72a1239aba363c (diff)
parente7b4440f2a525524fdaf8f132afe2dd824ed7714 (diff)
downloadnx-libs-3523d15e2a9f84e2136e3370129a9bea0e16e072.tar.gz
nx-libs-3523d15e2a9f84e2136e3370129a9bea0e16e072.tar.bz2
nx-libs-3523d15e2a9f84e2136e3370129a9bea0e16e072.zip
Merge branch 'uli42-pr/fullscreen_select' into 3.6.x
Attributes GH PR #978: https://github.com/ArcticaProject/nx-libs/pull/978
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 077457f0e..86f88bb7b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -337,6 +337,12 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen)
*/
void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
{
+ if (nxagentOption(AllScreens))
+ nxagentSwitchAllScreens(pScreen, True);
+ else
+ nxagentSwitchFullscreen(pScreen, True);
+ return;
+
/*
XUnmapWindow(nxagentDisplay, nxagentIconWindow);
*/
@@ -363,7 +369,7 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
XEvent e;
#ifdef TEST
- fprintf(stderr, "nxagentMaximizeToFullscreen: WARNING! Going to wait for the ReparentNotify event [%d].\n", i);
+ fprintf(stderr, "%d: WARNING! Going to wait for the ReparentNotify event [%d].\n", __func__, i);
#endif
if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e))