Index: tools/xdisplaycheck/xdisplaycheck.cc |
=================================================================== |
--- tools/xdisplaycheck/xdisplaycheck.cc (revision 135379) |
+++ tools/xdisplaycheck/xdisplaycheck.cc (working copy) |
@@ -12,6 +12,7 @@ |
#include <errno.h> |
#include <stdio.h> |
+#include <string.h> |
#include <time.h> |
#include <X11/Xlib.h> |
@@ -34,8 +35,19 @@ |
} |
int main(int argc, char* argv[]) { |
+ Display* display = NULL; |
+ if (argv[1] && strcmp(argv[1], "--noserver") == 0) { |
+ display = XOpenDisplay(NULL); |
+ if (display) { |
+ fprintf(stderr, "Found unexpected connectable display %s\n", |
+ XDisplayName(NULL)); |
+ } |
+ // Return success when we got an unexpected display so that the code |
+ // without the --noserver is the same, but slow, rather than inverted. |
+ return !display; |
+ } |
+ |
int kNumTries = 78; // 78*77/2 * 10 = 30s of waiting |
- Display* display = NULL; |
int tries; |
for (tries = 0; tries < kNumTries; ++tries) { |
display = XOpenDisplay(NULL); |