X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_xlib.c;h=59f972c8033c7cf9b742025378ed9afe38831ca3;hb=608058ec80edb041ca012d530b42d97474f80320;hp=61518f765fcfe824c468e5384185a38d41fcf79b;hpb=a92716f1da2741fca850b3c37299e80032726276;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_xlib.c b/src/xcb_xlib.c
index 61518f7..59f972c 100644
--- a/src/xcb_xlib.c
+++ b/src/xcb_xlib.c
@@ -26,12 +26,30 @@
 #include "xcbxlib.h"
 #include "xcbint.h"
 
-unsigned int XCBGetRequestSent(XCBConnection *c)
+#include <assert.h>
+
+unsigned int xcb_get_request_sent(xcb_connection_t *c)
 {
+    if(c->has_error)
+        return 0;
     return c->out.request;
 }
 
-pthread_mutex_t *XCBGetIOLock(XCBConnection *c)
+void xcb_xlib_lock(xcb_connection_t *c)
+{
+    _xcb_lock_io(c);
+    assert(!c->xlib.lock);
+    c->xlib.lock = 1;
+    c->xlib.thread = pthread_self();
+    _xcb_unlock_io(c);
+}
+
+void xcb_xlib_unlock(xcb_connection_t *c)
 {
-    return &c->iolock;
+    _xcb_lock_io(c);
+    assert(c->xlib.lock);
+    assert(pthread_equal(c->xlib.thread, pthread_self()));
+    c->xlib.lock = 0;
+    pthread_cond_broadcast(&c->xlib.cond);
+    _xcb_unlock_io(c);
 }