X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=1928f43cd1c314191f872f21340466adac039734;hb=19befb2d5fc087f96e40ddc432b2cc9385666209;hp=7744addf69211982eb519a30e9715b7c1d672173;hpb=85a428c69465b047731b6abb5005f01824f1444e;p=elogind.git

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 7744addf6..1928f43cd 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -70,6 +70,37 @@ int manager_handle_action(
                 return 0;
         }
 
+        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 < 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;
+                }
+        }
+
         /* If the key handling is inhibited, don't do anything */
         if (inhibit_key > 0) {
                 if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0, NULL)) {
@@ -80,6 +111,10 @@ int manager_handle_action(
 
         /* Locking is handled differently from the rest. */
         if (handle == HANDLE_LOCK) {
+
+                if (!is_edge)
+                        return 0;
+
                 log_info("Locking sessions...");
                 session_send_lock_all(m, true);
                 return 1;