circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-07 00:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Allow REP to work with Unicode characters, GitHub issue 3687.

Browse Source
This commit is contained in:
nicm 2024-08-19 08:31:36 +00:00
parent 937ba1d8dd
commit de6bce057a
1 changed files with 19 additions and 15 deletions

34
input.c
View File

@ -109,10 +109,11 @@ struct input_ctx {
int utf8started; int utf8started;
int ch; int ch;
int last; struct utf8_data last;
int flags; int flags;
#define INPUT_DISCARD 0x1 #define INPUT_DISCARD 0x1
#define INPUT_LAST 0x2
const struct input_state *state; const struct input_state *state;
@ -867,8 +868,6 @@ input_reset(struct input_ctx *ictx, int clear)
input_clear(ictx); input_clear(ictx);
ictx->last = -1;
ictx->state = &input_state_ground; ictx->state = &input_state_ground;
ictx->flags = 0; ictx->flags = 0;
} }
@ -1149,7 +1148,9 @@ input_print(struct input_ctx *ictx)
utf8_set(&ictx->cell.cell.data, ictx->ch); utf8_set(&ictx->cell.cell.data, ictx->ch);
screen_write_collect_add(sctx, &ictx->cell.cell); 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; ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
@ -1261,7 +1262,7 @@ input_c0_dispatch(struct input_ctx *ictx)
break; break;
} }
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
return (0); return (0);
} }
@ -1337,7 +1338,7 @@ input_esc_dispatch(struct input_ctx *ictx)
break; break;
} }
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
return (0); return (0);
} }
@ -1570,12 +1571,12 @@ input_csi_dispatch(struct input_ctx *ictx)
if (n > m) if (n > m)
n = m; n = m;
if (ictx->last == -1) if (~ictx->flags & INPUT_LAST)
break; break;
ictx->ch = ictx->last;
utf8_copy(&ictx->cell.cell.data, &ictx->last);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
input_print(ictx); screen_write_collect_add(sctx, &ictx->cell.cell);
break; break;
case INPUT_CSI_RCP: case INPUT_CSI_RCP:
input_restore_state(ictx); input_restore_state(ictx);
@ -1645,7 +1646,7 @@ input_csi_dispatch(struct input_ctx *ictx)
} }
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
return (0); return (0);
} }
@ -2266,7 +2267,7 @@ input_enter_dcs(struct input_ctx *ictx)
input_clear(ictx); input_clear(ictx);
input_start_timer(ictx); input_start_timer(ictx);
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
} }
/* DCS terminator (ST) received. */ /* DCS terminator (ST) received. */
@ -2310,7 +2311,7 @@ input_enter_osc(struct input_ctx *ictx)
input_clear(ictx); input_clear(ictx);
input_start_timer(ictx); input_start_timer(ictx);
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
} }
/* OSC terminator (ST) received. */ /* OSC terminator (ST) received. */
@ -2405,7 +2406,7 @@ input_enter_apc(struct input_ctx *ictx)
input_clear(ictx); input_clear(ictx);
input_start_timer(ictx); input_start_timer(ictx);
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
} }
/* APC terminator (ST) received. */ /* APC terminator (ST) received. */
@ -2434,7 +2435,7 @@ input_enter_rename(struct input_ctx *ictx)
input_clear(ictx); input_clear(ictx);
input_start_timer(ictx); input_start_timer(ictx);
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
} }
/* Rename terminator (ST) received. */ /* Rename terminator (ST) received. */
@ -2478,7 +2479,7 @@ input_top_bit_set(struct input_ctx *ictx)
struct screen_write_ctx *sctx = &ictx->ctx; struct screen_write_ctx *sctx = &ictx->ctx;
struct utf8_data *ud = &ictx->utf8data; struct utf8_data *ud = &ictx->utf8data;
ictx->last = -1; ictx->flags &= ~INPUT_LAST;
if (!ictx->utf8started) { if (!ictx->utf8started) {
if (utf8_open(ud, ictx->ch) != UTF8_MORE) 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); utf8_copy(&ictx->cell.cell.data, ud);
screen_write_collect_add(sctx, &ictx->cell.cell); screen_write_collect_add(sctx, &ictx->cell.cell);
utf8_copy(&ictx->last, &ictx->cell.cell.data);
ictx->flags |= INPUT_LAST;
return (0); return (0);
} }