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

Cleanup of how window resize events are handled.

Browse Source
This commit is contained in:
Bruce Hill 2019-12-07 21:17:06 -08:00
parent e3b0b03435
commit 0e94d55807
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bb.c
View File

@ -198,6 +198,7 @@ void handle_next_key_binding(bb_t *bb)
do { do {
do { do {
key = bgetkey(tty_in, &mouse_x, &mouse_y); key = bgetkey(tty_in, &mouse_x, &mouse_y);
if (key == -1 && dirty) return;
} while (key == -1); } while (key == -1);
binding = NULL; binding = NULL;
@ -1125,11 +1126,9 @@ static char *trim(char *s)
void update_term_size(int sig) void update_term_size(int sig)
{ {
(void)sig; (void)sig;
if (tty_in) { struct winsize oldsize = winsize;
struct winsize oldsize = winsize; ioctl(STDIN_FILENO, TIOCGWINSZ, &winsize);
ioctl(fileno(tty_in), TIOCGWINSZ, &winsize); dirty |= (oldsize.ws_col != winsize.ws_col || oldsize.ws_row != winsize.ws_row);
dirty |= (oldsize.ws_col != winsize.ws_col || oldsize.ws_row != winsize.ws_row);
}
} }
/* /*
@ -1199,6 +1198,13 @@ int main(int argc, char *argv[])
} }
} }
struct sigaction sa_winch = {.sa_handler = &update_term_size};
sigaction(SIGWINCH, &sa_winch, NULL);
update_term_size(0);
// Wait 10ms at a time for terminal to initialize if necessary
while (winsize.ws_row == 0)
usleep(10000);
cmdfilename = memcheck(strdup(CMDFILE_FORMAT)); cmdfilename = memcheck(strdup(CMDFILE_FORMAT));
int cmdfd; int cmdfd;
if ((cmdfd = mkostemp(cmdfilename, O_APPEND)) == -1) if ((cmdfd = mkostemp(cmdfilename, O_APPEND)) == -1)
@ -1237,21 +1243,6 @@ int main(int argc, char *argv[])
} }
setenv("BBINITIALPATH", full_initial_path, 1); setenv("BBINITIALPATH", full_initial_path, 1);
tty_in = fopen("/dev/tty", "r");
tty_out = fopen("/dev/tty", "w");
tcgetattr(fileno(tty_out), &orig_termios);
memcpy(&bb_termios, &orig_termios, sizeof(bb_termios));
cfmakeraw(&bb_termios);
bb_termios.c_cc[VMIN] = 0;
bb_termios.c_cc[VTIME] = 1;
atexit(cleanup);
struct sigaction sa_winch = {.sa_handler = &update_term_size};
sigaction(SIGWINCH, &sa_winch, NULL);
int signals[] = {SIGTERM, SIGINT, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGSEGV, SIGTSTP};
struct sigaction sa = {.sa_handler = &cleanup_and_raise, .sa_flags = (int)(SA_NODEFER | SA_RESETHAND)};
for (size_t i = 0; i < sizeof(signals)/sizeof(signals[0]); i++)
sigaction(signals[i], &sa, NULL);
write(cmdfd, "\0", 1); write(cmdfd, "\0", 1);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
if (argv[i][0] == '+') { if (argv[i][0] == '+') {
@ -1269,11 +1260,24 @@ int main(int argc, char *argv[])
} }
close(cmdfd); cmdfd = -1; close(cmdfd); cmdfd = -1;
init_term(); tty_in = fopen("/dev/tty", "r");
tty_out = fopen("/dev/tty", "w");
tcgetattr(fileno(tty_out), &orig_termios);
memcpy(&bb_termios, &orig_termios, sizeof(bb_termios));
cfmakeraw(&bb_termios);
bb_termios.c_cc[VMIN] = 0;
bb_termios.c_cc[VTIME] = 1;
atexit(cleanup);
int signals[] = {SIGTERM, SIGINT, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGSEGV, SIGTSTP};
struct sigaction sa = {.sa_handler = &cleanup_and_raise, .sa_flags = (int)(SA_NODEFER | SA_RESETHAND)};
for (size_t i = 0; i < sizeof(signals)/sizeof(signals[0]); i++)
sigaction(signals[i], &sa, NULL);
bb_t bb = { bb_t bb = {
.columns = "*smpn", .columns = "*smpn",
.sort = "+n" .sort = "+n"
}; };
init_term();
bb_browse(&bb, full_initial_path); bb_browse(&bb, full_initial_path);
fputs(T_LEAVE_BBMODE, tty_out); fputs(T_LEAVE_BBMODE, tty_out);
cleanup(); cleanup();

2
bb.h
View File

@ -25,7 +25,7 @@
#include "bterm.h" #include "bterm.h"
// Macros: // Macros:
#define BB_VERSION "0.20.1" #define BB_VERSION "0.20.2"
#ifndef PATH_MAX #ifndef PATH_MAX
#define PATH_MAX 4096 #define PATH_MAX 4096