X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=0c68208dd0510636f7a311008536dad41f3cbb61;hb=96e55444b9b9500420f9132a1ace720100a26398;hp=2ac1e5239c728dd5aa44f6748eb67d2cde4e870f;hpb=2c8b5994b3fbba343199ef555594a32e29d8bcee;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_in.c b/src/xcb_in.c index 2ac1e52..0c68208 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -37,11 +37,12 @@ #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; }; @@ -51,7 +52,8 @@ struct reply_list { }; typedef struct pending_reply { - unsigned int request; + unsigned int first_request; + unsigned int last_request; enum workarounds workaround; int flags; struct pending_reply *next; @@ -63,7 +65,7 @@ typedef struct reader_list { 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) @@ -73,10 +75,11 @@ static void wake_up_next_reader(XCBConnection *c) 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; @@ -89,7 +92,7 @@ static int read_packet(XCBConnection *c) 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; @@ -108,11 +111,9 @@ static int read_packet(XCBConnection *c) } c->in.request_completed = c->in.request_read - 1; } - if(genrep.response_type == XCBError) - c->in.request_completed = c->in.request_read; while(c->in.pending_replies && - XCB_SEQUENCE_COMPARE (c->in.pending_replies->request, <=, c->in.request_completed)) + XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed)) { pending_reply *oldpend = c->in.pending_replies; c->in.pending_replies = oldpend->next; @@ -120,55 +121,80 @@ static int read_packet(XCBConnection *c) 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) + if(pend && + (XCB_SEQUENCE_COMPARE(c->in.request_read, <, pend->first_request) || + XCB_SEQUENCE_COMPARE(c->in.request_read, >, pend->last_request))) pend = 0; } /* 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; @@ -205,10 +231,10 @@ static int read_packet(XCBConnection *c) 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; @@ -230,7 +256,7 @@ static void free_reply_list(struct reply_list *head) } } -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) @@ -253,7 +279,7 @@ static int read_block(const int fd, void *buf, const size_t 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; @@ -292,7 +318,7 @@ static int poll_for_reply(XCBConnection *c, unsigned int request, void **reply, 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; @@ -310,7 +336,7 @@ static int poll_for_reply(XCBConnection *c, unsigned int request, void **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) @@ -362,7 +388,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** 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) @@ -379,9 +405,9 @@ int XCBPollForReply(XCBConnection *c, unsigned int request, void **reply, XCBGen return ret; } -XCBGenericEvent *XCBWaitForEvent(XCBConnection *c) +xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c) { - XCBGenericEvent *ret; + xcb_generic_event_t *ret; if(c->has_error) return 0; pthread_mutex_lock(&c->iolock); @@ -395,51 +421,37 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *c) return ret; } -XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error) +xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c) { + xcb_generic_event_t *ret = 0; if(!c->has_error) { - XCBGenericEvent *ret = 0; - int success; pthread_mutex_lock(&c->iolock); /* FIXME: follow X meets Z architecture changes. */ - success = _xcb_in_read(c); - if(success) + ret = get_event(c); + if(!ret && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */ ret = get_event(c); pthread_mutex_unlock(&c->iolock); - if(success) - { - if(error) - *error = 0; - return ret; - } } - if(error) - *error = -1; - else - { - fprintf(stderr, "XCBPollForEvent: I/O error occured, but no handler provided.\n"); - abort(); - } - return 0; + return ret; } -XCBGenericError *XCBRequestCheck(XCBConnection *c, XCBVoidCookie cookie) +xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie) { /* FIXME: this could hold the lock to avoid syncing unnecessarily, but - * that would require factoring the locking out of XCBGetInputFocus, - * XCBGetInputFocusReply, and XCBWaitForReply. */ - XCBGenericError *ret; + * 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(XCBGetInputFocusReply(c, XCBGetInputFocus(c), &ret)); + free(xcb_get_input_focus_reply(c, xcb_get_input_focus(c), &ret)); assert(!ret); } - reply = XCBWaitForReply(c, cookie.sequence, &ret); + reply = xcb_wait_for_reply(c, cookie.sequence, &ret); assert(!reply); return ret; } @@ -488,7 +500,7 @@ void _xcb_in_destroy(_xcb_in *in) } } -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); @@ -497,7 +509,7 @@ int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workaround _xcb_conn_shutdown(c); return 0; } - pend->request = request; + pend->first_request = pend->last_request = request; pend->workaround = workaround; pend->flags = flags; pend->next = 0; @@ -506,7 +518,7 @@ int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workaround 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) @@ -519,7 +531,7 @@ int _xcb_in_read(XCBConnection *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)