X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=ab0264fe7e13bf728b97987475068c08495faae1;hb=db332dcda989b5b021dc220c102666f695c772cf;hp=1dc6f9385790286eae4a230036a238e52c316b3e;hpb=57b0cd8fea498a32ff2322583c7278d5e86aa4e8;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index 1dc6f93..ab0264f 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -28,6 +28,8 @@ #ifndef __XCBINT_H #define __XCBINT_H +#include "bigreq.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -41,6 +43,13 @@ enum workarounds { WORKAROUND_GLX_GET_FB_CONFIGS_BUG }; +enum lazy_reply_tag +{ + LAZY_NONE = 0, + LAZY_COOKIE, + LAZY_FORCED +}; + #define XCB_PAD(i) (-(i) & 3) #define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0) @@ -70,7 +79,11 @@ typedef struct _xcb_out { unsigned int request_written; pthread_mutex_t reqlenlock; - uint32_t maximum_request_length; + enum lazy_reply_tag maximum_request_length_tag; + union { + xcb_big_requests_enable_cookie_t cookie; + uint32_t value; + } maximum_request_length; } _xcb_out; int _xcb_out_init(_xcb_out *out); @@ -113,6 +126,16 @@ int _xcb_in_read(xcb_connection_t *c); int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread); +/* xcb_xlib.c */ + +typedef struct _xcb_xlib { + int lock; + int sloppy_lock; + pthread_t thread; + pthread_cond_t cond; +} _xcb_xlib; + + /* xcb_xid.c */ typedef struct _xcb_xid { @@ -150,6 +173,7 @@ struct xcb_connection_t { /* I/O data */ pthread_mutex_t iolock; + _xcb_xlib xlib; _xcb_in in; _xcb_out out; @@ -159,17 +183,22 @@ struct xcb_connection_t { }; void _xcb_conn_shutdown(xcb_connection_t *c); -void _xcb_lock_io(xcb_connection_t *c); -void _xcb_unlock_io(xcb_connection_t *c); +void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond); int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count); /* xcb_auth.c */ -int _xcb_get_auth_info(int fd, xcb_auth_info_t *info); +int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display); #ifdef GCC_HAS_VISIBILITY #pragma GCC visibility pop #endif + +/* xcb_conn.c symbols visible to xcb-xlib */ + +void _xcb_lock_io(xcb_connection_t *c); +void _xcb_unlock_io(xcb_connection_t *c); + #endif