X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=a6d92aa96d572dabbafecb6c5a3d1644985ea1a5;hb=b7d77a8de79493919281c4f742b1a65c1328b1c4;hp=67ec01767bc6184b4b4437042d260e24eee5f7a5;hpb=76ad79a7adbb315f7c7d5f08d6f42553210868cd;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcbint.h b/src/xcbint.h
index 67ec017..a6d92aa 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
@@ -41,17 +45,9 @@ enum workarounds {
 
 /* xcb_list.c */
 
-typedef struct _xcb_list _xcb_list;
 typedef void (*XCBListFreeFunc)(void *);
 
-_xcb_list *_xcb_list_new(void);
-void _xcb_list_delete(_xcb_list *list, XCBListFreeFunc do_free);
-int _xcb_list_append(_xcb_list *list, void *data);
-void *_xcb_list_peek_head(_xcb_list *list);
-void *_xcb_list_remove(_xcb_list *list, int (*cmp)(const void *, const void *), const void *data);
-void *_xcb_list_find(_xcb_list *list, int (*cmp)(const void *, const void *), const void *data);
-
-typedef _xcb_list _xcb_map;
+typedef struct _xcb_map _xcb_map;
 
 _xcb_map *_xcb_map_new(void);
 void _xcb_map_delete(_xcb_map *q, XCBListFreeFunc do_free);
@@ -67,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;
@@ -80,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);
-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 */
@@ -94,7 +87,9 @@ typedef struct _xcb_in {
     char queue[4096];
     int queue_len;
 
+    unsigned int request_expected;
     unsigned int request_read;
+    unsigned int request_completed;
     struct reply_list *current_reply;
     struct reply_list **current_reply_tail;
 
@@ -146,7 +141,7 @@ void _xcb_ext_destroy(XCBConnection *c);
 
 struct XCBConnection {
     /* constant data */
-    XCBConnSetupSuccessRep *setup;
+    XCBSetup *setup;
     int fd;
 
     /* I/O data */
@@ -159,5 +154,15 @@ 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
+#endif
+
 #endif