From a85adf5ea25ed8c3b7f72ffbd04cda0122f1b5a1 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 30 Dec 2020 19:27:15 +0100 Subject: nxagent: treat DesktopResize and nxagentResizeDesktopAtStartup as Booleans The already where Booleans but where not using True/False values everywhere --- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Extensions.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 835d05d19..77f2d6b38 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -429,7 +429,7 @@ int nxagentRandRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height, { UpdateCurrentTime(); - if (nxagentOption(DesktopResize) == 1 && + if (nxagentOption(DesktopResize) && (nxagentOption(Fullscreen) || width > WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)) || height > HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)))) @@ -437,11 +437,11 @@ int nxagentRandRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height, if (nxagentOption(ClientOs) != ClientOsWinnt /*&& nxagentOption(ClientOs) != ClientNXPlayer*/) { - nxagentChangeOption(DesktopResize, 0); + nxagentChangeOption(DesktopResize, False); } } - if (nxagentOption(DesktopResize) == 1 && !nxagentOption(Fullscreen) && + if (nxagentOption(DesktopResize) && !nxagentOption(Fullscreen) && !nxagentOption(AllScreens)) { nxagentChangeOption(Width, width); @@ -450,7 +450,7 @@ int nxagentRandRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height, int result = nxagentResizeScreen(pScreen, width, height, mmWidth, mmHeight, True); - if (result == 1 && nxagentOption(DesktopResize) == 1 && + if (result == 1 && nxagentOption(DesktopResize) && !nxagentOption(Fullscreen) && !nxagentOption(AllScreens)) { nxagentRandRSetWindowsSize(width, height); -- cgit v1.2.3