aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Display.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-12 12:09:45 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-12 12:09:45 +0200
commitba02470a5dea69754f31d9816d7e76f2d6893d0b (patch)
tree591f81f8c936d9814b08659502e6f9bf054a239a /nx-X11/programs/Xserver/hw/nxagent/Display.c
parent000a869b3e994c6f5df62bdc6ee1bb4528403c9d (diff)
parent84a403e2724ae9acac77bd1d819a9b1f4e56379a (diff)
downloadnx-libs-ba02470a5dea69754f31d9816d7e76f2d6893d0b.tar.gz
nx-libs-ba02470a5dea69754f31d9816d7e76f2d6893d0b.tar.bz2
nx-libs-ba02470a5dea69754f31d9816d7e76f2d6893d0b.zip
Merge branch 'sunweaver-pr/report-window-ids' into 3.6.x
Attributes GH PR #478: https://github.com/ArcticaProject/nx-libs/pull/478 Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Mon, 10 Jul 2017 09:18:09 +0000 (UTC)
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index c764f50ae..4930baee2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -198,6 +198,7 @@ unsigned long startTime;
*/
extern void RejectWellKnownSockets(void);
+extern Bool nxagentReportWindowIds;
int nxagentServerOrder()
{
@@ -1334,8 +1335,12 @@ FIXME: Use of nxagentParentWindow is strongly deprecated.
CopyFromParent,
0L, NULL);
+ if (nxagentReportWindowIds) {
+ fprintf(stderr, "NXAGENT_WINDOW_ID: CONFINEMENT_WINDOW,WID:[0x%x]\n",
+ nxagentConfineWindow);
+ }
#ifdef TEST
- fprintf(stderr, "nxagentOpenDisplay: Created agent's confine window with id [%ld].\n",
+ fprintf(stderr, "nxagentOpenDisplay: Created agent's confine window with id [0x%x].\n",
nxagentConfineWindow);
#endif
@@ -2842,8 +2847,12 @@ Bool nxagentReconnectDisplay(void *p0)
CopyFromParent,
0L, NULL);
+ if (nxagentReportWindowIds) {
+ fprintf(stderr, "NXAGENT_WINDOW_ID: CONFINEMENT_WINDOW,WID:[0x%x]\n",
+ nxagentConfineWindow);
+ }
#ifdef TEST
- fprintf(stderr, "nxagentReconnectDisplay: Created agent's confine window with id [%ld].\n",
+ fprintf(stderr, "nxagentReconnectDisplay: Created agent's confine window with id [0x%x].\n",
nxagentConfineWindow);
#endif