diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-12 12:09:45 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-12 12:09:45 +0200 |
commit | ba02470a5dea69754f31d9816d7e76f2d6893d0b (patch) | |
tree | 591f81f8c936d9814b08659502e6f9bf054a239a /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
parent | 000a869b3e994c6f5df62bdc6ee1bb4528403c9d (diff) | |
parent | 84a403e2724ae9acac77bd1d819a9b1f4e56379a (diff) | |
download | nx-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/Screen.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 1c3e76580..fb4ab9b19 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -139,6 +139,8 @@ extern Pixmap nxagentIconPixmap; extern Pixmap nxagentIconShape; extern Bool useXpmIcon; +extern Bool nxagentReportWindowIds; + Window nxagentDefaultWindows[MAXSCREENS]; Window nxagentInputWindows[MAXSCREENS]; Window nxagentScreenSaverWindows[MAXSCREENS]; @@ -396,9 +398,13 @@ Window nxagentCreateIconWindow() DefaultVisual(nxagentDisplay, DefaultScreen(nxagentDisplay)), valuemask, &attributes); + if (nxagentReportWindowIds) + { + fprintf (stderr, "NXAGENT_WINDOW_ID: ICON_WINDOW,WID:[0x%x]\n", nxagentIconWindow); + } #ifdef TEST - fprintf(stderr, "nxagentCreateIconWindow: Created new icon window with id [%lu].\n", - (long unsigned int)nxagentIconWindow); + fprintf(stderr, "nxagentCreateIconWindow: Created new icon window with id [0x%x].\n", + nxagentIconWindow); #endif /* @@ -1760,9 +1766,13 @@ N/A valuemask , &attributes); } + if (nxagentReportWindowIds) + { + fprintf (stderr, "NXAGENT_WINDOW_ID: SCREEN_WINDOW:[%d],WID:[0x%x]\n", pScreen -> myNum, nxagentInputWindows[pScreen->myNum]); + } #ifdef TEST - fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", - (long int)nxagentDefaultWindows[pScreen->myNum]); + fprintf(stderr, "nxagentOpenScreen: Created new default window with id [0x%x].\n", + nxagentDefaultWindows[pScreen->myNum]); #endif /* |