bugfix

[chaz/openbox] / openbox / screen.h

diff --git a/openbox/screen.h b/openbox/screen.h
index a694f66349cf4ac16d528f622bfaaad25ff56ea6..d6435fef12e93c630f8162e7ea517d529afb1a67 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -41,19 +41,19 @@ extern Window screen_support_win;
 /*! The last time at which the user changed desktops */
 extern Time screen_desktop_user_time;
 
-typedef struct DesktopLayout {
+typedef struct ObDesktopLayout {
     ObOrientation orientation;
     ObCorner start_corner;
     guint rows;
     guint columns;
-} DesktopLayout;
-extern DesktopLayout screen_desktop_layout;
+} ObDesktopLayout;
+extern ObDesktopLayout screen_desktop_layout;
 
 /*! An array of gchar*'s which are desktop names in UTF-8 format */
 extern gchar **screen_desktop_names;
 
 /*! Take over the screen, set the basic hints on it claming it as ours */
-gboolean screen_annex(const gchar *program_name);
+gboolean screen_annex();
 
 /*! Once the screen is ours, set up its initial state */
 void screen_startup(gboolean reconfig);
@@ -98,13 +98,16 @@ Rect *screen_physical_area();
 
 Rect *screen_physical_area_monitor(guint head);
 
-Rect *screen_area(guint desktop);
+Rect *screen_physical_area_monitor_active();
 
-Rect *screen_area_monitor(guint desktop, guint head);
+Rect *screen_area(guint desktop, Rect *search);
+
+Rect *screen_area_monitor(guint desktop, guint head, Rect *search);
 
 /*! Determines which physical monitor a rectangle is on by calculating the
     area of the part of the rectable on each monitor.  The number of the
-    monitor containing the greatest area of the rectangle is returned.*/
+    monitor containing the greatest area of the rectangle is returned.
+*/
 guint screen_find_monitor(Rect *search);
 
 /*! Sets the root cursor. This function decides which cursor to use, but you