Use the nearest monitor when the search query rect does not intersect any monitor (Fix bug 5500) Previously we would try to find the primary monitor and use that when the search was outside any monitor. However, if the primary monitor is chosen by the mouse position and the mouse is not inside any monitor, we enter infinite recursion trying to find the primary monitor. The nearest monitor is a better metric anyhow, and this ensures screen_find_monitor() is never recursive as it always returns a value without depending on other screen.c methods.
Dana Jansens danakj@orodu.net
2 files changed,
42 insertions(+),
6 deletions(-)
M
openbox/geom.h
→
openbox/geom.h
@@ -104,6 +104,25 @@ (b).x + (b).width - 1) - (r).x + 1, \
(r).height = MIN((a).y + (a).height - 1, \ (b).y + (b).height - 1) - (r).y + 1) +/* Returns the shortest manhatten distance between two rects, or 0 if they + intersect. */ +static inline gint rect_manhatten_distance(Rect r, Rect o) +{ + if (RECT_INTERSECTS_RECT(r, o)) + return 0; + + gint min_distance = G_MAXINT; + if (RECT_RIGHT(o) < RECT_LEFT(r)) + min_distance = MIN(min_distance, RECT_LEFT(r) - RECT_RIGHT(o)); + if (RECT_LEFT(o) > RECT_RIGHT(r)) + min_distance = MIN(min_distance, RECT_LEFT(o) - RECT_RIGHT(r)); + if (RECT_BOTTOM(o) < RECT_TOP(r)) + min_distance = MIN(min_distance, RECT_TOP(r) - RECT_BOTTOM(o)); + if (RECT_TOP(o) > RECT_BOTTOM(r)) + min_distance = MIN(min_distance, RECT_TOP(o) - RECT_BOTTOM(r)); + return min_distance; +} + typedef struct _Strut { int left; int top;
M
openbox/screen.c
→
openbox/screen.c
@@ -1644,8 +1644,10 @@
guint screen_find_monitor(const Rect *search) { guint i; - guint most = screen_num_monitors; + guint mostpx_index = screen_num_monitors; guint mostpx = 0; + guint closest_distance_index = screen_num_monitors; + guint closest_distance = G_MAXUINT; GSList *counted = NULL; /* we want to count the number of pixels search has on each monitor, but not@@ -1686,7 +1688,7 @@ area = RECT_AREA(on_current_monitor);
if (area > mostpx) { mostpx = area; - most = config_primary_monitor_index; + mostpx_index = config_primary_monitor_index; } /* add the intersection rect on the current monitor to the@@ -1709,10 +1711,21 @@ GSList *it;
monitor = screen_physical_area_monitor(i); + if (!RECT_INTERSECTS_RECT(*monitor, *search)) { + /* If we don't intersect then find the distance between the search + rect and the monitor. We'll use the closest monitor from this + metric if none of the monitors intersect. */ + guint distance = rect_manhatten_distance(*monitor, *search); + + if (distance < closest_distance) { + closest_distance = distance; + closest_distance_index = i; + } + continue; + } + if (i == config_primary_monitor_index) continue; /* already did this one */ - if (!RECT_INTERSECTS_RECT(*monitor, *search)) - continue; /* nothing to see here */ RECT_SET_INTERSECTION(on_current_monitor, *monitor, *search); area = RECT_AREA(on_current_monitor);@@ -1729,7 +1742,7 @@ }
if (area > mostpx) { mostpx = area; - most = i; + mostpx_index = i; } /* add the intersection rect on the current monitor I to the counted@@ -1765,7 +1778,11 @@ g_slice_free(RectArithmetic, counted->data);
counted = g_slist_delete_link(counted, counted); } - return most < screen_num_monitors ? most : screen_monitor_primary(FALSE); + if (mostpx_index < screen_num_monitors) + return mostpx_index; + + g_assert(closest_distance_index < screen_num_monitors); + return closest_distance_index; } const Rect* screen_physical_area_all_monitors(void)