2006-02-18 16:49:41 -08:00
|
|
|
/* Copyright (C) 2001-2004 Bart Massey and Jamey Sharp.
|
|
|
|
|
*
|
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
|
*
|
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
|
*
|
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
|
* AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
|
*
|
|
|
|
|
* Except as contained in this notice, the names of the authors or their
|
|
|
|
|
* institutions shall not be used in advertising or otherwise to promote the
|
|
|
|
|
* sale, use or other dealings in this Software without prior written
|
|
|
|
|
* authorization from the authors.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Utility functions implementable using only public APIs. */
|
|
|
|
|
|
|
|
|
|
#include <assert.h>
|
2006-03-11 20:32:04 -08:00
|
|
|
#include <sys/types.h>
|
2006-02-18 16:49:41 -08:00
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <sys/un.h>
|
2006-07-28 15:29:05 -07:00
|
|
|
#include <netinet/in.h>
|
2006-04-24 08:29:18 -07:00
|
|
|
#ifdef DNETCONN
|
|
|
|
|
#include <netdnet/dnetdb.h>
|
|
|
|
|
#include <netdnet/dn.h>
|
|
|
|
|
#endif
|
2006-02-18 16:49:41 -08:00
|
|
|
#include <netdb.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#include "xcb.h"
|
|
|
|
|
#include "xcbext.h"
|
2006-03-13 10:36:13 -08:00
|
|
|
#include "xcbint.h"
|
2006-02-18 16:49:41 -08:00
|
|
|
|
2006-09-15 00:39:51 -07:00
|
|
|
static const int error_connection = 1;
|
|
|
|
|
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
int xcb_popcount(uint32_t mask)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
2006-11-21 20:29:34 -08:00
|
|
|
uint32_t y;
|
2006-02-18 16:49:41 -08:00
|
|
|
y = (mask >> 1) & 033333333333;
|
|
|
|
|
y = mask - y - ((y >> 1) & 033333333333);
|
|
|
|
|
return ((y + (y >> 3)) & 030707070707) % 077;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
static int _xcb_parse_display(const char *name, char **host, char **protocol,
|
|
|
|
|
int *displayp, int *screenp)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
|
|
|
|
int len, display, screen;
|
2007-07-19 17:00:18 +02:00
|
|
|
char *slash, *colon, *dot, *end;
|
2006-02-18 16:49:41 -08:00
|
|
|
if(!name || !*name)
|
|
|
|
|
name = getenv("DISPLAY");
|
|
|
|
|
if(!name)
|
|
|
|
|
return 0;
|
2007-07-19 17:00:18 +02:00
|
|
|
slash = strrchr(name, '/');
|
|
|
|
|
if (slash) {
|
|
|
|
|
len = slash - name;
|
|
|
|
|
if (protocol) {
|
|
|
|
|
*protocol = malloc(len + 1);
|
|
|
|
|
if(!*protocol)
|
|
|
|
|
return 0;
|
|
|
|
|
memcpy(*protocol, name, len);
|
|
|
|
|
(*protocol)[len] = '\0';
|
|
|
|
|
}
|
|
|
|
|
name = slash + 1;
|
|
|
|
|
} else
|
|
|
|
|
if (protocol)
|
|
|
|
|
*protocol = NULL;
|
|
|
|
|
|
2006-02-18 16:49:41 -08:00
|
|
|
colon = strrchr(name, ':');
|
|
|
|
|
if(!colon)
|
|
|
|
|
return 0;
|
|
|
|
|
len = colon - name;
|
|
|
|
|
++colon;
|
|
|
|
|
display = strtoul(colon, &dot, 10);
|
|
|
|
|
if(dot == colon)
|
|
|
|
|
return 0;
|
|
|
|
|
if(*dot == '\0')
|
|
|
|
|
screen = 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if(*dot != '.')
|
|
|
|
|
return 0;
|
|
|
|
|
++dot;
|
|
|
|
|
screen = strtoul(dot, &end, 10);
|
|
|
|
|
if(end == dot || *end != '\0')
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
/* At this point, the display string is fully parsed and valid, but
|
|
|
|
|
* the caller's memory is untouched. */
|
|
|
|
|
|
|
|
|
|
*host = malloc(len + 1);
|
|
|
|
|
if(!*host)
|
|
|
|
|
return 0;
|
|
|
|
|
memcpy(*host, name, len);
|
|
|
|
|
(*host)[len] = '\0';
|
|
|
|
|
*displayp = display;
|
|
|
|
|
if(screenp)
|
|
|
|
|
*screenp = screen;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
int xcb_parse_display(const char *name, char **host, int *displayp,
|
|
|
|
|
int *screenp)
|
|
|
|
|
{
|
|
|
|
|
return _xcb_parse_display(name, host, NULL, displayp, screenp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port);
|
|
|
|
|
static int _xcb_open_unix(char *protocol, const char *file);
|
2006-04-24 08:29:18 -07:00
|
|
|
#ifdef DNETCONN
|
2007-07-19 17:00:18 +02:00
|
|
|
static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port);
|
2006-04-24 08:29:18 -07:00
|
|
|
#endif
|
2006-03-12 23:02:45 -08:00
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
static int _xcb_open(char *host, char *protocol, const int display)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
|
|
|
|
int fd;
|
2007-07-19 17:00:18 +02:00
|
|
|
static const char base[] = "/tmp/.X11-unix/X";
|
|
|
|
|
char file[sizeof(base) + 20];
|
2006-02-18 16:49:41 -08:00
|
|
|
|
|
|
|
|
if(*host)
|
|
|
|
|
{
|
2006-04-24 08:29:18 -07:00
|
|
|
#ifdef DNETCONN
|
2007-07-19 17:00:18 +02:00
|
|
|
/* DECnet displays have two colons, so _xcb_parse_display will have
|
|
|
|
|
left one at the end. However, an IPv6 address can end with *two*
|
|
|
|
|
colons, so only treat this as a DECnet display if host ends with
|
|
|
|
|
exactly one colon. */
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
char *colon = strchr(host, ':');
|
|
|
|
|
if(colon && *(colon+1) == '\0')
|
2006-04-24 08:29:18 -07:00
|
|
|
{
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
*colon = '\0';
|
2007-07-19 17:00:18 +02:00
|
|
|
return _xcb_open_decnet(host, protocol, display);
|
2006-04-24 08:29:18 -07:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
2007-07-19 17:00:18 +02:00
|
|
|
if (protocol
|
|
|
|
|
|| strcmp("unix",host)) { /* follow the old unix: rule */
|
|
|
|
|
|
|
|
|
|
/* display specifies TCP */
|
|
|
|
|
unsigned short port = X_TCP_PORT + display;
|
|
|
|
|
return _xcb_open_tcp(host, protocol, port);
|
|
|
|
|
}
|
2006-02-18 16:49:41 -08:00
|
|
|
}
|
|
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
/* display specifies Unix socket */
|
|
|
|
|
snprintf(file, sizeof(file), "%s%d", base, display);
|
|
|
|
|
return _xcb_open_unix(protocol, file);
|
|
|
|
|
|
|
|
|
|
|
2006-02-18 16:49:41 -08:00
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
|
2006-04-24 08:29:18 -07:00
|
|
|
#ifdef DNETCONN
|
2007-07-19 17:00:18 +02:00
|
|
|
static int _xcb_open_decnet(const char *host, const char *protocol, const unsigned short port)
|
2006-04-24 08:29:18 -07:00
|
|
|
{
|
|
|
|
|
int fd;
|
|
|
|
|
struct sockaddr_dn addr;
|
|
|
|
|
struct accessdata_dn accessdata;
|
|
|
|
|
struct nodeent *nodeaddr = getnodebyname(host);
|
|
|
|
|
|
|
|
|
|
if(!nodeaddr)
|
|
|
|
|
return -1;
|
2007-07-19 17:00:18 +02:00
|
|
|
if (protocol && strcmp("dnet",protocol))
|
|
|
|
|
return -1;
|
2006-04-24 08:29:18 -07:00
|
|
|
addr.sdn_family = AF_DECnet;
|
|
|
|
|
|
|
|
|
|
addr.sdn_add.a_len = nodeaddr->n_length;
|
|
|
|
|
memcpy(addr.sdn_add.a_addr, nodeaddr->n_addr, addr.sdn_add.a_len);
|
|
|
|
|
|
|
|
|
|
sprintf((char *)addr.sdn_objname, "X$X%d", port);
|
|
|
|
|
addr.sdn_objnamel = strlen((char *)addr.sdn_objname);
|
|
|
|
|
addr.sdn_objnum = 0;
|
|
|
|
|
|
|
|
|
|
fd = socket(PF_DECnet, SOCK_STREAM, 0);
|
|
|
|
|
if(fd == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
memset(&accessdata, 0, sizeof(accessdata));
|
|
|
|
|
sprintf((char*)accessdata.acc_acc, "%d", getuid());
|
|
|
|
|
accessdata.acc_accl = strlen((char *)accessdata.acc_acc);
|
|
|
|
|
setsockopt(fd, DNPROTO_NSP, SO_CONACCESS, &accessdata, sizeof(accessdata));
|
|
|
|
|
|
|
|
|
|
if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
int fd = -1;
|
2008-08-28 14:35:54 +02:00
|
|
|
struct addrinfo hints;
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
char service[6]; /* "65535" with the trailing '\0' */
|
|
|
|
|
struct addrinfo *results, *addr;
|
|
|
|
|
char *bracket;
|
2007-07-19 17:00:18 +02:00
|
|
|
|
|
|
|
|
if (protocol && strcmp("tcp",protocol))
|
|
|
|
|
return -1;
|
|
|
|
|
|
2008-08-28 14:35:54 +02:00
|
|
|
memset(&hints, 0, sizeof(hints));
|
|
|
|
|
#ifdef AI_ADDRCONFIG
|
|
|
|
|
hints.ai_flags |= AI_ADDRCONFIG;
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef AI_NUMERICSERV
|
|
|
|
|
hints.ai_flags |= AI_NUMERICSERV;
|
|
|
|
|
#endif
|
|
|
|
|
hints.ai_family = AF_UNSPEC;
|
|
|
|
|
hints.ai_socktype = SOCK_STREAM;
|
|
|
|
|
|
2007-11-24 14:53:54 -08:00
|
|
|
#ifdef AF_INET6
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
/* Allow IPv6 addresses enclosed in brackets. */
|
|
|
|
|
if(host[0] == '[' && (bracket = strrchr(host, ']')) && bracket[1] == '\0')
|
|
|
|
|
{
|
|
|
|
|
*bracket = '\0';
|
|
|
|
|
++host;
|
|
|
|
|
hints.ai_flags |= AI_NUMERICHOST;
|
|
|
|
|
hints.ai_family = AF_INET6;
|
|
|
|
|
}
|
2007-11-24 14:53:54 -08:00
|
|
|
#endif
|
2006-02-18 16:49:41 -08:00
|
|
|
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
snprintf(service, sizeof(service), "%hu", port);
|
|
|
|
|
if(getaddrinfo(host, service, &hints, &results))
|
|
|
|
|
/* FIXME: use gai_strerror, and fill in error connection */
|
2006-02-18 16:49:41 -08:00
|
|
|
return -1;
|
Support displays with IPv6 addresses or hosts which resolve to IPv6 addresses
xcb_parse_display already correctly handled IPv6 displays. Now, _xcb_open_tcp
uses getaddrinfo, and correctly connects to IPv6 displays. Displays can use
bare IPv6 addresses, square-bracketed IPv6 addresses, or hostnames which
resolve to IPv6 addresses.
Since IPv6 addresses may include colons, including at the end, revise the
DECnet display parsing code to avoid triggering on IPv6 addresses.
Authorization may not work with IPv6 connections yet.
This commit brought to you by the (display) number ::1:1.1, the letter X,
the Gobby collaborative editor, Josh Triplett, and Jamey Sharp.
2006-11-20 17:53:30 -08:00
|
|
|
|
|
|
|
|
for(addr = results; addr; addr = addr->ai_next)
|
|
|
|
|
{
|
|
|
|
|
fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
|
|
|
|
|
if(fd >= 0 && connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
|
|
|
|
|
break;
|
|
|
|
|
fd = -1;
|
|
|
|
|
}
|
|
|
|
|
freeaddrinfo(results);
|
2006-02-18 16:49:41 -08:00
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
static int _xcb_open_unix(char *protocol, const char *file)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
|
|
|
|
int fd;
|
2008-07-07 17:57:37 +02:00
|
|
|
struct sockaddr_un addr;
|
2007-07-19 17:00:18 +02:00
|
|
|
|
|
|
|
|
if (protocol && strcmp("unix",protocol))
|
|
|
|
|
return -1;
|
|
|
|
|
|
2006-02-18 16:49:41 -08:00
|
|
|
strcpy(addr.sun_path, file);
|
2008-07-07 17:57:37 +02:00
|
|
|
addr.sun_family = AF_UNIX;
|
2008-08-28 13:51:38 +02:00
|
|
|
#ifdef HAVE_SOCKADDR_SUN_LEN
|
2008-07-07 17:57:37 +02:00
|
|
|
addr.sun_len = SUN_LEN(&addr);
|
|
|
|
|
#endif
|
2006-02-18 16:49:41 -08:00
|
|
|
fd = socket(AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
|
if(fd == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
return fd;
|
|
|
|
|
}
|
|
|
|
|
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
xcb_connection_t *xcb_connect(const char *displayname, int *screenp)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
|
|
|
|
int fd, display = 0;
|
|
|
|
|
char *host;
|
2007-07-19 17:00:18 +02:00
|
|
|
char *protocol;
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
xcb_connection_t *c;
|
|
|
|
|
xcb_auth_info_t auth;
|
2006-02-18 16:49:41 -08:00
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
if(!_xcb_parse_display(displayname, &host, &protocol, &display, screenp))
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
return (xcb_connection_t *) &error_connection;
|
2007-07-19 17:00:18 +02:00
|
|
|
fd = _xcb_open(host, protocol, display);
|
2006-02-18 16:49:41 -08:00
|
|
|
free(host);
|
|
|
|
|
if(fd == -1)
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
return (xcb_connection_t *) &error_connection;
|
2006-02-18 16:49:41 -08:00
|
|
|
|
2006-11-20 23:25:41 -08:00
|
|
|
if(_xcb_get_auth_info(fd, &auth, display))
|
|
|
|
|
{
|
|
|
|
|
c = xcb_connect_to_fd(fd, &auth);
|
|
|
|
|
free(auth.name);
|
|
|
|
|
free(auth.data);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
c = xcb_connect_to_fd(fd, 0);
|
2006-02-18 16:49:41 -08:00
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, xcb_auth_info_t *auth, int *screenp)
|
2006-02-18 16:49:41 -08:00
|
|
|
{
|
|
|
|
|
int fd, display = 0;
|
|
|
|
|
char *host;
|
2007-07-19 17:00:18 +02:00
|
|
|
char *protocol;
|
2006-02-18 16:49:41 -08:00
|
|
|
|
2007-07-19 17:00:18 +02:00
|
|
|
if(!_xcb_parse_display(displayname, &host, &protocol, &display, screenp))
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
return (xcb_connection_t *) &error_connection;
|
2007-07-19 17:00:18 +02:00
|
|
|
fd = _xcb_open(host, protocol, display);
|
2006-02-18 16:49:41 -08:00
|
|
|
free(host);
|
|
|
|
|
if(fd == -1)
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
return (xcb_connection_t *) &error_connection;
|
2006-02-18 16:49:41 -08:00
|
|
|
|
The Great XCB Renaming
Rename API to follow a new naming convention:
* XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES
* xcb_functions_lowercase_with_underscores
* xcb_types_lowercase_with_underscores_and_suffix_t
* expand all abbreviations like "req", "rep", and "iter"
Word boundaries for the names in the protocol descriptions fall:
* Wherever the protocol descriptions already have an underscore
* Between a lowercase letter and a subsequent uppercase letter
* Before the last uppercase letter in a string of uppercase letters followed
by a lowercase letter (such as in LSBFirst between LSB and First)
* Before and after a string of digits (with exceptions for sized types like
xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention)
Also fix up some particular naming issues:
* Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise
these types end up as xcb_shape_shape_{op,kind}_t.
* Remove leading underscores from enums in the GLX protocol description,
previously needed to ensure a word separator, but now redundant.
This renaming breaks code written for the previous API naming convention. The
scripts in XCB's tools directory will convert code written for the old API to
use the new API; they work well enough that we used them to convert the
non-program-generated code in XCB, and when run on the old program-generated
code, they almost exactly reproduce the new program-generated code (modulo
whitespace and bugs in the old code generator).
Authors: Vincent Torri, Thomas Hunger, Josh Triplett
2006-09-23 12:22:22 -07:00
|
|
|
return xcb_connect_to_fd(fd, auth);
|
2006-02-18 16:49:41 -08:00
|
|
|
}
|