diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-22 14:35:08 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-22 14:35:08 +0200 |
commit | 7392dd6a9b550538a5b7f2aa5204c805c15a9d6a (patch) | |
tree | e2f5a8fc5b50ed8eeeb018ffb7051f888b7dd5f1 /nx-X11/programs/Xserver/hw/nxagent/Events.c | |
parent | c478ba2937b6a7e6c55b615ddeac3ca525f6a743 (diff) | |
parent | 450760bcafc8d2a708b9f6087f3c0c2cdab046a8 (diff) | |
download | nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.gz nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.bz2 nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.zip |
Merge branch 'uli42-pr/cleanup_wmisrunning' into 3.6.x
Attributes GH PR #728: https://github.com/ArcticaProject/nx-libs/pull/728
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 071e93b32..94480c45c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -373,7 +373,7 @@ void nxagentRemoteWindowID(Window window, Bool newline) } } - if (newline == TRUE) + if (newline) { fprintf(stderr, "\n"); } @@ -411,7 +411,7 @@ void nxagentRemoteWindowInfo(Window win, int indent, Bool newLine) (attributes.override_redirect == 0) ? "No" : "Yes" ); - if (newLine == TRUE) + if (newLine) { fprintf(stderr, "\n"); } @@ -537,7 +537,7 @@ void nxagentInternalWindowInfo(WindowPtr pWin, int indent, Bool newLine) (pWin -> overrideRedirect == 0) ? "No" : "Yes"); - if (newLine == TRUE) + if (newLine) { fprintf(stderr, "\n"); } @@ -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; @@ -4061,8 +4061,7 @@ void nxagentHandleCollectPropertyEvent(XEvent *X) nxagentImportProperty(window, property, atomReturnType, resultFormat, ulReturnItems, ulReturnBytesLeft, pszReturnData); } - - if (result == 0) + else { #ifdef DEBUG fprintf (stderr, "nxagentHandleCollectPropertyEvent: Failed to get reply data for client [%d].\n", |