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: don't error out on all special keys, egads =[

Browse Source
This commit is contained in:
nick black 2021-07-23 06:40:55 -04:00
parent 2fb9db77e8
commit 613d437b87
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/input.c
View File

@ -195,7 +195,7 @@ handle_csi(ncinputlayer* nc, ncinput* ni, int leftmargin, int topmargin){
uint32_t id = (uint32_t)-1;
while(nc->inputbuf_occupied){
int candidate = pop_input_keypress(nc);
logdebug("Candidate: %c (%d)\n", candidate, candidate);
logdebug("candidate: %c (%d)\n", candidate, candidate);
if(state == PARAM1){
// if !mouse and candidate is '>', set mouse. otherwise it ought be a
// digit or a semicolon.
@ -322,8 +322,17 @@ handle_getc(ncinputlayer* nc, int kpress, ncinput* ni, int leftmargin, int topma
if(kpress == NCKEY_ESC){
const esctrie* esc = nc->inputescapes;
int candidate = 0;
while(esc && esc->special == NCKEY_INVALID && nc->inputbuf_occupied){
const esctrie* csi = NULL;
while(esc && nc->inputbuf_occupied){
if(esc->special != NCKEY_INVALID){
if(esc->special == NCKEY_CSI){
csi = NULL;
}else{
break;
}
}
candidate = pop_input_keypress(nc);
logdebug("trie candidate: %c %d (%d)\n", candidate, esc->special, candidate);
if(esc->trie == NULL){
esc = NULL;
}else if(candidate >= 0x80 || candidate < 0){
@ -331,13 +340,16 @@ handle_getc(ncinputlayer* nc, int kpress, ncinput* ni, int leftmargin, int topma
}else{
esc = esc->trie[candidate];
}
logtrace("move to %p (%u)\n", esc, esc ? esc->special : 0);
}
if(esc && esc->special != NCKEY_INVALID){
if(esc->special == NCKEY_CSI){
return handle_csi(nc, ni, leftmargin, topmargin);
}
return esc->special;
}
if(csi){
// FIXME might need to unpop more than one
unpop_keypress(nc, candidate);
return handle_csi(nc, ni, leftmargin, topmargin);
}
// interpret it as alt + candidate FIXME broken for first char matching
// trie, second char not -- will read as alt+second char...
if(candidate > 0 && candidate < 0x80){
@ -698,7 +710,7 @@ prep_special_keys(ncinputlayer* nc){
//fprintf(stderr, "Terminfo's %s is not an escape sequence (%zub)\n", k->tinfo, strlen(seq));
continue;
}
//fprintf(stderr, "support for terminfo's %s: %s\n", k->tinfo, seq);
logdebug("support for terminfo's %s: %s\n", k->tinfo, seq);
if(ncinputlayer_add_input_escape(nc, seq, k->key)){
return -1;
}