aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-11-25 13:30:45 +0000
committerTiago Cunha <tcunha@gmx.com>2011-11-25 13:30:45 +0000
commit9ec457575d0db6450d8a436426b4a705c49285aa (patch)
tree8347c9f9f85bab98096f56fbcfb48df496592158 /window.c
parent398af28d2a5a8a0e6fad0ecd8289a987fbf963f8 (diff)
downloadrtmux-9ec457575d0db6450d8a436426b4a705c49285aa.tar.gz
rtmux-9ec457575d0db6450d8a436426b4a705c49285aa.tar.bz2
rtmux-9ec457575d0db6450d8a436426b4a705c49285aa.zip
Sync OpenBSD patchset 979:
Make window_pane_index work the same as window_index, from Ben Boeckel.
Diffstat (limited to 'window.c')
-rw-r--r--window.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/window.c b/window.c
index 8b82c06e..e170dd27 100644
--- a/window.c
+++ b/window.c
@@ -483,19 +483,21 @@ window_pane_previous_by_number(struct window *w, struct window_pane *wp,
return (wp);
}
-u_int
-window_pane_index(struct window *w, struct window_pane *wp)
+int
+window_pane_index(struct window_pane *wp, u_int *i)
{
struct window_pane *wq;
- u_int n;
+ struct window *w = wp->window;
- n = options_get_number(&w->options, "pane-base-index");
+ *i = options_get_number(&w->options, "pane-base-index");
TAILQ_FOREACH(wq, &w->panes, entry) {
- if (wp == wq)
- break;
- n++;
+ if (wp == wq) {
+ return (0);
+ }
+ (*i)++;
}
- return (n);
+
+ return (-1);
}
u_int