X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=f05952210e48ffbd41bb3d17c6b469d8d5407bb6;hb=ac17ae62fe1a3a29991e36e35eeee838ac4acb00;hp=7c8f33140614240d9021482b0d09fb3f36c0540c;hpb=522a6e0eac9adeaac533a5b700f42d85d46e2dd7;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index 7c8f331..f059522 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -43,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 *); @@ -63,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; @@ -76,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 */ @@ -143,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 */ @@ -157,7 +158,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