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

Xext: saver: use REPLY_*() macros for preparing / sending replies 

Use the new macros for preparing and sending replies to clients.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-02 21:55:36 +02:00
parent 0fde105e38
commit 6f6379ff54
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Xext/saver.c
View File

@ -595,19 +595,13 @@ ProcScreenSaverQueryVersion(ClientPtr client)
REQUEST_HEAD_STRUCT(xScreenSaverQueryVersionReq); REQUEST_HEAD_STRUCT(xScreenSaverQueryVersionReq);
xScreenSaverQueryVersionReply rep = { xScreenSaverQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.majorVersion = SERVER_SAVER_MAJOR_VERSION, .majorVersion = SERVER_SAVER_MAJOR_VERSION,
.minorVersion = SERVER_SAVER_MINOR_VERSION .minorVersion = SERVER_SAVER_MINOR_VERSION
}; };
if (client->swapped) { REPLY_FIELD_CARD16(majorVersion);
swaps(&rep.sequenceNumber); REPLY_FIELD_CARD16(minorVersion);
swaps(&rep.majorVersion); REPLY_SEND_RET_SUCCESS();
swaps(&rep.minorVersion);
}
WriteToClient(client, sizeof(xScreenSaverQueryVersionReply), &rep);
return Success;
} }
static int static int
@ -637,10 +631,11 @@ ProcScreenSaverQueryInfo(ClientPtr client)
lastInput = GetTimeInMillis() - LastEventTime(XIAllDevices).milliseconds; lastInput = GetTimeInMillis() - LastEventTime(XIAllDevices).milliseconds;
xScreenSaverQueryInfoReply rep = { xScreenSaverQueryInfoReply rep = {
.type = X_Reply, .window = pSaver->wid,
.sequenceNumber = client->sequence, .idle = lastInput,
.window = pSaver->wid .eventMask = getEventMask(pDraw->pScreen, client),
}; };
if (screenIsSaved != SCREEN_SAVER_OFF) { if (screenIsSaved != SCREEN_SAVER_OFF) {
rep.state = ScreenSaverOn; rep.state = ScreenSaverOn;
if (ScreenSaverTime) if (ScreenSaverTime)
@ -656,23 +651,19 @@ ProcScreenSaverQueryInfo(ClientPtr client)
rep.state = ScreenSaverDisabled; rep.state = ScreenSaverDisabled;
} }
} }
rep.idle = lastInput;
rep.eventMask = getEventMask(pDraw->pScreen, client);
if (pPriv && pPriv->attr) if (pPriv && pPriv->attr)
rep.kind = ScreenSaverExternal; rep.kind = ScreenSaverExternal;
else if (ScreenSaverBlanking != DontPreferBlanking) else if (ScreenSaverBlanking != DontPreferBlanking)
rep.kind = ScreenSaverBlanked; rep.kind = ScreenSaverBlanked;
else else
rep.kind = ScreenSaverInternal; rep.kind = ScreenSaverInternal;
if (client->swapped) {
swaps(&rep.sequenceNumber); REPLY_FIELD_CARD32(window);
swapl(&rep.window); REPLY_FIELD_CARD32(tilOrSince);
swapl(&rep.tilOrSince); REPLY_FIELD_CARD32(idle);
swapl(&rep.idle); REPLY_FIELD_CARD32(eventMask);
swapl(&rep.eventMask); REPLY_SEND_RET_SUCCESS();
}
WriteToClient(client, sizeof(xScreenSaverQueryInfoReply), &rep);
return Success;
} }
static int static int
@ -1164,7 +1155,6 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
PanoramiXRes *draw; PanoramiXRes *draw;
int rc, i; int rc, i;
rc = dixLookupResourceByClass((void **) &draw, stuff->drawable, rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess); XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success) if (rc != Success)
@ -1173,8 +1163,6 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
for (i = PanoramiXNumScreens - 1; i > 0; i--) { for (i = PanoramiXNumScreens - 1; i > 0; i--) {
ScreenSaverUnsetAttributes(client, draw->info[i].id); ScreenSaverUnsetAttributes(client, draw->info[i].id);
} }
stuff->drawable = draw->info[0].id;
} }
#endif /* XINERAMA */ #endif /* XINERAMA */