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 42e3dc17f22766d8876f5b0c213268080768e27a..1d119ac8bada07657a5e11bab6785f7e60472715 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -1,10 +1,11 @@
 #ifndef __screen_h
 #define __screen_h
 
+#include "misc.h"
 #include "geom.h"
 #include "client.h"
 
-struct Client;
+struct _ObClient;
 
 #define DESKTOP_ALL (0xffffffff)
 
@@ -17,15 +18,9 @@ extern guint screen_desktop;
 /*! 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;
@@ -62,7 +57,7 @@ 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();