From 16bdd970dcc68e50f26c512b3ead628b9b899c88 Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 20 Jan 2015 08:18:04 +0000 Subject: Support blinking cursor mode, both the xterm CSI ?12 h/l and (the backwards) screen CSI 34 h/l. From Guanpeng Xu. --- tmux.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index aff664c0..c73b59ca 100644 --- a/tmux.h +++ b/tmux.h @@ -175,6 +175,7 @@ enum tty_code_code { TTYC_CUP, /* cursor_address, cm */ TTYC_CUU, /* parm_up_cursor, UP */ TTYC_CUU1, /* cursor_up, up */ + TTYC_CVVIS, /* cursor_visible, vs */ TTYC_DCH, /* parm_dch, DC */ TTYC_DCH1, /* delete_character, dc */ TTYC_DIM, /* enter_dim_mode, mh */ @@ -600,7 +601,7 @@ struct mode_key_table { #define MODE_WRAP 0x10 /* whether lines wrap */ #define MODE_MOUSE_STANDARD 0x20 #define MODE_MOUSE_BUTTON 0x40 -/* 0x80 unused */ +#define MODE_BLINKING 0x80 #define MODE_MOUSE_UTF8 0x100 #define MODE_MOUSE_SGR 0x200 #define MODE_BRACKETPASTE 0x400 -- cgit From c9642ee21367f0bf2b17b423d7155c88138aa9fc Mon Sep 17 00:00:00 2001 From: nicm Date: Sun, 1 Feb 2015 23:43:23 +0000 Subject: Remove two unused arguments from status_replace. --- tmux.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index c73b59ca..6b974698 100644 --- a/tmux.h +++ b/tmux.h @@ -1926,8 +1926,8 @@ void status_free_jobs(struct status_out_tree *); void status_update_jobs(struct client *); void status_set_window_at(struct client *, u_int); int status_redraw(struct client *); -char *status_replace(struct client *, struct session *, struct winlink *, - struct window_pane *, const char *, time_t, int); +char *status_replace(struct client *, struct winlink *, const char *, time_t, + int); void printflike(2, 3) status_message_set(struct client *, const char *, ...); void status_message_clear(struct client *); int status_message_redraw(struct client *); -- cgit From e5d9ceff18e37320b9243d24204a0a79d77172e4 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 5 Feb 2015 10:26:29 +0000 Subject: There is no need to save the guard state because the function checks it again anyway. --- tmux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index 6b974698..da8d3bfe 100644 --- a/tmux.h +++ b/tmux.h @@ -1832,7 +1832,7 @@ struct cmd_q *cmdq_new(struct client *); int cmdq_free(struct cmd_q *); void printflike(2, 3) cmdq_print(struct cmd_q *, const char *, ...); void printflike(2, 3) cmdq_error(struct cmd_q *, const char *, ...); -int cmdq_guard(struct cmd_q *, const char *, int); +void cmdq_guard(struct cmd_q *, const char *, int); void cmdq_run(struct cmd_q *, struct cmd_list *); void cmdq_append(struct cmd_q *, struct cmd_list *); int cmdq_continue(struct cmd_q *); -- cgit From 4946f74253de52f10beb023d4c5b88bafdb11ec4 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 5 Feb 2015 10:29:43 +0000 Subject: Wrap all the individual format_* calls in a single format_defaults functions. --- tmux.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index da8d3bfe..c9be497a 100644 --- a/tmux.h +++ b/tmux.h @@ -1513,14 +1513,12 @@ void printflike(3, 4) format_add(struct format_tree *, const char *, const char *, ...); const char *format_find(struct format_tree *, const char *); char *format_expand(struct format_tree *, const char *); -void format_session(struct format_tree *, struct session *); -void format_client(struct format_tree *, struct client *); -void format_window(struct format_tree *, struct window *); -void format_winlink(struct format_tree *, struct session *, - struct winlink *); -void format_window_pane(struct format_tree *, +void format_defaults(struct format_tree *, struct client *, + struct session *, struct winlink *, struct window_pane *); +void format_defaults_window(struct format_tree *, struct window *); +void format_defaults_pane(struct format_tree *, struct window_pane *); -void format_paste_buffer(struct format_tree *, +void format_defaults_paste_buffer(struct format_tree *, struct paste_buffer *, int); /* mode-key.c */ -- cgit From 03758a50dc21b7c77b75f689d06f81292266c20a Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 6 Feb 2015 17:11:39 +0000 Subject: Add format_expand_time and use it instead of status_replace where command execution is not needed. --- tmux.h | 1 + 1 file changed, 1 insertion(+) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index c9be497a..72e417f9 100644 --- a/tmux.h +++ b/tmux.h @@ -1512,6 +1512,7 @@ void format_free(struct format_tree *); void printflike(3, 4) format_add(struct format_tree *, const char *, const char *, ...); const char *format_find(struct format_tree *, const char *); +char *format_expand_time(struct format_tree *, const char *, time_t); char *format_expand(struct format_tree *, const char *); void format_defaults(struct format_tree *, struct client *, struct session *, struct winlink *, struct window_pane *); -- cgit From 313f2263f8bb3336893527f65789f820ba7eaf0f Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 6 Feb 2015 17:21:08 +0000 Subject: status_replace can now become local to status.c and it no longer needs the jobsflag argument. While here there is no need to repeat work that format_defaults already does. --- tmux.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index 72e417f9..4e1ee1b3 100644 --- a/tmux.h +++ b/tmux.h @@ -1925,8 +1925,6 @@ void status_free_jobs(struct status_out_tree *); void status_update_jobs(struct client *); void status_set_window_at(struct client *, u_int); int status_redraw(struct client *); -char *status_replace(struct client *, struct winlink *, const char *, time_t, - int); void printflike(2, 3) status_message_set(struct client *, const char *, ...); void status_message_clear(struct client *); int status_message_redraw(struct client *); -- cgit