use gint

[chaz/openbox] / openbox / screen.h

diff --git a/openbox/screen.h b/openbox/screen.h
index 42e3dc17f22766d8876f5b0c213268080768e27a..7008854aa0bb8925c22d2c5634be1e1642200f76 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -1,10 +1,10 @@
 #ifndef __screen_h
 #define __screen_h
 
+#include "misc.h"
 #include "geom.h"
-#include "client.h"
 
-struct Client;
+struct _ObClient;
 
 #define DESKTOP_ALL (0xffffffff)
 
@@ -16,16 +16,12 @@ extern guint screen_num_monitors;
 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;
+/*! The support window also used for focus and stacking */
+extern Window screen_support_win;
 
 typedef struct DesktopLayout {
-    Orientation orientation;
-    Corner start_corner;
+    ObOrientation orientation;
+    ObCorner start_corner;
     guint rows;
     guint columns;
 } DesktopLayout;
@@ -62,7 +58,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();