Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ctrl-z for suspend and added a sort of hybrid mode for running

Browse Source 
commands at the bottom of the screen instead of in a full terminal mode.
This commit is contained in:
Bruce Hill 2019-05-21 22:41:22 -07:00
parent bff00bf755
commit b7b6b6cc74
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bb.c
View File

@ -535,6 +535,12 @@ static void explore(char *path, int print_dir, int print_selection)
_exit(1); _exit(1);
return; return;
case KEY_CTRL_Z:
close_term();
raise(SIGTSTP);
init_term();
goto redraw;
case 'q': case 'Q': case 'q': case 'Q':
goto done; goto done;
@ -807,26 +813,29 @@ static void explore(char *path, int print_dir, int print_selection)
default: default:
for (int i = 0; bindings[i].key; i++) { for (int i = 0; bindings[i].key; i++) {
if (key == bindings[i].key) { if (key == bindings[i].key) {
if (!(bindings[i].flags & SILENT)) term_move(0, height-1);
if (!(bindings[i].flags & ONSCREEN))
close_term(); close_term();
else {
int fd; // Show cursor:
pid_t child; writez(termfd, "\e[?25h");
child = run_cmd(NULL, &fd, bindings[i].command); tcsetattr(termfd, TCSAFLUSH, &orig_termios);
close(termfd);
if (!(bindings[i].flags & NO_FILES)) {
if (state.nselected > 0) {
write_selection(fd, state.firstselected);
} else if (strcmp(state.files[state.cursor]->d_name, "..") != 0) {
write(fd, state.files[state.cursor]->d_name, state.files[state.cursor]->d_namlen);
}
} }
close(fd); int scriptinfd;
pid_t child;
child = run_cmd(NULL, &scriptinfd, bindings[i].command);
if (!(bindings[i].flags & NO_FILES)) {
if (state.nselected > 0) {
write_selection(scriptinfd, state.firstselected);
} else if (strcmp(state.files[state.cursor]->d_name, "..") != 0) {
write(scriptinfd, state.files[state.cursor]->d_name, state.files[state.cursor]->d_namlen);
}
}
close(scriptinfd);
waitpid(child, NULL, 0); waitpid(child, NULL, 0);
init_term();
if (!(bindings[i].flags & SILENT))
init_term();
if (bindings[i].flags & CLEAR_SELECTION) if (bindings[i].flags & CLEAR_SELECTION)
clear_selection(&state); clear_selection(&state);

19
config.h
View File

@ -9,7 +9,7 @@
#define CD_TO_RESULT (1<<1) #define CD_TO_RESULT (1<<1)
#define REFRESH (1<<2) #define REFRESH (1<<2)
#define CLEAR_SELECTION (1<<3) #define CLEAR_SELECTION (1<<3)
#define SILENT (1<<4) #define ONSCREEN (1<<4)
#define DEVNULL " >/dev/null" #define DEVNULL " >/dev/null"
@ -17,18 +17,19 @@ struct {
int key; int key;
const char *command; const char *command;
int flags; int flags;
const char *prompt;
} bindings[] = { } bindings[] = {
{'?', "less"}, {'?', "less"},
{'D', "xargs rm -rf" DEVNULL, CLEAR_SELECTION | REFRESH | SILENT}, {'D', "xargs rm -rf" DEVNULL, CLEAR_SELECTION | REFRESH | ONSCREEN},
{'d', "xargs -I @ sh -c 'rm -rfi @ </dev/tty'", CLEAR_SELECTION | REFRESH}, {'d', "xargs -I @ sh -c 'rm -rfi @ </dev/tty'", CLEAR_SELECTION | REFRESH | ONSCREEN},
{'+', "xargs -n1 -I @ cp @ @.copy" DEVNULL, REFRESH | SILENT}, {'+', "xargs -n1 -I @ cp @ @.copy" DEVNULL, REFRESH | ONSCREEN},
{'m', "xargs -I @ mv -i @ . </dev/tty" DEVNULL, CLEAR_SELECTION | REFRESH | SILENT}, {'m', "xargs -I @ mv -i @ . </dev/tty" DEVNULL, CLEAR_SELECTION | REFRESH | ONSCREEN},
{'p', "xargs -I @ cp -i @ . </dev/tty" DEVNULL, CLEAR_SELECTION | REFRESH | SILENT}, {'p', "xargs -I @ cp -i @ . </dev/tty" DEVNULL, CLEAR_SELECTION | REFRESH | ONSCREEN},
{'n', "touch \"`printf '\\033[33;1mNew file:\\033[0m '`\"", SILENT | REFRESH | NO_FILES, "New file: "}, {'n', "touch \"`printf '\\033[33;1mNew file:\\033[0m ' >/dev/tty && head -n1 /dev/tty`\"", ONSCREEN | REFRESH | NO_FILES},
{'|', "sh -c \"`printf '> ' >/dev/tty && head -n1 /dev/tty`\"", REFRESH}, {'|', "sh -c \"`printf '> ' >/dev/tty && head -n1 /dev/tty`\"", REFRESH},
{'>', "sh -c \"`printf '> ' >/dev/tty && head -n1 /dev/tty`\"", NO_FILES | REFRESH}, {'>', "sh -c \"`printf '> ' >/dev/tty && head -n1 /dev/tty`\"", NO_FILES | REFRESH},
{'r', "xargs -I @ -n1 sh -c 'mv \"@\" \"`printf \"\e[1mRename \e[0;33m%%s\e[0m: \" \"@\" >&2 && head -n1 </dev/tty`\"'",
REFRESH | CLEAR_SELECTION | ONSCREEN},
{'r', "xargs -I @ -n1 sh -c 'mv \"@\" \"`printf \"\\033[1mRename \\033[0;33m%%s\\033[0m: \" \"@\" >&2 && head -n1 </dev/tty`\"'", {'r', "xargs -I @ -n1 sh -c 'mv \"@\" \"`printf \"\\033[1mRename \\033[0;33m%%s\\033[0m: \" \"@\" >&2 && head -n1 </dev/tty`\"'",
REFRESH | CLEAR_SELECTION}, REFRESH | CLEAR_SELECTION | ONSCREEN},
{0}, {0},
}; };