summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-04-04 15:29:42 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-01 11:36:30 +1000
commit88bacc49f06da5927f716869f5a32672a8297ed0 (patch)
tree322009183b8774de9b15a5cbd3cf4c04a4d972c6 /dix
parent1d82ec95942b88dd01f0ac6b883368360a0b5fe6 (diff)
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>
Diffstat (limited to 'dix')
-rw-r--r--dix/globals.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dix/globals.c b/dix/globals.c
index a564575f3..332b91f5c 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -128,6 +128,7 @@ int defaultColorVisualClass = -1;
int monitorResolution = 0;
char *display;
+int displayfd;
char *ConnectionInfo;
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;