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

Restructure to remove most deprecation warnings.

This commit is contained in:
Ian Osgood 2006-03-12 23:02:45 -08:00
parent 5b0ae3421d
commit e7576738c3
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

@ -89,7 +89,10 @@ int XCBParseDisplay(const char *name, char **host, int *displayp, int *screenp)
return 1; 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; int fd;
@ -97,7 +100,7 @@ int XCBOpen(const char *host, const int display)
{ {
/* display specifies TCP */ /* display specifies TCP */
unsigned short port = X_TCP_PORT + display; unsigned short port = X_TCP_PORT + display;
fd = XCBOpenTCP(host, port); fd = _xcb_open_tcp(host, port);
} }
else else
{ {
@ -105,13 +108,13 @@ int XCBOpen(const char *host, const int display)
static const char base[] = "/tmp/.X11-unix/X"; static const char base[] = "/tmp/.X11-unix/X";
char file[sizeof(base) + 20]; char file[sizeof(base) + 20];
snprintf(file, sizeof(file), "%s%d", base, display); snprintf(file, sizeof(file), "%s%d", base, display);
fd = XCBOpenUnix(file); fd = _xcb_open_unix(file);
} }
return fd; 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; int fd;
struct sockaddr_in addr; struct sockaddr_in addr;
@ -130,7 +133,7 @@ int XCBOpenTCP(const char *host, const unsigned short port)
return fd; return fd;
} }
int XCBOpenUnix(const char *file) static int _xcb_open_unix(const char *file)
{ {
int fd; int fd;
struct sockaddr_un addr = { AF_UNIX }; struct sockaddr_un addr = { AF_UNIX };
@ -153,7 +156,7 @@ XCBConnection *XCBConnect(const char *displayname, int *screenp)
if(!XCBParseDisplay(displayname, &host, &display, screenp)) if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0; return 0;
fd = XCBOpen(host, display); fd = _xcb_open(host, display);
free(host); free(host);
if(fd == -1) if(fd == -1)
return 0; return 0;
@ -172,7 +175,7 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
if(!XCBParseDisplay(displayname, &host, &display, screenp)) if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0; return 0;
fd = XCBOpen(host, display); fd = _xcb_open(host, display);
free(host); free(host);
if(fd == -1) if(fd == -1)
return 0; return 0;
@ -180,7 +183,17 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
return XCBConnectToFD(fd, auth); 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 *XCBConnectBasic()
{ {
XCBConnection *c = XCBConnect(0, 0); XCBConnection *c = XCBConnect(0, 0);
@ -190,9 +203,17 @@ XCBConnection *XCBConnectBasic()
abort(); abort();
} }
int XCBSync(XCBConnection *c, XCBGenericError **e) int XCBOpen(const char *host, const int display)
{ {
XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e); return _xcb_open(host, display);
free(reply); }
return reply != 0;
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);
} }