aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-01-12 01:01:55 +0100
committerUlrich Sibiller <uli42@gmx.de>2019-01-14 00:27:43 +0100
commitd16a5fbb19c072b667be76633bc3f23f12ca82ef (patch)
tree15698731b348375873fcbbb18002da57d8f53f6b
parent3c92b5db9d3d90967410c4dc1d1f8a45554c724b (diff)
downloadnx-libs-d16a5fbb19c072b667be76633bc3f23f12ca82ef.tar.gz
nx-libs-d16a5fbb19c072b667be76633bc3f23f12ca82ef.tar.bz2
nx-libs-d16a5fbb19c072b667be76633bc3f23f12ca82ef.zip
Screen.c: fix handling of fullscreen startup
If nxagent is started in fullscreen mode take care the saved size (that is applied on exit of the fullscreen mode) will be configured correctly. Also respect a user provided -geometry option (had been ignored here previously). Fixes ArcticaProject/nx-libs#449
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index bd0236ad4..19057dfe1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1019,10 +1019,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
/* first time screen initialization or resize during reconnect */
if (nxagentReconnectTrap == False || nxagentResizeDesktopAtStartup)
{
- nxagentChangeOption(RootWidth, w);
- nxagentChangeOption(RootHeight, h);
-
- if (nxagentOption(RootWidth) > w)
+ if (nxagentOption(RootWidth) >= w)
{
nxagentChangeOption(SavedWidth, w * 3 / 4);
}
@@ -1031,7 +1028,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
nxagentChangeOption(SavedWidth, nxagentOption(RootWidth));
}
- if (nxagentOption(RootHeight) > h)
+ if (nxagentOption(RootHeight) >= h)
{
nxagentChangeOption(SavedHeight, h * 3 / 4);
}
@@ -1040,6 +1037,9 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
nxagentChangeOption(SavedHeight, nxagentOption(RootHeight));
}
+ nxagentChangeOption(RootWidth, w);
+ nxagentChangeOption(RootHeight, h);
+
nxagentChangeOption(RootX, 0);
nxagentChangeOption(RootY, 0);
}