From df84a1c16844c0eaebe12dd0e606d5b2c478c478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 7 Apr 2016 17:54:12 +0200 Subject: vis: cleanup window focusing code --- vis.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'vis.c') diff --git a/vis.c b/vis.c index d2d0c2f..e1f14ff 100644 --- a/vis.c +++ b/vis.c @@ -226,24 +226,29 @@ bool vis_window_split(Win *original) { return true; } +void vis_window_focus(Win *win) { + if (!win) + return; + Vis *vis = win->vis; + vis->win = win; + vis->ui->window_focus(win->ui); +} + void vis_window_next(Vis *vis) { Win *sel = vis->win; if (!sel) return; - vis->win = vis->win->next; - if (!vis->win) - vis->win = vis->windows; - vis->ui->window_focus(vis->win->ui); + vis_window_focus(sel->next ? sel->next : vis->windows); } void vis_window_prev(Vis *vis) { Win *sel = vis->win; if (!sel) return; - vis->win = vis->win->prev; - if (!vis->win) - for (vis->win = vis->windows; vis->win->next; vis->win = vis->win->next); - vis->ui->window_focus(vis->win->ui); + sel = sel->prev; + if (!sel) + for (sel = vis->windows; sel->next; sel = sel->next); + vis_window_focus(sel); } void vis_draw(Vis *vis) { -- cgit v1.2.3