mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic filter-as-you-type mode

Browse source
This commit is contained in:
lostd 2015-01-27 10:47:57 +02:00
parent 1295b7f0e6
commit 84e124bb46
2 changed files with 86 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.def.h
View file

@ -26,6 +26,8 @@ struct key bindings[] = {
/* Filter */ /* Filter */
{ '/', SEL_FLTR }, { '/', SEL_FLTR },
{ '&', SEL_FLTR }, { '&', SEL_FLTR },
/* Type */
{ '?', SEL_TYPE },
/* Next */ /* Next */
{ 'j', SEL_NEXT }, { 'j', SEL_NEXT },
{ KEY_DOWN, SEL_NEXT }, { KEY_DOWN, SEL_NEXT },

84
noice.c
View file

@ -49,6 +49,7 @@ enum action {
SEL_BACK, SEL_BACK,
SEL_GOIN, SEL_GOIN,
SEL_FLTR, SEL_FLTR,
SEL_TYPE,
SEL_NEXT, SEL_NEXT,
SEL_PREV, SEL_PREV,
SEL_PGDN, SEL_PGDN,
@ -359,6 +360,55 @@ readln(void)
return ln; return ln;
} }
/*
* Read one key and modify the provided string accordingly.
* Returns 0 when more input is expected and 1 on completion.
*/
int
readmore(char **str)
{
int c;
int i;
char *ln = *str;
int ret = 0;
if (ln != NULL)
i = strlen(ln);
else
i = 0;
DPRINTF_D(i);
curs_set(TRUE);
c = getch();
if (c == KEY_ENTER || c == '\r') {
ret = 1;
goto out;
}
if (c == KEY_BACKSPACE) {
i--;
if (i > 0) {
ln = xrealloc(ln, (i + 1) * sizeof(*ln));
ln[i] = '\0';
} else {
free(ln);
ln = NULL;
}
goto out;
}
ln = xrealloc(ln, (i + 2) * sizeof(*ln));
ln[i] = c;
i++;
ln[i] = '\0';
out:
curs_set(FALSE);
*str = ln;
return ret;
}
int int
canopendir(char *path) canopendir(char *path)
{ {
@ -518,6 +568,7 @@ browse(const char *ipath, const char *ifilter)
char *cwd, *newpath, *oldpath = NULL; char *cwd, *newpath, *oldpath = NULL;
struct stat sb; struct stat sb;
char *name, *bin, *dir, *tmp; char *name, *bin, *dir, *tmp;
int nowtyping = 0;
begin: begin:
/* Path and filter should be malloc(3)-ed strings at all times */ /* Path and filter should be malloc(3)-ed strings at all times */
@ -580,6 +631,10 @@ begin:
printent(&dents[i], i == cur); printent(&dents[i], i == cur);
} }
/* Handle filter-as-you-type mode */
if (nowtyping)
goto moretyping;
nochange: nochange:
switch (nextsel()) { switch (nextsel()) {
case SEL_QUIT: case SEL_QUIT:
@ -679,6 +734,35 @@ nochange:
if (n > 0) if (n > 0)
oldpath = makepath(path, dents[cur].name); oldpath = makepath(path, dents[cur].name);
goto out; goto out;
case SEL_TYPE:
nowtyping = 1;
tmp = NULL;
moretyping:
printprompt("type: ");
if (tmp != NULL)
printw("%s", tmp);
r = readmore(&tmp);
DPRINTF_D(r);
DPRINTF_S(tmp);
if (r == 1)
nowtyping = 0;
/* Check regex errors */
if (tmp != NULL)
r = setfilter(&re, tmp);
if (r != 0 && nowtyping)
goto moretyping;
/* Copy or reset filter */
free(filter);
if (tmp != NULL)
filter = xstrdup(tmp);
else
filter = xstrdup(ifilter);
/* Save current */
if (n > 0)
oldpath = makepath(path, dents[cur].name);
if (!nowtyping)
free(tmp);
goto out;
case SEL_NEXT: case SEL_NEXT:
if (cur < n - 1) if (cur < n - 1)
cur++; cur++;