[X2Go-Commits] [nx-libs] 27/429: Display.c: disable confine window

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 210db316300c9a24f74963fc90d0eb59db9555a5
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon May 25 19:31:29 2020 +0200

    Display.c: disable confine window
    
    We are not using it anywhere so let's disable it via a macro for now.
---
 nx-X11/programs/Xserver/hw/nxagent/Display.c | 4 ++++
 nx-X11/programs/Xserver/hw/nxagent/Display.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 2db83e9db..5ba3d5d12 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -159,6 +159,7 @@ Pixmap nxagentScreenSaverPixmap;
 
 XlibGC nxagentBitmapGC;
 
+#ifdef NX_CONFINE_WINDOW
 /*
  * The "confine" window is used in the nxagentConstrainCursor
  * procedure. We are currently overriding the original Xnest
@@ -166,6 +167,7 @@ XlibGC nxagentBitmapGC;
  */
 
 Window nxagentConfineWindow;
+#endif
 
 Pixmap nxagentIconPixmap;
 Pixmap nxagentIconShape;
@@ -1110,6 +1112,7 @@ void nxagentResetSignalHandlers(void)
  */
 void nxagentOpenConfineWindow(void)
 {
+#ifdef NX_CONFINE_WINDOW
   nxagentConfineWindow = XCreateWindow(nxagentDisplay,
                                        DefaultRootWindow(nxagentDisplay),
                                        0, 0, 1, 1, 0, 0,
@@ -1125,6 +1128,7 @@ void nxagentOpenConfineWindow(void)
   #ifdef TEST
   fprintf(stderr, "%s: Created agent's confine window with id [0x%x].\n", __func__, nxagentConfineWindow);
   #endif
+#endif
 }
 
 void nxagentOpenDisplay(int argc, char *argv[])
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.h b/nx-X11/programs/Xserver/hw/nxagent/Display.h
index 759b0de35..2d4119a46 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.h
@@ -59,6 +59,7 @@ extern Pixel nxagentWhitePixel;
 extern Drawable nxagentDefaultDrawables[MAXDEPTH + 1];
 extern Pixmap nxagentScreenSaverPixmap;
 
+#ifdef NX_CONFINE_WINDOW
 /*
  * The "confine" window is used in nxagentConstrainCursor().
  * We are currently overriding the original Xnest behaviour
@@ -66,6 +67,7 @@ extern Pixmap nxagentScreenSaverPixmap;
  */
 
 extern Window nxagentConfineWindow;
+#endif
 
 /*
  * Keyboard and pointer are handled as they were hardware

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git