Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[input] extend support for kitty keyboard protocol through level 3 #2184

Browse Source
This commit is contained in:
nick black 2021-10-05 06:35:07 -04:00
parent 4856431ff3
commit 2adda48d92
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/lib/in.c
View File

@ -508,15 +508,17 @@ send_synth_signal(int sig){
}
static void
kitty_kbd(inputctx* ictx, int val, int mods){
kitty_kbd(inputctx* ictx, int val, int mods, int evtype){
int synth = 0;
assert(evtype >= 0);
assert(mods >= 0);
assert(val > 0);
logdebug("v/m/e %d %d %d\n", val, mods, evtype);
ncinput tni = {
.id = val == 0x7f ? NCKEY_BACKSPACE : val,
.shift = !!((mods - 1) & 0x1),
.alt = !!((mods - 1) & 0x2),
.ctrl = !!((mods - 1) & 0x4),
.shift = mods && !!((mods - 1) & 0x1),
.alt = mods && !!((mods - 1) & 0x2),
.ctrl = mods && !!((mods - 1) & 0x4),
};
// FIXME decode remaining modifiers through 128
// standard keyboard protocol reports ctrl+ascii as the capital form,
@ -535,6 +537,20 @@ kitty_kbd(inputctx* ictx, int val, int mods){
}
tni.x = 0;
tni.y = 0;
switch(evtype){
case 1:
tni.evtype = NCTYPE_PRESS;
break;
case 2:
tni.evtype = NCTYPE_REPEAT;
break;
case 3:
tni.evtype = NCTYPE_RELEASE;
break;
default:
tni.evtype = NCTYPE_UNKNOWN;
break;
}
pthread_mutex_lock(&ictx->ilock);
if(ictx->ivalid == ictx->isize){
pthread_mutex_unlock(&ictx->ilock);
@ -557,7 +573,7 @@ kitty_kbd(inputctx* ictx, int val, int mods){
static int
kitty_cb_simple(inputctx* ictx){
unsigned val = amata_next_numeric(&ictx->amata, "\x1b[", 'u');
kitty_kbd(ictx, val, 0);
kitty_kbd(ictx, val, 0, 0);
return 2;
}
@ -565,7 +581,16 @@ static int
kitty_cb(inputctx* ictx){
unsigned val = amata_next_numeric(&ictx->amata, "\x1b[", ';');
unsigned mods = amata_next_numeric(&ictx->amata, "", 'u');
kitty_kbd(ictx, val, mods);
kitty_kbd(ictx, val, mods, 0);
return 2;
}
static int
kitty_cb_complex(inputctx* ictx){
unsigned val = amata_next_numeric(&ictx->amata, "\x1b[", ';');
unsigned mods = amata_next_numeric(&ictx->amata, "", ':');
unsigned ev = amata_next_numeric(&ictx->amata, "", 'u');
kitty_kbd(ictx, val, mods, ev);
return 2;
}
@ -856,6 +881,7 @@ build_cflow_automaton(inputctx* ictx){
{ "[\\N;\\N;\\Nt", geom_cb, },
{ "[\\Nu", kitty_cb_simple, },
{ "[\\N;\\Nu", kitty_cb, },
{ "[\\N;\\N:\\Nu", kitty_cb_complex, },
{ "[?\\Nu", kitty_keyboard_cb, },
{ "[?1;2c", da1_cb, }, // CSI ? 1 ; 2 c ("VT100 with Advanced Video Option")
{ "[?1;0c", da1_cb, }, // CSI ? 1 ; 0 c ("VT101 with No Options")

6
src/lib/termdesc.c
View File

@ -318,10 +318,10 @@ init_terminfo_esc(tinfo* ti, const char* name, escape_e idx,
// which can be identified directly, sans queries.
#define KITTYQUERY "\x1b_Gi=1,a=q;\x1b\\"
// request kitty keyboard protocol through level 1, first pushing current.
// request kitty keyboard protocol through level 3, first pushing current.
// see https://sw.kovidgoyal.net/kitty/keyboard-protocol/#progressive-enhancement
// FIXME go to level 3, but need handle release codes
#define KBDSUPPORT "\x1b[>u\x1b[=1u"
// FIXME go to level 11, but need handle all functional keys
#define KBDSUPPORT "\x1b[>u\x1b[=3u"
// the kitty keyboard protocol allows unambiguous, complete identification of
// input events. this queries for the level of support. we want to do this