X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-button.c;h=3dd08294862da3e836f9013d8663390c957fb36c;hb=cc3f2093f622c04d12d287689d37d861ded41360;hp=62e0c3dbbae0021420c70066d1c1b70d490b6e55;hpb=669241a076108e0483d7d8475beaa506106d077e;p=elogind.git

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 62e0c3dbb..3dd082948 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -26,13 +26,12 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <linux/input.h>
-#include <sys/epoll.h>
 
+#include "sd-messages.h"
 #include "conf-parser.h"
 #include "util.h"
-#include "logind-button.h"
 #include "special.h"
-#include "dbus-common.h"
+#include "logind-button.h"
 
 Button* button_new(Manager *m, const char *name) {
         Button *b;
@@ -67,10 +66,13 @@ void button_free(Button *b) {
 
         hashmap_remove(b->manager->buttons, b->name);
 
+        sd_event_source_unref(b->event_source);
+
         if (b->fd >= 0) {
-                hashmap_remove(b->manager->button_fds, INT_TO_PTR(b->fd + 1));
-                assert_se(epoll_ctl(b->manager->epoll_fd, EPOLL_CTL_DEL, b->fd, NULL) == 0);
-                close_nointr_nofail(b->fd);
+                /* If the device has been unplugged close() returns
+                 * ENODEV, let's ignore this, hence we don't use
+                 * close_nointr_nofail() */
+                close(b->fd);
         }
 
         free(b->name);
@@ -94,237 +96,151 @@ int button_set_seat(Button *b, const char *sn) {
         return 0;
 }
 
-int button_open(Button *b) {
-        char name[256], *p;
-        struct epoll_event ev;
+static int button_handle(
+                Button *b,
+                InhibitWhat inhibit_key,
+                HandleAction handle,
+                bool ignore_inhibited,
+                bool is_edge) {
+
         int r;
 
         assert(b);
 
-        if (b->fd >= 0) {
-                close_nointr_nofail(b->fd);
-                b->fd = -1;
-        }
-
-        p = strappend("/dev/input/", b->name);
-        if (!p) {
-                log_error("Out of memory.");
-                return -ENOMEM;
-        }
-
-        b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
-        free(p);
-        if (b->fd < 0) {
-                log_warning("Failed to open %s: %m", b->name);
-                return -errno;
-        }
-
-        if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
-                log_error("Failed to get input name: %m");
-                r = -errno;
-                goto fail;
-        }
-
-        zero(ev);
-        ev.events = EPOLLIN;
-        ev.data.u32 = FD_OTHER_BASE + b->fd;
-
-        if (epoll_ctl(b->manager->epoll_fd, EPOLL_CTL_ADD, b->fd, &ev) < 0) {
-                log_error("Failed to add to epoll: %m");
-                r = -errno;
-                goto fail;
-        }
-
-        r = hashmap_put(b->manager->button_fds, INT_TO_PTR(b->fd + 1), b);
-        if (r < 0) {
-                log_error("Failed to add to hash map: %s", strerror(-r));
-                assert_se(epoll_ctl(b->manager->epoll_fd, EPOLL_CTL_DEL, b->fd, NULL) == 0);
-                goto fail;
-        }
-
-        log_info("Watching system buttons on /dev/input/%s (%s)", b->name, name);
+        r = manager_handle_action(b->manager, inhibit_key, handle, ignore_inhibited, is_edge);
+        if (r > 0)
+                /* We are executing the operation, so make sure we don't
+                 * execute another one until the lid is opened/closed again */
+                b->lid_close_queued = false;
 
         return 0;
-
-fail:
-        close_nointr_nofail(b->fd);
-        b->fd = -1;
-        return r;
 }
 
-static Session *button_get_session(Button *b) {
-        Seat *seat;
+static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        Button *b = userdata;
+        struct input_event ev;
+        ssize_t l;
+
+        assert(s);
+        assert(fd == b->fd);
         assert(b);
 
-        if (!b->seat)
-                return NULL;
+        l = read(b->fd, &ev, sizeof(ev));
+        if (l < 0)
+                return errno != EAGAIN ? -errno : 0;
+        if ((size_t) l < sizeof(ev))
+                return -EIO;
 
-        seat = hashmap_get(b->manager->seats, b->seat);
-        if (!seat)
-                return NULL;
+        if (ev.type == EV_KEY && ev.value > 0) {
 
-        return seat->active;
-}
+                switch (ev.code) {
 
-static int button_power_off(Button *b, HandleButton handle) {
-        DBusError error;
-        int r;
+                case KEY_POWER:
+                case KEY_POWER2:
+                        log_struct(LOG_INFO,
+                                   "MESSAGE=Power key pressed.",
+                                   MESSAGE_ID(SD_MESSAGE_POWER_KEY),
+                                   NULL);
+                        return button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true);
 
-        assert(b);
+                /* The kernel is a bit confused here:
 
-        if (handle == HANDLE_OFF)
-                return 0;
+                   KEY_SLEEP   = suspend-to-ram, which everybody else calls "suspend"
+                   KEY_SUSPEND = suspend-to-disk, which everybody else calls "hibernate"
+                */
+
+                case KEY_SLEEP:
+                        log_struct(LOG_INFO,
+                                   "MESSAGE=Suspend key pressed.",
+                                   MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY),
+                                   NULL);
+                        return button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true);
 
-        if (handle == HANDLE_NO_SESSION) {
-                if (hashmap_size(b->manager->sessions) > 0) {
-                        log_error("Refusing power-off, user is logged in.");
-                        warn_melody();
-                        return -EPERM;
+                case KEY_SUSPEND:
+                        log_struct(LOG_INFO,
+                                   "MESSAGE=Hibernate key pressed.",
+                                   MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY),
+                                   NULL);
+                        return button_handle(b, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true);
                 }
 
-        } else if (handle == HANDLE_TTY_SESSION ||
-                   handle == HANDLE_ANY_SESSION) {
-                unsigned n;
-                Session *s;
+        } else if (ev.type == EV_SW && ev.value > 0) {
 
-                n = hashmap_size(b->manager->sessions);
-                s = button_get_session(b);
+                switch (ev.code) {
 
-                /* Silently ignore events of graphical sessions */
-                if (handle == HANDLE_TTY_SESSION &&
-                    s && s->type == SESSION_X11)
-                        return 0;
+                case SW_LID:
+                        log_struct(LOG_INFO,
+                                   "MESSAGE=Lid closed.",
+                                   MESSAGE_ID(SD_MESSAGE_LID_CLOSED),
+                                   NULL);
+                        b->lid_close_queued = true;
 
-                if (n > 1 || (n == 1 && !s)) {
-                        log_error("Refusing power-off, other user is logged in.");
-                        warn_melody();
-                        return -EPERM;
+                        return button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, true);
                 }
 
-        }
+        } else if (ev.type == EV_SW && ev.value == 0) {
 
-        if (handle != HANDLE_ALWAYS) {
-                if (manager_is_inhibited(b->manager, INHIBIT_SHUTDOWN, INHIBIT_BLOCK, NULL)) {
-                        log_error("Refusing power-off, shutdown is inhibited.");
-                        warn_melody();
-                        return -EPERM;
-                }
-        }
-
-        log_info("Powering off...");
+                switch (ev.code) {
 
-        dbus_error_init(&error);
-        r = bus_manager_shutdown_or_sleep_now_or_later(b->manager, SPECIAL_POWEROFF_TARGET, INHIBIT_SHUTDOWN, &error);
-        if (r < 0) {
-                log_error("Failed to power off: %s", bus_error_message(&error));
-                dbus_error_free(&error);
+                case SW_LID:
+                        log_struct(LOG_INFO,
+                                   "MESSAGE=Lid opened.",
+                                   MESSAGE_ID(SD_MESSAGE_LID_OPENED),
+                                   NULL);
+                        b->lid_close_queued = false;
+                        break;
+                }
         }
 
-        return r;
+        return 0;
 }
 
-static int button_suspend(Button *b, HandleButton handle) {
-        DBusError error;
+int button_open(Button *b) {
+        char *p, name[256];
         int r;
 
         assert(b);
 
-        if (handle == HANDLE_OFF)
-                return 0;
-
-        if (handle == HANDLE_NO_SESSION) {
-                if (hashmap_size(b->manager->sessions) > 0) {
-                        log_error("Refusing suspend, user is logged in.");
-                        warn_melody();
-                        return -EPERM;
-                }
-
-        } else if (handle == HANDLE_TTY_SESSION ||
-                   handle == HANDLE_ANY_SESSION) {
-                unsigned n;
-                Session *s;
-
-                n = hashmap_size(b->manager->sessions);
-                s = button_get_session(b);
+        if (b->fd >= 0) {
+                close(b->fd);
+                b->fd = -1;
+        }
 
-                /* Silently ignore events of graphical sessions */
-                if (handle == HANDLE_TTY_SESSION &&
-                    s && s->type == SESSION_X11)
-                        return 0;
+        p = strappenda("/dev/input/", b->name);
 
-                if (n > 1 || (n == 1 && !s)) {
-                        log_error("Refusing suspend, other user is logged in.");
-                        warn_melody();
-                        return -EPERM;
-                }
+        b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
+        if (b->fd < 0) {
+                log_warning("Failed to open %s: %m", b->name);
+                return -errno;
         }
 
-        if (handle != HANDLE_ALWAYS) {
-                if (manager_is_inhibited(b->manager, INHIBIT_SLEEP, INHIBIT_BLOCK, NULL)) {
-                        log_error("Refusing suspend, sleeping is inhibited.");
-                        warn_melody();
-                        return -EPERM;
-                }
+        if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
+                log_error("Failed to get input name: %m");
+                r = -errno;
+                goto fail;
         }
 
-        log_info("Suspending...");
-
-        dbus_error_init(&error);
-        r = bus_manager_shutdown_or_sleep_now_or_later(b->manager, SPECIAL_SUSPEND_TARGET, INHIBIT_SLEEP, &error);
+        r = sd_event_add_io(b->manager->event, b->fd, EPOLLIN, button_dispatch, b, &b->event_source);
         if (r < 0) {
-                log_error("Failed to suspend: %s", bus_error_message(&error));
-                dbus_error_free(&error);
+                log_error("Failed to add button event: %s", strerror(-r));
+                goto fail;
         }
 
+        log_info("Watching system buttons on /dev/input/%s (%s)", b->name, name);
+
+        return 0;
+
+fail:
+        close(b->fd);
+        b->fd = -1;
         return r;
 }
 
-int button_process(Button *b) {
-        struct input_event ev;
-        ssize_t l;
-
+int button_recheck(Button *b) {
         assert(b);
 
-        l = read(b->fd, &ev, sizeof(ev));
-        if (l < 0)
-                return errno != EAGAIN ? -errno : 0;
-        if ((size_t) l < sizeof(ev))
-                return -EIO;
-
-        if (ev.type == EV_KEY && ev.value > 0) {
-
-                switch (ev.code) {
-
-                case KEY_POWER:
-                case KEY_POWER2:
-                        log_info("Power key pressed.");
-                        return button_power_off(b, b->manager->handle_power_key);
-
-                case KEY_SLEEP:
-                case KEY_SUSPEND:
-                        log_info("Sleep key pressed.");
-                        return button_suspend(b, b->manager->handle_sleep_key);
-
-                }
-        } else if (ev.type == EV_SW && ev.value > 0) {
-
-                switch (ev.code) {
-
-                case SW_LID:
-                        log_info("Lid closed.");
-                        return button_suspend(b, b->manager->handle_lid_switch);
-                }
-        }
+        if (!b->lid_close_queued)
+                return 0;
 
-        return 0;
+        return button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, false);
 }
-
-static const char* const handle_button_table[_HANDLE_BUTTON_MAX] = {
-        [HANDLE_OFF] = "off",
-        [HANDLE_NO_SESSION] = "no-session",
-        [HANDLE_TTY_SESSION] = "tty-session",
-        [HANDLE_ANY_SESSION] = "any-session",
-        [HANDLE_ALWAYS] = "always"
-};
-DEFINE_STRING_TABLE_LOOKUP(handle_button, HandleButton);
-DEFINE_CONFIG_PARSE_ENUM(config_parse_handle_button, handle_button, HandleButton, "Failed to parse handle button setting");