circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2022-07-19 10:01:08 +01:00
parent e06c09889c ee431d482a
commit ab1d18d00f
3 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
format.c
View File

@ -3564,12 +3564,12 @@ found:
} }
if (modifiers & FORMAT_QUOTE_SHELL) { if (modifiers & FORMAT_QUOTE_SHELL) {
saved = found; saved = found;
found = xstrdup(format_quote_shell(saved)); found = format_quote_shell(saved);
free(saved); free(saved);
} }
if (modifiers & FORMAT_QUOTE_STYLE) { if (modifiers & FORMAT_QUOTE_STYLE) {
saved = found; saved = found;
found = xstrdup(format_quote_style(saved)); found = format_quote_style(saved);
free(saved); free(saved);
} }
return (found); return (found);

3
server-client.c
View File

@ -2218,7 +2218,8 @@ server_client_check_pane_buffer(struct window_pane *wp)
} }
wpo = control_pane_offset(c, wp, &flag); wpo = control_pane_offset(c, wp, &flag);
if (wpo == NULL) { if (wpo == NULL) {
off = 0; if (!flag)
off = 0;
continue; continue;
} }
if (!flag) if (!flag)

38
tty-keys.c
View File

@ -934,34 +934,16 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
nkey = number; nkey = number;
/* Update the modifiers. */ /* Update the modifiers. */
switch (modifiers) { if (modifiers > 0) {
case 2: modifiers--;
nkey |= KEYC_SHIFT; if (modifiers & 1)
break; nkey |= KEYC_SHIFT;
case 3: if (modifiers & 2)
nkey |= (KEYC_META|KEYC_IMPLIED_META); nkey |= (KEYC_META|KEYC_IMPLIED_META); /* Alt */
break; if (modifiers & 4)
case 4: nkey |= KEYC_CTRL;
nkey |= (KEYC_SHIFT|KEYC_META|KEYC_IMPLIED_META); if (modifiers & 8)
break; nkey |= (KEYC_META|KEYC_IMPLIED_META); /* Meta */
case 5:
nkey |= KEYC_CTRL;
break;
case 6:
nkey |= (KEYC_SHIFT|KEYC_CTRL);
break;
case 7:
nkey |= (KEYC_META|KEYC_CTRL);
break;
case 8:
nkey |= (KEYC_SHIFT|KEYC_META|KEYC_IMPLIED_META|KEYC_CTRL);
break;
case 9:
nkey |= (KEYC_META|KEYC_IMPLIED_META);
break;
default:
*key = KEYC_NONE;
break;
} }
/* /*