X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-session.h;h=aab39b72e3594365b6675af09c550137bc6806f0;hp=edaae8d20ac43bbacbaf62aa00eb89ce49f77dd5;hb=90a18413f8be577a649900eca977e060273f2b5b;hpb=405e0255d5e6950180d9563f1a26294b5360db03

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index edaae8d20..aab39b72e 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -28,7 +28,9 @@ typedef enum KillWho KillWho;
 #include "util.h"
 #include "logind.h"
 #include "logind-seat.h"
+#include "logind-session-device.h"
 #include "logind-user.h"
+#include "login-shared.h"
 
 typedef enum SessionState {
         SESSION_OPENING,  /* Session scope is being created */
@@ -87,8 +89,10 @@ struct Session {
         char *scope;
         char *scope_job;
 
-        int vtnr;
         Seat *seat;
+        int vtnr;
+        int vtfd;
+        sd_event_source *vt_source;
 
         pid_t leader;
         uint32_t audit_id;
@@ -96,6 +100,8 @@ struct Session {
         int fifo_fd;
         char *fifo_path;
 
+        sd_event_source *fifo_event_source;
+
         bool idle_hint;
         dual_timestamp idle_hint_timestamp;
 
@@ -103,7 +109,10 @@ struct Session {
         bool started:1;
         bool closing:1;
 
-        DBusMessage *create_message;
+        sd_bus_message *create_message;
+
+        char *controller;
+        Hashmap *devices;
 
         LIST_FIELDS(Session, sessions_by_user);
         LIST_FIELDS(Session, sessions_by_seat);
@@ -114,7 +123,7 @@ struct Session {
 Session *session_new(Manager *m, const char *id);
 void session_free(Session *s);
 void session_set_user(Session *s, User *u);
-int session_check_gc(Session *s, bool drop_not_started);
+bool session_check_gc(Session *s, bool drop_not_started);
 void session_add_to_gc_queue(Session *s);
 int session_activate(Session *s);
 bool session_is_active(Session *s);
@@ -129,18 +138,19 @@ int session_save(Session *s);
 int session_load(Session *s);
 int session_kill(Session *s, KillWho who, int signo);
 
-char *session_bus_path(Session *s);
-
 SessionState session_get_state(Session *u);
 
-extern const DBusObjectPathVTable bus_session_vtable;
+extern const sd_bus_vtable session_vtable[];
+int session_node_enumerator(sd_bus *bus, const char *path,void *userdata, char ***nodes, sd_bus_error *error);
+int session_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
+char *session_bus_path(Session *s);
 
 int session_send_signal(Session *s, bool new_session);
-int session_send_changed(Session *s, const char *properties);
+int session_send_changed(Session *s, const char *properties, ...) _sentinel_;
 int session_send_lock(Session *s, bool lock);
 int session_send_lock_all(Manager *m, bool lock);
 
-int session_send_create_reply(Session *s, DBusError *error);
+int session_send_create_reply(Session *s, sd_bus_error *error);
 
 const char* session_state_to_string(SessionState t) _const_;
 SessionState session_state_from_string(const char *s) _pure_;
@@ -153,3 +163,10 @@ SessionClass session_class_from_string(const char *s) _pure_;
 
 const char *kill_who_to_string(KillWho k) _const_;
 KillWho kill_who_from_string(const char *s) _pure_;
+
+void session_mute_vt(Session *s);
+void session_restore_vt(Session *s);
+
+bool session_is_controller(Session *s, const char *sender);
+int session_set_controller(Session *s, const char *sender, bool force);
+void session_drop_controller(Session *s);