X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-button.c;h=ea45c28eefe8fad705fb50ce24b9eef6b1301112;hb=a20affe2f0fb4c8d488155a0b860549e9389f32a;hp=48432e195d717da8b2048ccaa8fe024ee92ada3d;hpb=e9d21f240704f87c6bb5f7fca1c5e6d0f31c84cd;p=elogind.git diff --git a/src/login/logind-button.c b/src/login/logind-button.c index 48432e195..ea45c28ee 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -33,6 +33,7 @@ #include "logind-button.h" #include "special.h" #include "dbus-common.h" +#include "sd-messages.h" Button* button_new(Manager *m, const char *name) { Button *b; @@ -70,7 +71,11 @@ void button_free(Button *b) { 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); @@ -102,15 +107,13 @@ int button_open(Button *b) { assert(b); if (b->fd >= 0) { - close_nointr_nofail(b->fd); + close(b->fd); b->fd = -1; } p = strappend("/dev/input/", b->name); - if (!p) { - log_error("Out of memory"); - return -ENOMEM; - } + if (!p) + return log_oom(); b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); free(p); @@ -147,95 +150,27 @@ int button_open(Button *b) { return 0; fail: - close_nointr_nofail(b->fd); + close(b->fd); b->fd = -1; return r; } -static bool has_graphical_session(Manager *m, const char *seat) { - Seat *s; - - assert(m); - assert(seat); - - s = hashmap_get(m->seats, seat); - if (!s) - return false; - - if (!s->active) - return false; +static int button_handle( + Button *b, + InhibitWhat inhibit_key, + HandleAction handle, + bool ignore_inhibited, + bool is_edge) { - return s->active->type == SESSION_X11; -} - -static int button_power_off(Button *b, HandleButton handle) { - DBusError error; int r; assert(b); - if (handle == HANDLE_NO) - return 0; - - if (handle != HANDLE_ALWAYS) { - - if (hashmap_size(b->manager->sessions) > 0) { - log_error("Refusing power-off, user is logged in."); - warn_melody(); - return -EPERM; - } - - 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..."); - - 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); - } - - return r; -} - -static int button_suspend(Button *b, HandleButton handle) { - DBusError error; - int r; - - assert(b); - - if (handle == HANDLE_NO) - return 0; - - if (handle != HANDLE_ALWAYS) { - - if (hashmap_size(b->manager->sessions) > 0) { - log_error("Refusing suspend, user is logged in."); - warn_melody(); - return -EPERM; - } - - if (manager_is_inhibited(b->manager, INHIBIT_SLEEP, INHIBIT_BLOCK, NULL)) { - log_error("Refusing suspend, sleeping is inhibited."); - warn_melody(); - return -EPERM; - } - } - - log_info("Suspending..."); - - dbus_error_init(&error); - r = bus_manager_shutdown_or_sleep_now_or_later(b->manager, SPECIAL_SUSPEND_TARGET, INHIBIT_SLEEP, &error); - if (r < 0) { - log_error("Failed to suspend: %s", bus_error_message(&error)); - dbus_error_free(&error); - } + 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 r; } @@ -252,44 +187,75 @@ int button_process(Button *b) { if ((size_t) l < sizeof(ev)) return -EIO; - /* If there's a graphical session on the seat this device - * belongs to we ignore events, it is job of the graphical - * session to handle the event. */ - if (has_graphical_session(b->manager, b->seat)) - return 0; - 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); + 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); + + /* The kernel is a bit confused here: + + KEY_SLEEP = suspend-to-ram, which everybody else calls "suspend" + KEY_SUSPEND = suspend-to-disk, which everybody else calls "hibernate" + */ case KEY_SLEEP: - case KEY_SUSPEND: - log_info("Sleep key pressed."); - return button_suspend(b, b->manager->handle_sleep_key); + 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); + 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 (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); + log_struct(LOG_INFO, + "MESSAGE=Lid closed.", + MESSAGE_ID(SD_MESSAGE_LID_CLOSED), + NULL); + b->lid_close_queued = true; + + 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) { + + switch (ev.code) { + + case SW_LID: + log_struct(LOG_INFO, + "MESSAGE=Lid opened.", + MESSAGE_ID(SD_MESSAGE_LID_OPENED), + NULL); + b->lid_close_queued = false; + break; } } return 0; } -static const char* const handle_button_table[_HANDLE_BUTTON_MAX] = { - [HANDLE_YES] = "yes", - [HANDLE_NO] = "no", - [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"); +int button_recheck(Button *b) { + assert(b); + + if (!b->lid_close_queued) + return 0; + + return button_handle(b, INHIBIT_HANDLE_LID_SWITCH, b->manager->handle_lid_switch, b->manager->lid_switch_ignore_inhibited, false); +}