X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fsysview.c;fp=src%2Flibsystemd-terminal%2Fsysview.c;h=5b623c1e6c35592fb2342fa7321444d16285121f;hb=f6e3ee1493f20823b2c33465458b92f3581af88d;hp=161ea117a4fbe88308e06186f557fdddbacba2ca;hpb=89febb631a4710992cd41e402a643451b19c11a7;p=elogind.git diff --git a/src/libsystemd-terminal/sysview.c b/src/libsystemd-terminal/sysview.c index 161ea117a..5b623c1e6 100644 --- a/src/libsystemd-terminal/sysview.c +++ b/src/libsystemd-terminal/sysview.c @@ -517,10 +517,11 @@ static int context_raise_session_detach(sysview_context *c, sysview_session *ses return context_raise(c, &event, 0); } -static int context_raise_device_change(sysview_context *c, sysview_device *device, struct udev_device *ud) { +static int context_raise_session_refresh(sysview_context *c, sysview_session *session, sysview_device *device, struct udev_device *ud) { sysview_event event = { - .type = SYSVIEW_EVENT_DEVICE_CHANGE, - .device_change = { + .type = SYSVIEW_EVENT_SESSION_REFRESH, + .session_refresh = { + .session = session, .device = device, .ud = ud, } @@ -581,6 +582,31 @@ static int context_remove_device(sysview_context *c, sysview_device *device) { return error; } +static int context_change_device(sysview_context *c, sysview_device *device, struct udev_device *ud) { + sysview_session *session; + int r, error = 0; + Iterator i; + + assert(c); + assert(device); + + log_debug("sysview: change device '%s'", device->name); + + HASHMAP_FOREACH(session, device->seat->session_map, i) { + if (!session->public) + continue; + + r = context_raise_session_refresh(c, session, device, ud); + if (r != 0) + error = r; + } + + if (error < 0) + log_debug("sysview: error while changing device '%s': %s", + device->name, strerror(-r)); + return error; +} + static int context_add_session(sysview_context *c, sysview_seat *seat, const char *id) { sysview_session *session; sysview_device *device; @@ -884,7 +910,7 @@ static int context_ud_hotplug(sysview_context *c, struct udev_device *d) { if (!device) return 0; - return context_raise_device_change(c, device, d); + return context_change_device(c, device, d); } else if (!action || streq_ptr(action, "add")) { struct udev_device *p; unsigned int type, t;