Skip to content

N
nx-libs
You need to sign in or sign up before continuing.
Commit 210db316 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Display.c: disable confine window

We are not using it anywhere so let's disable it via a macro for now.
parent a4dd6a46
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
nx-X11/programs/Xserver/hw/nxagent/Display.c
View file @ 210db316
...@@ -159,6 +159,7 @@ Pixmap nxagentScreenSaverPixmap; ...@@ -159,6 +159,7 @@ Pixmap nxagentScreenSaverPixmap;
XlibGC nxagentBitmapGC; XlibGC nxagentBitmapGC;
#ifdef NX_CONFINE_WINDOW
/* /*
* The "confine" window is used in the nxagentConstrainCursor * The "confine" window is used in the nxagentConstrainCursor
* procedure. We are currently overriding the original Xnest * procedure. We are currently overriding the original Xnest
...@@ -166,6 +167,7 @@ XlibGC nxagentBitmapGC; ...@@ -166,6 +167,7 @@ XlibGC nxagentBitmapGC;
*/ */
Window nxagentConfineWindow; Window nxagentConfineWindow;
#endif
Pixmap nxagentIconPixmap; Pixmap nxagentIconPixmap;
Pixmap nxagentIconShape; Pixmap nxagentIconShape;
...@@ -1110,6 +1112,7 @@ void nxagentResetSignalHandlers(void) ...@@ -1110,6 +1112,7 @@ void nxagentResetSignalHandlers(void)
*/ */
void nxagentOpenConfineWindow(void) void nxagentOpenConfineWindow(void)
{ {
#ifdef NX_CONFINE_WINDOW
nxagentConfineWindow = XCreateWindow(nxagentDisplay, nxagentConfineWindow = XCreateWindow(nxagentDisplay,
DefaultRootWindow(nxagentDisplay), DefaultRootWindow(nxagentDisplay),
0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
...@@ -1125,6 +1128,7 @@ void nxagentOpenConfineWindow(void) ...@@ -1125,6 +1128,7 @@ void nxagentOpenConfineWindow(void)
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: Created agent's confine window with id [0x%x].\n", __func__, nxagentConfineWindow); fprintf(stderr, "%s: Created agent's confine window with id [0x%x].\n", __func__, nxagentConfineWindow);
#endif #endif
#endif
} }
void nxagentOpenDisplay(int argc, char *argv[]) void nxagentOpenDisplay(int argc, char *argv[])
......
nx-X11/programs/Xserver/hw/nxagent/Display.h
View file @ 210db316
...@@ -59,6 +59,7 @@ extern Pixel nxagentWhitePixel; ...@@ -59,6 +59,7 @@ extern Pixel nxagentWhitePixel;
extern Drawable nxagentDefaultDrawables[MAXDEPTH + 1]; extern Drawable nxagentDefaultDrawables[MAXDEPTH + 1];
extern Pixmap nxagentScreenSaverPixmap; extern Pixmap nxagentScreenSaverPixmap;
#ifdef NX_CONFINE_WINDOW
/* /*
* The "confine" window is used in nxagentConstrainCursor(). * The "confine" window is used in nxagentConstrainCursor().
* We are currently overriding the original Xnest behaviour * We are currently overriding the original Xnest behaviour
...@@ -66,6 +67,7 @@ extern Pixmap nxagentScreenSaverPixmap; ...@@ -66,6 +67,7 @@ extern Pixmap nxagentScreenSaverPixmap;
*/ */
extern Window nxagentConfineWindow; extern Window nxagentConfineWindow;
#endif
/* /*
* Keyboard and pointer are handled as they were hardware * Keyboard and pointer are handled as they were hardware
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment