diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
| commit | acafa38c8ea210b12ed92fc16281b915ab61542c (patch) | |
| tree | ce4c7d2a4a9b3478a4d48af2c54ada06593ed022 /openbox/screen.h | |
| parent | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff) | |
| parent | 9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
Diffstat (limited to 'openbox/screen.h')
| -rw-r--r-- | openbox/screen.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/openbox/screen.h b/openbox/screen.h index 11915f11..1479db16 100644 --- 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 |