circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-12 17:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-10-15 00:01:10 +01:00
commit 3d2686a236
32 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-bind-key.c
View File

@ -40,7 +40,7 @@ const struct cmd_entry cmd_bind_key_entry = {
.usage = "[-cnr] [-t mode-table] [-T key-table] key "
"command [arguments]",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_bind_key_exec
};

2
cmd-capture-pane.c
View File

@ -46,7 +46,7 @@ const struct cmd_entry cmd_capture_pane_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_capture_pane_exec
};

2
cmd-clear-history.c
View File

@ -35,7 +35,7 @@ const struct cmd_entry cmd_clear_history_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_clear_history_exec
};

4
cmd-copy-mode.c
View File

@ -35,7 +35,7 @@ const struct cmd_entry cmd_copy_mode_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_copy_mode_exec
};
@ -48,7 +48,7 @@ const struct cmd_entry cmd_clock_mode_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_copy_mode_exec
};

2
cmd-display-panes.c
View File

@ -41,7 +41,7 @@ const struct cmd_entry cmd_display_panes_entry = {
.tflag = CMD_CLIENT,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_display_panes_exec
};

2
cmd-list-buffers.c
View File

@ -39,7 +39,7 @@ const struct cmd_entry cmd_list_buffers_entry = {
.args = { "F:", 0, 0 },
.usage = "[-F format]",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_list_buffers_exec
};

2
cmd-list-clients.c
View File

@ -44,7 +44,7 @@ const struct cmd_entry cmd_list_clients_entry = {
.tflag = CMD_SESSION,
.flags = CMD_READONLY,
.flags = CMD_READONLY|CMD_AFTERHOOK,
.exec = cmd_list_clients_exec
};

4
cmd-list-keys.c
View File

@ -39,7 +39,7 @@ const struct cmd_entry cmd_list_keys_entry = {
.args = { "t:T:", 0, 0 },
.usage = "[-t mode-table] [-T key-table]",
.flags = CMD_STARTSERVER,
.flags = CMD_STARTSERVER|CMD_AFTERHOOK,
.exec = cmd_list_keys_exec
};
@ -50,7 +50,7 @@ const struct cmd_entry cmd_list_commands_entry = {
.args = { "F:", 0, 0 },
.usage = "[-F format]",
.flags = CMD_STARTSERVER,
.flags = CMD_STARTSERVER|CMD_AFTERHOOK,
.exec = cmd_list_keys_exec
};

2
cmd-list-panes.c
View File

@ -43,7 +43,7 @@ const struct cmd_entry cmd_list_panes_entry = {
.tflag = CMD_WINDOW,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_list_panes_exec
};

2
cmd-list-sessions.c
View File

@ -45,7 +45,7 @@ const struct cmd_entry cmd_list_sessions_entry = {
.args = { "F:", 0, 0 },
.usage = "[-F format]",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_list_sessions_exec
};

2
cmd-list-windows.c
View File

@ -54,7 +54,7 @@ const struct cmd_entry cmd_list_windows_entry = {
.tflag = CMD_SESSION,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_list_windows_exec
};

2
cmd-load-buffer.c
View File

@ -42,7 +42,7 @@ const struct cmd_entry cmd_load_buffer_entry = {
.args = { "b:", 1, 1 },
.usage = CMD_BUFFER_USAGE " path",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_load_buffer_exec
};

6
cmd-lock-server.c
View File

@ -33,7 +33,7 @@ const struct cmd_entry cmd_lock_server_entry = {
.args = { "", 0, 0 },
.usage = "",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_lock_server_exec
};
@ -46,7 +46,7 @@ const struct cmd_entry cmd_lock_session_entry = {
.tflag = CMD_SESSION,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_lock_server_exec
};
@ -59,7 +59,7 @@ const struct cmd_entry cmd_lock_client_entry = {
.tflag = CMD_CLIENT,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_lock_server_exec
};

2
cmd-paste-buffer.c
View File

@ -39,7 +39,7 @@ const struct cmd_entry cmd_paste_buffer_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_paste_buffer_exec
};

2
cmd-pipe-pane.c
View File

@ -45,7 +45,7 @@ const struct cmd_entry cmd_pipe_pane_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_pipe_pane_exec
};

2
cmd-refresh-client.c
View File

@ -35,7 +35,7 @@ const struct cmd_entry cmd_refresh_client_entry = {
.tflag = CMD_CLIENT,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_refresh_client_exec
};

2
cmd-rename-session.c
View File

@ -37,7 +37,7 @@ const struct cmd_entry cmd_rename_session_entry = {
.tflag = CMD_SESSION,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_rename_session_exec
};

2
cmd-rename-window.c
View File

@ -37,7 +37,7 @@ const struct cmd_entry cmd_rename_window_entry = {
.tflag = CMD_WINDOW,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_rename_window_exec
};

2
cmd-resize-pane.c
View File

@ -41,7 +41,7 @@ const struct cmd_entry cmd_resize_pane_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_resize_pane_exec
};

4
cmd-save-buffer.c
View File

@ -40,7 +40,7 @@ const struct cmd_entry cmd_save_buffer_entry = {
.args = { "ab:", 1, 1 },
.usage = "[-a] " CMD_BUFFER_USAGE " path",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_save_buffer_exec
};
@ -51,7 +51,7 @@ const struct cmd_entry cmd_show_buffer_entry = {
.args = { "b:", 0, 0 },
.usage = CMD_BUFFER_USAGE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_save_buffer_exec
};

6
cmd-select-layout.c
View File

@ -37,7 +37,7 @@ const struct cmd_entry cmd_select_layout_entry = {
.tflag = CMD_WINDOW,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_select_layout_exec
};
@ -50,7 +50,7 @@ const struct cmd_entry cmd_next_layout_entry = {
.tflag = CMD_WINDOW,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_select_layout_exec
};
@ -63,7 +63,7 @@ const struct cmd_entry cmd_previous_layout_entry = {
.tflag = CMD_WINDOW,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_select_layout_exec
};

4
cmd-send-keys.c
View File

@ -38,7 +38,7 @@ const struct cmd_entry cmd_send_keys_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_send_keys_exec
};
@ -51,7 +51,7 @@ const struct cmd_entry cmd_send_prefix_entry = {
.tflag = CMD_PANE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_send_keys_exec
};

4
cmd-set-buffer.c
View File

@ -36,7 +36,7 @@ const struct cmd_entry cmd_set_buffer_entry = {
.args = { "ab:n:", 0, 1 },
.usage = "[-a] " CMD_BUFFER_USAGE " [-n new-buffer-name] data",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_buffer_exec
};
@ -47,7 +47,7 @@ const struct cmd_entry cmd_delete_buffer_entry = {
.args = { "b:", 0, 0 },
.usage = CMD_BUFFER_USAGE,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_buffer_exec
};

2
cmd-set-environment.c
View File

@ -38,7 +38,7 @@ const struct cmd_entry cmd_set_environment_entry = {
.tflag = CMD_SESSION_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_environment_exec
};

4
cmd-set-hook.c
View File

@ -38,7 +38,7 @@ const struct cmd_entry cmd_set_hook_entry = {
.tflag = CMD_SESSION_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_hook_exec
};
@ -51,7 +51,7 @@ const struct cmd_entry cmd_show_hooks_entry = {
.tflag = CMD_SESSION,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_hook_exec
};

4
cmd-set-option.c
View File

@ -73,7 +73,7 @@ const struct cmd_entry cmd_set_option_entry = {
.tflag = CMD_WINDOW_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_option_exec
};
@ -86,7 +86,7 @@ const struct cmd_entry cmd_set_window_option_entry = {
.tflag = CMD_WINDOW_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_set_option_exec
};

2
cmd-show-environment.c
View File

@ -42,7 +42,7 @@ const struct cmd_entry cmd_show_environment_entry = {
.tflag = CMD_SESSION_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_show_environment_exec
};

4
cmd-show-messages.c
View File

@ -39,7 +39,7 @@ const struct cmd_entry cmd_show_messages_entry = {
.tflag = CMD_CLIENT,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_show_messages_exec
};
@ -50,7 +50,7 @@ const struct cmd_entry cmd_server_info_entry = {
.args = { "", 0, 0 },
.usage = "",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_show_messages_exec
};

4
cmd-show-options.c
View File

@ -43,7 +43,7 @@ const struct cmd_entry cmd_show_options_entry = {
.tflag = CMD_WINDOW_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_show_options_exec
};
@ -56,7 +56,7 @@ const struct cmd_entry cmd_show_window_options_entry = {
.tflag = CMD_WINDOW_CANFAIL,
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_show_options_exec
};

3
cmd-string.c
View File

@ -133,7 +133,8 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, const char *file,
if (argc == 0)
goto out;
*cmdlist = cmd_list_parse(argc, argv, file, line, cause);
*cmdlist = cmd_list_parse(argc, argv, file, line,
cause);
if (*cmdlist == NULL)
goto out;

2
cmd-unbind-key.c
View File

@ -37,7 +37,7 @@ const struct cmd_entry cmd_unbind_key_entry = {
.args = { "ant:T:", 0, 1 },
.usage = "[-an] [-t mode-table] [-T key-table] key",
.flags = 0,
.flags = CMD_AFTERHOOK,
.exec = cmd_unbind_key_exec
};

20
tty.c
View File

@ -424,7 +424,6 @@ void
tty_putc(struct tty *tty, u_char ch)
{
const char *acs;
u_int sx;
if (tty->cell.attr & GRID_ATTR_CHARSET) {
acs = tty_acs_get(tty, ch);
@ -436,14 +435,18 @@ tty_putc(struct tty *tty, u_char ch)
bufferevent_write(tty->event, &ch, 1);
if (ch >= 0x20 && ch != 0x7f) {
sx = tty->sx;
if (tty->term->flags & TERM_EARLYWRAP)
sx--;
if (tty->cx >= sx) {
if (tty->cx >= tty->sx) {
tty->cx = 1;
if (tty->cy != tty->rlower)
tty->cy++;
/*
* On !xenl terminals, force the cursor position to
* where we think it should be after a line wrap - this
* means it works on sensible terminals as well.
*/
if (tty->term->flags & TERM_EARLYWRAP)
tty_putcode2(tty, TTYC_CUP, tty->cy, tty->cx);
} else
tty->cx++;
}
@ -1169,8 +1172,9 @@ tty_cell(struct tty *tty, const struct grid_cell *gc,
u_int i;
/* Skip last character if terminal is stupid. */
if (tty->term->flags & TERM_EARLYWRAP &&
tty->cy == tty->sy - 1 && tty->cx == tty->sx - 1)
if ((tty->term->flags & TERM_EARLYWRAP) &&
tty->cy == tty->sy - 1 &&
tty->cx == tty->sx - 1)
return;
/* If this is a padding character, do nothing. */