summaryrefslogtreecommitdiff
path: root/xserver/Xext/saver.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2013-12-08 10:53:03 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2013-12-08 10:53:03 +0000
commitdcd2a9024f6c62f64a6014e56914dede60ad2f5f (patch)
tree9ba5dd8839bb3dd4434eb511c2fc7f03b9600207 /xserver/Xext/saver.c
parentd86224ecd984420f952f9e4b732d72631e7090ed (diff)
Update to xserver 1.14.4
Diffstat (limited to 'xserver/Xext/saver.c')
-rw-r--r--xserver/Xext/saver.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/xserver/Xext/saver.c b/xserver/Xext/saver.c
index fe81bc4d7..e06f40837 100644
--- a/xserver/Xext/saver.c
+++ b/xserver/Xext/saver.c
@@ -392,9 +392,7 @@ ScreenSaverFreeSuspend(pointer value, XID id)
DeviceIntPtr dev;
UpdateCurrentTimeIf();
nt_list_for_each_entry(dev, inputInfo.devices, next)
- lastDeviceEventTime[dev->id] = currentTime;
- lastDeviceEventTime[XIAllDevices] = currentTime;
- lastDeviceEventTime[XIAllMasterDevices] = currentTime;
+ NoticeTime(dev, currentTime);
SetScreenSaverTimer();
}
}
@@ -681,7 +679,7 @@ ProcScreenSaverQueryInfo(ClientPtr client)
pPriv = GetScreenPrivate(pDraw->pScreen);
UpdateCurrentTime();
- lastInput = GetTimeInMillis() - lastDeviceEventTime[XIAllDevices].milliseconds;
+ lastInput = GetTimeInMillis() - LastEventTime(XIAllDevices).milliseconds;
rep = (xScreenSaverQueryInfoReply) {
.type = X_Reply,