X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=d81e787edb80eb398cbb565505bb583a158cd4e9;hb=40589db8124b8c72894deb86a825c6117b0a2cd2;hp=402b0420c14d92fda1921190fca5f90598afa718;hpb=55c1842686d2e668708cd106b5e08847df0184c3;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index 402b042..d81e787 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -28,64 +28,35 @@ #ifndef __XCBINT_H #define __XCBINT_H -/* Not simply (a <= b) because eventually the 32-bit sequence number - * will wrap, causing earlier sequence numbers to be higher than later - * ones for a brief but fatal period. (a and b must be unsigned.) */ -#define _xcb_assert_sequence_less(a,b) assert((b) - (a) < 65536) +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#define _xcb_assert_valid_sequence(c) do { \ - _xcb_assert_sequence_less((c)->in.request_read, (c)->out.request_written); \ - _xcb_assert_sequence_less((c)->out.request_written, (c)->out.request); \ -} while(0) +#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 (*xcb_list_free_func_t)(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); +void _xcb_map_delete(_xcb_map *q, xcb_list_free_func_t 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 */ - -/* Index of nearest 4-byte boundary following E. */ -#define XCB_CEIL(E) (((E)+3)&~3) - -#define XCB_PAD(i) ((4 - (i & 3)) & 3) - -int _xcb_set_fd_flags(const int fd); -int _xcb_readn(const int fd, void *buf, const int buflen, int *count); -int _xcb_read_block(const int fd, void *buf, const size_t len); - - /* xcb_out.c */ typedef struct _xcb_out { @@ -94,22 +65,19 @@ typedef struct _xcb_out { char queue[4096]; int queue_len; - struct iovec *vec; - int vec_len; unsigned int request; unsigned int request_written; pthread_mutex_t reqlenlock; - CARD32 maximum_request_length; + uint32_t maximum_request_length; } _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(xcb_connection_t *c, struct iovec **vector, int *count); +int _xcb_out_flush_to(xcb_connection_t *c, unsigned int request); /* xcb_in.c */ @@ -121,59 +89,77 @@ 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(xcb_connection_t *c, unsigned int request, enum workarounds workaround, int flags); + +int _xcb_in_read(xcb_connection_t *c); +int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread); + -int _xcb_in_read(XCBConnection *c); -int _xcb_in_read_block(XCBConnection *c, void *buf, int nread); +/* xcb_xlib.c */ + +typedef struct _xcb_xlib { + int lock; + pthread_t thread; + pthread_cond_t cond; +} _xcb_xlib; /* xcb_xid.c */ typedef struct _xcb_xid { pthread_mutex_t lock; - CARD32 last; - CARD32 base; - CARD32 max; - CARD32 inc; + uint32_t last; + uint32_t base; + uint32_t max; + uint32_t inc; } _xcb_xid; -int _xcb_xid_init(XCBConnection *c); -void _xcb_xid_destroy(XCBConnection *c); +int _xcb_xid_init(xcb_connection_t *c); +void _xcb_xid_destroy(xcb_connection_t *c); /* xcb_ext.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); -void _xcb_ext_destroy(XCBConnection *c); +int _xcb_ext_init(xcb_connection_t *c); +void _xcb_ext_destroy(xcb_connection_t *c); /* xcb_conn.c */ -struct XCBConnection { +struct xcb_connection_t { + int has_error; + /* constant data */ - XCBConnSetupSuccessRep *setup; + xcb_setup_t *setup; int fd; /* I/O data */ pthread_mutex_t iolock; + _xcb_xlib xlib; _xcb_in in; _xcb_out out; @@ -182,5 +168,22 @@ struct XCBConnection { _xcb_xid xid; }; -int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond); +void _xcb_conn_shutdown(xcb_connection_t *c); +int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count); + + +/* xcb_auth.c */ + +int _xcb_get_auth_info(int fd, xcb_auth_info_t *info); + +#ifdef GCC_HAS_VISIBILITY +#pragma GCC visibility pop +#endif + + +/* xcb_conn.c symbols visible to xcb-xlib */ + +void _xcb_lock_io(xcb_connection_t *c); +void _xcb_unlock_io(xcb_connection_t *c); + #endif