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

Screen.c: fix handling of fullscreen startup
d16a5fbb · Ulrich Sibiller · 3c92b5db · d16a5fbb
Commit d16a5fbb authored Jan 12, 2019 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Screen.c nx-X11/programs/Xserver/hw/nxagent/Screen.c +5 -5

No files found.
--- 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);
    }