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

Add XCB_REQUEST_RAW flag for XCBSendRequest.

This commit is contained in:
Jamey Sharp 2006-02-27 11:03:13 -08:00
parent 5e350126a7
commit 8f991bdd38
2 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/xcb_out.c
View File

@ -86,8 +86,6 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
int i;
struct iovec *padded;
int padlen = 0;
CARD16 shortlen = 0;
CARD32 longlen = 0;
enum workarounds workaround = WORKAROUND_NONE;
assert(c != 0);
@ -95,37 +93,6 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
assert(vector != 0);
assert(req->count > 0);
/* set the major opcode, and the minor opcode for extensions */
if(req->ext)
{
const XCBQueryExtensionRep *extension = XCBGetExtensionData(c, req->ext);
/* TODO: better error handling here, please! */
assert(extension && extension->present);
((CARD8 *) vector[0].iov_base)[0] = extension->major_opcode;
((CARD8 *) vector[0].iov_base)[1] = req->opcode;
/* do we need to work around the X server bug described in glx.xml? */
if(!req->isvoid && strcmp(req->ext->name, "GLX") &&
((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[0] == 0x10004) ||
req->opcode == 21))
workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
}
else
((CARD8 *) vector[0].iov_base)[0] = req->opcode;
/* put together the length field, possibly using BIGREQUESTS */
for(i = 0; i < req->count; ++i)
longlen += (vector[i].iov_len + 3) >> 2;
if(longlen <= c->setup->maximum_request_length)
{
/* we don't need BIGREQUESTS. */
shortlen = longlen;
longlen = 0;
}
else if(longlen > XCBGetMaximumRequestLength(c))
return 0; /* server can't take this; maybe need BIGREQUESTS? */
padded =
#ifdef HAVE_ALLOCA
alloca
@ -133,19 +100,51 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
malloc
#endif
((req->count * 2 + 3) * sizeof(struct iovec));
/* set the length field. */
((CARD16 *) vector[0].iov_base)[1] = shortlen;
if(!shortlen)
if(!(flags & XCB_REQUEST_RAW))
{
padded[0].iov_base = vector[0].iov_base;
padded[0].iov_len = sizeof(CARD32);
vector[0].iov_base = ((char *) vector[0].iov_base) + sizeof(CARD32);
vector[0].iov_len -= sizeof(CARD32);
++longlen;
padded[1].iov_base = &longlen;
padded[1].iov_len = sizeof(CARD32);
padlen = 2;
CARD16 shortlen = 0;
CARD32 longlen = 0;
/* set the major opcode, and the minor opcode for extensions */
if(req->ext)
{
const XCBQueryExtensionRep *extension = XCBGetExtensionData(c, req->ext);
/* TODO: better error handling here, please! */
assert(extension && extension->present);
((CARD8 *) vector[0].iov_base)[0] = extension->major_opcode;
((CARD8 *) vector[0].iov_base)[1] = req->opcode;
}
else
((CARD8 *) vector[0].iov_base)[0] = req->opcode;
/* put together the length field, possibly using BIGREQUESTS */
for(i = 0; i < req->count; ++i)
longlen += (vector[i].iov_len + 3) >> 2;
if(longlen <= c->setup->maximum_request_length)
{
/* we don't need BIGREQUESTS. */
shortlen = longlen;
longlen = 0;
}
else if(longlen > XCBGetMaximumRequestLength(c))
return 0; /* server can't take this; maybe need BIGREQUESTS? */
/* set the length field. */
((CARD16 *) vector[0].iov_base)[1] = shortlen;
if(!shortlen)
{
padded[0].iov_base = vector[0].iov_base;
padded[0].iov_len = sizeof(CARD32);
vector[0].iov_base = ((char *) vector[0].iov_base) + sizeof(CARD32);
vector[0].iov_len -= sizeof(CARD32);
++longlen;
padded[1].iov_base = &longlen;
padded[1].iov_len = sizeof(CARD32);
padlen = 2;
}
}
flags &= ~XCB_REQUEST_RAW;
for(i = 0; i < req->count; ++i)
{
@ -159,6 +158,12 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
padded[padlen++].iov_len = XCB_PAD(vector[i].iov_len);
}
/* do we need to work around the X server bug described in glx.xml? */
if(req->ext && !req->isvoid && strcmp(req->ext->name, "GLX") &&
((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[0] == 0x10004) ||
req->opcode == 21))
workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
/* get a sequence number and arrange for delivery. */
pthread_mutex_lock(&c->iolock);
if(req->isvoid && !force_sequence_wrap(c))

3
src/xcbext.h
View File

@ -52,7 +52,8 @@ typedef struct {
} XCBProtocolRequest;
enum XCBSendRequestFlags {
XCB_REQUEST_CHECKED = 1 << 0
XCB_REQUEST_CHECKED = 1 << 0,
XCB_REQUEST_RAW = 1 << 1
};
int XCBSendRequest(XCBConnection *c, unsigned int *sequence, int flags, struct iovec *vector, const XCBProtocolRequest *request);