The branch, master has been updated
via 57eb334d5b989642c84b974908c43c729983d1b8 (commit)
via 5f904aa35002246ee1005e3849455ccbdc321781 (commit)
from ee0f8adfac76cdf21cfd2c0b503d8d66dcb883cc (commit)
- Log -----------------------------------------------------------------
commit 57eb334d5b989642c84b974908c43c729983d1b8
Merge: 5f904aa ee0f8ad
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Makefile.am | 4 +++-
cmd-break-pane.c | 2 +-
cmd-command-prompt.c | 2 +-
cmd-confirm-before.c | 2 +-
cmd-detach-client.c | 2 +-
cmd-display-message.c | 6 ++----
cmd-display-panes.c | 2 +-
cmd-lock-server.c | 2 +-
cmd-new-window.c | 2 +-
cmd-pipe-pane.c | 2 +-
cmd-refresh-client.c | 2 +-
cmd-show-messages.c | 2 +-
cmd-split-window.c | 2 +-
cmd-suspend-client.c | 2 +-
cmd-switch-client.c | 2 +-
cmd.c | 12 ++++++++----
server-client.c | 23 +++++++++++++++++------
tmux.h | 6 +++++-
tty-keys.c | 13 +++++++++++++
tty.c | 4 ++--
20 files changed, 63 insertions(+), 31 deletions(-)
commit 5f904aa35002246ee1005e3849455ccbdc321781
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Add pane_tags format to format_window_pane based on code from George
Nachman.
---
format.c | 30 ++++++++++++++++++++++++++++--
tmux.1 | 1 +
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/format.c b/format.c
index 993728c..2ad936b 100644
--- a/format.c
+++ b/format.c
@@ -32,8 +32,9 @@
* string.
*/
-int format_replace(struct format_tree *,
- const char *, size_t, char **, size_t *, size_t *);
+int format_replace(struct format_tree *, const char *, size_t, char **,
+ size_t *, size_t *);
+void format_window_pane_tabs(struct format_tree *, struct window_pane *);
/* Format key-value replacement entry. */
RB_GENERATE(format_tree, format_entry, entry, format_cmp);
@@ -367,6 +368,28 @@ format_winlink(struct format_tree *ft, struct session *s,
struct winlink *wl)
free(layout);
}
+/* Add window pane tabs. */
+void
+format_window_pane_tabs(struct format_tree *ft, struct window_pane *wp)
+{
+ struct evbuffer *buffer;
+ u_int i;
+
+ buffer = evbuffer_new();
+ for (i = 0; i < wp->base.grid->sx; i++) {
+ if (!bit_test(wp->base.tabs, i))
+ continue;
+
+ if (EVBUFFER_LENGTH(buffer) > 0)
+ evbuffer_add(buffer, ",", 1);
+ evbuffer_add_printf(buffer, "%d", i);
+ }
+
+ format_add(ft, "pane_tabs", "%.*s", (int) EVBUFFER_LENGTH(buffer),
+ EVBUFFER_DATA(buffer));
+ evbuffer_free(buffer);
+}
+
/* Set default format keys for a window pane. */
void
format_window_pane(struct format_tree *ft, struct window_pane *wp)
@@ -444,8 +467,11 @@ format_window_pane(struct format_tree *ft, struct
window_pane *wp)
!!(wp->base.mode & MODE_MOUSE_ANY));
format_add(ft, "mouse_utf8_flag", "%d",
!!(wp->base.mode & MODE_MOUSE_UTF8));
+
+ format_window_pane_tabs(ft, wp);
}
+/* Set default format keys for paste buffer. */
void
format_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
{
diff --git a/tmux.1 b/tmux.1
index 475bac0..882a71f 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3037,6 +3037,7 @@ The following variables are available, where appropriate:
.It Li "pane_pid" Ta "PID of first process in pane"
.It Li "pane_start_command" Ta "Command pane started with"
.It Li "pane_start_path" Ta "Path pane started with"
+.It Li "pane_tabs" Ta "Pane tab positions"
.It Li "pane_title" Ta "Title of pane"
.It Li "pane_tty" Ta "Pseudo terminal of pane"
.It Li "pane_width" Ta "Width of pane"
-----------------------------------------------------------------------
Summary of changes:
format.c | 30 ++++++++++++++++++++++++++++--
tmux.1 | 1 +
2 files changed, 29 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
