Merge branch 'master' into chaz

[chaz/openbox] / openbox / session.h

diff --git a/openbox/session.h b/openbox/session.h
index 8663fce2973110d34688312ac1c5529b03d1307c..8cfcb8e71b3c68458d979811145b3daae50dc8c9 100644 (file)
--- a/openbox/session.h
+++ b/openbox/session.h
@@ -19,19 +19,22 @@
 #ifndef __ob__session_h
 #define __ob__session_h
 
-#include <glib.h>
+#include "client.h"
+#include "screen.h"
 
-struct _ObClient;
+#include <glib.h>
 
 typedef struct _ObSessionState ObSessionState;
 
 struct _ObSessionState {
     gchar *id, *command, *name, *class, *role;
+    ObClientType type;
     guint desktop;
     gint x, y, w, h;
     gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen;
     gboolean above, below, max_horz, max_vert, undecorated;
     gboolean focused;
+    guint8 opacity;
 
     gboolean matched;
 };
@@ -39,6 +42,10 @@ struct _ObSessionState {
 /*! The desktop being viewed when the session was saved. A valud of -1 means
   it was not saved */
 extern gint session_desktop;
+extern gint session_num_desktops;
+extern gboolean session_desktop_layout_present;
+extern ObDesktopLayout session_desktop_layout;
+extern GSList *session_desktop_names;
 
 extern GList *session_saved_state;
 
@@ -47,4 +54,8 @@ void session_shutdown(gboolean permanent);
 
 GList* session_state_find(struct _ObClient *c);
 
+void session_request_logout(gboolean silent);
+
+gboolean session_connected(void);
+
 #endif