logind: use new udev_enumerate_add_match_parent() where applicable

[elogind.git] / src / logind.h

diff --git a/src/logind.h b/src/logind.h
index 5c513b4021028c2366e3f6d490c61ea428091114..1f5f9fe4a6dba927dc55aee3039b60da6c4b855b 100644 (file)
--- a/src/logind.h
+++ b/src/logind.h
@@ -34,12 +34,11 @@
 
 /* TODO:
  *
- * recreate VTs when disallocated
  * spawn user systemd
  * direct client API
- * D-Bus method: AttachDevices(seat, devices[]);
- * D-Bus method: SetLinger(user, bool b);
- * kill cgroup immediately when fd is EOF.
+ *
+ * udev:
+ * use sysfs in device hash table, not sysname, when fb driver is fixed
  *
  * non-local X11 server
  * reboot/shutdown halt management
@@ -65,9 +64,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;
@@ -77,7 +78,7 @@ struct Manager {
         Seat *vtconsole;
 
         char *cgroup_path;
-        char **controllers;
+        char **controllers, **reset_controllers;
 
         char **kill_only_users, **kill_exclude_users;
 
@@ -86,14 +87,15 @@ struct Manager {
         unsigned long session_counter;
 
         Hashmap *cgroups;
-        Hashmap *pipe_fds;
+        Hashmap *fifo_fds;
 };
 
 enum {
-        FD_UDEV,
+        FD_SEAT_UDEV,
+        FD_VCSA_UDEV,
         FD_CONSOLE,
         FD_BUS,
-        FD_PIPE_BASE
+        FD_FIFO_BASE
 };
 
 Manager *manager_new(void);
@@ -106,8 +108,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);
@@ -121,12 +124,10 @@ int manager_spawn_autovt(Manager *m, int vtnr);
 
 void manager_cgroup_notify_empty(Manager *m, const char *cgroup);
 
-void manager_gc(Manager *m);
+void manager_gc(Manager *m, bool drop_not_started);
 
 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);