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=9fb0188a8478ee16086e2622c61f4a38246b18b2;hp=f7a9dbc24932c77dff1724e26fc38a7afa8f528c;hb=e9e74f28d783a052dce7edfa94d7918bb591ba7a;hpb=f00c31213a2e521680c2381ef231f05e30c874a7

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index f7a9dbc24..9fb0188a8 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -54,10 +54,15 @@ typedef enum SessionType {
         SESSION_UNSPECIFIED,
         SESSION_TTY,
         SESSION_X11,
+        SESSION_WAYLAND,
+        SESSION_MIR,
+        SESSION_WEB,
         _SESSION_TYPE_MAX,
         _SESSION_TYPE_INVALID = -1
 } SessionType;
 
+#define SESSION_TYPE_IS_GRAPHICAL(type) IN_SET(type, SESSION_X11, SESSION_WAYLAND, SESSION_MIR)
+
 enum KillWho {
         KILL_LEADER,
         KILL_ALL,
@@ -68,7 +73,8 @@ enum KillWho {
 struct Session {
         Manager *manager;
 
-        char *id;
+        const char *id;
+        unsigned int pos;
         SessionType type;
         SessionClass class;
 
@@ -85,12 +91,14 @@ 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;
 
         pid_t leader;
         uint32_t audit_id;
@@ -105,10 +113,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 +138,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);
@@ -162,6 +172,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_;
 
+int session_prepare_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);