prefixing and capitalization for the Frame->ObFrame struct and the Context->ObFrameCo...

[chaz/openbox] / openbox / screen.h

diff --git a/openbox/screen.h b/openbox/screen.h
index 1c0a4f7704df918b41c3682362e7aaba88866857..1d119ac8bada07657a5e11bab6785f7e60472715 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -1,37 +1,33 @@
 #ifndef __screen_h
 #define __screen_h
 
+#include "misc.h"
 #include "geom.h"
+#include "client.h"
 
-struct Client;
+struct _ObClient;
 
 #define DESKTOP_ALL (0xffffffff)
 
 /*! The number of available desktops */
 extern guint screen_num_desktops;
+/*! The number of virtual "xinerama" screens/heads */
+extern guint screen_num_monitors;
 /*! The current desktop */
 extern guint screen_desktop;
-/*! The size of the screen */
-extern Size  screen_physical_size;
 /*! Are we in showing-desktop mode? */
 extern gboolean screen_showing_desktop;
 
-/*! Orientation of the desktops */
-typedef enum {
-    Orientation_Horz,
-    Orientation_Vert
-} Orientation;
-
 typedef struct DesktopLayout {
-    guint orientation;
-    guint start_corner;
+    ObOrientation orientation;
+    ObCorner 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();
@@ -61,12 +57,16 @@ void screen_update_desktop_names();
 
 /*! Installs or uninstalls a colormap for a client. If client is NULL, then
   it handles the root colormap. */
-void screen_install_colormap(struct Client *client, gboolean install);
+void screen_install_colormap(struct _ObClient *client, gboolean install);
+
+void screen_update_areas();
+
+Rect *screen_physical_area();
 
-void screen_update_struts();
+Rect *screen_physical_area_monitor(guint head);
 
 Rect *screen_area(guint desktop);
 
-Strut *screen_strut(guint desktop);
+Rect *screen_area_monitor(guint desktop, guint head);
 
 #endif