emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: rearrange functions, no logic changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-04-01 14:02:37 +02:00
parent 363a2bc9b1
commit 616e4699d2
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
editors/vi.c
View File

@ -2444,48 +2444,6 @@ static void cookmode(void)
tcsetattr_stdin_TCSANOW(&term_orig); tcsetattr_stdin_TCSANOW(&term_orig);
} }
#if ENABLE_FEATURE_VI_USE_SIGNALS
static void winch_handler(int sig UNUSED_PARAM)
{
int save_errno = errno;
// FIXME: do it in main loop!!!
signal(SIGWINCH, winch_handler);
query_screen_dimensions();
new_screen(rows, columns); // get memory for virtual screen
redraw(TRUE); // re-draw the screen
errno = save_errno;
}
static void tstp_handler(int sig UNUSED_PARAM)
{
int save_errno = errno;
// ioctl inside cookmode() was seen to generate SIGTTOU,
// stopping us too early. Prevent that:
signal(SIGTTOU, SIG_IGN);
go_bottom_and_clear_to_eol();
cookmode(); // terminal to "cooked"
// stop now
//signal(SIGTSTP, SIG_DFL);
//raise(SIGTSTP);
raise(SIGSTOP); // avoid "dance" with TSTP handler - use SIGSTOP instead
//signal(SIGTSTP, tstp_handler);
// we have been "continued" with SIGCONT, restore screen and termios
rawmode(); // terminal to "raw"
last_status_cksum = 0; // force status update
redraw(TRUE); // re-draw the screen
errno = save_errno;
}
static void int_handler(int sig)
{
signal(SIGINT, int_handler);
siglongjmp(restart, sig);
}
#endif /* FEATURE_VI_USE_SIGNALS */
static int mysleep(int hund) // sleep for 'hund' 1/100 seconds or stdin ready static int mysleep(int hund) // sleep for 'hund' 1/100 seconds or stdin ready
{ {
struct pollfd pfd[1]; struct pollfd pfd[1];
@ -3103,6 +3061,48 @@ static void refresh(int full_screen)
#undef old_offset #undef old_offset
} }
#if ENABLE_FEATURE_VI_USE_SIGNALS
static void winch_handler(int sig UNUSED_PARAM)
{
int save_errno = errno;
// FIXME: do it in main loop!!!
signal(SIGWINCH, winch_handler);
query_screen_dimensions();
new_screen(rows, columns); // get memory for virtual screen
redraw(TRUE); // re-draw the screen
errno = save_errno;
}
static void tstp_handler(int sig UNUSED_PARAM)
{
int save_errno = errno;
// ioctl inside cookmode() was seen to generate SIGTTOU,
// stopping us too early. Prevent that:
signal(SIGTTOU, SIG_IGN);
go_bottom_and_clear_to_eol();
cookmode(); // terminal to "cooked"
// stop now
//signal(SIGTSTP, SIG_DFL);
//raise(SIGTSTP);
raise(SIGSTOP); // avoid "dance" with TSTP handler - use SIGSTOP instead
//signal(SIGTSTP, tstp_handler);
// we have been "continued" with SIGCONT, restore screen and termios
rawmode(); // terminal to "raw"
last_status_cksum = 0; // force status update
redraw(TRUE); // re-draw the screen
errno = save_errno;
}
static void int_handler(int sig)
{
signal(SIGINT, int_handler);
siglongjmp(restart, sig);
}
#endif /* FEATURE_VI_USE_SIGNALS */
static void do_cmd(int c); static void do_cmd(int c);
static int find_range(char **start, char **stop, char c) static int find_range(char **start, char **stop, char c)