X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=fa13e90b27a2454a92895c535d2fa6277269438c;hb=057ae541a3a73cffd58533029292c1c721fa3162;hp=a805fa8666006ad6ee201c4baf415eb5d09a6b89;hpb=76ad79a7adbb315f7c7d5f08d6f42553210868cd;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_in.c b/src/xcb_in.c index a805fa8..fa13e90 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -36,6 +36,9 @@ #include "xcbext.h" #include "xcbint.h" +#define XCBError 0 +#define XCBReply 1 + struct event_list { XCBGenericEvent *event; struct event_list *next; @@ -85,32 +88,39 @@ 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) != KeymapNotify) + if((genrep.response_type & 0x7f) != XCBKeymapNotify) { int lastread = c->in.request_read; c->in.request_read = (lastread & 0xffff0000) | genrep.sequence; + if(c->in.request_read < lastread) + c->in.request_read += 0x10000; + if(c->in.request_read > c->in.request_expected) + c->in.request_expected = c->in.request_read; + if(c->in.request_read != lastread) { - pending_reply *oldpend = c->in.pending_replies; - if(oldpend && oldpend->request == lastread) - { - c->in.pending_replies = oldpend->next; - if(!oldpend->next) - c->in.pending_replies_tail = &c->in.pending_replies; - free(oldpend); - } if(c->in.current_reply) { _xcb_map_put(c->in.replies, lastread, c->in.current_reply); c->in.current_reply = 0; c->in.current_reply_tail = &c->in.current_reply; } + 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 && c->in.pending_replies->request <= c->in.request_completed) + { + pending_reply *oldpend = c->in.pending_replies; + c->in.pending_replies = oldpend->next; + if(!oldpend->next) + c->in.pending_replies_tail = &c->in.pending_replies; + free(oldpend); } - if(c->in.request_read < lastread) - c->in.request_read += 0x10000; } - if(genrep.response_type == 0 || genrep.response_type == 1) + if(genrep.response_type == XCBError || genrep.response_type == XCBReply) { pend = c->in.pending_replies; if(pend && pend->request != c->in.request_read) @@ -118,7 +128,7 @@ static int read_packet(XCBConnection *c) } /* For reply packets, check that the entire packet is available. */ - if(genrep.response_type == 1) + if(genrep.response_type == XCBReply) { if(pend && pend->workaround == WORKAROUND_GLX_GET_FB_CONFIGS_BUG) { @@ -128,7 +138,7 @@ static int read_packet(XCBConnection *c) length += genrep.length * 4; } - buf = malloc(length); + buf = malloc(length + (genrep.response_type == XCBReply ? 0 : sizeof(CARD32))); if(!buf) return 0; if(_xcb_in_read_block(c, buf, length) <= 0) @@ -136,9 +146,18 @@ static int read_packet(XCBConnection *c) 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; /* reply, or checked error */ - if(genrep.response_type == 1 || (genrep.response_type == 0 && pend && (pend->flags & XCB_REQUEST_CHECKED))) + if( genrep.response_type == XCBReply || + (genrep.response_type == XCBError && pend && (pend->flags & XCB_REQUEST_CHECKED))) { reader_list *reader; struct reply_list *cur = malloc(sizeof(struct reply_list)); @@ -230,12 +249,15 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** if(e) *e = 0; + /* If an error occurred when issuing the request, fail immediately. */ + if(!request) + return 0; + pthread_mutex_lock(&c->iolock); /* If this request has not been written yet, write it. */ - if((signed int) (c->out.request_written - request) < 0) - if(!_xcb_out_flush(c)) - goto done; /* error */ + 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) @@ -246,10 +268,11 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** reader.next = *prev_reader; *prev_reader = &reader; - /* If this request has not been read yet, wait for it. */ - while(((signed int) (c->in.request_read - request) < 0 || - (c->in.request_read == request && !c->in.current_reply))) - if(!_xcb_conn_wait(c, /*should_write*/ 0, &cond)) + /* If this request has not completed yet and has no reply waiting, + * wait for one. */ + while(c->in.request_completed < request && + !(c->in.request_read == request && c->in.current_reply)) + if(!_xcb_conn_wait(c, &cond, 0, 0)) goto done; if(c->in.request_read != request) @@ -274,7 +297,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** ret = head->reply; free(head); - if(((XCBGenericRep *) ret)->response_type == 0) /* X error */ + if(((XCBGenericRep *) ret)->response_type == XCBError) { if(e) *e = ret; @@ -309,7 +332,7 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *c) pthread_mutex_lock(&c->iolock); /* get_event returns 0 on empty list. */ while(!(ret = get_event(c))) - if(!_xcb_conn_wait(c, /*should_write*/ 0, &c->in.event_cond)) + if(!_xcb_conn_wait(c, &c->in.event_cond, 0, 0)) break; wake_up_next_reader(c); @@ -359,6 +382,7 @@ int _xcb_in_init(_xcb_in *in) in->queue_len = 0; in->request_read = 0; + in->request_completed = 0; in->replies = _xcb_map_new(); if(!in->replies)