Remove maximum size limits for nxagent window

Set maximum size to MAXSHORT (32767). This especially helps when reconnecting to a session that had initially been started from a client with a small(er) screen. Before it was impossible to increase the maximum size of a running session beyond the screen size of the client that had initiated the session. This change, together with the previous commit, fixes #472
ArcticaProject · Jul 11, 2017 · 8eb3531 · 8eb3531
1 parent 615bf96
commit 8eb3531
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -614,8 +614,8 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen)
       NXSetExposeParameters(nxagentDisplay, 0, 0, 0);
     }
 
-    sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
-    sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
+    sizeHints.max_width = MAXSHORT;
+    sizeHints.max_height = MAXSHORT;
 
     XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum],
                           &sizeHints);
@@ -655,8 +655,8 @@ void nxagentShadowSwitchResizeMode(ScreenPtr pScreen)
                                       screenInfo.screens[0]->root, screenInfo.screens[0]->root -> drawable.width,
                                           screenInfo.screens[0]->root -> drawable.height);
 
-    sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
-    sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
+    sizeHints.max_width = MAXSHORT;
+    sizeHints.max_height = MAXSHORT;
 
     fprintf(stderr,"Info: Enabled resize mode in shadow agent.\n");
   }

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1854,8 +1854,8 @@ N/A
 
     if (nxagentOption(DesktopResize) == 1 || nxagentOption(Fullscreen) == 1)
     {
-      sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
-      sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
+      sizeHints.max_width = MAXSHORT;
+      sizeHints.max_height = MAXSHORT;
     }
     else
     {
@@ -2377,8 +2377,8 @@ FIXME: We should try to restore the previously
 
     if (nxagentOption(DesktopResize) == 1)
     {
-      sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
-      sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
+      sizeHints.max_width = MAXSHORT;
+      sizeHints.max_height = MAXSHORT;
     }
     else
     {
@@ -4414,8 +4414,8 @@ void nxagentSetWMNormalHints(int screen)
 
   if (nxagentOption(DesktopResize) == 1)
   {
-    sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
-    sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay));
+    sizeHints.max_width = MAXSHORT;
+    sizeHints.max_height = MAXSHORT;
   }
   else
   {