#include "xcbext.h"
#include "xcbint.h"
-#define XCBError 0
-#define XCBReply 1
+#define XCB_ERROR 0
+#define XCB_REPLY 1
+#define XCB_XGE_EVENT 35
struct event_list {
- XCBGenericEvent *event;
+ xcb_generic_event_t *event;
struct event_list *next;
};
struct reader_list *next;
} reader_list;
-static void wake_up_next_reader(XCBConnection *c)
+static void wake_up_next_reader(xcb_connection_t *c)
{
int pthreadret;
if(c->in.readers)
assert(pthreadret == 0);
}
-static int read_packet(XCBConnection *c)
+static int read_packet(xcb_connection_t *c)
{
- XCBGenericRep genrep;
+ xcb_generic_reply_t genrep;
int length = 32;
+ int eventlength = 0; /* length after first 32 bytes for GenericEvents */
void *buf;
pending_reply *pend = 0;
struct event_list *event;
memcpy(&genrep, c->in.queue, sizeof(genrep));
/* Compute 32-bit sequence number of this packet. */
- if((genrep.response_type & 0x7f) != XCBKeymapNotify)
+ if((genrep.response_type & 0x7f) != XCB_KEYMAP_NOTIFY)
{
unsigned int lastread = c->in.request_read;
c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
}
c->in.request_completed = c->in.request_read - 1;
}
- if(genrep.response_type != XCBReply) /* error or event */
- c->in.request_completed = c->in.request_read; /* XXX: does event/error imply no more replies? */
while(c->in.pending_replies &&
XCB_SEQUENCE_COMPARE (c->in.pending_replies->request, <=, c->in.request_completed))
c->in.pending_replies_tail = &c->in.pending_replies;
free(oldpend);
}
+
+ if(genrep.response_type == XCB_ERROR)
+ c->in.request_completed = c->in.request_read;
}
- if(genrep.response_type == XCBError || genrep.response_type == XCBReply)
+ if(genrep.response_type == XCB_ERROR || genrep.response_type == XCB_REPLY)
{
pend = c->in.pending_replies;
if(pend && pend->request != c->in.request_read)
}
/* For reply packets, check that the entire packet is available. */
- if(genrep.response_type == XCBReply)
+ if(genrep.response_type == XCB_REPLY)
{
if(pend && pend->workaround == WORKAROUND_GLX_GET_FB_CONFIGS_BUG)
{
- CARD32 *p = (CARD32 *) c->in.queue;
+ uint32_t *p = (uint32_t *) c->in.queue;
genrep.length = p[2] * p[3] * 2;
}
length += genrep.length * 4;
}
- buf = malloc(length + (genrep.response_type == XCBReply ? 0 : sizeof(CARD32)));
+ /* XGE events may have sizes > 32 */
+ if (genrep.response_type == XCB_XGE_EVENT)
+ {
+ eventlength = ((xcb_ge_event_t*)&genrep)->length * 4;
+ }
+
+ buf = malloc(length + eventlength +
+ (genrep.response_type == XCB_REPLY ? 0 : sizeof(uint32_t)));
if(!buf)
+ {
+ _xcb_conn_shutdown(c);
return 0;
+ }
+
if(_xcb_in_read_block(c, buf, length) <= 0)
{
free(buf);
return 0;
}
+
+ /* pull in XGE event data if available, append after event struct */
+ if (eventlength)
+ {
+ if(_xcb_in_read_block(c, &((xcb_generic_event_t*)buf)[1], eventlength) <= 0)
+ {
+ free(buf);
+ return 0;
+ }
+ }
+
if(pend && (pend->flags & XCB_REQUEST_DISCARD_REPLY))
{
free(buf);
return 1;
}
- if(genrep.response_type != XCBReply)
- ((XCBGenericEvent *) buf)->full_sequence = c->in.request_read;
+ if(genrep.response_type != XCB_REPLY)
+ ((xcb_generic_event_t *) buf)->full_sequence = c->in.request_read;
/* reply, or checked error */
- if( genrep.response_type == XCBReply ||
- (genrep.response_type == XCBError && pend && (pend->flags & XCB_REQUEST_CHECKED)))
+ if( genrep.response_type == XCB_REPLY ||
+ (genrep.response_type == XCB_ERROR && pend && (pend->flags & XCB_REQUEST_CHECKED)))
{
reader_list *reader;
struct reply_list *cur = malloc(sizeof(struct reply_list));
if(!cur)
+ {
+ _xcb_conn_shutdown(c);
+ free(buf);
return 0;
+ }
cur->reply = buf;
cur->next = 0;
*c->in.current_reply_tail = cur;
event = malloc(sizeof(struct event_list));
if(!event)
{
+ _xcb_conn_shutdown(c);
free(buf);
return 0;
}
return 1; /* I have something for you... */
}
-static XCBGenericEvent *get_event(XCBConnection *c)
+static xcb_generic_event_t *get_event(xcb_connection_t *c)
{
struct event_list *cur = c->in.events;
- XCBGenericEvent *ret;
+ xcb_generic_event_t *ret;
if(!c->in.events)
return 0;
ret = cur->event;
}
}
-static int read_block(const int fd, void *buf, const size_t len)
+static int read_block(const int fd, void *buf, const ssize_t len)
{
int done = 0;
while(done < len)
return len;
}
-static int poll_for_reply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error)
+static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error)
{
struct reply_list *head;
if(head)
{
- if(((XCBGenericRep *) head->reply)->response_type == XCBError)
+ if(((xcb_generic_reply_t *) head->reply)->response_type == XCB_ERROR)
{
if(error)
*error = head->reply;
/* Public interface */
-void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
+void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e)
{
void *ret = 0;
if(e)
*e = 0;
+ if(c->has_error)
+ return 0;
- pthread_mutex_lock(&c->iolock);
+ _xcb_lock_io(c);
/* If this request has not been written yet, write it. */
if(_xcb_out_flush_to(c, request))
}
wake_up_next_reader(c);
- pthread_mutex_unlock(&c->iolock);
+ _xcb_unlock_io(c);
return ret;
}
-int XCBPollForReply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error)
+int xcb_poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error)
{
int ret;
+ if(c->has_error)
+ {
+ *reply = 0;
+ if(error)
+ *error = 0;
+ return 1; /* would not block */
+ }
assert(reply != 0);
- pthread_mutex_lock(&c->iolock);
+ _xcb_lock_io(c);
ret = poll_for_reply(c, request, reply, error);
- pthread_mutex_unlock(&c->iolock);
+ _xcb_unlock_io(c);
return ret;
}
-XCBGenericEvent *XCBWaitEvent(XCBConnection *c)
+xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c)
{
- return XCBWaitForEvent(c);
-}
-
-XCBGenericEvent *XCBWaitForEvent(XCBConnection *c)
-{
- XCBGenericEvent *ret;
- pthread_mutex_lock(&c->iolock);
+ xcb_generic_event_t *ret;
+ if(c->has_error)
+ return 0;
+ _xcb_lock_io(c);
/* get_event returns 0 on empty list. */
while(!(ret = get_event(c)))
if(!_xcb_conn_wait(c, &c->in.event_cond, 0, 0))
break;
wake_up_next_reader(c);
- pthread_mutex_unlock(&c->iolock);
+ _xcb_unlock_io(c);
return ret;
}
-XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error)
+xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c)
{
- XCBGenericEvent *ret = 0;
- pthread_mutex_lock(&c->iolock);
- if(error)
- *error = 0;
- /* FIXME: follow X meets Z architecture changes. */
- if(_xcb_in_read(c))
- ret = get_event(c);
- else if(error)
- *error = -1;
- else
+ xcb_generic_event_t *ret = 0;
+ if(!c->has_error)
{
- fprintf(stderr, "XCBPollForEvent: I/O error occured, but no handler provided.\n");
- abort();
+ _xcb_lock_io(c);
+ /* FIXME: follow X meets Z architecture changes. */
+ ret = get_event(c);
+ if(!ret && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+ ret = get_event(c);
+ _xcb_unlock_io(c);
}
- pthread_mutex_unlock(&c->iolock);
return ret;
}
-unsigned int XCBGetRequestRead(XCBConnection *c)
+xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie)
{
- unsigned int ret;
- pthread_mutex_lock(&c->iolock);
- /* FIXME: follow X meets Z architecture changes. */
- _xcb_in_read(c);
- ret = c->in.request_read;
- pthread_mutex_unlock(&c->iolock);
+ /* FIXME: this could hold the lock to avoid syncing unnecessarily, but
+ * that would require factoring the locking out of xcb_get_input_focus,
+ * xcb_get_input_focus_reply, and xcb_wait_for_reply. */
+ xcb_generic_error_t *ret;
+ void *reply;
+ if(c->has_error)
+ return 0;
+ if(XCB_SEQUENCE_COMPARE(cookie.sequence,>,c->in.request_expected)
+ && XCB_SEQUENCE_COMPARE(cookie.sequence,>,c->in.request_completed))
+ {
+ free(xcb_get_input_focus_reply(c, xcb_get_input_focus(c), &ret));
+ assert(!ret);
+ }
+ reply = xcb_wait_for_reply(c, cookie.sequence, &ret);
+ assert(!reply);
return ret;
}
}
}
-int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags)
+int _xcb_in_expect_reply(xcb_connection_t *c, unsigned int request, enum workarounds workaround, int flags)
{
pending_reply *pend = malloc(sizeof(pending_reply));
assert(workaround != WORKAROUND_NONE || flags != 0);
if(!pend)
+ {
+ _xcb_conn_shutdown(c);
return 0;
+ }
pend->request = request;
pend->workaround = workaround;
pend->flags = flags;
return 1;
}
-int _xcb_in_read(XCBConnection *c)
+int _xcb_in_read(xcb_connection_t *c)
{
int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len);
if(n > 0)
c->in.queue_len += n;
while(read_packet(c))
/* empty */;
- return (n > 0) || (n < 0 && errno == EAGAIN);
+ if((n > 0) || (n < 0 && errno == EAGAIN))
+ return 1;
+ _xcb_conn_shutdown(c);
+ return 0;
}
-int _xcb_in_read_block(XCBConnection *c, void *buf, int len)
+int _xcb_in_read_block(xcb_connection_t *c, void *buf, int len)
{
int done = c->in.queue_len;
if(len < done)
{
int ret = read_block(c->fd, (char *) buf + done, len - done);
if(ret <= 0)
+ {
+ _xcb_conn_shutdown(c);
return ret;
+ }
}
return len;
projects / free-sw / xcb / libxcb / blobdiff