diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-18 12:30:54 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-18 12:30:54 +0200 |
| commit | 13211ec6a5060db75c93cbb4e75d017b0a49386e (patch) | |
| tree | d73d06fd267eb90d707dd2106fcdffc17230074c /nx-X11/programs/Xserver/hw/nxagent/Display.h | |
| parent | 7a02b4aba77a64b38992f1a20d8c851bdcc11500 (diff) | |
| parent | 2d99cdd1cf5d8d0e8248d94bc07dca8ff32e4058 (diff) | |
| download | nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.tar.gz nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.tar.bz2 nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.zip | |
Merge branch 'uli42-pr/window_resize_bug' into 3.6.x
Attributes GH PR #940: https://github.com/ArcticaProject/nx-libs/pull/940
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Display.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Display.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 |