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 /os | |
| 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 'os')
| -rw-r--r-- | os/WaitFor.c | 2 | ||||
| -rw-r--r-- | os/xdmcp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index 4c3be343b..95e64ba45 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -547,7 +547,7 @@ NextDPMSTimeout(INT32 timeout) static CARD32 ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, pointer arg) { - INT32 timeout = now - lastDeviceEventTime.milliseconds; + INT32 timeout = now - lastDeviceEventTime[XIAllDevices].milliseconds; CARD32 nextTimeout = 0; #ifdef DPMSExtension diff --git a/os/xdmcp.c b/os/xdmcp.c index 8d0fbb5a9..87f04b455 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1391,7 +1391,7 @@ recv_alive_msg(unsigned length) if (SessionRunning && AliveSessionID == SessionID) { /* backoff dormancy period */ state = XDM_RUN_SESSION; - if ((GetTimeInMillis() - lastDeviceEventTime.milliseconds) > + if ((GetTimeInMillis() - lastDeviceEventTime[XIAllDevices].milliseconds) > keepaliveDormancy * 1000) { keepaliveDormancy <<= 1; if (keepaliveDormancy > XDM_MAX_DORMANCY) |