projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop implicitly importing xproto; goes with proto change to explicitly import it
[free-sw/xcb/libxcb]
/
src
/
xcbext.h
diff --git
a/src/xcbext.h
b/src/xcbext.h
index
c8f532c
..
4824660
100644
(file)
--- a/
src/xcbext.h
+++ b/
src/xcbext.h
@@
-36,7
+36,7
@@
extern "C" {
/* xcb_ext.c */
/* xcb_ext.c */
-struct
XCBExtension
{
+struct
xcb_extension_t
{
const char *name;
int global_id;
};
const char *name;
int global_id;
};
@@
-46,27
+46,34
@@
struct XCBExtension {
typedef struct {
size_t count;
typedef struct {
size_t count;
- XCBExtension *ext;
- CARD8 opcode;
- BOOL isvoid;
-} XCBProtocolRequest;
+ xcb_extension_t *ext;
+ uint8_t opcode;
+ uint8_t isvoid;
+} xcb_protocol_request_t;
+
+enum xcb_send_request_flags_t {
+ XCB_REQUEST_CHECKED = 1 << 0,
+ XCB_REQUEST_RAW = 1 << 1,
+ XCB_REQUEST_DISCARD_REPLY = 1 << 2
+};
-
int XCBSendRequest(XCBConnection *c, unsigned int *sequence, struct iovec *vector, const XCBProtocolReques
t *request);
+
unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_
t *request);
/* xcb_in.c */
/* xcb_in.c */
-void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e);
+void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e);
+int xcb_poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error);
/* xcb_xid.c */
/* xcb_xid.c */
-
CARD32 XCBGenerateID(XCBConnection
*c);
+
uint32_t xcb_generate_id(xcb_connection_t
*c);
/* xcb_util.c */
/* xcb_util.c */
-int
XCBPopcount(CARD32
mask);
+int
xcb_popcount(uint32_t
mask);
#ifdef __cplusplus
}
#ifdef __cplusplus
}