diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-05-15 18:25:07 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-17 22:38:05 +0200 |
| commit | abe5e8479aca9f53ed4778336978bf7bd623c56a (patch) | |
| tree | ad2e4b9c54c0aa533cc9b4f0110c969a6c63d95a /nx-X11 | |
| parent | 0f8ed4d103b3f68d5cedaa611b47b7cdb1e0517c (diff) | |
| download | nx-libs-abe5e8479aca9f53ed4778336978bf7bd623c56a.tar.gz nx-libs-abe5e8479aca9f53ed4778336978bf7bd623c56a.tar.bz2 nx-libs-abe5e8479aca9f53ed4778336978bf7bd623c56a.zip | |
Display.c: factor out confinement window creation
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Display.c | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 55e40b461..2db83e9db 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -1105,6 +1105,28 @@ void nxagentResetSignalHandlers(void) nxagentInitTimer(); } +/* + * currently unused it seems + */ +void nxagentOpenConfineWindow(void) +{ + nxagentConfineWindow = XCreateWindow(nxagentDisplay, + DefaultRootWindow(nxagentDisplay), + 0, 0, 1, 1, 0, 0, + InputOnly, + CopyFromParent, + 0L, NULL); + + if (nxagentReportWindowIds) { + fprintf(stderr, "NXAGENT_WINDOW_ID: CONFINEMENT_WINDOW,WID:[0x%x]\n", + nxagentConfineWindow); + } + + #ifdef TEST + fprintf(stderr, "%s: Created agent's confine window with id [0x%x].\n", __func__, nxagentConfineWindow); + #endif +} + void nxagentOpenDisplay(int argc, char *argv[]) { if (!nxagentDoFullGeneration) @@ -1298,21 +1320,7 @@ FIXME: Use of nxagentParentWindow is strongly deprecated. We need fprintf(stderr, "nxagentOpenDisplay: Going to create agent's confine window.\n"); #endif - nxagentConfineWindow = XCreateWindow(nxagentDisplay, - DefaultRootWindow(nxagentDisplay), - 0, 0, 1, 1, 0, 0, - InputOnly, - 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 [0x%x].\n", - nxagentConfineWindow); - #endif + nxagentOpenConfineWindow(); if (!(nxagentUserGeometry.flag & XValue)) { @@ -2665,21 +2673,7 @@ Bool nxagentReconnectDisplay(void *p0) fprintf(stderr, "nxagentReconnectDisplay: Going to create agent's confine window.\n"); #endif - nxagentConfineWindow = XCreateWindow(nxagentDisplay, - DefaultRootWindow(nxagentDisplay), - 0, 0, 1, 1, 0, 0, - InputOnly, - 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 [0x%x].\n", - nxagentConfineWindow); - #endif + nxagentOpenConfineWindow(); useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape); |