frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 32-bit full_sequence fields to generic errors and events, so callers can always correlate events and errors with requests correctly.

This commit is contained in:
Jamey Sharp 2006-03-03 01:45:00 -08:00
parent 622b599c8f
commit 255c21b17f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xcb.h
View File

@ -80,12 +80,16 @@ typedef struct {
BYTE response_type; BYTE response_type;
CARD8 pad0; CARD8 pad0;
CARD16 sequence; CARD16 sequence;
CARD32 pad[7];
CARD32 full_sequence;
} XCBGenericEvent; } XCBGenericEvent;
typedef struct { typedef struct {
BYTE response_type; BYTE response_type;
BYTE error_code; BYTE error_code;
CARD16 sequence; CARD16 sequence;
CARD32 pad[7];
CARD32 full_sequence;
} XCBGenericError; } XCBGenericError;
typedef struct { typedef struct {

5
src/xcb_in.c
View File

@ -133,7 +133,7 @@ static int read_packet(XCBConnection *c)
length += genrep.length * 4; length += genrep.length * 4;
} }
buf = malloc(length); buf = malloc(length + (genrep.response_type == 1 ? 0 : sizeof(CARD32)));
if(!buf) if(!buf)
return 0; return 0;
if(_xcb_in_read_block(c, buf, length) <= 0) if(_xcb_in_read_block(c, buf, length) <= 0)
@ -142,6 +142,9 @@ static int read_packet(XCBConnection *c)
return 0; return 0;
} }
if(genrep.response_type != 1)
((XCBGenericEvent *) buf)->full_sequence = c->in.request_read;
/* reply, or checked error */ /* reply, or checked error */
if(genrep.response_type == 1 || (genrep.response_type == 0 && pend && (pend->flags & XCB_REQUEST_CHECKED))) if(genrep.response_type == 1 || (genrep.response_type == 0 && pend && (pend->flags & XCB_REQUEST_CHECKED)))
{ {