Skip to content

N
nx-libs
Commit cf660f48 authored by Keith Packard's avatar Keith Packard Committed by Ulrich Sibiller
Browse files
Options

Backport: Make RANDR 'set' timestamps follow client specified time. Bug 21987.

The lastSetTime value which indicates when the configuration within the server was last changed was not getting set in the appropriate RandR requests. Signed-off-by: 's avatarKeith Packard <keithp@keithp.com>
parent 9dbd7479
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
nx-X11/programs/Xserver/randr/rrcrtc.c
View file @ cf660f48
......@@ -838,10 +838,8 @@ ProcRRSetCrtcConfig (ClientPtr client)
rep.status = RRSetConfigFailed;
goto sendReply;
}
#ifdef NXAGENT_SERVER /* Bug 21987 */
pScrPriv->lastSetTime = time;
#endif
rep.status = RRSetConfigSuccess;
pScrPriv->lastSetTime = time;
sendReply:
if (outputs)
......@@ -851,11 +849,7 @@ sendReply:
/* rep.status has already been filled in */
rep.length = 0;
rep.sequenceNumber = client->sequence;
#ifndef NXAGENT_SERVER /* Bug 21987 */
rep.newTimestamp = pScrPriv->lastConfigTime.milliseconds;
#else
rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;
#endif
if (client->swapped)
{
......
nx-X11/programs/Xserver/randr/rrscreen.c
View file @ cf660f48
......@@ -977,15 +977,10 @@ ProcRRSetScreenConfig (ClientPtr client)
if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))
rep.status = RRSetConfigFailed;
#ifndef NXAGENT_SERVER /* Bug 21987 */
else
rep.status = RRSetConfigSuccess;
#else
else {
rep.status = RRSetConfigSuccess;
pScrPriv->lastSetTime = time;
rep.status = RRSetConfigSuccess;
}
#endif
/*
* XXX Configure other crtcs to mirror as much as possible
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment