XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-07 17:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PR #1520] dix: inline SProcCreateGlyphCursor()

Browse Source 
PR: https://github.com/X11Libre/xserver/pull/1520
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-02 19:21:05 +01:00
parent 87e22bbecf
commit 1ded81981e
4 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dix/dispatch.c
View File

@@ -3197,12 +3197,26 @@ ProcCreateCursor(ClientPtr client)
int
ProcCreateGlyphCursor(ClientPtr client)
{
REQUEST(xCreateGlyphCursorReq);
REQUEST_SIZE_MATCH(xCreateGlyphCursorReq);
if (client->swapped) {
swapl(&stuff->cid);
swapl(&stuff->source);
swapl(&stuff->mask);
swaps(&stuff->sourceChar);
swaps(&stuff->maskChar);
swaps(&stuff->foreRed);
swaps(&stuff->foreGreen);
swaps(&stuff->foreBlue);
swaps(&stuff->backRed);
swaps(&stuff->backGreen);
swaps(&stuff->backBlue);
}
CursorPtr pCursor;
int res;
REQUEST(xCreateGlyphCursorReq);
REQUEST_SIZE_MATCH(xCreateGlyphCursorReq);
LEGAL_NEW_RESOURCE(stuff->cid, client);
res = AllocGlyphCursor(stuff->source, stuff->sourceChar,

19
dix/swapreq.c
View File

@@ -702,25 +702,6 @@ SProcCreateCursor(ClientPtr client)
return ((*ProcVector[X_CreateCursor]) (client));
}
int _X_COLD
SProcCreateGlyphCursor(ClientPtr client)
{
REQUEST(xCreateGlyphCursorReq);
REQUEST_SIZE_MATCH(xCreateGlyphCursorReq);
swapl(&stuff->cid);
swapl(&stuff->source);
swapl(&stuff->mask);
swaps(&stuff->sourceChar);
swaps(&stuff->maskChar);
swaps(&stuff->foreRed);
swaps(&stuff->foreGreen);
swaps(&stuff->foreBlue);
swaps(&stuff->backRed);
swaps(&stuff->backGreen);
swaps(&stuff->backBlue);
return ((*ProcVector[X_CreateGlyphCursor]) (client));
}
int _X_COLD
SProcRecolorCursor(ClientPtr client)
{

1
dix/swapreq.h
View File

@@ -49,7 +49,6 @@ int SProcCopyPlane(ClientPtr client);
int SProcCreateColormap(ClientPtr client);
int SProcCreateCursor(ClientPtr client);
int SProcCreateGC(ClientPtr client);
int SProcCreateGlyphCursor(ClientPtr client);
int SProcCreatePixmap(ClientPtr client);
int SProcCreateWindow(ClientPtr client);
int SProcFillPoly(ClientPtr client);

2
dix/tables.c
View File

@@ -426,7 +426,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
SProcQueryColors,
SProcLookupColor,
SProcCreateCursor,
SProcCreateGlyphCursor,
ProcCreateGlyphCursor,
ProcFreeCursor, /* 95 */
SProcRecolorCursor,
SProcQueryBestSize,