The branch, master has been updated
via 4d38b6d1fab398b0af6d22281d0d4b35448524f7 (commit)
from 9e879b4aabc925fc1fbf02e25c331317a3881d17 (commit)
- Log -----------------------------------------------------------------
commit 4d38b6d1fab398b0af6d22281d0d4b35448524f7
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Include prefix on ids, from George Nachman.
---
control-notify.c | 20 ++++++++++----------
format.c | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/control-notify.c b/control-notify.c
index 42c1695..0931c23 100644
--- a/control-notify.c
+++ b/control-notify.c
@@ -45,7 +45,7 @@ control_notify_input(struct client *c, struct window_pane *wp,
*/
if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) {
message = evbuffer_new();
- evbuffer_add_printf(message, "%%output %u ", wp->id);
+ evbuffer_add_printf(message, "%%output %%%u ", wp->id);
for (i = 0; i < len; i++) {
if (buf[i] < ' ' || buf[i] == '\\')
evbuffer_add_printf(message, "\\%03o", buf[i]);
@@ -108,7 +108,7 @@ control_notify_window_unlinked(unused struct session *s,
struct window *w)
continue;
cs = c->session;
- control_write(c, "%%window-close %u", w->id);
+ control_write(c, "%%window-close @%u", w->id);
}
}
@@ -126,9 +126,9 @@ control_notify_window_linked(unused struct session *s,
struct window *w)
cs = c->session;
if (winlink_find_by_window_id(&cs->windows, w->id) != NULL)
- control_write(c, "%%window-add %u", w->id);
+ control_write(c, "%%window-add @%u", w->id);
else
- control_write(c, "%%unlinked-window-add %u", w->id);
+ control_write(c, "%%unlinked-window-add @%u", w->id);
}
}
@@ -145,7 +145,7 @@ control_notify_window_renamed(struct window *w)
continue;
s = c->session;
- control_write(c, "%%window-renamed %u %s", w->id, w->name);
+ control_write(c, "%%window-renamed @%u %s", w->id, w->name);
}
}
@@ -158,7 +158,7 @@ control_notify_attached_session_changed(struct client *c)
return;
s = c->session;
- control_write(c, "%%session-changed %u %s", s->id, s->name);
+ control_write(c, "%%session-changed $%u %s", s->id, s->name);
}
void
@@ -169,10 +169,10 @@ control_notify_session_renamed(struct session *s)
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session != s)
+ if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
continue;
- control_write(c, "%%session-renamed %s", s->name);
+ control_write(c, "%%session-renamed $%u %s", s->id, s->name);
}
}
@@ -184,7 +184,7 @@ control_notify_session_created(unused struct session *s)
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
+ if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
continue;
control_write(c, "%%sessions-changed");
@@ -199,7 +199,7 @@ control_notify_session_close(unused struct session *s)
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (!CONTROL_SHOULD_NOTIFY_CLIENT(c) || c->session == NULL)
+ if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
continue;
control_write(c, "%%sessions-changed");
diff --git a/format.c b/format.c
index 4d70d59..fa2dd0b 100644
--- a/format.c
+++ b/format.c
@@ -280,7 +280,7 @@ format_session(struct format_tree *ft, struct session *s)
format_add(ft, "session_windows", "%u", winlink_count(&s->windows));
format_add(ft, "session_width", "%u", s->sx);
format_add(ft, "session_height", "%u", s->sy);
- format_add(ft, "session_id", "%u", s->id);
+ format_add(ft, "session_id", "$%u", s->id);
sg = session_group_find(s);
format_add(ft, "session_grouped", "%d", sg != NULL);
-----------------------------------------------------------------------
Summary of changes:
control-notify.c | 20 ++++++++++----------
format.c | 2 +-
2 files changed, 11 insertions(+), 11 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_mar
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
