SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-08-19 17:15:41 +00:00
parent c78abe7784
commit eb9d621948
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
270 changed files with 666 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

36
usr.bin/tmux/input.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: input.c,v 1.225 2024/06/24 08:30:50 nicm Exp $ */
/* $OpenBSD: input.c,v 1.226 2024/08/19 08:31:36 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -109,10 +109,11 @@ struct input_ctx {
int utf8started;
int ch;
int last;
struct utf8_data last;
int flags;
#define INPUT_DISCARD 0x1
#define INPUT_LAST 0x2
const struct input_state *state;
@ -867,8 +868,6 @@ input_reset(struct input_ctx *ictx, int clear)
input_clear(ictx);
ictx->last = -1;
ictx->state = &input_state_ground;
ictx->flags = 0;
}
@ -1149,7 +1148,9 @@ input_print(struct input_ctx *ictx)
utf8_set(&ictx->cell.cell.data, ictx->ch);
screen_write_collect_add(sctx, &ictx->cell.cell);
ictx->last = ictx->ch;
utf8_copy(&ictx->last, &ictx->cell.cell.data);
ictx->flags |= INPUT_LAST;
ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
@ -1261,7 +1262,7 @@ input_c0_dispatch(struct input_ctx *ictx)
break;
}
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
return (0);
}
@ -1337,7 +1338,7 @@ input_esc_dispatch(struct input_ctx *ictx)
break;
}
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
return (0);
}
@ -1570,12 +1571,12 @@ input_csi_dispatch(struct input_ctx *ictx)
if (n > m)
n = m;
if (ictx->last == -1)
if (~ictx->flags & INPUT_LAST)
break;
ictx->ch = ictx->last;
utf8_copy(&ictx->cell.cell.data, &ictx->last);
for (i = 0; i < n; i++)
input_print(ictx);
screen_write_collect_add(sctx, &ictx->cell.cell);
break;
case INPUT_CSI_RCP:
input_restore_state(ictx);
@ -1645,7 +1646,7 @@ input_csi_dispatch(struct input_ctx *ictx)
}
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
return (0);
}
@ -2266,7 +2267,7 @@ input_enter_dcs(struct input_ctx *ictx)
input_clear(ictx);
input_start_timer(ictx);
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
}
/* DCS terminator (ST) received. */
@ -2310,7 +2311,7 @@ input_enter_osc(struct input_ctx *ictx)
input_clear(ictx);
input_start_timer(ictx);
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
}
/* OSC terminator (ST) received. */
@ -2405,7 +2406,7 @@ input_enter_apc(struct input_ctx *ictx)
input_clear(ictx);
input_start_timer(ictx);
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
}
/* APC terminator (ST) received. */
@ -2434,7 +2435,7 @@ input_enter_rename(struct input_ctx *ictx)
input_clear(ictx);
input_start_timer(ictx);
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
}
/* Rename terminator (ST) received. */
@ -2478,7 +2479,7 @@ input_top_bit_set(struct input_ctx *ictx)
struct screen_write_ctx *sctx = &ictx->ctx;
struct utf8_data *ud = &ictx->utf8data;
ictx->last = -1;
ictx->flags &= ~INPUT_LAST;
if (!ictx->utf8started) {
if (utf8_open(ud, ictx->ch) != UTF8_MORE)
@ -2504,6 +2505,9 @@ input_top_bit_set(struct input_ctx *ictx)
utf8_copy(&ictx->cell.cell.data, ud);
screen_write_collect_add(sctx, &ictx->cell.cell);
utf8_copy(&ictx->last, &ictx->cell.cell.data);
ictx->flags |= INPUT_LAST;
return (0);
}

4
usr.bin/tmux/tty-keys.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: tty-keys.c,v 1.175 2024/07/12 11:21:18 nicm Exp $ */
/* $OpenBSD: tty-keys.c,v 1.176 2024/08/19 08:29:16 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -1212,7 +1212,7 @@ tty_keys_clipboard(struct tty *tty, const char *buf, size_t len, size_t *size)
}
if (end == len)
return (1);
*size = end + terminator;
*size = end + 1;
/* Skip the initial part. */
buf += 5;