From a50dcb09b56f6ee673d7a90c2682738cb884ba99 Mon Sep 17 00:00:00 2001 From: Nicolas Viennot Date: Thu, 13 Jun 2013 04:31:25 -0400 Subject: Notification messages --- tmate-decoder.c | 11 +++++------ tmate-msg.c | 2 +- tmate.h | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tmate-decoder.c b/tmate-decoder.c index e18e6184..3e780dc5 100644 --- a/tmate-decoder.c +++ b/tmate-decoder.c @@ -74,12 +74,11 @@ static char *unpack_string(struct tmate_unpacker *uk) return alloc_buf; } -static void tmate_reply_header(struct tmate_unpacker *uk) +static void tmate_notify(struct tmate_unpacker *uk) { - unsigned long flags = unpack_int(uk); - char *remote_session = unpack_string(uk); - - tmate_status_message("Remote session: %s", remote_session); + char *msg = unpack_string(uk); + tmate_status_message("%s", msg); + free(msg); } static void tmate_client_pane_key(struct tmate_unpacker *uk) @@ -157,7 +156,7 @@ static void handle_message(msgpack_object obj) init_unpacker(uk, obj); switch (unpack_int(uk)) { - case TMATE_REPLY_HEADER: tmate_reply_header(uk); break; + case TMATE_NOTIFY: tmate_notify(uk); break; case TMATE_CLIENT_PANE_KEY: tmate_client_pane_key(uk); break; case TMATE_CLIENT_RESIZE: tmate_client_resize(uk); break; case TMATE_CLIENT_EXEC_CMD: tmate_client_exec_cmd(uk); break; diff --git a/tmate-msg.c b/tmate-msg.c index 7fe0c0b8..2ab663f6 100644 --- a/tmate-msg.c +++ b/tmate-msg.c @@ -16,7 +16,7 @@ static void tmate_status_message_client(struct client *c, const char *message) status_prompt_clear(c); status_message_clear(c); - xasprintf(&c->message_string, "tmate: %s", message); + xasprintf(&c->message_string, "[tmate] %s", message); ARRAY_EXPAND(&c->message_log, 1); msg = &ARRAY_LAST(&c->message_log); diff --git a/tmate.h b/tmate.h index 9030c90e..63cbb4b6 100644 --- a/tmate.h +++ b/tmate.h @@ -48,7 +48,7 @@ extern void tmate_sync_copy_mode(struct window_pane *wp); /* tmate-decoder.c */ enum tmate_client_commands { - TMATE_REPLY_HEADER, + TMATE_NOTIFY, TMATE_CLIENT_PANE_KEY, TMATE_CLIENT_RESIZE, TMATE_CLIENT_EXEC_CMD, -- cgit v1.2.3