Merge branch 'backport' into work

[chaz/openbox] / openbox / screen.h

diff --git a/openbox/screen.h b/openbox/screen.h
index 11915f11a78e4cc7d420a0bee1c79211af432365..1479db16a38dee947174497a53317231e68b1149 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -104,8 +104,17 @@ Rect *screen_physical_area_all_monitors(void);
 
 Rect *screen_physical_area_monitor(guint head);
 
+/*! Returns the monitor which contains the active window, or the one
+  containing the pointer otherwise. */
+guint screen_monitor_active(void);
+
 Rect *screen_physical_area_active(void);
 
+/*! Returns the primary monitor, as specified by the config */
+guint screen_monitor_primary(void);
+
+Rect *screen_physical_area_primary(void);
+
 /* doesn't include struts which the search area is already outside of when
    'search' is not NULL */
 #define SCREEN_AREA_ALL_MONITORS ((unsigned)-1)
@@ -133,4 +142,7 @@ void screen_set_root_cursor(void);
   is on this screen and FALSE if it is on another screen. */
 gboolean screen_pointer_pos(gint *x, gint *y);
 
+/*! Returns the monitor which contains the pointer device */
+guint screen_monitor_pointer(void);
+
 #endif