aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-02-07 13:41:17 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-02-07 13:41:17 +0000
commit8872a0da8e9588b0ec5eac1a1cc3753037ed68e1 (patch)
tree5c21a56f80ffeed5c2c1edadb7b1b73873026a3a /input.c
parent0f5a2c86da5cf2cf024b0653fb84f2dc69c246a2 (diff)
parent9f66fb4fd779640c214df812afcdc0840d851c53 (diff)
downloadrtmux-8872a0da8e9588b0ec5eac1a1cc3753037ed68e1.tar.gz
rtmux-8872a0da8e9588b0ec5eac1a1cc3753037ed68e1.tar.bz2
rtmux-8872a0da8e9588b0ec5eac1a1cc3753037ed68e1.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'input.c')
-rw-r--r--input.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/input.c b/input.c
index 17f81dd7..26eb1686 100644
--- a/input.c
+++ b/input.c
@@ -87,6 +87,7 @@ struct input_ctx {
struct utf8_data utf8data;
int ch;
+
int flags;
#define INPUT_DISCARD 0x1
@@ -871,9 +872,10 @@ input_parse(struct window_pane *wp)
buf = EVBUFFER_DATA(evb);
len = EVBUFFER_LENGTH(evb);
- notify_input(wp, evb);
off = 0;
+ notify_input(wp, evb);
+
log_debug("%s: %%%u %s, %zu bytes: %.*s", __func__, wp->id,
ictx->state->name, len, (int)len, buf);
@@ -1218,11 +1220,13 @@ input_csi_dispatch(struct input_ctx *ictx)
if (ictx->flags & INPUT_DISCARD)
return (0);
- if (input_split(ictx) != 0)
- return (0);
+
log_debug("%s: '%c' \"%s\" \"%s\"",
__func__, ictx->ch, ictx->interm_buf, ictx->param_buf);
+ if (input_split(ictx) != 0)
+ return (0);
+
entry = bsearch(ictx, input_csi_table, nitems(input_csi_table),
sizeof input_csi_table[0], input_table_compare);
if (entry == NULL) {
@@ -1327,7 +1331,7 @@ input_csi_dispatch(struct input_ctx *ictx)
screen_write_clearendofscreen(sctx, ictx->cell.cell.bg);
break;
case 1:
- screen_write_clearstartofscreen(sctx);
+ screen_write_clearstartofscreen(sctx, ictx->cell.cell.bg);
break;
case 2:
screen_write_clearscreen(sctx, ictx->cell.cell.bg);