From 9c0b51cd5df342aa96048948d42323df6e6d3dc0 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 20 Sep 2007 08:21:59 +0000 Subject: Wrap next/prev. --- session.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'session.c') diff --git a/session.c b/session.c index 79e394d2..463bc040 100644 --- a/session.c +++ b/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.7 2007-08-27 20:36:52 nicm Exp $ */ +/* $Id: session.c,v 1.8 2007-09-20 08:21:59 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -155,13 +155,19 @@ int session_next(struct session *s) { struct window *w; + u_int n; if (s->window == NULL) return (-1); w = window_next(&s->windows, s->window); - if (w == NULL) - return (-1); + if (w == NULL) { + n = 0; + while ((w = ARRAY_ITEM(&s->windows, n)) == NULL) + n++; + if (w == s->window) + return (1); + } s->window = w; return (0); } @@ -176,8 +182,11 @@ session_previous(struct session *s) return (-1); w = window_previous(&s->windows, s->window); - if (w == NULL) - return (-1); + if (w == NULL) { + w = ARRAY_LAST(&s->windows); + if (w == s->window) + return (1); + } s->window = w; return (0); } -- cgit