summaryrefslogtreecommitdiff
path: root/src/login/logind-action.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-03 20:49:33 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-03 20:57:09 +0100
commitf9cd6be10ece07e10488c05e270a0b5860779864 (patch)
treef236bd39b54c2b66276c7ac72a36cb565cf0b53e /src/login/logind-action.c
parent7e9110a29d90041b0364cb93a84aec9dd72363b6 (diff)
logind: ignore lid switch events for 30s after each suspend and 3min after startup
This is needed to give USB docking stations and suchlike time to settle, so that a display connected to an USB docking station can actually act as a lid swith inhibitor correctly. With this change we should have somewhat reliable docking station support in place.
Diffstat (limited to 'src/login/logind-action.c')
-rw-r--r--src/login/logind-action.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index c9d8bc5413..ae7b35055a 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -70,20 +70,33 @@ int manager_handle_action(
return 0;
}
- /* If we are docked don't react to lid closing */
if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) {
int n;
+ /* If we are docked don't react to lid closing */
if (manager_is_docked(m)) {
log_debug("Ignoring lid switch request, system is docked.");
return 0;
}
+ /* If we have more than one or no displays connected,
+ * don't react to lid closing. The no display case we
+ * treat like this under the assumption that there is
+ * no modern drm driver available. */
n = manager_count_displays(m);
if (n != 1) {
log_debug("Ignoring lid switch request, %i displays connected.", n);
return 0;
}
+
+ /* If the last system suspend or startup is too close,
+ * let's not suspend for now, to give USB docking
+ * stations some time to settle so that we can
+ * properly watch its displays. */
+ if (m->lid_switch_ignore_event_source) {
+ log_debug("Ignoring lid switch request, system startup or resume too close.");
+ return 0;
+ }
}
/* If the key handling is inhibited, don't do anything */