combine the old focus cycle popup code with mika's new list-mode popup, and make...

[chaz/openbox] / openbox / session.h

diff --git a/openbox/session.h b/openbox/session.h
index cbfd517774df74f74b9f30664f875a49fc6dc6d9..b4ce6d917a156c775c02ce72f832fcec0cf8a3eb 100644 (file)
--- a/openbox/session.h
+++ b/openbox/session.h
@@ -19,14 +19,16 @@
 #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, *name, *class, *role;
+    gchar *id, *command, *name, *class, *role;
+    ObClientType type;
     guint desktop;
     gint x, y, w, h;
     gboolean shaded, iconic, skip_pager, skip_taskbar, fullscreen;
@@ -39,6 +41,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;