[PATCH libxcb] Fallback to TCP if no protocol is specified and the UNIX connection fails

[Jeremy Huddleston]

Can we delay the libX11 change until this is in a tagged libxcb (and have libX11 require that version to avoid regression)?  All the changes currently on xcb/libxcb master look 1.8.1 worthy, so perhaps we can push this one into the mix and get a 1.8.1 this week.

--Jeremy

On Feb 19, 2012, at 04:43, Julien Cristau wrote:

> Signed-off-by: Julien Cristau <jcristau at debian.org>
> ---
> src/xcb_util.c |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/src/xcb_util.c b/src/xcb_util.c
> index fde4f85..6d9efe0 100644
> --- a/src/xcb_util.c
> +++ b/src/xcb_util.c
> @@ -234,6 +234,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 */
> -- 
> 1.7.9
>