X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=1928f43cd1c314191f872f21340466adac039734;hb=22fdeadcc06e95fe41ac4de872ec245c0887547f;hp=da5a8305fa9af4f1ec248e0fadaa4e086c09a2c5;hpb=6a79c58603ea816a1b4fa1520397b4e138bc1ca0;p=elogind.git diff --git a/src/login/logind-action.c b/src/login/logind-action.c index da5a8305f..1928f43cd 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -70,18 +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, %s displays connected."); + if (n < 0) + log_warning("Display counting failed: %s", strerror(-n)); + else 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; } }