prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / screen.h

diff --git a/openbox/screen.h b/openbox/screen.h
index 21d05e474534dee9f4742c6486c9793e26d9a6d9..4df32be10dbf0a7afe4c4f357a73f697b81ac287 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -1,33 +1,25 @@
 #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_xin_areas;
+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 = 0,
-    Orientation_Vert = 1
-} Orientation;
-
 typedef struct DesktopLayout {
-    Orientation orientation;
-    Corner start_corner;
+    ObOrientation orientation;
+    ObCorner start_corner;
     guint rows;
     guint columns;
 } DesktopLayout;
@@ -45,7 +37,7 @@ void screen_startup();
 void screen_shutdown();
 
 /*! Figure out the new size of the screen and adjust stuff for it */
-void screen_resize(int w, int h);
+void screen_resize();
 
 /*! Change the number of available desktops */
 void screen_set_num_desktops(guint num);
@@ -64,16 +56,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();
 
-Rect *screen_physical_area_xinerama(guint head);
+Rect *screen_physical_area_monitor(guint head);
 
 Rect *screen_area(guint desktop);
 
-Rect *screen_area_xinerama(guint desktop, guint head);
+Rect *screen_area_monitor(guint desktop, guint head);
 
 #endif