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

Revert "Xext: saver: skip unneeded zero init and zero-swapping" 

This reverts commit 40469a9d51.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2023>
This commit is contained in:
Alan Coopersmith 2025-06-15 12:46:52 -07:00 committed by Marge Bot
parent 74182c52e9
commit 5ad38ac585
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xext/saver.c
View File

@ -601,6 +601,7 @@ ProcScreenSaverQueryVersion(ClientPtr client)
xScreenSaverQueryVersionReply rep = { xScreenSaverQueryVersionReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = 0,
.majorVersion = SERVER_SAVER_MAJOR_VERSION, .majorVersion = SERVER_SAVER_MAJOR_VERSION,
.minorVersion = SERVER_SAVER_MINOR_VERSION .minorVersion = SERVER_SAVER_MINOR_VERSION
}; };
@ -609,6 +610,7 @@ ProcScreenSaverQueryVersion(ClientPtr client)
if (client->swapped) { if (client->swapped) {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep.length);
swaps(&rep.majorVersion); swaps(&rep.majorVersion);
swaps(&rep.minorVersion); swaps(&rep.minorVersion);
} }
@ -620,6 +622,7 @@ static int
ProcScreenSaverQueryInfo(ClientPtr client) ProcScreenSaverQueryInfo(ClientPtr client)
{ {
REQUEST(xScreenSaverQueryInfoReq); REQUEST(xScreenSaverQueryInfoReq);
xScreenSaverQueryInfoReply rep;
int rc; int rc;
ScreenSaverStuffPtr pSaver; ScreenSaverStuffPtr pSaver;
DrawablePtr pDraw; DrawablePtr pDraw;
@ -641,24 +644,30 @@ ProcScreenSaverQueryInfo(ClientPtr client)
UpdateCurrentTime(); UpdateCurrentTime();
lastInput = GetTimeInMillis() - LastEventTime(XIAllDevices).milliseconds; lastInput = GetTimeInMillis() - LastEventTime(XIAllDevices).milliseconds;
xScreenSaverQueryInfoReply rep = { rep = (xScreenSaverQueryInfoReply) {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = 0,
.window = pSaver->wid .window = pSaver->wid
}; };
if (screenIsSaved != SCREEN_SAVER_OFF) { if (screenIsSaved != SCREEN_SAVER_OFF) {
rep.state = ScreenSaverOn; rep.state = ScreenSaverOn;
if (ScreenSaverTime) if (ScreenSaverTime)
rep.tilOrSince = lastInput - ScreenSaverTime; rep.tilOrSince = lastInput - ScreenSaverTime;
else
rep.tilOrSince = 0;
} }
else { else {
if (ScreenSaverTime) { if (ScreenSaverTime) {
rep.state = ScreenSaverOff; rep.state = ScreenSaverOff;
if (ScreenSaverTime >= lastInput) if (ScreenSaverTime < lastInput)
rep.tilOrSince = 0;
else
rep.tilOrSince = ScreenSaverTime - lastInput; rep.tilOrSince = ScreenSaverTime - lastInput;
} }
else { else {
rep.state = ScreenSaverDisabled; rep.state = ScreenSaverDisabled;
rep.tilOrSince = 0;
} }
} }
rep.idle = lastInput; rep.idle = lastInput;
@ -671,6 +680,7 @@ ProcScreenSaverQueryInfo(ClientPtr client)
rep.kind = ScreenSaverInternal; rep.kind = ScreenSaverInternal;
if (client->swapped) { if (client->swapped) {
swaps(&rep.sequenceNumber); swaps(&rep.sequenceNumber);
swapl(&rep.length);
swapl(&rep.window); swapl(&rep.window);
swapl(&rep.tilOrSince); swapl(&rep.tilOrSince);
swapl(&rep.idle); swapl(&rep.idle);