X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=85e79e3846f23cc17e3f337e61a957a961aa5eff;hb=ff665b57266b9e7e9b9a366272c2115bbd516173;hp=e8e98eba9687f2dbbf5a0fe25976a6d476c35b6c;hpb=a1eff0c49a2dbb328a79edbeb2b851fa1dfe9e61;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index e8e98eb..85e79e3 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -46,27 +46,16 @@ 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; _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,19 +95,22 @@ typedef struct _xcb_in { int queue_len; unsigned int request_read; - _xcb_queue *current_reply; + struct reply_list *current_reply; + struct reply_list **current_reply_tail; _xcb_map *replies; - _xcb_queue *events; + struct event_list *events; + struct event_list **events_tail; _xcb_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);