diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2017-03-15 14:10:24 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-21 10:58:08 +0100 |
| commit | 89496d987dc6a21250c9fdda2cd3668516061f5c (patch) | |
| tree | 8ab182618ed5089a41a0582cee3342dfc4330199 /nx-X11/programs/Xserver/dix | |
| parent | eb49996116fd3beeff66ddf192bfc80e117086d1 (diff) | |
| download | nx-libs-89496d987dc6a21250c9fdda2cd3668516061f5c.tar.gz nx-libs-89496d987dc6a21250c9fdda2cd3668516061f5c.tar.bz2 nx-libs-89496d987dc6a21250c9fdda2cd3668516061f5c.zip | |
os: Add -displayfd option
commit 88bacc49f06da5927f716869f5a32672a8297ed0
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 4 15:29:42 2012 -0700
os: Add -displayfd option
This option specifies a file descriptor in the launching process. X
will scan for an available display number and write that number back to
the launching process, at the same time as SIGUSR1 generation. This
means display managers don't need to guess at available display numbers.
As a consequence, if X fails to start when using -displayfd, it's not
because the display was in use, so there's no point in retrying the X
launch on a higher display number.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Tested-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/globals.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index a0af50fa8..5a3e22c26 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -149,6 +149,7 @@ int defaultColorVisualClass = -1; int monitorResolution = 0; char *display; +int displayfd; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; int argcGlobal; |