X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind.h;h=309541415d2336c927f5ab8619b245cd7a5bd69c;hb=a0a0c7f18c5d4f157f471b6b2824b8e0653491ab;hp=2b9b702f3d9591d3154ab936e2232525b2fb9acc;hpb=0771475394887e3635e67196fa6f56486fa2126c;p=elogind.git diff --git a/src/logind.h b/src/logind.h index 2b9b702f3..309541415 100644 --- a/src/logind.h +++ b/src/logind.h @@ -34,13 +34,18 @@ /* TODO: * - * recreate VTs when disallocated * spawn user systemd * direct client API - * subscribe to fd HUP - * D-Bus method: AttachDevice(seat, device); - * D-Bus method: PermitLinger(user, bool b); - * properly handle if two sessions with the same loginuid are attempted to be created + * add configuration file + * D-Bus method: AttachDevices(seat, devices[]); + * use named pipes to detect when a session dies + * verify access to SetIdleHint + * drop redundant udev_device_get_is_initialized() use as soon as libudev is fixed + * properly escape/remove : and . from seat names in udev rules + * use device_has_tag() as soon as it is available + * trigger based on libudev if available + * enumerate recursively with libudev when triggering + * make sure IMPORT{parent}="ID_SEAT" works between usb hub and sound card * * non-local X11 server * reboot/shutdown halt management @@ -66,9 +71,11 @@ struct Manager { LIST_HEAD(User, user_gc_queue); struct udev *udev; - struct udev_monitor *udev_monitor; + struct udev_monitor *udev_seat_monitor, *udev_vcsa_monitor; + + int udev_seat_fd; + int udev_vcsa_fd; - int udev_fd; int console_active_fd; int bus_fd; int epoll_fd; @@ -87,6 +94,15 @@ struct Manager { unsigned long session_counter; Hashmap *cgroups; + Hashmap *pipe_fds; +}; + +enum { + FD_SEAT_UDEV, + FD_VCSA_UDEV, + FD_CONSOLE, + FD_BUS, + FD_PIPE_BASE }; Manager *manager_new(void); @@ -99,8 +115,9 @@ int manager_add_user(Manager *m, uid_t uid, gid_t gid, const char *name, User ** int manager_add_user_by_name(Manager *m, const char *name, User **_user); int manager_add_user_by_uid(Manager *m, uid_t uid, User **_user); -int manager_process_device(Manager *m, struct udev_device *d); -int manager_dispatch_udev(Manager *m); +int manager_process_seat_device(Manager *m, struct udev_device *d); +int manager_dispatch_seat_udev(Manager *m); +int manager_dispatch_vcsa_udev(Manager *m); int manager_dispatch_console(Manager *m); int manager_enumerate_devices(Manager *m); @@ -118,8 +135,6 @@ void manager_gc(Manager *m); int manager_get_idle_hint(Manager *m, dual_timestamp *t); -bool x11_display_is_local(const char *display); - extern const DBusObjectPathVTable bus_manager_vtable; DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *message, void *userdata);