frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb

This commit is contained in:
Ian Osgood 2006-03-12 23:03:24 -08:00
parent 5e0cfa84be e7576738c3
commit d8de2c7c2a
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/xcb_util.c
View File

@ -90,7 +90,10 @@ int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp)
return 1;
}
int XCBOpen(const char *host, const int display)
static int _xcb_open_tcp(const char *host, const unsigned short port);
static int _xcb_open_unix(const char *file);
static int _xcb_open(const char *host, const int display)
{
int fd;
@ -98,7 +101,7 @@ int XCBOpen(const char *host, const int display)
{
/* display specifies TCP */
unsigned short port = X_TCP_PORT + display;
fd = XCBOpenTCP(host, port);
fd = _xcb_open_tcp(host, port);
}
else
{
@ -106,13 +109,13 @@ int XCBOpen(const char *host, const int display)
static const char base[] = "/tmp/.X11-unix/X";
char file[sizeof(base) + 20];
snprintf(file, sizeof(file), "%s%d", base, display);
fd = XCBOpenUnix(file);
fd = _xcb_open_unix(file);
}
return fd;
}
int XCBOpenTCP(const char *host, const unsigned short port)
static int _xcb_open_tcp(const char *host, const unsigned short port)
{
int fd;
struct sockaddr_in addr;
@ -131,7 +134,7 @@ int XCBOpenTCP(const char *host, const unsigned short port)
return fd;
}
int XCBOpenUnix(const char *file)
static int _xcb_open_unix(const char *file)
{
int fd;
struct sockaddr_un addr = { AF_UNIX };
@ -154,7 +157,7 @@ XCBConnection *XCBConnect(const char *displayname, int *screenp)
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
fd = XCBOpen(host, display);
fd = _xcb_open(host, display);
free(host);
if(fd == -1)
return 0;
@ -173,7 +176,7 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
fd = XCBOpen(host, display);
fd = _xcb_open(host, display);
free(host);
if(fd == -1)
return 0;
@ -181,7 +184,17 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
return XCBConnectToFD(fd, auth);
}
/* backwards compatible interface: remove before 1.0 release */
int XCBSync(XCBConnection *c, XCBGenericError **e)
{
XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
free(reply);
return reply != 0;
}
/* backwards compatible interfaces: remove before 1.0 release */
XCBConnection *XCBConnectBasic()
{
XCBConnection *c = XCBConnect(0, 0);
@ -191,9 +204,17 @@ XCBConnection *XCBConnectBasic()
abort();
}
int XCBSync(XCBConnection *c, XCBGenericError **e)
int XCBOpen(const char *host, const int display)
{
XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
free(reply);
return reply != 0;
return _xcb_open(host, display);
}
int XCBOpenTCP(const char *host, const unsigned short port)
{
return _xcb_open_tcp(host, port);
}
int XCBOpenUnix(const char *file)
{
return _xcb_open_unix(file);
}