blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 09:09:03 -04:00
Code Issues Projects Releases Wiki Activity

Do not be lazy, make amount of max text code points into a define

Browse Source
This commit is contained in:
Jeroen Domburg 2023-01-20 22:31:02 +08:00 committed by nick black
parent 3512f9e812
commit b0f19f9f29
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/notcurses/notcurses.h
View File

@ -1198,6 +1198,11 @@ typedef enum {
NCTYPE_RELEASE,
} ncintype_e;
//Note: changing this also means adding kitty_cb_atxt functions in
//in.c otherwise extra codepoints won't be picked up.
#define NCINPUT_MAX_EFF_TEXT_CODEPOINTS 4
// An input event. Cell coordinates are currently defined only for mouse
// events. It is not guaranteed that we can set the modifiers for a given
// ncinput. We encompass single Unicode codepoints, not complete EGCs.
@ -1214,8 +1219,9 @@ typedef struct ncinput {
ncintype_e evtype;
unsigned modifiers;// bitmask over NCKEY_MOD_*
int ypx, xpx; // pixel offsets within cell, -1 for undefined
uint32_t eff_text[5]; // Effective utf32 representation, taking
// modifier keys into account. This can be multiple
uint32_t eff_text[NCINPUT_MAX_EFF_TEXT_CODEPOINTS]; // Effective
// utf32 representation, taking modifier
// keys into account. This can be multiple
// codepoints. Array is zero-terminated.
} ncinput;

2
src/lib/in.c
View File

@ -832,7 +832,7 @@ kitty_kbd_txt(inputctx* ictx, int val, int mods, uint32_t *txt, int evtype){
}
//note: if we don't set eff_text here, it will be set to .id later.
if(txt && txt[0]!=0){
for(int i=0 ; i<4 ; i++){
for(int i=0 ; i<NCINPUT_MAX_EFF_TEXT_CODEPOINTS ; i++){
tni.eff_text[i] = txt[i];
}
}