X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=4acc3a27d2dfdb2e32d87a9ecfa5e1a1467f8f83;hb=e300ee4920bf4618f58618f3063b362f811154c1;hp=ca75169ae6f5da5e8989329ab5f9e34b4bf5e27d;hpb=2415c11dec5e5adb0c17f98aa52fbb371a4f8f23;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_in.c b/src/xcb_in.c
index ca75169..4acc3a2 100644
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -57,7 +57,6 @@
 #endif
 
 struct event_list {
-    uint64_t sequence;
     xcb_generic_event_t *event;
     struct event_list *next;
 };
@@ -126,7 +125,7 @@ static int read_packet(xcb_connection_t *c)
                 c->in.current_reply = 0;
                 c->in.current_reply_tail = &c->in.current_reply;
             }
-            c->in.request_completed = c->in.event_responses_completed = c->in.request_read - 1;
+            c->in.request_completed = c->in.request_read - 1;
         }
 
         while(c->in.pending_replies && 
@@ -141,12 +140,9 @@ static int read_packet(xcb_connection_t *c)
         }
 
         if(genrep.response_type == XCB_ERROR)
-            c->in.request_completed = c->in.event_responses_completed = c->in.request_read;
-        else if(genrep.response_type == XCB_REPLY)
-            c->in.event_responses_completed = c->in.request_read;
+            c->in.request_completed = c->in.request_read;
 
         remove_finished_readers(&c->in.readers, c->in.request_completed);
-        remove_finished_readers(&c->in.event_readers, c->in.event_responses_completed);
     }
 
     if(genrep.response_type == XCB_ERROR || genrep.response_type == XCB_REPLY)
@@ -171,7 +167,7 @@ static int read_packet(xcb_connection_t *c)
     }
 
     /* XGE events may have sizes > 32 */
-    if (genrep.response_type == XCB_XGE_EVENT)
+    if ((genrep.response_type & 0x7f) == XCB_XGE_EVENT)
         eventlength = genrep.length * 4;
 
     buf = malloc(length + eventlength +
@@ -235,15 +231,11 @@ static int read_packet(xcb_connection_t *c)
         free(buf);
         return 0;
     }
-    event->sequence = c->in.request_read;
     event->event = buf;
     event->next = 0;
     *c->in.events_tail = event;
     c->in.events_tail = &event->next;
-    if(c->in.event_readers)
-        pthread_cond_signal(c->in.event_readers->data);
-    else
-        pthread_cond_signal(&c->in.event_cond);
+    pthread_cond_signal(&c->in.event_cond);
     return 1; /* I have something for you... */
 }
 
@@ -535,7 +527,7 @@ xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c)
     return ret;
 }
 
-xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c)
+static xcb_generic_event_t *poll_for_next_event(xcb_connection_t *c, int queued)
 {
     xcb_generic_event_t *ret = 0;
     if(!c->has_error)
@@ -543,40 +535,21 @@ xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c)
         pthread_mutex_lock(&c->iolock);
         /* 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 */
+        if(!ret && !queued && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
             ret = get_event(c);
         pthread_mutex_unlock(&c->iolock);
     }
     return ret;
 }
 
-static xcb_generic_event_t *get_event_until(xcb_connection_t *c, uint64_t request)
+xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c)
 {
-    if(c->in.events && XCB_SEQUENCE_COMPARE(c->in.events->sequence, <=, request))
-        return get_event(c);
-    return 0;
+    return poll_for_next_event(c, 0);
 }
 
-xcb_generic_event_t *xcb_wait_for_event_until(xcb_connection_t *c, unsigned int request)
+xcb_generic_event_t *xcb_poll_for_queued_event(xcb_connection_t *c)
 {
-    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-    reader_list reader;
-    xcb_generic_event_t *ret;
-    if(c->has_error)
-        return 0;
-    pthread_mutex_lock(&c->iolock);
-
-    insert_reader(&c->in.event_readers, &reader, widen(c, request), &cond);
-
-    while(!(ret = get_event_until(c, reader.request)) && XCB_SEQUENCE_COMPARE(c->in.event_responses_completed, <, reader.request))
-        if(!_xcb_conn_wait(c, &cond, 0, 0))
-            break;
-
-    remove_reader(&c->in.event_readers, &reader);
-    pthread_cond_destroy(&cond);
-    _xcb_in_wake_up_next_reader(c);
-    pthread_mutex_unlock(&c->iolock);
-    return ret;
+    return poll_for_next_event(c, 1);
 }
 
 xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie)
@@ -649,8 +622,6 @@ void _xcb_in_wake_up_next_reader(xcb_connection_t *c)
     int pthreadret;
     if(c->in.readers)
         pthreadret = pthread_cond_signal(c->in.readers->data);
-    else if(c->in.event_readers)
-        pthreadret = pthread_cond_signal(c->in.event_readers->data);
     else
         pthreadret = pthread_cond_signal(&c->in.event_cond);
     assert(pthreadret == 0);