X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-button.c;h=e29f2c4c5f072f3af5740b1de50135af2d4b2f93;hp=dbf3d3c446dd260f3ab81d8ed22a2287affe0d7d;hb=5b04fe60004e7c5cd5a43648ede3e6a965e70b8c;hpb=f274ece0f76b5709408821e317e87aef76123db6 diff --git a/src/login/logind-button.c b/src/login/logind-button.c index dbf3d3c44..e29f2c4c5 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -26,13 +26,12 @@ #include #include #include -#include +#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,62 +96,6 @@ int button_set_seat(Button *b, const char *sn) { return 0; } -int button_open(Button *b) { - char name[256], *p; - struct epoll_event ev; - int r; - - assert(b); - - if (b->fd >= 0) { - close_nointr_nofail(b->fd); - b->fd = -1; - } - - p = strappend("/dev/input/", b->name); - if (!p) - return log_oom(); - - 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); - - return 0; - -fail: - close_nointr_nofail(b->fd); - b->fd = -1; - return r; -} - static int button_handle( Button *b, InhibitWhat inhibit_key, @@ -167,13 +113,16 @@ static int button_handle( * execute another one until the lid is opened/closed again */ b->lid_close_queued = false; - return r; + return 0; } -int button_process(Button *b) { +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); l = read(b->fd, &ev, sizeof(ev)); @@ -188,8 +137,13 @@ int button_process(Button *b) { case KEY_POWER: case KEY_POWER2: - log_info("Power key pressed."); - return button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true); + log_struct(LOG_INFO, + "MESSAGE=Power key pressed.", + MESSAGE_ID(SD_MESSAGE_POWER_KEY), + NULL); + + button_handle(b, INHIBIT_HANDLE_POWER_KEY, b->manager->handle_power_key, b->manager->power_key_ignore_inhibited, true); + break; /* The kernel is a bit confused here: @@ -198,39 +152,92 @@ int button_process(Button *b) { */ case KEY_SLEEP: - log_info("Suspend key pressed."); - return button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true); + log_struct(LOG_INFO, + "MESSAGE=Suspend key pressed.", + MESSAGE_ID(SD_MESSAGE_SUSPEND_KEY), + NULL); + + button_handle(b, INHIBIT_HANDLE_SUSPEND_KEY, b->manager->handle_suspend_key, b->manager->suspend_key_ignore_inhibited, true); + break; case KEY_SUSPEND: - log_info("Hibernate key pressed."); - return button_handle(b, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true); + log_struct(LOG_INFO, + "MESSAGE=Hibernate key pressed.", + MESSAGE_ID(SD_MESSAGE_HIBERNATE_KEY), + NULL); + + button_handle(b, INHIBIT_HANDLE_HIBERNATE_KEY, b->manager->handle_hibernate_key, b->manager->hibernate_key_ignore_inhibited, true); + break; } } else if (ev.type == EV_SW && ev.value > 0) { - switch (ev.code) { + if (ev.code == SW_LID) { + log_struct(LOG_INFO, + "MESSAGE=Lid closed.", + MESSAGE_ID(SD_MESSAGE_LID_CLOSED), + NULL); - case SW_LID: - log_info("Lid closed."); 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); + 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) { + if (ev.code == SW_LID) { + log_struct(LOG_INFO, + "MESSAGE=Lid opened.", + MESSAGE_ID(SD_MESSAGE_LID_OPENED), + NULL); - case SW_LID: - log_info("Lid opened."); b->lid_close_queued = false; - break; } } return 0; } +int button_open(Button *b) { + char *p, name[256]; + int r; + + assert(b); + + if (b->fd >= 0) { + close(b->fd); + b->fd = -1; + } + + p = strappenda("/dev/input/", b->name); + + 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 (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) { + log_error("Failed to get input name: %m"); + r = -errno; + goto fail; + } + + r = sd_event_add_io(b->manager->event, b->fd, EPOLLIN, button_dispatch, b, &b->event_source); + if (r < 0) { + 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_recheck(Button *b) { assert(b);