Applied, thanks.
On Fri, Nov 11, 2011 at 05:12:36PM -0500, Ben Boeckel wrote:
> On Sat, Nov 05, 2011 at 09:03:03 +0000, Nicholas Marriott wrote:
> > - -F pane_index, need the latest version.
>
> Attached. They apply on top of the window_pane_index fix.
>
> --Ben
> From eda10065bbcc951ce4df8cc86979b0ae0262d0b6 Mon Sep 17 00:00:00 2001
> From: Ben Boeckel <maths...@gmail.com>
> Date: Fri, 11 Nov 2011 17:10:04 -0500
> Subject: [PATCH 1/2] Implement the pane_index format string
>
> ---
> trunk/format.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/trunk/format.c b/trunk/format.c
> index 74df2ab..713c952 100644
> --- a/trunk/format.c
> +++ b/trunk/format.c
> @@ -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);
> --
> 1.7.6.4
>
> From 10c603b9c44649cfe1593ddb9fbe7fc7141a1f6b Mon Sep 17 00:00:00 2001
> From: Ben Boeckel <maths...@gmail.com>
> Date: Wed, 19 Oct 2011 17:39:31 -0400
> Subject: [PATCH 2/2] Use the pane_index format string
>
> ---
> trunk/cmd-list-panes.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/trunk/cmd-list-panes.c b/trunk/cmd-list-panes.c
> index 723c703..7331abd 100644
> --- a/trunk/cmd-list-panes.c
> +++ b/trunk/cmd-list-panes.c
> @@ -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}"
> --
> 1.7.6.4
>
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
