X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=3b51d2ed261218f20f425cccf7c54b9692a988ac;hb=ed823bf65192a72f8c3060698c9bded9f77d49c2;hp=670dd6958c0e720380fbcffc4892934ac2189476;hpb=ff7b6c9124e7caf26381cc7a10fba9eaf1875652;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index 670dd69..3b51d2e 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -41,32 +41,13 @@ 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_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); - -typedef _xcb_list _xcb_queue; - -_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 _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); @@ -106,11 +87,14 @@ typedef struct _xcb_in { int queue_len; 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; struct pending_reply *pending_replies; struct pending_reply **pending_replies_tail;