X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fidev.c;h=989683f39a62cc2053928b547cc09a1aa65560d5;hb=be795898c0d2fa21e3389b89793dcd45c47f8b9f;hp=0ed518cded0d6c75a672b2e98ff8b4908f67c73d;hpb=e06cc7b07465369fb7c01c9778b84cf82c82fdcf;p=elogind.git diff --git a/src/libsystemd-terminal/idev.c b/src/libsystemd-terminal/idev.c index 0ed518cde..989683f39 100644 --- a/src/libsystemd-terminal/idev.c +++ b/src/libsystemd-terminal/idev.c @@ -33,7 +33,6 @@ #include "idev-internal.h" #include "login-shared.h" #include "macro.h" -#include "set.h" #include "udev-util.h" #include "util.h" @@ -275,6 +274,22 @@ static void element_disable(idev_element *e) { } } +static void element_resume(idev_element *e, int fd) { + assert(e); + assert(fd >= 0); + + if (e->vtable->resume) + e->vtable->resume(e, fd); +} + +static void element_pause(idev_element *e, const char *mode) { + assert(e); + assert(mode); + + if (e->vtable->pause) + e->vtable->pause(e, mode); +} + /* * Sessions */ @@ -336,8 +351,8 @@ static int session_add_device(idev_session *s, idev_device *d) { error: if (r < 0) - log_debug("idev: %s: error while adding device '%s': %s", - s->name, d->name, strerror(-r)); + log_debug_errno(r, "idev: %s: error while adding device '%s': %m", + s->name, d->name); return r; } @@ -357,8 +372,8 @@ static int session_remove_device(idev_session *s, idev_device *d) { idev_device_disable(d); if (error < 0) - log_debug("idev: %s: error while removing device '%s': %s", - s->name, d->name, strerror(-error)); + log_debug_errno(error, "idev: %s: error while removing device '%s': %m", + s->name, d->name); idev_device_free(d); return error; } @@ -405,8 +420,8 @@ static int session_remove_element(idev_session *s, idev_element *e) { element_disable(e); if (error < 0) - log_debug("idev: %s: error while removing element '%s': %s", - s->name, e->name, strerror(-r)); + log_debug_errno(r, "idev: %s: error while removing element '%s': %m", + s->name, e->name); idev_element_free(e); return error; } @@ -418,6 +433,98 @@ idev_session *idev_find_session(idev_context *c, const char *name) { return hashmap_get(c->session_map, name); } +static int session_resume_device_fn(sd_bus *bus, + sd_bus_message *signal, + void *userdata, + sd_bus_error *ret_error) { + idev_session *s = userdata; + idev_element *e; + uint32_t major, minor; + int r, fd; + + r = sd_bus_message_read(signal, "uuh", &major, &minor, &fd); + if (r < 0) { + log_debug("idev: %s: erroneous ResumeDevice signal", s->name); + return 0; + } + + e = idev_find_evdev(s, makedev(major, minor)); + if (!e) + return 0; + + element_resume(e, fd); + return 0; +} + +static int session_pause_device_fn(sd_bus *bus, + sd_bus_message *signal, + void *userdata, + sd_bus_error *ret_error) { + idev_session *s = userdata; + idev_element *e; + uint32_t major, minor; + const char *mode; + int r; + + r = sd_bus_message_read(signal, "uus", &major, &minor, &mode); + if (r < 0) { + log_debug("idev: %s: erroneous PauseDevice signal", s->name); + return 0; + } + + e = idev_find_evdev(s, makedev(major, minor)); + if (!e) + return 0; + + element_pause(e, mode); + return 0; +} + +static int session_setup_bus(idev_session *s) { + _cleanup_free_ char *match = NULL; + int r; + + if (!s->managed) + return 0; + + match = strjoin("type='signal'," + "sender='org.freedesktop.login1'," + "interface='org.freedesktop.login1.Session'," + "member='ResumeDevice'," + "path='", s->path, "'", + NULL); + if (!match) + return -ENOMEM; + + r = sd_bus_add_match(s->context->sysbus, + &s->slot_resume_device, + match, + session_resume_device_fn, + s); + if (r < 0) + return r; + + free(match); + match = strjoin("type='signal'," + "sender='org.freedesktop.login1'," + "interface='org.freedesktop.login1.Session'," + "member='PauseDevice'," + "path='", s->path, "'", + NULL); + if (!match) + return -ENOMEM; + + r = sd_bus_add_match(s->context->sysbus, + &s->slot_pause_device, + match, + session_pause_device_fn, + s); + if (r < 0) + return r; + + return 0; +} + int idev_session_new(idev_session **out, idev_context *c, unsigned int flags, @@ -455,14 +562,18 @@ int idev_session_new(idev_session **out, return r; } - s->element_map = hashmap_new(string_hash_func, string_compare_func); + s->element_map = hashmap_new(&string_hash_ops); if (!s->element_map) return -ENOMEM; - s->device_map = hashmap_new(string_hash_func, string_compare_func); + s->device_map = hashmap_new(&string_hash_ops); if (!s->device_map) return -ENOMEM; + r = session_setup_bus(s); + if (r < 0) + return r; + r = hashmap_put(c->session_map, s->name, s); if (r < 0) return r; @@ -486,6 +597,8 @@ idev_session *idev_session_free(idev_session *s) { if (s->name) hashmap_remove_value(s->context->session_map, s->name, s); + s->slot_pause_device = sd_bus_slot_unref(s->slot_pause_device); + s->slot_resume_device = sd_bus_slot_unref(s->slot_resume_device); s->context = idev_context_unref(s->context); hashmap_free(s->device_map); hashmap_free(s->element_map); @@ -648,11 +761,11 @@ int idev_context_new(idev_context **out, sd_event *event, sd_bus *sysbus) { if (sysbus) c->sysbus = sd_bus_ref(sysbus); - c->session_map = hashmap_new(string_hash_func, string_compare_func); + c->session_map = hashmap_new(&string_hash_ops); if (!c->session_map) return -ENOMEM; - c->data_map = hashmap_new(string_hash_func, string_compare_func); + c->data_map = hashmap_new(&string_hash_ops); if (!c->data_map) return -ENOMEM;