diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-18 12:30:54 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-18 12:30:54 +0200 |
commit | 13211ec6a5060db75c93cbb4e75d017b0a49386e (patch) | |
tree | d73d06fd267eb90d707dd2106fcdffc17230074c /nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | |
parent | 7a02b4aba77a64b38992f1a20d8c851bdcc11500 (diff) | |
parent | 2d99cdd1cf5d8d0e8248d94bc07dca8ff32e4058 (diff) | |
download | nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.tar.gz nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.tar.bz2 nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.zip |
Merge branch 'uli42-pr/window_resize_bug' into 3.6.x
Attributes GH PR #940: https://github.com/ArcticaProject/nx-libs/pull/940
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXwindow.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index 43d00a21d..a8d1849ae 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -149,7 +149,7 @@ InitRootWindow(WindowPtr pWin) if (nxagentOption(Rootless)) { #ifdef TEST - fprintf(stderr, "InitRootWindow: Assigned agent root to window at [%p][%ld] with parent [%p].\n", + fprintf(stderr, "InitRootWindow: Assigned agent root to window at [%p][%d] with parent [%p].\n", (void *) pWin, nxagentWindowPriv(pWin)->window, (void *) pWin -> parent); #endif @@ -381,13 +381,12 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP #ifdef TEST if (nxagentWindowTopLevel(pWin)) { - - fprintf(stderr, "ConfigureWindow: pWin [%p] mask [%lu] client [%p]\n", - pWin, mask, client); + fprintf(stderr, "ConfigureWindow: pWin [%p] mask [%u] client [%p]\n", + (void *)pWin, mask, (void *)client); fprintf(stderr, "ConfigureWindow: x [%d] y [%d] w [%d] h [%d] CWStackMode [%d] " "smode [%d] pSib [%p]\n", - x, y, w, h, (mask & CWStackMode) ? 1 : 0, smode, pSib); + x, y, w, h, (mask & CWStackMode) ? 1 : 0, smode, (void *)pSib); } #endif @@ -683,7 +682,7 @@ MapWindow(register WindowPtr pWin, ClientPtr client) #ifdef TEST if (nxagentWindowTopLevel(pWin)) { - fprintf(stderr, "MapWindow: pWin [%p] client [%p]\n", pWin, client); + fprintf(stderr, "MapWindow: pWin [%p] client [%p]\n", (void *)pWin, (void *)client); } #endif #endif |