diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-11-15 23:21:53 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-11-15 23:21:53 +0000 |
| commit | d02f3d6cd1813b6f4e6b1df20d109d4b69e08c96 (patch) | |
| tree | b7a6723343af3d2b29301137710a298409ae88cb /usr.bin | |
| parent | 602f7427acffff822aef52008f38d3af8430a91b (diff) | |
Add a pane_index format string and use it, from Ben Boeckel.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-list-panes.c | 8 | ||||
| -rw-r--r-- | usr.bin/tmux/format.c | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-list-panes.c b/usr.bin/tmux/cmd-list-panes.c index 7b7e06dedec..10ffd86234d 100644 --- a/usr.bin/tmux/cmd-list-panes.c +++ b/usr.bin/tmux/cmd-list-panes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-panes.c,v 1.12 2011/08/26 10:53:16 nicm Exp $ */ +/* $OpenBSD: cmd-list-panes.c,v 1.13 2011/11/15 23:21:52 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -102,21 +102,21 @@ cmd_list_panes_window(struct cmd *self, if (template == NULL) { switch (type) { case 0: - template = "#{line}: " + template = "#{pane_index}: " "[#{pane_width}x#{pane_height}] [history " "#{history_size}/#{history_limit}, " "#{history_bytes} bytes] #{pane_id}" "#{?pane_active, (active),}#{?pane_dead, (dead),}"; break; case 1: - template = "#{window_index}.#{line}: " + template = "#{window_index}.#{pane_index}: " "[#{pane_width}x#{pane_height}] [history " "#{history_size}/#{history_limit}, " "#{history_bytes} bytes] #{pane_id}" "#{?pane_active, (active),}#{?pane_dead, (dead),}"; break; case 2: - template = "#{session_name}:#{window_index}.#{line}: " + template = "#{session_name}:#{window_index}.#{pane_index}: " "[#{pane_width}x#{pane_height}] [history " "#{history_size}/#{history_limit}, " "#{history_bytes} bytes] #{pane_id}" diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index 304359f0dc0..b08a9489b8d 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.3 2011/10/23 01:12:46 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.4 2011/11/15 23:21:52 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net> @@ -361,6 +361,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp) struct grid_line *gl; unsigned long long size; u_int i; + u_int idx; size = 0; for (i = 0; i < gd->hsize; i++) { @@ -370,9 +371,13 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp) } size += gd->hsize * sizeof *gd->linedata; + if (window_pane_index(wp, &idx) != 0) + fatalx("index not found"); + format_add(ft, "pane_width", "%u", wp->sx); format_add(ft, "pane_height", "%u", wp->sy); format_add(ft, "pane_title", "%s", wp->base.title); + format_add(ft, "pane_index", "%u", idx); format_add(ft, "history_size", "%u", gd->hsize); format_add(ft, "history_limit", "%u", gd->hlimit); format_add(ft, "history_bytes", "%llu", size); |