From 6b2033bd2c1ae12b91127d26d3f99d8299f6495e Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 24 Sep 2018 21:03:15 +0200 Subject: nxagent: use nxagentWMIsRunning as Bool all over the place has been used as integer sometimes (technically correct, but not nice) Fixes ArcticaProject/nx-libs#698 --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 071e93b32..c0263cc81 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -2046,7 +2046,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was * event that would trigger xinerama updates. So we do that once * the nxagent window gets mapped. */ - if (nxagentWMIsRunning == 0 && + if (!nxagentWMIsRunning && X.xmap.window == nxagentDefaultWindows[nxagentScreen(X.xmap.window)->myNum]) { nxagentChangeScreenConfig(nxagentScreen(X.xmap.window)->myNum, nxagentOption(Width), @@ -2767,7 +2767,7 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result) if (X -> xclient.window == (nxagentOption(Fullscreen) ? nxagentIconWindow : nxagentDefaultWindows[0]) || - nxagentWMIsRunning == 0) + !nxagentWMIsRunning) { *result = doCloseSession; } @@ -3353,7 +3353,7 @@ int nxagentHandleConfigureNotify(XEvent* X) * by the window manager are relevant, see ICCCM Chapter 4, * "Configuring the Window" */ - Bool updatePos = (nxagentWMIsRunning == 0 || X -> xconfigure.send_event != 0); + Bool updatePos = (!nxagentWMIsRunning || X -> xconfigure.send_event != 0); int newX = X -> xconfigure.x; int newY = X -> xconfigure.y; @@ -3395,7 +3395,7 @@ int nxagentHandleConfigureNotify(XEvent* X) count++; #endif - if (nxagentWMIsRunning == 0 || X -> xconfigure.send_event) + if (!nxagentWMIsRunning || X -> xconfigure.send_event) { updatePos = True; newX = X -> xconfigure.x; @@ -3626,7 +3626,7 @@ int nxagentHandleReparentNotify(XEvent* X) return 1; } - else if (nxagentWMIsRunning == 1 && nxagentOption(Fullscreen) == 0 && + else if (nxagentWMIsRunning && nxagentOption(Fullscreen) == 0 && nxagentOption(WMBorderWidth) == -1) { XlibWindow w; -- cgit v1.2.3