mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not botch SIGWINCH delivery to the subshell.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Yuri Khan 2016-05-09 18:04:21 +06:00 committed by Andrew Borodin
parent 52871230a2
commit 968882335a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tty/tty-slang.c
View File

@ -83,6 +83,8 @@ static struct termios new_mode;
/* Controls whether we should wait for input in tty_lowlevel_getch */ /* Controls whether we should wait for input in tty_lowlevel_getch */
static gboolean no_slang_delay; static gboolean no_slang_delay;
static gboolean slsmg_active = FALSE;
/* This table describes which capabilities we want and which values we /* This table describes which capabilities we want and which values we
* assign to them. * assign to them.
*/ */
@ -329,6 +331,7 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
tty_display_8bit (FALSE); tty_display_8bit (FALSE);
SLsmg_init_smg (); SLsmg_init_smg ();
slsmg_active = TRUE;
if (!mouse_enable) if (!mouse_enable)
use_mouse_p = MOUSE_DISABLED; use_mouse_p = MOUSE_DISABLED;
tty_init_xterm_support (is_xterm); /* do it before tty_enter_ca_mode() call */ tty_init_xterm_support (is_xterm); /* do it before tty_enter_ca_mode() call */
@ -354,6 +357,7 @@ tty_shutdown (void)
tty_reset_screen (); tty_reset_screen ();
tty_exit_ca_mode (); tty_exit_ca_mode ();
SLang_reset_tty (); SLang_reset_tty ();
slsmg_active = FALSE;
/* Load the op capability to reset the colors to those that were /* Load the op capability to reset the colors to those that were
* active when the program was started up * active when the program was started up
@ -388,6 +392,7 @@ void
tty_change_screen_size (void) tty_change_screen_size (void)
{ {
SLtt_get_screen_size (); SLtt_get_screen_size ();
if (slsmg_active)
SLsmg_reinit_smg (); SLsmg_reinit_smg ();
#ifdef ENABLE_SUBSHELL #ifdef ENABLE_SUBSHELL
@ -404,6 +409,7 @@ tty_reset_prog_mode (void)
{ {
tcsetattr (SLang_TT_Read_FD, TCSANOW, &new_mode); tcsetattr (SLang_TT_Read_FD, TCSANOW, &new_mode);
SLsmg_init_smg (); SLsmg_init_smg ();
slsmg_active = TRUE;
SLsmg_touch_lines (0, LINES); SLsmg_touch_lines (0, LINES);
} }
@ -504,6 +510,7 @@ int
tty_reset_screen (void) tty_reset_screen (void)
{ {
SLsmg_reset_smg (); SLsmg_reset_smg ();
slsmg_active = FALSE;
return 0; /* OK */ return 0; /* OK */
} }