[X2Go-Commits] [nx-libs] 187/219: dix: add whiteroot flag
git-admin at x2go.org
git-admin at x2go.org
Sat Sep 28 12:10:55 CEST 2019
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 8eeaa40b1b0bb76e8bc74534576e8dca98063c3e
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Sun Aug 11 00:21:44 2019 +0200
dix: add whiteroot flag
Before there was no way of getting a white background despite having
the approriate code.
Backport of this commit:
commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri Aug 18 17:04:48 2006 +0300
dix: add whiteroot flag
Add a -wr option to use a white root window, and use a BackPixel rather
than BackPixmap for both white and black root windows.
Fixes ArcticaProject/nx-libs#832
---
nx-X11/programs/Xserver/hw/nxagent/Init.c | 3 ++-
nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 6 ++++--
nx-X11/programs/Xserver/os/utils.c | 3 +++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 1e24a618e..2a0bceaf5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -413,7 +413,8 @@ FIXME: These variables, if not removed at all because have probably
* background.
*/
- blackRoot = TRUE;
+ if (!whiteRoot)
+ blackRoot = TRUE;
nxagentInitKeystrokes(False);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index 6804032a2..34ac7d7d0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -142,8 +142,10 @@ to authenticate access. See also the \fIxdm\fP(1) and
disables backing store support on all screens.
.TP 8
.B \-br
-sets the default root window to solid black instead of the standard root weave
-pattern.
+sets the default root window to solid black (default).
+.TP 8
+.B \-wr
+sets the default root window to solid white.
.TP 8
.B \-c
turns off key-click.
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 5634bb621..4d81ff927 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -634,6 +634,7 @@ void UseMsg(void)
ErrorF("v video blanking for screen-saver\n");
ErrorF("-v screen-saver without video blanking\n");
ErrorF("-wm WhenMapped default backing-store\n");
+ ErrorF("-wr create root window with white background\n");
ErrorF("-maxbigreqsize set maximal bigrequest size \n");
#ifdef PANORAMIX
ErrorF("+xinerama Enable XINERAMA (PanoramiX) extension\n");
@@ -996,6 +997,8 @@ ProcessCommandLine(int argc, char *argv[])
defaultScreenSaverBlanking = DontPreferBlanking;
else if ( strcmp( argv[i], "-wm") == 0)
defaultBackingStore = WhenMapped;
+ else if ( strcmp( argv[i], "-wr") == 0)
+ whiteRoot = TRUE;
else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
if(++i < argc) {
long reqSizeArg = atol(argv[i]);
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list