#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#include <sys/select.h>
#include <errno.h>
#include "xcb.h"
/* Compute 32-bit sequence number of this packet. */
if((genrep.response_type & 0x7f) != XCBKeymapNotify)
{
- int lastread = c->in.request_read;
+ unsigned int lastread = c->in.request_read;
c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
- if(c->in.request_read < lastread)
+ if(XCB_SEQUENCE_COMPARE(c->in.request_read, <, lastread))
c->in.request_read += 0x10000;
- if(c->in.request_read > c->in.request_expected)
+ if(XCB_SEQUENCE_COMPARE(c->in.request_read, >, c->in.request_expected))
c->in.request_expected = c->in.request_read;
if(c->in.request_read != lastread)
}
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? */
+ if(genrep.response_type == XCBError)
+ c->in.request_completed = c->in.request_read;
- while(c->in.pending_replies && c->in.pending_replies->request <= c->in.request_completed)
+ while(c->in.pending_replies &&
+ XCB_SEQUENCE_COMPARE (c->in.pending_replies->request, <=, c->in.request_completed))
{
pending_reply *oldpend = c->in.pending_replies;
c->in.pending_replies = oldpend->next;
cur->next = 0;
*c->in.current_reply_tail = cur;
c->in.current_reply_tail = &cur->next;
- for(reader = c->in.readers; reader && reader->request <= c->in.request_read; reader = reader->next)
+ for(reader = c->in.readers;
+ reader &&
+ XCB_SEQUENCE_COMPARE(reader->request, <=, c->in.request_read);
+ reader = reader->next)
+ {
if(reader->request == c->in.request_read)
{
pthread_cond_signal(reader->data);
break;
}
+ }
return 1;
}
head = 0;
/* We've read requests past the one we want, so if it has replies we have
* them all and they're in the replies map. */
- else if(request < c->in.request_read)
+ else if(XCB_SEQUENCE_COMPARE(request, <, c->in.request_read))
{
head = _xcb_map_remove(c->in.replies, request);
if(head && head->next)
void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
{
- pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
- reader_list reader;
- reader_list **prev_reader;
void *ret = 0;
if(e)
*e = 0;
pthread_mutex_lock(&c->iolock);
/* If this request has not been written yet, write it. */
- if(!_xcb_out_flush_to(c, request))
- goto done; /* error */
-
- for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next)
- if((*prev_reader)->request == request)
- goto done; /* error */
-
- reader.request = request;
- reader.data = &cond;
- reader.next = *prev_reader;
- *prev_reader = &reader;
-
- /* If this request has not completed yet and has no reply waiting,
- * wait for one. */
- while(!poll_for_reply(c, request, &ret, e))
- if(!_xcb_conn_wait(c, &cond, 0, 0))
- goto done;
-
-done:
- for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next)
- if(*prev_reader == &reader)
- {
- *prev_reader = (*prev_reader)->next;
- break;
- }
- pthread_cond_destroy(&cond);
+ if(_xcb_out_flush_to(c, request))
+ {
+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+ reader_list reader;
+ reader_list **prev_reader;
+
+ for(prev_reader = &c->in.readers;
+ *prev_reader &&
+ XCB_SEQUENCE_COMPARE ((*prev_reader)->request, <=, request);
+ prev_reader = &(*prev_reader)->next)
+ {
+ /* empty */;
+ }
+ reader.request = request;
+ reader.data = &cond;
+ reader.next = *prev_reader;
+ *prev_reader = &reader;
+
+ while(!poll_for_reply(c, request, &ret, e))
+ if(!_xcb_conn_wait(c, &cond, 0, 0))
+ break;
+
+ for(prev_reader = &c->in.readers;
+ *prev_reader &&
+ XCB_SEQUENCE_COMPARE((*prev_reader)->request, <=, request);
+ prev_reader = &(*prev_reader)->next)
+ {
+ if(*prev_reader == &reader)
+ {
+ *prev_reader = (*prev_reader)->next;
+ break;
+ }
+ }
+ pthread_cond_destroy(&cond);
+ }
wake_up_next_reader(c);
pthread_mutex_unlock(&c->iolock);
return ret;
}
-XCBGenericEvent *XCBWaitEvent(XCBConnection *c)
-{
- return XCBWaitForEvent(c);
-}
-
XCBGenericEvent *XCBWaitForEvent(XCBConnection *c)
{
XCBGenericEvent *ret;
XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error)
{
XCBGenericEvent *ret = 0;
+ int success;
pthread_mutex_lock(&c->iolock);
- if(error)
- *error = 0;
/* FIXME: follow X meets Z architecture changes. */
- if(_xcb_in_read(c))
+ success = _xcb_in_read(c);
+ if(success)
ret = get_event(c);
- else if(error)
+ 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();
}
- pthread_mutex_unlock(&c->iolock);
- return ret;
+ return 0;
}
-unsigned int XCBGetRequestRead(XCBConnection *c)
+XCBGenericError *XCBRequestCheck(XCBConnection *c, XCBVoidCookie 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 XCBGetInputFocus,
+ * XCBGetInputFocusReply, and XCBWaitForReply. */
+ XCBGenericError *ret;
+ void *reply;
+ 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));
+ assert(!ret);
+ }
+ reply = XCBWaitForReply(c, cookie.sequence, &ret);
+ assert(!reply);
return ret;
}
int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags)
{
- if(workaround != WORKAROUND_NONE || flags != 0)
- {
- pending_reply *pend = malloc(sizeof(pending_reply));
- if(!pend)
- return 0;
- pend->request = request;
- pend->workaround = workaround;
- pend->flags = flags;
- pend->next = 0;
- *c->in.pending_replies_tail = pend;
- c->in.pending_replies_tail = &pend->next;
- }
+ pending_reply *pend = malloc(sizeof(pending_reply));
+ assert(workaround != WORKAROUND_NONE || flags != 0);
+ if(!pend)
+ return 0;
+ pend->request = request;
+ pend->workaround = workaround;
+ pend->flags = flags;
+ pend->next = 0;
+ *c->in.pending_replies_tail = pend;
+ c->in.pending_replies_tail = &pend->next;
return 1;
}