X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=a6d92aa96d572dabbafecb6c5a3d1644985ea1a5;hb=162c7593adf1577ca8aecfcd53fd5644b6182609;hp=e6f540a16fbaa95763f5db4f7fe4a85c8b854778;hpb=621f891c49cbf4beba1e20fb9b6fb1be576d42f3;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index e6f540a..a6d92aa 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -63,8 +63,6 @@ typedef struct _xcb_out { char queue[4096]; int queue_len; - struct iovec *vec; - int vec_len; unsigned int request; unsigned int request_written; @@ -76,9 +74,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, struct iovec **vector, int *count); -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 */ @@ -144,7 +141,7 @@ void _xcb_ext_destroy(XCBConnection *c); struct XCBConnection { /* constant data */ - XCBConnSetupSuccessRep *setup; + XCBSetup *setup; int fd; /* I/O data */ @@ -157,7 +154,12 @@ struct XCBConnection { _xcb_xid xid; }; -int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond); +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