Skip to content

N
nx-libs
Commit 5bbab001 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Screen.c: code optimization for rootless mode

In rootless mode skip processing user geometry stuff since the values will we overwritten later anyway.
parent 34e4291d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @ 5bbab001
...@@ -885,10 +885,10 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, ...@@ -885,10 +885,10 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
#endif #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) if (nxagentUserGeometry.flag & XValue)
{ {
...@@ -922,9 +922,11 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, ...@@ -922,9 +922,11 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
/* /*
* This is first time the screen is initialized. * This is first time the screen is initialized.
* Filling the geometry parameter from user geometry. * 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) if (nxagentUserGeometry.flag & XValue)
{ {
...@@ -1067,7 +1069,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, ...@@ -1067,7 +1069,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
else /* window mode */ else /* window mode */
{ {
/* /*
* screen is initialized for the first time * screen is initialized for the first time.
*/ */
if (nxagentReconnectTrap == False) if (nxagentReconnectTrap == False)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment