From dbe44e48c8b0434565fa9322fda4d493b0ae25ba Mon Sep 17 00:00:00 2001 From: Leonardo Hernández Hernández Date: Fri, 30 Dec 2022 14:31:56 -0600 Subject: return early if selmon is not part of the output layout in dirtomon() instead of checking twice --- dwl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dwl.c b/dwl.c index 1f0db88..19bb6ce 100644 --- a/dwl.c +++ b/dwl.c @@ -1168,12 +1168,12 @@ Monitor * dirtomon(enum wlr_direction dir) { struct wlr_output *next; - if (wlr_output_layout_get(output_layout, selmon->wlr_output) - && (next = wlr_output_layout_adjacent_output(output_layout, + if (!wlr_output_layout_get(output_layout, selmon->wlr_output)) + return selmon; + if ((next = wlr_output_layout_adjacent_output(output_layout, dir, selmon->wlr_output, selmon->m.x, selmon->m.y))) return next->data; - if (wlr_output_layout_get(output_layout, selmon->wlr_output) - && (next = wlr_output_layout_farthest_output(output_layout, + if ((next = wlr_output_layout_farthest_output(output_layout, dir ^ (WLR_DIRECTION_LEFT|WLR_DIRECTION_RIGHT), selmon->wlr_output, selmon->m.x, selmon->m.y))) return next->data; -- cgit v1.2.3