Improved cycling with ctrl-p/ctrl-n and better rendering of highlighted
partial matches (with grouping to greedily maximize longest highlighted substrings)
This commit is contained in:
parent
66c4861b11
commit
2732a1e5eb
139
ask.c
139
ask.c
@ -23,7 +23,7 @@
|
|||||||
#define EQ(a, b) (case_sensitive ? (a) == (b) : LOWERCASE(a) == LOWERCASE(b))
|
#define EQ(a, b) (case_sensitive ? (a) == (b) : LOWERCASE(a) == LOWERCASE(b))
|
||||||
#define PASSWORD "-\\|/"
|
#define PASSWORD "-\\|/"
|
||||||
|
|
||||||
static int password = 0, quickpick = 0, case_sensitive = 0, to_skip = 0;
|
static int password = 0, quickpick = 0, case_sensitive = 0;
|
||||||
|
|
||||||
static inline void *memcheck(void *p)
|
static inline void *memcheck(void *p)
|
||||||
{
|
{
|
||||||
@ -34,44 +34,72 @@ static inline void *memcheck(void *p)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int score(const char *str, const char *patt)
|
/* Return length of the longest substring of patt[p:] that occurs within
|
||||||
|
* str[s:], while still leaving enough space for the rest of `patt` to occur
|
||||||
|
* within the rest of `str`. If there is no valid solution, return -1.
|
||||||
|
*/
|
||||||
|
static int lcs(const char *str, const char *patt, int slen, int plen, int s, int p, int *cache)
|
||||||
{
|
{
|
||||||
if (!patt[0]) return 0;
|
if (!patt[p]) return 0;
|
||||||
int score = 0;
|
if (!str[s]) return -1;
|
||||||
const char *s = str, *p = patt;
|
if (cache[s*plen + p]) return cache[s*plen + p];
|
||||||
while (*s && !EQ(*s, *p)) ++s;
|
if (!EQ(str[s], patt[p])) return lcs(str, patt, slen, plen, s+1, p, cache);
|
||||||
while (*s && *p && EQ(*s, *p)) {
|
// Run starting here
|
||||||
++score;
|
int run = 1;
|
||||||
++s;
|
while (str[s+run] && patt[p+run] && EQ(str[s+run], patt[p+run])
|
||||||
++p;
|
&& lcs(str, patt, slen, plen, s+run, p+run, cache) >= 0) {
|
||||||
|
++run;
|
||||||
}
|
}
|
||||||
for (; *p; ++s, ++p) {
|
if (run == 0) run = -1;
|
||||||
while (*s && !EQ(*s, *p)) ++s;
|
cache[s*plen + p] = run;
|
||||||
if (!*s) return 0;
|
return run;
|
||||||
}
|
|
||||||
if (*p && !*s) return 0;
|
|
||||||
return score;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void draw_line(FILE *out, const char *line, const char *hl, const char *cur)
|
static int matches(const char *str, const char *patt)
|
||||||
{
|
{
|
||||||
int dim = 0, backtrack = 0;
|
while (*patt) {
|
||||||
for (const char *pl = line, *phl = hl; *pl; pl++) {
|
while (!EQ(*str, *patt)) {
|
||||||
if (phl >= cur) ++backtrack;
|
if (!*str) return 0;
|
||||||
if (case_sensitive ? *pl == *phl : LOWERCASE(*pl) == LOWERCASE(*phl)) {
|
++str;
|
||||||
++phl;
|
}
|
||||||
|
++str;
|
||||||
|
++patt;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void draw_line(FILE *out, const char *line, const char *patt, int cursor)
|
||||||
|
{
|
||||||
|
size_t linelen = strlen(line), patlen = strlen(patt);
|
||||||
|
int dim = 0;
|
||||||
|
int p = 0;
|
||||||
|
int run = 0;
|
||||||
|
int *cache = calloc((linelen+1)*(patlen+1), sizeof(int));
|
||||||
|
if (cursor >= (int)patlen)
|
||||||
|
fputs("\0337", out);
|
||||||
|
for (int i = 0; i < (int)linelen; i++) {
|
||||||
|
if (EQ(patt[p], line[i]) &&
|
||||||
|
run + lcs(line,patt,(int)linelen,(int)patlen,i,p,cache)
|
||||||
|
>= lcs(line,patt,(int)linelen,(int)patlen,i+1,p,cache)) {
|
||||||
if (dim) {
|
if (dim) {
|
||||||
fputs("\033[22m", out);
|
fputs("\033[22m", out);
|
||||||
dim = 0;
|
dim = 0;
|
||||||
}
|
}
|
||||||
} else if (!dim) {
|
fputc(patt[p], out);
|
||||||
fputs("\033[2m", out);
|
++run;
|
||||||
dim = 1;
|
++p;
|
||||||
|
if (cursor == p)
|
||||||
|
fputs("\0337", out);
|
||||||
|
} else {
|
||||||
|
run = 0;
|
||||||
|
if (!dim) {
|
||||||
|
fputs("\033[2m", out);
|
||||||
|
dim = 1;
|
||||||
|
}
|
||||||
|
fputc(line[i], out);
|
||||||
}
|
}
|
||||||
fputc(*pl, out);
|
|
||||||
}
|
}
|
||||||
if (backtrack)
|
fputs("\0338", out);
|
||||||
fprintf(out, "\033[%dD", backtrack);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -90,6 +118,7 @@ static char *get_input(FILE *in, FILE *out, const char *prompt, const char *init
|
|||||||
fputs(initial, out);
|
fputs(initial, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int start = 0;
|
||||||
// Show cursor and set to blinking line:
|
// Show cursor and set to blinking line:
|
||||||
while (1) {
|
while (1) {
|
||||||
fputs("\033[G\033[K\033[0m", out);
|
fputs("\033[G\033[K\033[0m", out);
|
||||||
@ -98,43 +127,35 @@ static char *get_input(FILE *in, FILE *out, const char *prompt, const char *init
|
|||||||
fputs(prompt, out);
|
fputs(prompt, out);
|
||||||
fputs("\033[0m", out);
|
fputs("\033[0m", out);
|
||||||
}
|
}
|
||||||
picked = NULL;
|
|
||||||
case_sensitive = 0;
|
case_sensitive = 0;
|
||||||
for (const char *p = buf; *p; ++p)
|
for (const char *p = buf; *p; ++p)
|
||||||
case_sensitive |= ('A' <= *p && *p <= 'Z');
|
case_sensitive |= ('A' <= *p && *p <= 'Z');
|
||||||
|
|
||||||
int ncandidates = 0;
|
int ncandidates = 0;
|
||||||
for (int i = 0; i < nopts; i++)
|
picked = NULL;
|
||||||
ncandidates += score(opts[i], buf) > 0;
|
|
||||||
|
|
||||||
int bestscore = 0;
|
|
||||||
char *best = NULL;
|
|
||||||
int skipped = 0;
|
|
||||||
for (int i = 0; i < nopts; i++) {
|
for (int i = 0; i < nopts; i++) {
|
||||||
int s = score(opts[i], buf);
|
int j = (start + i) % nopts;
|
||||||
if (s && skipped < to_skip) {
|
if (matches(opts[j], buf)) {
|
||||||
++skipped;
|
++ncandidates;
|
||||||
continue;
|
if (!picked) {
|
||||||
}
|
picked = opts[j];
|
||||||
if (s > bestscore) {
|
start = j;
|
||||||
best = opts[i];
|
}
|
||||||
bestscore = s;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
picked = best;
|
if (quickpick && ncandidates == 1 && picked)
|
||||||
if (quickpick && ncandidates == 1 && best)
|
|
||||||
goto finished;
|
goto finished;
|
||||||
|
|
||||||
if (password) {
|
if (password) {
|
||||||
if (best) fputs("\033[0;32m", out);
|
if (picked) fputs("\033[0;32m", out);
|
||||||
else if (nopts > 0) fputs("\033[0;31m", out);
|
else if (nopts > 0) fputs("\033[0;31m", out);
|
||||||
else fputs("\033[0;2m", out);
|
else fputs("\033[0;2m", out);
|
||||||
fputc((PASSWORD)[strlen(buf) % strlen(PASSWORD)], out);
|
fputc((PASSWORD)[strlen(buf) % strlen(PASSWORD)], out);
|
||||||
fputs("\033[0m", out);
|
fputs("\033[0m", out);
|
||||||
} else {
|
} else {
|
||||||
if (best) {
|
if (picked) {
|
||||||
draw_line(out, best, buf, &buf[b]);
|
draw_line(out, picked, buf, b);
|
||||||
} else {
|
} else {
|
||||||
if (nopts > 0)
|
if (nopts > 0)
|
||||||
fprintf(out, "\033[0;31m%s\033[0m", buf);
|
fprintf(out, "\033[0;31m%s\033[0m", buf);
|
||||||
@ -178,12 +199,26 @@ static char *get_input(FILE *in, FILE *out, const char *prompt, const char *init
|
|||||||
buf[len = b] = 0;
|
buf[len = b] = 0;
|
||||||
break;
|
break;
|
||||||
case KEY_CTRL_N:
|
case KEY_CTRL_N:
|
||||||
if (ncandidates)
|
if (picked) {
|
||||||
to_skip = (to_skip + 1) % ncandidates;
|
for (int i = 1; i < nopts; i++) {
|
||||||
|
int j = (start + i) % nopts;
|
||||||
|
if (matches(opts[j], buf)) {
|
||||||
|
start = j;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case KEY_CTRL_P:
|
case KEY_CTRL_P:
|
||||||
if (ncandidates)
|
if (picked) {
|
||||||
to_skip = (to_skip + ncandidates - 1) % ncandidates;
|
for (int i = nopts-1; i > 0; i--) {
|
||||||
|
int j = (start + i) % nopts;
|
||||||
|
if (matches(opts[j], buf)) {
|
||||||
|
start = j;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case KEY_BACKSPACE: case KEY_BACKSPACE2:
|
case KEY_BACKSPACE: case KEY_BACKSPACE2:
|
||||||
if (b > 0) {
|
if (b > 0) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user