diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-12 13:51:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-22 13:12:56 +1000 |
| commit | 6aef209ebc2e54f5465da505a780f7b4cc273ee0 (patch) | |
| tree | 13798842bcc4ba3e2fef224bf6f74d7f86d26b7b /Xext | |
| parent | 20cf0ef825e3f14b0688b691691e0aeba0a4860a (diff) | |
Change lastDeviceIdleTime to be per-device
Preparation work for per-device idle counters.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/saver.c | 7 | ||||
| -rw-r--r-- | Xext/sync.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Xext/saver.c b/Xext/saver.c index 159153c23..61fc044d7 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -46,6 +46,7 @@ in this Software without prior written authorization from the X Consortium. #include "cursorstr.h" #include "colormapst.h" #include "xace.h" +#include "inputstr.h" #ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" @@ -388,8 +389,10 @@ ScreenSaverFreeSuspend(pointer value, XID id) if (screenIsSaved != SCREEN_SAVER_ON) #endif { + DeviceIntPtr dev; UpdateCurrentTimeIf(); - lastDeviceEventTime = currentTime; + nt_list_for_each_entry(dev, inputInfo.devices, next) + lastDeviceEventTime[dev->id] = currentTime; SetScreenSaverTimer(); } } @@ -672,7 +675,7 @@ ProcScreenSaverQueryInfo(ClientPtr client) pPriv = GetScreenPrivate(pDraw->pScreen); UpdateCurrentTime(); - lastInput = GetTimeInMillis() - lastDeviceEventTime.milliseconds; + lastInput = GetTimeInMillis() - lastDeviceEventTime[XIAllDevices].milliseconds; rep.type = X_Reply; rep.length = 0; diff --git a/Xext/sync.c b/Xext/sync.c index 25379bbec..8217e7662 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -2599,7 +2599,7 @@ typedef struct { static void IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return) { - CARD32 idle = GetTimeInMillis() - lastDeviceEventTime.milliseconds; + CARD32 idle = GetTimeInMillis() - lastDeviceEventTime[XIAllDevices].milliseconds; XSyncIntsToValue(pValue_return, idle, 0); } |