From fec42e5941c20f4b69164dd0d78ea7e7e0f17de5 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 16 Nov 2021 16:32:58 +0100 Subject: kitty kbd: add flag state, implement push/pop/update/query --- csi.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 0224dd80..45bf1a16 100644 --- a/csi.c +++ b/csi.c @@ -1444,6 +1444,16 @@ csi_dispatch(struct terminal *term, uint8_t final) break; } + case 'u': { + enum kitty_kbd_flags flags = + term->grid->kitty_kbd.flags[term->grid->kitty_kbd.idx]; + + char reply[8]; + int chars = snprintf(reply, sizeof(reply), "\033[?%uu", flags); + term_to_slave(term, reply, chars); + break; + } + default: UNHANDLED(); break; @@ -1532,6 +1542,26 @@ csi_dispatch(struct terminal *term, uint8_t final) } break; /* final == 'm' */ + case 'u': { + int flags = vt_param_get(term, 0, 0) & KITTY_KBD_MASK; + + struct grid *grid = term->grid; + uint8_t idx = grid->kitty_kbd.idx; + + if (idx + 1 >= ALEN(grid->kitty_kbd.flags)) { + /* Stack full, evict oldest by wrapping around */ + idx = 0; + } else + idx++; + + grid->kitty_kbd.flags[idx] = flags; + grid->kitty_kbd.idx = idx; + + xassert(grid->kitty_kbd.idx < ALEN(grid->kitty_kbd.flags)); + LOG_DBG("kitty kbd: pushed new mode: 0x%03x", flags); + break; + } + case 'q': { /* XTVERSION */ if (vt_param_get(term, 0, 0) != 0) { @@ -1556,6 +1586,37 @@ csi_dispatch(struct terminal *term, uint8_t final) break; /* private[0] == '>' */ } + case '<': { + switch (final) { + case 'u': { + int count = vt_param_get(term, 0, 1); + LOG_DBG("kitty kbd: popping %d levels of flags", count); + + struct grid *grid = term->grid; + uint8_t idx = grid->kitty_kbd.idx; + + for (int i = 0; i < count; i++) { + /* Reset flags. This ensures we get flags=0 when + * over-popping */ + grid->kitty_kbd.flags[idx] = 0; + + if (idx == 0) + idx = ALEN(grid->kitty_kbd.flags) - 1; + else + idx--; + } + + grid->kitty_kbd.idx = idx; + xassert(grid->kitty_kbd.idx < ALEN(grid->kitty_kbd.flags)); + + LOG_DBG("kitty kbd: mode after pop: 0x%03x", + term->grid->kitty_kbd.flags[idx]); + break; + } + } + break; /* private[0] == ‘<’ */ + } + case ' ': { switch (final) { case 'q': { @@ -1633,6 +1694,36 @@ csi_dispatch(struct terminal *term, uint8_t final) term_to_slave(term, "\033P!|464f4f54\033\\", 14); /* FOOT */ break; + case 'u': { + int flag_set = vt_param_get(term, 0, 0) & KITTY_KBD_MASK; + int mode = vt_param_get(term, 1, 1); + + struct grid *grid = term->grid; + uint8_t idx = grid->kitty_kbd.idx; + + switch (mode) { + case 1: + /* set bits are set, unset bits are reset */ + grid->kitty_kbd.flags[idx] = flag_set; + break; + + case 2: + /* set bits are set, unset bits are left unchanged */ + grid->kitty_kbd.flags[idx] |= flag_set; + break; + + case 3: + /* set bits are reset, unset bits are left unchanged */ + grid->kitty_kbd.flags[idx] &= ~flag_set; + break; + + default: + UNHANDLED(); + break; + } + break; + } + default: UNHANDLED(); break; -- cgit v1.3 From ad2539af4430751c5fceafc635a0b0a45cc438c0 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 16 Nov 2021 16:37:10 +0100 Subject: csi: kitty: s/mode/flags in debug logs --- csi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 45bf1a16..a62aaa35 100644 --- a/csi.c +++ b/csi.c @@ -1558,7 +1558,7 @@ csi_dispatch(struct terminal *term, uint8_t final) grid->kitty_kbd.idx = idx; xassert(grid->kitty_kbd.idx < ALEN(grid->kitty_kbd.flags)); - LOG_DBG("kitty kbd: pushed new mode: 0x%03x", flags); + LOG_DBG("kitty kbd: pushed new flags: 0x%03x", flags); break; } @@ -1609,7 +1609,7 @@ csi_dispatch(struct terminal *term, uint8_t final) grid->kitty_kbd.idx = idx; xassert(grid->kitty_kbd.idx < ALEN(grid->kitty_kbd.flags)); - LOG_DBG("kitty kbd: mode after pop: 0x%03x", + LOG_DBG("kitty kbd: flags after pop: 0x%03x", term->grid->kitty_kbd.flags[idx]); break; } -- cgit v1.3 From c3fda015544c2ef442656bc5b1b9a1363a247876 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 16 Nov 2021 16:37:23 +0100 Subject: csi: kitty: log flags after ‘update’ operation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- csi.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'csi.c') diff --git a/csi.c b/csi.c index a62aaa35..183caa08 100644 --- a/csi.c +++ b/csi.c @@ -1721,6 +1721,9 @@ csi_dispatch(struct terminal *term, uint8_t final) UNHANDLED(); break; } + + LOG_DBG("kitty kbd: flags after update: 0x%03x", + grid->kitty_kbd.flags[idx]); break; } -- cgit v1.3 From 28ad0ca60295fadc42ac75f6a1237d12fff371ac Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 21 Nov 2021 15:05:00 +0100 Subject: csi: kitty: remove unneeded xasserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘idx’ is calculated just above, and the logic is simple enough that we don’t really need to assert it. --- csi.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 183caa08..9f29bb3d 100644 --- a/csi.c +++ b/csi.c @@ -1557,7 +1557,6 @@ csi_dispatch(struct terminal *term, uint8_t final) grid->kitty_kbd.flags[idx] = flags; grid->kitty_kbd.idx = idx; - xassert(grid->kitty_kbd.idx < ALEN(grid->kitty_kbd.flags)); LOG_DBG("kitty kbd: pushed new flags: 0x%03x", flags); break; } @@ -1607,7 +1606,6 @@ csi_dispatch(struct terminal *term, uint8_t final) } grid->kitty_kbd.idx = idx; - xassert(grid->kitty_kbd.idx < ALEN(grid->kitty_kbd.flags)); LOG_DBG("kitty kbd: flags after pop: 0x%03x", term->grid->kitty_kbd.flags[idx]); -- cgit v1.3 From 8f38cd486f73db1bb2239acf0ab8382786a21752 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 22 Nov 2021 22:42:49 +0100 Subject: term: rename: KITTY_KBD_MASK -> KITTY_KBD_SUPPORTED --- csi.c | 4 ++-- terminal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'csi.c') diff --git a/csi.c b/csi.c index 9f29bb3d..f27f805f 100644 --- a/csi.c +++ b/csi.c @@ -1543,7 +1543,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; /* final == 'm' */ case 'u': { - int flags = vt_param_get(term, 0, 0) & KITTY_KBD_MASK; + int flags = vt_param_get(term, 0, 0) & KITTY_KBD_SUPPORTED; struct grid *grid = term->grid; uint8_t idx = grid->kitty_kbd.idx; @@ -1693,7 +1693,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 'u': { - int flag_set = vt_param_get(term, 0, 0) & KITTY_KBD_MASK; + int flag_set = vt_param_get(term, 0, 0) & KITTY_KBD_SUPPORTED; int mode = vt_param_get(term, 1, 1); struct grid *grid = term->grid; diff --git a/terminal.h b/terminal.h index 12d3fa0d..62ccfb2a 100644 --- a/terminal.h +++ b/terminal.h @@ -133,7 +133,7 @@ enum kitty_kbd_flags { KITTY_KBD_REPORT_ALTERNATE = 0x04, KITTY_KBD_REPORT_ALL = 0x08, KITTY_KBD_REPORT_ASSOCIATED = 0x10, - KITTY_KBD_MASK = 0x1f, + KITTY_KBD_SUPPORTED = KITTY_KBD_DISAMBIGUATE, }; struct grid { -- cgit v1.3