X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=01d8a2046c9f621f16773e5567d9a3d497fa8d4e;hb=79e3227022ae3d66f9f3806d231fdeec2a06cc6b;hp=f3830f9313ec7a252584645d0e4d3b2e5e769756;hpb=5437032c7dee85da99b612a707fa94d012d40282;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index f3830f9..01d8a20 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -32,6 +32,10 @@ #include "config.h" #endif +#ifdef GCC_HAS_VISIBILITY +#pragma GCC visibility push(hidden) +#endif + enum workarounds { WORKAROUND_NONE, WORKAROUND_GLX_GET_FB_CONFIGS_BUG @@ -39,6 +43,8 @@ enum workarounds { #define XCB_PAD(i) (-(i) & 3) +#define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0) + /* xcb_list.c */ typedef void (*XCBListFreeFunc)(void *); @@ -59,8 +65,6 @@ typedef struct _xcb_out { char queue[4096]; int queue_len; - struct iovec *vec; - int vec_len; unsigned int request; unsigned int request_written; @@ -72,9 +76,8 @@ typedef struct _xcb_out { int _xcb_out_init(_xcb_out *out); void _xcb_out_destroy(_xcb_out *out); -int _xcb_out_write(XCBConnection *c); -int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count); -int _xcb_out_flush(XCBConnection *c); +int _xcb_out_send(XCBConnection *c, struct iovec **vector, int *count); +int _xcb_out_flush_to(XCBConnection *c, unsigned int request); /* xcb_in.c */ @@ -139,8 +142,10 @@ void _xcb_ext_destroy(XCBConnection *c); /* xcb_conn.c */ struct XCBConnection { + int has_error; + /* constant data */ - XCBConnSetupSuccessRep *setup; + XCBSetup *setup; int fd; /* I/O data */ @@ -153,5 +158,16 @@ struct XCBConnection { _xcb_xid xid; }; -int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond); +void _xcb_conn_shutdown(XCBConnection *c); +int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count); + + +/* xcb_auth.c */ + +int _xcb_get_auth_info(int fd, XCBAuthInfo *info); + +#ifdef GCC_HAS_VISIBILITY +#pragma GCC visibility pop +#endif + #endif