From 5bbab001a7909b665683e577bc47794edfd294d4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 7 Feb 2019 23:06:58 +0100 Subject: Screen.c: code optimization for rootless mode In rootless mode skip processing user geometry stuff since the values will we overwritten later anyway. --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 103cd1dbf..9ba217c8f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -885,10 +885,10 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, #endif /* - * Forced geometry parameter to user geometry. + * Force geometry parameter to user geometry except if in rootless mode. */ - if (nxagentResizeDesktopAtStartup) + if (nxagentResizeDesktopAtStartup && !nxagentOption(Rootless)) { if (nxagentUserGeometry.flag & XValue) { @@ -922,9 +922,11 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, /* * This is first time the screen is initialized. * Filling the geometry parameter from user geometry. + * we do not need this in rootless mode since we ignore + * user geometry then. */ - if (nxagentReconnectTrap == False) + if (nxagentReconnectTrap == False && !nxagentOption(Rootless)) { if (nxagentUserGeometry.flag & XValue) { @@ -1067,7 +1069,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, else /* window mode */ { /* - * screen is initialized for the first time + * screen is initialized for the first time. */ if (nxagentReconnectTrap == False) -- cgit v1.2.3