Switch sequence comparisons to handle 32-bit sequence number wrap.

[profile/ivi/libxcb.git] / src / xcbint.h

diff --git a/src/xcbint.h b/src/xcbint.h
index 439b885..9048e9d 100644 (file)
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -32,50 +32,31 @@
 #include "config.h"
 #endif
 
+#ifdef GCC_HAS_VISIBILITY
+#pragma GCC visibility push(hidden)
+#endif
+
 enum workarounds {
     WORKAROUND_NONE,
     WORKAROUND_GLX_GET_FB_CONFIGS_BUG
 };
 
-/* xcb_list.c */
-
-typedef struct _xcb_list _xcb_list;
-typedef void (*XCBListFreeFunc)(void *);
+#define XCB_PAD(i) (-(i) & 3)
 
-_xcb_list *_xcb_list_new(void);
-void _xcb_list_delete(_xcb_list *list, XCBListFreeFunc do_free);
-int _xcb_list_insert(_xcb_list *list, void *data);
-int _xcb_list_append(_xcb_list *list, void *data);
-void *_xcb_list_peek_head(_xcb_list *list);
-void *_xcb_list_remove_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);
+#define XCB_SEQUENCE_COMPARE(a,op,b)   ((int) ((a) - (b)) op 0)
 
-typedef _xcb_list _xcb_queue;
+/* xcb_list.c */
 
-_xcb_queue *_xcb_queue_new(void);
-void _xcb_queue_delete(_xcb_queue *q, XCBListFreeFunc do_free);
-int _xcb_queue_enqueue(_xcb_queue *q, void *data);
-void *_xcb_queue_dequeue(_xcb_queue *q);
-int _xcb_queue_is_empty(_xcb_queue *q);
+typedef void (*XCBListFreeFunc)(void *);
 
-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);
 int _xcb_map_put(_xcb_map *q, unsigned int key, void *data);
-void *_xcb_map_get(_xcb_map *q, unsigned int key);
 void *_xcb_map_remove(_xcb_map *q, unsigned int key);
 
 
-/* xcb_util.c */
-
-#define XCB_PAD(i) (-(i) & 3)
-
-int _xcb_set_fd_flags(const int fd);
-int _xcb_read_block(const int fd, void *buf, const size_t len);
-
-
 /* xcb_out.c */
 
 typedef struct _xcb_out {
@@ -84,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;
@@ -97,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 */
@@ -111,20 +89,25 @@ typedef struct _xcb_in {
     char queue[4096];
     int queue_len;
 
+    unsigned int request_expected;
     unsigned int request_read;
-    _xcb_queue *current_reply;
+    unsigned int request_completed;
+    struct reply_list *current_reply;
+    struct reply_list **current_reply_tail;
 
     _xcb_map *replies;
-    _xcb_queue *events;
-    _xcb_list *readers;
+    struct event_list *events;
+    struct event_list **events_tail;
+    struct reader_list *readers;
 
-    _xcb_queue *pending_replies;
+    struct pending_reply *pending_replies;
+    struct pending_reply **pending_replies_tail;
 } _xcb_in;
 
 int _xcb_in_init(_xcb_in *in);
 void _xcb_in_destroy(_xcb_in *in);
 
-int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround);
+int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags);
 
 int _xcb_in_read(XCBConnection *c);
 int _xcb_in_read_block(XCBConnection *c, void *buf, int nread);
@@ -148,7 +131,8 @@ void _xcb_xid_destroy(XCBConnection *c);
 
 typedef struct _xcb_ext {
     pthread_mutex_t lock;
-    _xcb_map *extensions;
+    struct lazyreply *extensions;
+    int extensions_size;
 } _xcb_ext;
 
 int _xcb_ext_init(XCBConnection *c);
@@ -159,7 +143,7 @@ void _xcb_ext_destroy(XCBConnection *c);
 
 struct XCBConnection {
     /* constant data */
-    XCBConnSetupSuccessRep *setup;
+    XCBSetup *setup;
     int fd;
 
     /* I/O data */
@@ -172,5 +156,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