From: Julien Cristau <jcristau@debian.org>
Date: Sun, 19 Feb 2012 12:43:54 +0000 (+0100)
Subject: Fallback to TCP if no protocol is specified and the UNIX connection fails
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d235c62f0d5bd0df1236cc52141c10c5d272a18;hp=f7bd139616d228b20eeb2c96b85e4093606c93fc;p=free-sw%2Fxcb%2Flibxcb

Fallback to TCP if no protocol is specified and the UNIX connection fails

Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
---

diff --git a/src/xcb_util.c b/src/xcb_util.c
index 7173db3..f17aa3c 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -235,6 +235,11 @@ static int _xcb_open(const char *host, char *protocol, const int display)
     fd = _xcb_open_unix(protocol, file);
     free(file);
 
+    if (fd < 0 && !protocol && *host == '\0') {
+	    unsigned short port = X_TCP_PORT + display;
+	    fd = _xcb_open_tcp(host, protocol, port);
+    }
+
     return fd;
 #endif /* !_WIN32 */
     return -1; /* if control reaches here then something has gone wrong */