X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-session.h;h=c9af5ebe0d58a96b84cd6ba4e21d16950a885086;hb=22fdeadcc06e95fe41ac4de872ec245c0887547f;hp=bcbd4e56250931202d96b87b23f357212e62efd9;hpb=cc3773810855956bad92337cee8fa193584ab62e;p=elogind.git

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index bcbd4e562..c9af5ebe0 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -54,6 +54,7 @@ typedef enum SessionType {
         SESSION_UNSPECIFIED,
         SESSION_TTY,
         SESSION_X11,
+        SESSION_WAYLAND,
         _SESSION_TYPE_MAX,
         _SESSION_TYPE_INVALID = -1
 } SessionType;
@@ -69,6 +70,7 @@ struct Session {
         Manager *manager;
 
         char *id;
+        unsigned int pos;
         SessionType type;
         SessionClass class;
 
@@ -85,12 +87,15 @@ struct Session {
         char *remote_user;
         char *remote_host;
         char *service;
+        char *desktop;
 
         char *scope;
         char *scope_job;
 
-        int vtnr;
         Seat *seat;
+        unsigned int vtnr;
+        int vtfd;
+        sd_event_source *vt_source;
 
         pid_t leader;
         uint32_t audit_id;
@@ -105,10 +110,12 @@ struct Session {
 
         bool in_gc_queue:1;
         bool started:1;
-        bool closing:1;
+        bool stopping:1;
 
         sd_bus_message *create_message;
 
+        sd_event_source *timer_event_source;
+
         char *controller;
         Hashmap *devices;
 
@@ -128,10 +135,10 @@ bool session_is_active(Session *s);
 int session_get_idle_hint(Session *s, dual_timestamp *t);
 void session_set_idle_hint(Session *s, bool b);
 int session_create_fifo(Session *s);
-void session_remove_fifo(Session *s);
 int session_start(Session *s);
-int session_stop(Session *s);
+int session_stop(Session *s, bool force);
 int session_finalize(Session *s);
+void session_release(Session *s);
 int session_save(Session *s);
 int session_load(Session *s);
 int session_kill(Session *s, KillWho who, int signo);
@@ -139,8 +146,8 @@ int session_kill(Session *s, KillWho who, int signo);
 SessionState session_get_state(Session *u);
 
 extern const sd_bus_vtable session_vtable[];
-int session_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
-int session_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata);
+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);
@@ -162,6 +169,9 @@ 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);