Make pane/window wrapping more logical (so with 10 windows, +10 from

window 5 stays in the same place), and tidy the code. From Tiago Cunha.

1 files changed, 27 insertions, 4 deletions

diff --git a/window.c b/window.c
index 320da2a2..70596284 100644
--- a/window.c
+++ b/window.c
@@ -173,22 +173,22 @@ winlink_previous(struct winlink *wl)
 }
 
 struct winlink *
-winlink_next_by_number(struct winlink *wl, int n)
+winlink_next_by_number(struct winlink *wl, struct session *s, int n)
 {
 	for (; n > 0; n--) {
 		if ((wl = RB_NEXT(winlinks, wwl, wl)) == NULL)
-			break;
+			wl = RB_MIN(winlinks, &s->windows);
 	}
 
 	return (wl);
 }
 
 struct winlink *
-winlink_previous_by_number(struct winlink *wl, int n)
+winlink_previous_by_number(struct winlink *wl, struct session *s, int n)
 {
 	for (; n > 0; n--) {
 		if ((wl = RB_PREV(winlinks, wwl, wl)) == NULL)
-			break;
+			wl = RB_MAX(winlinks, &s->windows);
 	}
 
 	return (wl);
@@ -391,6 +391,29 @@ window_pane_at_index(struct window *w, u_int idx)
 	return (NULL);
 }
 
+struct window_pane *
+window_pane_next_by_number(struct window *w, struct window_pane *wp, u_int n)
+{
+	for (; n > 0; n--) {
+		if ((wp = TAILQ_NEXT(wp, entry)) == NULL)
+			wp = TAILQ_FIRST(&w->panes);
+	}
+
+	return (wp);
+}
+
+struct window_pane *
+window_pane_previous_by_number(struct window *w, struct window_pane *wp,
+    u_int n)
+{
+	for (; n > 0; n--) {
+		if ((wp = TAILQ_PREV(wp, window_panes, entry)) == NULL)
+			wp = TAILQ_LAST(&w->panes, window_panes);
+	}
+
+	return (wp);
+}
+
 u_int
 window_pane_index(struct window *w, struct window_pane *wp)
 {