aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c54
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);