diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-11 14:34:32 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-03-27 14:34:34 +0000 |
| commit | bc348bd2c42f3f18786085ccef2f010eff5bf3d2 (patch) | |
| tree | 76e763e6bb3f6a05dd07be123f5d8a6c2cf44e50 /dix | |
| parent | a3730271d52542757ec0f41acc29e7730501f666 (diff) | |
Handle -displayfd and an explicit display number sensibly
Handle -displayfd and an explicit display number sensibly, e.g. use the
explicitly specified display number, and write it to the displayfd
v2: displayfd might be 0, so use -1 as invalid value
v3: Rebase for addition of NoListenAll flag
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/globals.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dix/globals.c b/dix/globals.c index 9738e9cdf..eaa2afe24 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -127,7 +127,8 @@ int defaultColorVisualClass = -1; int monitorResolution = 0; const char *display; -int displayfd; +int displayfd = -1; +Bool explicit_display = FALSE; char *ConnectionInfo; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; |