projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add XCBAllPlanes from xcb-image util library.
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
b0d727b
..
9aa7cdf
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-39,10
+39,12
@@
#include "xcbint.h"
typedef struct {
#include "xcbint.h"
typedef struct {
- CARD8 status;
- CARD8 pad0[5];
- CARD16 length;
-} XCBSetupGeneric;
+ uint8_t status;
+ uint8_t pad0[5];
+ uint16_t length;
+} xcb_setup_generic_t;
+
+static const int error_connection = 1;
static int set_fd_flags(const int fd)
{
static int set_fd_flags(const int fd)
{
@@
-57,10
+59,10
@@
static int set_fd_flags(const int fd)
return 1;
}
return 1;
}
-static int write_setup(
XCBConnection *c, XCBAuthInfo
*auth_info)
+static int write_setup(
xcb_connection_t *c, xcb_auth_info_t
*auth_info)
{
static const char pad[3];
{
static const char pad[3];
-
XCBSetupReq
out;
+
xcb_setup_request_t
out;
struct iovec parts[6];
int count = 0;
int endian = 0x01020304;
struct iovec parts[6];
int count = 0;
int endian = 0x01020304;
@@
-77,9
+79,9
@@
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
out.protocol_minor_version = X_PROTOCOL_REVISION;
out.authorization_protocol_name_len = 0;
out.authorization_protocol_data_len = 0;
out.protocol_minor_version = X_PROTOCOL_REVISION;
out.authorization_protocol_name_len = 0;
out.authorization_protocol_data_len = 0;
- parts[count].iov_len = sizeof(
XCBSetupReq
);
+ parts[count].iov_len = sizeof(
xcb_setup_request_t
);
parts[count++].iov_base = &out;
parts[count++].iov_base = &out;
- parts[count].iov_len = XCB_PAD(sizeof(
XCBSetupReq
));
+ parts[count].iov_len = XCB_PAD(sizeof(
xcb_setup_request_t
));
parts[count++].iov_base = (char *) pad;
if(auth_info)
parts[count++].iov_base = (char *) pad;
if(auth_info)
@@
-104,24
+106,24
@@
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
return ret;
}
return ret;
}
-static int read_setup(
XCBConnection
*c)
+static int read_setup(
xcb_connection_t
*c)
{
/* Read the server response */
{
/* Read the server response */
- c->setup = malloc(sizeof(
XCBSetupGeneric
));
+ c->setup = malloc(sizeof(
xcb_setup_generic_t
));
if(!c->setup)
return 0;
if(!c->setup)
return 0;
- if(_xcb_in_read_block(c, c->setup, sizeof(
XCBSetupGeneric)) != sizeof(XCBSetupGeneric
))
+ if(_xcb_in_read_block(c, c->setup, sizeof(
xcb_setup_generic_t)) != sizeof(xcb_setup_generic_t
))
return 0;
{
return 0;
{
- void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(
XCBSetupGeneric
));
+ void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(
xcb_setup_generic_t
));
if(!tmp)
return 0;
c->setup = tmp;
}
if(!tmp)
return 0;
c->setup = tmp;
}
- if(_xcb_in_read_block(c, (char *) c->setup + sizeof(
XCBSetupGeneric
), c->setup->length * 4) <= 0)
+ if(_xcb_in_read_block(c, (char *) c->setup + sizeof(
xcb_setup_generic_t
), c->setup->length * 4) <= 0)
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
@@
-129,15
+131,15
@@
static int read_setup(XCBConnection *c)
{
case 0: /* failed */
{
{
case 0: /* failed */
{
-
XCBSetupFailed *setup = (XCBSetupFailed
*) c->setup;
- write(STDERR_FILENO,
XCBSetupFailedReason(setup), XCBSetupFailedReasonL
ength(setup));
+
xcb_setup_failed_t *setup = (xcb_setup_failed_t
*) c->setup;
+ write(STDERR_FILENO,
xcb_setup_failed_reason(setup), xcb_setup_failed_reason_l
ength(setup));
return 0;
}
case 2: /* authenticate */
{
return 0;
}
case 2: /* authenticate */
{
-
XCBSetupAuthenticate *setup = (XCBSetupAuthenticate
*) c->setup;
- write(STDERR_FILENO,
XCBSetupAuthenticateReason(setup), XCBSetupAuthenticateReasonL
ength(setup));
+
xcb_setup_authenticate_t *setup = (xcb_setup_authenticate_t
*) c->setup;
+ write(STDERR_FILENO,
xcb_setup_authenticate_reason(setup), xcb_setup_authenticate_reason_l
ength(setup));
return 0;
}
}
return 0;
}
}
@@
-146,7
+148,7
@@
static int read_setup(XCBConnection *c)
}
/* precondition: there must be something for us to write. */
}
/* precondition: there must be something for us to write. */
-static int write_vec(
XCBConnection
*c, struct iovec **vector, int *count)
+static int write_vec(
xcb_connection_t
*c, struct iovec **vector, int *count)
{
int n;
assert(!c->out.queue_len);
{
int n;
assert(!c->out.queue_len);
@@
-154,7
+156,10
@@
static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
if(n < 0 && errno == EAGAIN)
return 1;
if(n <= 0)
if(n < 0 && errno == EAGAIN)
return 1;
if(n <= 0)
+ {
+ _xcb_conn_shutdown(c);
return 0;
return 0;
+ }
for(; *count; --*count, ++*vector)
{
for(; *count; --*count, ++*vector)
{
@@
-175,31
+180,35
@@
static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
/* Public interface */
/* Public interface */
-const
XCBSetup *XCBGetSetup(XCBConnection
*c)
+const
xcb_setup_t *xcb_get_setup(xcb_connection_t
*c)
{
{
+ if(c->has_error)
+ return 0;
/* doesn't need locking because it's never written to. */
return c->setup;
}
/* doesn't need locking because it's never written to. */
return c->setup;
}
-int
XCBGetFileDescriptor(XCBConnection
*c)
+int
xcb_get_file_descriptor(xcb_connection_t
*c)
{
{
+ if(c->has_error)
+ return -1;
/* doesn't need locking because it's never written to. */
return c->fd;
}
/* doesn't need locking because it's never written to. */
return c->fd;
}
-int
XCBConnectionHasError(XCBConnection
*c)
+int
xcb_connection_has_error(xcb_connection_t
*c)
{
/* doesn't need locking because it's read and written atomically. */
return c->has_error;
}
{
/* doesn't need locking because it's read and written atomically. */
return c->has_error;
}
-
XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo
*auth_info)
+
xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t
*auth_info)
{
{
-
XCBConnection
* c;
+
xcb_connection_t
* c;
- c = calloc(1, sizeof(
XCBConnection
));
+ c = calloc(1, sizeof(
xcb_connection_t
));
if(!c)
if(!c)
- return
0
;
+ return
(xcb_connection_t *) &error_connection
;
c->fd = fd;
c->fd = fd;
@@
-214,16
+223,16
@@
XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
_xcb_xid_init(c)
))
{
_xcb_xid_init(c)
))
{
-
XCBD
isconnect(c);
- return
0
;
+
xcb_d
isconnect(c);
+ return
(xcb_connection_t *) &error_connection
;
}
return c;
}
}
return c;
}
-void
XCBDisconnect(XCBConnection
*c)
+void
xcb_disconnect(xcb_connection_t
*c)
{
{
- if(
!c
)
+ if(
c->has_error
)
return;
free(c->setup);
return;
free(c->setup);
@@
-241,7
+250,12
@@
void XCBDisconnect(XCBConnection *c)
/* Private interface */
/* Private interface */
-int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count)
+void _xcb_conn_shutdown(xcb_connection_t *c)
+{
+ c->has_error = 1;
+}
+
+int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
{
int ret;
fd_set rfds, wfds;
{
int ret;
fd_set rfds, wfds;
@@
-269,7
+283,10
@@
int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
} while (ret == -1 && errno == EINTR);
if (ret < 0)
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
} while (ret == -1 && errno == EINTR);
if (ret < 0)
+ {
+ _xcb_conn_shutdown(c);
ret = 0;
ret = 0;
+ }
pthread_mutex_lock(&c->iolock);
if(ret)
pthread_mutex_lock(&c->iolock);
if(ret)