mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-05-22 18:01:20 +01:00
parent 2ac6cc2633 033d6472cb
commit e71c5efd58
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
options-table.c
View File

@@ -306,7 +306,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_SERVER, .scope = OPTIONS_TABLE_SERVER,
.flags = OPTIONS_TABLE_IS_ARRAY, .flags = OPTIONS_TABLE_IS_ARRAY,
.default_str = "xterm*:clipboard:ccolour:cstyle:title," .default_str = "xterm*:clipboard:ccolour:cstyle:focus:title,"
"screen*:title", "screen*:title",
.separator = ",", .separator = ",",
.text = "List of terminal features, used if they cannot be " .text = "List of terminal features, used if they cannot be "

2
server-client.c
View File

@@ -1284,7 +1284,7 @@ forward_key:
window_pane_key(wp, c, s, wl, key, m); window_pane_key(wp, c, s, wl, key, m);
out: out:
if (s != NULL) if (s != NULL && key != KEYC_FOCUS_OUT)
server_client_update_latest(c); server_client_update_latest(c);
free(event); free(event);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);

7
tty-keys.c
View File

@@ -800,13 +800,10 @@ complete_key:
tty->flags &= ~TTY_TIMER; tty->flags &= ~TTY_TIMER;
/* Check for focus events. */ /* Check for focus events. */
if (key == KEYC_FOCUS_OUT) { if (key == KEYC_FOCUS_OUT)
tty->client->flags &= ~CLIENT_FOCUSED; tty->client->flags &= ~CLIENT_FOCUSED;
return (1); else if (key == KEYC_FOCUS_IN)
} else if (key == KEYC_FOCUS_IN) {
tty->client->flags |= CLIENT_FOCUSED; tty->client->flags |= CLIENT_FOCUSED;
return (1);
}
/* Fire the key. */ /* Fire the key. */
if (key != KEYC_UNKNOWN) { if (key != KEYC_UNKNOWN) {

2
tty.c
View File

@@ -467,7 +467,7 @@ tty_update_features(struct tty *tty)
if (options_get_number(global_options, "extended-keys")) if (options_get_number(global_options, "extended-keys"))
tty_puts(tty, tty_term_string(tty->term, TTYC_ENEKS)); tty_puts(tty, tty_term_string(tty->term, TTYC_ENEKS));
if (options_get_number(global_options, "focus-events")) if (options_get_number(global_options, "focus-events"))
tty_raw(tty, tty_term_string(tty->term, TTYC_ENFCS)); tty_puts(tty, tty_term_string(tty->term, TTYC_ENFCS));
if (tty->term->flags & TERM_VT100LIKE) if (tty->term->flags & TERM_VT100LIKE)
tty_puts(tty, "\033[?7727h"); tty_puts(tty, "\033[?7727h");
} }