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

ncreader: implement Alt+B for back by word #983

Browse Source
This commit is contained in:
nick black 2020-11-07 05:30:28 -05:00
parent 65a0059b38
commit 67e7046956
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/reader.c
View File

@ -227,6 +227,8 @@ ncreader_ctrl_input(ncreader* n, const ncinput* ni){
case 'F':
ncreader_move_right(n);
break;
case 'A':
break;
default:
return false; // pass on all other ctrls
}
@ -236,10 +238,27 @@ ncreader_ctrl_input(ncreader* n, const ncinput* ni){
static bool
ncreader_alt_input(ncreader* n, const ncinput* ni){
switch(ni->id){
case 'B': // back one word (to first cell) FIXME
ncreader_move_left(n);
case 'b': // back one word (to first cell), but not to previous line
while(n->textarea->x){
if(ncreader_move_left(n)){
break;
}
char* egc = ncplane_at_yx(n->textarea, n->textarea->y, n->textarea->x, NULL, NULL);
if(egc == NULL){
break;
}
wchar_t w;
mbstate_t mbstate = {0};
size_t s = mbrtowc(&w, egc, MB_CUR_MAX, &mbstate);
free(egc);
if(s != (size_t)-1 && s != (size_t)-2){
if(iswordbreak(w)){
break;
}
}
}
break;
case 'F': // forward one word (past end cell) FIXME
case 'f': // forward one word (past end cell) FIXME
ncreader_move_right(n);
break;
default:
@ -255,14 +274,14 @@ ncreader_alt_input(ncreader* n, const ncinput* ni){
bool ncreader_offer_input(ncreader* n, const ncinput* ni){
int x = n->textarea->x;
int y = n->textarea->y;
if(ni->alt){ // pass on all alts
return false;
}
if(ni->ctrl && !n->no_cmd_keys){
return ncreader_ctrl_input(n, ni);
}else if(ni->alt && !n->no_cmd_keys){
return ncreader_alt_input(n, ni);
}
if(ni->alt || ni->ctrl){ // pass on all alts/ctrls if no_cmd_keys is set
return false;
}
if(ni->id == NCKEY_BACKSPACE){
if(n->textarea->x == 0){
if(n->textarea->y){

2
src/poc/reader.cpp
View File

@ -59,7 +59,7 @@ auto main(int argc, const char** argv) -> int {
ncplane_dim_yx(tplane, &tgeomy, &tgeomx);
ncplane_dim_yx(ncp, &vgeomy, &vgeomx);
(*n)->printf(0, 0, "Scroll: %lc Cursor: %03d/%03d Viewgeom: %03d/%03d Textgeom: %03d/%03d",
horscroll ? L'✔' : L'🗴', ncpy, ncpx, vgeomy, vgeomx, tgeomy, tgeomx);
horscroll ? L'✔' : L'🗴', ncpy, ncpx, vgeomy, vgeomx, tgeomy, tgeomx);
nc.render();
}
}