XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: ProcLookupColor(): simplify code flow

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-26 15:05:00 +02:00
committed by Enrico Weigelt
parent bff6f86afc
commit eaff5ba96c
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
dix/dispatch.c
View File

@@ -2978,51 +2978,50 @@ ProcQueryColors(ClientPtr client)
int
ProcLookupColor(ClientPtr client)
{
ColormapPtr pcmp;
int rc;
REQUEST(xLookupColorReq);
REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, X11_RESTYPE_COLORMAP,
ColormapPtr pcmp;
int rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, X11_RESTYPE_COLORMAP,
client, DixReadAccess);
if (rc == Success) {
CARD16 exactRed, exactGreen, exactBlue;
if (dixLookupBuiltinColor(pcmp->pScreen->myNum,
(char *) &stuff[1],
stuff->nbytes,
&exactRed,
&exactGreen,
&exactBlue)) {
xLookupColorReply rep = {
.exactRed = exactRed,
.exactGreen = exactGreen,
.exactBlue = exactBlue,
.screenRed = exactRed,
.screenGreen = exactGreen,
.screenBlue = exactBlue
};
(*pcmp->pScreen->ResolveColor) (&rep.screenRed,
&rep.screenGreen,
&rep.screenBlue, pcmp->pVisual);
if (client->swapped) {
swaps(&rep.exactRed);
swaps(&rep.exactGreen);
swaps(&rep.exactBlue);
swaps(&rep.screenRed);
swaps(&rep.screenGreen);
swaps(&rep.screenBlue);
}
return X_SEND_REPLY_SIMPLE(client, rep);
}
return BadName;
}
else {
if (rc != Success) {
client->errorValue = stuff->cmap;
return rc;
}
CARD16 exactRed, exactGreen, exactBlue;
if (!dixLookupBuiltinColor(pcmp->pScreen->myNum,
(char *) &stuff[1],
stuff->nbytes,
&exactRed,
&exactGreen,
&exactBlue))
return BadName;
xLookupColorReply rep = {
.exactRed = exactRed,
.exactGreen = exactGreen,
.exactBlue = exactBlue,
.screenRed = exactRed,
.screenGreen = exactGreen,
.screenBlue = exactBlue
};
pcmp->pScreen->ResolveColor(&rep.screenRed,
&rep.screenGreen,
&rep.screenBlue,
pcmp->pVisual);
if (client->swapped) {
swaps(&rep.exactRed);
swaps(&rep.exactGreen);
swaps(&rep.exactBlue);
swaps(&rep.screenRed);
swaps(&rep.screenGreen);
swaps(&rep.screenBlue);
}
return X_SEND_REPLY_SIMPLE(client, rep);
}
int