Remove menu plugins because they are stupid and don't work.

[chaz/openbox] / openbox / screen.h

diff --git a/openbox/screen.h b/openbox/screen.h
index 1c0a4f7704df918b41c3682362e7aaba88866857..21d05e474534dee9f4742c6486c9793e26d9a6d9 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -2,6 +2,7 @@
 #define __screen_h
 
 #include "geom.h"
+#include "client.h"
 
 struct Client;
 
@@ -9,6 +10,8 @@ struct Client;
 
 /*! The number of available desktops */
 extern guint screen_num_desktops;
+/*! The number of virtual "xinerama" screens/heads */
+extern guint screen_num_xin_areas;
 /*! The current desktop */
 extern guint screen_desktop;
 /*! The size of the screen */
@@ -18,20 +21,20 @@ extern gboolean screen_showing_desktop;
 
 /*! Orientation of the desktops */
 typedef enum {
-    Orientation_Horz,
-    Orientation_Vert
+    Orientation_Horz = 0,
+    Orientation_Vert = 1
 } Orientation;
 
 typedef struct DesktopLayout {
-    guint orientation;
-    guint start_corner;
+    Orientation orientation;
+    Corner start_corner;
     guint rows;
     guint columns;
 } DesktopLayout;
 extern DesktopLayout screen_desktop_layout;
 
 /*! An array of gchar*'s which are desktop names in UTF-8 format */
-extern GPtrArray *screen_desktop_names;
+extern char **screen_desktop_names;
 
 /*! Take over the screen, set the basic hints on it claming it as ours */
 gboolean screen_annex();
@@ -42,7 +45,7 @@ void screen_startup();
 void screen_shutdown();
 
 /*! Figure out the new size of the screen and adjust stuff for it */
-void screen_resize();
+void screen_resize(int w, int h);
 
 /*! Change the number of available desktops */
 void screen_set_num_desktops(guint num);
@@ -63,10 +66,14 @@ void screen_update_desktop_names();
   it handles the root colormap. */
 void screen_install_colormap(struct Client *client, gboolean install);
 
-void screen_update_struts();
+void screen_update_areas();
+
+Rect *screen_physical_area();
+
+Rect *screen_physical_area_xinerama(guint head);
 
 Rect *screen_area(guint desktop);
 
-Strut *screen_strut(guint desktop);
+Rect *screen_area_xinerama(guint desktop, guint head);
 
 #endif