rtnl: change from bitmask to enum for rtnl groups

[elogind.git] / src / login / logind-session.h

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index aab39b72e3594365b6675af09c550137bc6806f0..f78f30956d2ba9b1d05bc3834f696b2ab512664c 100644 (file)
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -54,6 +54,8 @@ typedef enum SessionType {
         SESSION_UNSPECIFIED,
         SESSION_TTY,
         SESSION_X11,
+        SESSION_WAYLAND,
+        SESSION_MIR,
         _SESSION_TYPE_MAX,
         _SESSION_TYPE_INVALID = -1
 } SessionType;
@@ -69,6 +71,7 @@ struct Session {
         Manager *manager;
 
         char *id;
+        unsigned int pos;
         SessionType type;
         SessionClass class;
 
@@ -85,12 +88,13 @@ struct Session {
         char *remote_user;
         char *remote_host;
         char *service;
+        char *desktop;
 
         char *scope;
         char *scope_job;
 
         Seat *seat;
-        int vtnr;
+        unsigned int vtnr;
         int vtfd;
         sd_event_source *vt_source;
 
@@ -107,10 +111,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;
 
@@ -130,10 +136,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);
@@ -164,7 +170,7 @@ 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_prepare_vt(Session *s);
 void session_restore_vt(Session *s);
 
 bool session_is_controller(Session *s, const char *sender);