projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
[free-sw/xcb/libxcb]
/
src
/
xcb_util.c
diff --git
a/src/xcb_util.c
b/src/xcb_util.c
index
b7f5ffa
..
343e21f
100644
(file)
--- a/
src/xcb_util.c
+++ b/
src/xcb_util.c
@@
-26,9
+26,8
@@
/* Utility functions implementable using only public APIs. */
#include <assert.h>
/* Utility functions implementable using only public APIs. */
#include <assert.h>
-#include <sys/
select
.h>
+#include <sys/
types
.h>
#include <sys/socket.h>
#include <sys/socket.h>
-#include <sys/fcntl.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <netdb.h>
@@
-40,6
+39,7
@@
#include "xcb.h"
#include "xcbext.h"
#include "xcb.h"
#include "xcbext.h"
+#include "xcbint.h"
int XCBPopcount(CARD32 mask)
{
int XCBPopcount(CARD32 mask)
{
@@
-90,7
+90,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;
@@
-98,7
+101,7
@@
int XCBOpen(const char *host, const int display)
{
/* display specifies TCP */
unsigned short port = X_TCP_PORT + display;
{
/* display specifies TCP */
unsigned short port = X_TCP_PORT + display;
- fd =
XCBOpenTCP
(host, port);
+ fd =
_xcb_open_tcp
(host, port);
}
else
{
}
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);
static const char base[] = "/tmp/.X11-unix/X";
char file[sizeof(base) + 20];
snprintf(file, sizeof(file), "%s%d", base, display);
- fd =
XCBOpenU
nix(file);
+ fd =
_xcb_open_u
nix(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;
struct sockaddr_in addr;
{
int fd;
struct sockaddr_in addr;
@@
-131,7
+134,7
@@
int XCBOpenTCP(const char *host, const unsigned short port)
return fd;
}
return fd;
}
-
int XCBOpenU
nix(const char *file)
+
static int _xcb_open_u
nix(const char *file)
{
int fd;
struct sockaddr_un addr = { AF_UNIX };
{
int fd;
struct sockaddr_un addr = { AF_UNIX };
@@
-154,12
+157,12
@@
XCBConnection *XCBConnect(const char *displayname, int *screenp)
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
- fd =
XCBO
pen(host, display);
+ fd =
_xcb_o
pen(host, display);
free(host);
if(fd == -1)
return 0;
free(host);
if(fd == -1)
return 0;
-
XCBGetAuthI
nfo(fd, &auth);
+
_xcb_get_auth_i
nfo(fd, &auth);
c = XCBConnectToFD(fd, &auth);
free(auth.name);
free(auth.data);
c = XCBConnectToFD(fd, &auth);
free(auth.name);
free(auth.data);
@@
-173,7
+176,7
@@
XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *displayname, XCBAuthI
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
if(!XCBParseDisplay(displayname, &host, &display, screenp))
return 0;
- fd =
XCBO
pen(host, display);
+ fd =
_xcb_o
pen(host, display);
free(host);
if(fd == -1)
return 0;
free(host);
if(fd == -1)
return 0;
@@
-181,7
+184,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 *c = XCBConnect(0, 0);
XCBConnection *XCBConnectBasic()
{
XCBConnection *c = XCBConnect(0, 0);
@@
-191,28
+204,22
@@
XCBConnection *XCBConnectBasic()
abort();
}
abort();
}
-int XCB
Sync(XCBConnection *c, XCBGenericError **e
)
+int XCB
Open(const char *host, const int display
)
{
{
- XCBGetInputFocusRep *reply = XCBGetInputFocusReply(c, XCBGetInputFocus(c), e);
- free(reply);
- return reply != 0;
+ return _xcb_open(host, display);
}
}
-/* The functions beyond this point still use only public interfaces,
- * but are not themselves part of the public interface. So their
- * prototypes are in xcbint.h. */
+int XCBOpenTCP(const char *host, const unsigned short port)
+{
+ return _xcb_open_tcp(host, port);
+}
-#include "xcbint.h"
+int XCBOpenUnix(const char *file)
+{
+ return _xcb_open_unix(file);
+}
-int
_xcb_set_fd_flags(const int fd
)
+int
XCBGetAuthInfo(int fd, XCBAuthInfo *info
)
{
{
- long flags = fcntl(fd, F_GETFL, 0);
- if(flags == -1)
- return 0;
- flags |= O_NONBLOCK;
- if(fcntl(fd, F_SETFL, flags) == -1)
- return 0;
- if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
- return 0;
- return 1;
+ return _xcb_get_auth_info(fd, info);
}
}