X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-device.c;h=ee4c45fb8dd9125d76d0bc0d366981a67c31f5c4;hb=fb047e8edd9fc19b4a65f2656df494a12add1d31;hp=51b15358baa07684819d7c6717e46454ed1bd266;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 51b15358b..ee4c45fb8 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -19,13 +19,12 @@
along with systemd; If not, see .
***/
-#include
#include
-#include "logind-device.h"
#include "util.h"
+#include "logind-device.h"
-Device* device_new(Manager *m, const char *sysfs) {
+Device* device_new(Manager *m, const char *sysfs, bool master) {
Device *d;
assert(m);
@@ -48,38 +47,49 @@ Device* device_new(Manager *m, const char *sysfs) {
}
d->manager = m;
+ d->master = master;
dual_timestamp_get(&d->timestamp);
return d;
}
-void device_free(Device *d) {
+static void device_detach(Device *d) {
+ Seat *s;
+ SessionDevice *sd;
+
assert(d);
- device_detach(d);
+ if (!d->seat)
+ return;
- hashmap_remove(d->manager->devices, d->sysfs);
+ while ((sd = d->session_devices))
+ session_device_free(sd);
- free(d->sysfs);
- free(d);
+ s = d->seat;
+ LIST_REMOVE(devices, d->seat->devices, d);
+ d->seat = NULL;
+
+ if (!seat_has_master_device(s)) {
+ seat_add_to_gc_queue(s);
+ seat_send_changed(s, "CanGraphical", NULL);
+ }
}
-void device_detach(Device *d) {
- Seat *s;
+void device_free(Device *d) {
assert(d);
- if (!d->seat)
- return;
+ device_detach(d);
- s = d->seat;
- LIST_REMOVE(Device, devices, d->seat->devices, d);
- d->seat = NULL;
+ hashmap_remove(d->manager->devices, d->sysfs);
- seat_add_to_gc_queue(s);
- seat_send_changed(s, "CanGraphical\0");
+ free(d->sysfs);
+ free(d);
}
void device_attach(Device *d, Seat *s) {
+ Device *i;
+ bool had_master;
+
assert(d);
assert(s);
@@ -90,7 +100,26 @@ void device_attach(Device *d, Seat *s) {
device_detach(d);
d->seat = s;
- LIST_PREPEND(Device, devices, s->devices, d);
+ had_master = seat_has_master_device(s);
+
+ /* We keep the device list sorted by the "master" flag. That is, master
+ * devices are at the front, other devices at the tail. As there is no
+ * way to easily add devices at the list-tail, we need to iterate the
+ * list to find the first non-master device when adding non-master
+ * devices. We assume there is only a few (normally 1) master devices
+ * per seat, so we iterate only a few times. */
+
+ if (d->master || !s->devices)
+ LIST_PREPEND(devices, s->devices, d);
+ else {
+ LIST_FOREACH(devices, i, s->devices) {
+ if (!i->devices_next || !i->master) {
+ LIST_INSERT_AFTER(devices, s->devices, i, d);
+ break;
+ }
+ }
+ }
- seat_send_changed(s, "CanGraphical\0");
+ if (!had_master && d->master)
+ seat_send_changed(s, "CanGraphical", NULL);
}