engine: use stable candidate pages
This commit is contained in:
@@ -122,8 +122,9 @@ void
|
||||
engine_selects_visible_candidate(struct ct *t)
|
||||
{
|
||||
static const struct { int n, sel; Rune key; char *want; } cases[] = {
|
||||
{ Maxdisp, -1, '9', "c9" },
|
||||
{ Maxdisp+3, Maxdisp+1, '1', "c3" },
|
||||
{ Maxdisp, 0, '9', "c9" },
|
||||
{ Maxkouho, Maxdisp, '1', "c10" },
|
||||
{ Maxkouho, 2*Maxdisp, '9', "c27" },
|
||||
};
|
||||
char name[8];
|
||||
Str com;
|
||||
@@ -147,18 +148,19 @@ engine_selects_visible_candidate(struct ct *t)
|
||||
void
|
||||
engine_candidate_shortcut_modifiers(struct ct *t)
|
||||
{
|
||||
static u32int mods[] = { Mctrl, Malt, Msuper };
|
||||
Str com;
|
||||
static u32int mods[] = { Mshift, Mctrl, Malt, Msuper };
|
||||
Str com, selected;
|
||||
int i;
|
||||
|
||||
for(i = 0; i < nelem(mods); i++){
|
||||
init();
|
||||
im.kouho[0] = mkstr("must-not-select");
|
||||
im.nkouho = 1;
|
||||
im.sel = -1;
|
||||
im.kouho[9] = mkstr("must-not-select");
|
||||
im.nkouho = 10;
|
||||
im.sel = 9;
|
||||
selected = im.kouho[9];
|
||||
sclear(&com);
|
||||
CT_CHECK(t, !keystroke('1', mods[i], &com));
|
||||
CT_CHECK(t, scmp(&com, &im.kouho[0]) != 0);
|
||||
CT_CHECK(t, scmp(&com, &selected) != 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -397,8 +399,6 @@ engine_commit_contract(struct ct *t)
|
||||
|
||||
init();
|
||||
im.l = getlang(LangJP);
|
||||
im.nkouho = 1;
|
||||
im.sel = -1;
|
||||
sclear(&com);
|
||||
if(!typekeys(t, "ka", &com))
|
||||
return;
|
||||
@@ -661,6 +661,147 @@ draindraw(Drawcmd *last)
|
||||
return n;
|
||||
}
|
||||
|
||||
static void
|
||||
setcandidates(int n)
|
||||
{
|
||||
Dictres res;
|
||||
char name[8];
|
||||
int i;
|
||||
|
||||
memset(&res, 0, sizeof res);
|
||||
for(i = 0; i < n; i++){
|
||||
snprint(name, sizeof name, "c%d", i+1);
|
||||
res.kouho[i] = mkstr(name);
|
||||
}
|
||||
res.nkouho = n;
|
||||
setkouho(&res);
|
||||
}
|
||||
|
||||
static void
|
||||
candidatebegin(int n)
|
||||
{
|
||||
init();
|
||||
draindraw(nil);
|
||||
setcandidates(n);
|
||||
}
|
||||
|
||||
static int
|
||||
checkcandidatepage(struct ct *t, char *where, int first, int n, int sel)
|
||||
{
|
||||
Drawcmd dc;
|
||||
char want[8];
|
||||
|
||||
show();
|
||||
if(!CT_CHECK(t, draindraw(&dc) > 0))
|
||||
return 0;
|
||||
if(!CT_EQ_INT(t, n, dc.nkouho) || !CT_EQ_INT(t, sel, dc.sel))
|
||||
return 0;
|
||||
if(n == 0)
|
||||
return 1;
|
||||
snprint(want, sizeof want, "c%d", first+1);
|
||||
if(!checkstr(t, where, want, &dc.kouho[0]))
|
||||
return 0;
|
||||
snprint(want, sizeof want, "c%d", first+n);
|
||||
return checkstr(t, where, want, &dc.kouho[n-1]);
|
||||
}
|
||||
|
||||
void
|
||||
engine_candidate_page_snapshots(struct ct *t)
|
||||
{
|
||||
static int totals[] = { 0, 1, 9, 10, 18, 19, 32 };
|
||||
int i, n;
|
||||
|
||||
for(i = 0; i < nelem(totals); i++){
|
||||
candidatebegin(totals[i]);
|
||||
CT_EQ_INT(t, totals[i] == 0 ? -1 : 0, im.sel);
|
||||
if(totals[i] == 0){
|
||||
show();
|
||||
CT_EQ_INT(t, 0, draindraw(nil));
|
||||
continue;
|
||||
}
|
||||
n = totals[i] < Maxdisp ? totals[i] : Maxdisp;
|
||||
checkcandidatepage(t, "default candidate page", 0, n, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
engine_candidate_page_movement(struct ct *t)
|
||||
{
|
||||
static const struct {
|
||||
int n;
|
||||
int sel;
|
||||
Rune key;
|
||||
int want;
|
||||
} cases[] = {
|
||||
{ 1, 0, Kup, 0 },
|
||||
{ 9, 8, Kdown, 8 },
|
||||
{ 10, 8, Kdown, 9 },
|
||||
{ 10, 9, Kup, 8 },
|
||||
{ 18, 8, Kpgdown, 17 },
|
||||
{ 19, 17, Kdown, 18 },
|
||||
{ 19, 18, Kup, 17 },
|
||||
{ 32, 26, Kdown, 27 },
|
||||
{ 32, 27, Kup, 26 },
|
||||
{ 32, 0, Kpgup, 0 },
|
||||
{ 32, 9, Kpgup, 0 },
|
||||
{ 32, 22, Kpgdown, 31 },
|
||||
{ 32, 31, Kpgup, 22 },
|
||||
{ 32, 31, Kpgdown, 31 },
|
||||
};
|
||||
int first, i, n;
|
||||
Str com;
|
||||
|
||||
for(i = 0; i < nelem(cases); i++){
|
||||
candidatebegin(cases[i].n);
|
||||
im.sel = cases[i].sel;
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke(cases[i].key, 0, &com));
|
||||
CT_EQ_INT(t, cases[i].want, im.sel);
|
||||
first = cases[i].want / Maxdisp * Maxdisp;
|
||||
n = cases[i].n - first;
|
||||
if(n > Maxdisp)
|
||||
n = Maxdisp;
|
||||
checkcandidatepage(t, "moved candidate page", first, n,
|
||||
cases[i].want-first);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
engine_candidate_completion(struct ct *t)
|
||||
{
|
||||
Str com;
|
||||
|
||||
candidatebegin(2);
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke(Kret, 0, &com));
|
||||
checkstr(t, "default candidate", "c1", &com);
|
||||
|
||||
candidatebegin(2);
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke(Ktab, 0, &com));
|
||||
checkstr(t, "ordinary Tab candidate", "c1", &com);
|
||||
|
||||
candidatebegin(2);
|
||||
im.pre = mkstr("reading");
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('0', 0, &com));
|
||||
checkstr(t, "ordinary zero reading", "reading", &com);
|
||||
|
||||
candidatebegin(0);
|
||||
im.pre = mkstr("reading");
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke(Kret, 0, &com));
|
||||
checkstr(t, "Enter without candidates", "reading", &com);
|
||||
|
||||
candidatebegin(32);
|
||||
im.sel = 27;
|
||||
sclear(&com);
|
||||
CT_CHECK(t, !keystroke('9', 0, &com));
|
||||
checkstr(t, "unavailable short-page digit", "", &com);
|
||||
CT_EQ_INT(t, 32, im.nkouho);
|
||||
CT_EQ_INT(t, 27, im.sel);
|
||||
}
|
||||
|
||||
static void
|
||||
setdict(Hmap **dict, char *key, char *val)
|
||||
{
|
||||
@@ -888,11 +1029,10 @@ engine_japanese_candidates(struct ct *t)
|
||||
dictresult(&res);
|
||||
if(!CT_EQ_INT(t, 2, im.nkouho))
|
||||
goto cleanup;
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
checkstr(t, "candidate one", "漢字", &im.kouho[0]);
|
||||
checkstr(t, "candidate two", "幹事", &im.kouho[1]);
|
||||
CT_CHECK(t, keystroke(Kdown, 0, &com));
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
CT_CHECK(t, keystroke(Kdown, 0, &com));
|
||||
CT_EQ_INT(t, 1, im.sel);
|
||||
CT_CHECK(t, keystroke(Kret, 0, &com));
|
||||
checkstr(t, "selected Kanji", "幹事", &com);
|
||||
@@ -1187,40 +1327,89 @@ engine_emoji_navigation(struct ct *t)
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
if(typekeys(t, "many", &com)){
|
||||
CT_EQ_INT(t, 12, im.nkouho);
|
||||
for(i = 0; i < Maxdisp+1; i++)
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
for(i = 0; i < Maxdisp; i++)
|
||||
CT_CHECK(t, keystroke(Kdown, 0, &com));
|
||||
CT_EQ_INT(t, Maxdisp, im.sel);
|
||||
CT_CHECK(t, draindraw(&dc) > 0);
|
||||
checkstr(t, "scrolled first row", "c2", &dc.kouho[0]);
|
||||
checkstr(t, "scrolled ninth row", "c10", &dc.kouho[8]);
|
||||
CT_EQ_INT(t, 8, dc.sel);
|
||||
checkstr(t, "second-page first row", "c10", &dc.kouho[0]);
|
||||
checkstr(t, "second-page last row", "c12", &dc.kouho[2]);
|
||||
CT_EQ_INT(t, 3, dc.nkouho);
|
||||
CT_EQ_INT(t, 0, dc.sel);
|
||||
CT_CHECK(t, keystroke('1', 0, &com));
|
||||
checkstr(t, "scrolled row one", "c2", &com);
|
||||
checkstr(t, "second-page row one", "c10", &com);
|
||||
}
|
||||
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
if(typekeys(t, "many", &com)){
|
||||
for(i = 0; i < 12; i++)
|
||||
for(i = 0; i < 11; i++)
|
||||
CT_CHECK(t, keystroke(Kdown, 0, &com));
|
||||
CT_EQ_INT(t, 11, im.sel);
|
||||
CT_CHECK(t, keystroke('9', 0, &com));
|
||||
checkstr(t, "scrolled row nine", "c12", &com);
|
||||
CT_CHECK(t, keystroke('3', 0, &com));
|
||||
checkstr(t, "short-page row three", "c12", &com);
|
||||
}
|
||||
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
if(typekeys(t, "smile", &com)){
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
CT_CHECK(t, keystroke(Ktab, Mshift, &com));
|
||||
CT_EQ_INT(t, 1, im.sel);
|
||||
CT_CHECK(t, keystroke(Ktab, 0, &com));
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
CT_CHECK(t, keystroke(Kdown, 0, &com));
|
||||
CT_EQ_INT(t, 1, im.sel);
|
||||
CT_CHECK(t, keystroke(Kup, 0, &com));
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
CT_CHECK(t, keystroke(Ktab, Mshift, &com));
|
||||
CT_EQ_INT(t, 1, im.sel);
|
||||
CT_CHECK(t, keystroke(Kret, 0, &com));
|
||||
checkstr(t, "navigated candidate", "😄", &com);
|
||||
checkstr(t, "navigated candidate", "😀", &com);
|
||||
}
|
||||
searchend(&f);
|
||||
}
|
||||
|
||||
void
|
||||
engine_search_candidate_keys(struct ct *t)
|
||||
{
|
||||
Searchfix f;
|
||||
Str com;
|
||||
|
||||
emojibegin(&f, 0);
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
if(typekeys(t, "smile", &com)){
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
CT_CHECK(t, keystroke(Kret, 0, &com));
|
||||
checkstr(t, "search default Enter", "😀", &com);
|
||||
}
|
||||
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
if(typekeys(t, "missing", &com)){
|
||||
CT_EQ_INT(t, 0, im.nkouho);
|
||||
CT_EQ_INT(t, -1, im.sel);
|
||||
CT_CHECK(t, keystroke(Kret, 0, &com));
|
||||
checkstr(t, "search query Enter", "missing", &com);
|
||||
}
|
||||
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
CT_CHECK(t, keystroke('^', Mshift, &com));
|
||||
CT_CHECK(t, keystroke('0', 0, &com));
|
||||
checkstr(t, "search zero query", "^0", &search.text);
|
||||
checkstr(t, "search zero commit", "", &com);
|
||||
CT_CHECK(t, search.lang);
|
||||
CT_CHECK(t, keystroke(Kesc, 0, &com));
|
||||
|
||||
sclear(&com);
|
||||
CT_CHECK(t, keystroke('e', Mctrl, &com));
|
||||
if(typekeys(t, "many", &com)){
|
||||
im.sel = Maxdisp;
|
||||
CT_CHECK(t, keystroke('1', Mshift, &com));
|
||||
checkstr(t, "modified search digit commit", "", &com);
|
||||
checkstr(t, "modified search digit query", "many1", &search.text);
|
||||
CT_CHECK(t, search.lang);
|
||||
CT_CHECK(t, keystroke(Kesc, 0, &com));
|
||||
}
|
||||
searchend(&f);
|
||||
}
|
||||
@@ -1382,7 +1571,7 @@ engine_emoji_dictionary_identity(struct ct *t)
|
||||
res.kouho[0] = mkstr("right");
|
||||
dictresult(&res);
|
||||
CT_EQ_INT(t, 1, im.nkouho);
|
||||
CT_EQ_INT(t, -1, im.sel);
|
||||
CT_EQ_INT(t, 0, im.sel);
|
||||
checkstr(t, "matching response accepted", "right", &im.kouho[0]);
|
||||
searchend(&f);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user