Merge branch '4630_resize'

* 4630_resize:
  (toggle_subshell): fix possible race condition on SIGWINCH handling.
  (tty_flush_winch): return boolean.
  Ticket #4630: mc doesn't fully resize itself...

Author: aborodin

lib/tty/tty.c

@@ -216,10 +216,11 @@ tty_got_winch (void)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
+gboolean
 tty_flush_winch (void)
 {
     ssize_t n;
+    gboolean ret = FALSE;
 
     /* merge all SIGWINCH events raised to this moment */
     do
@@ -228,8 +229,14 @@ tty_flush_winch (void)
 
         /* read multiple events at a time  */
         n = read (sigwinch_pipe[0], &x, sizeof (x));
+
+        /* at least one SIGWINCH came */
+        if (n > 0)
+            ret = TRUE;
     }
     while (n > 0 || (n == -1 && errno == EINTR));
+
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/tty/tty.h

@@ -81,7 +81,7 @@ extern void tty_disable_interrupt_key (void);
 extern gboolean tty_got_interrupt (void);
 
 extern gboolean tty_got_winch (void);
-extern void tty_flush_winch (void);
+extern gboolean tty_flush_winch (void);
 
 extern void tty_reset_prog_mode (void);
 extern void tty_reset_shell_mode (void);

lib/widget/dialog-switch.c

@@ -386,6 +386,14 @@ dialog_change_screen_size (void)
 {
     GList *d;
 
+    /* On startup, when mc reads directories top_dlg isn't created yet. If window is resized
+     * at this time, SIGWINCH can be missed because tty_flush_winch() is called here before
+     * a first tty_got_winch() call in frontend_dlg_run().
+     *
+     * Keep SIGWINCH events in pipe if top_dlg isn't created yet. */
+    if (top_dlg == NULL)
+        return;
+
     tty_flush_winch ();
     tty_change_screen_size ();
 

src/execute.c

@@ -547,8 +547,7 @@ toggle_subshell (void)
      * Save sigwinch flag that will be reset in mc_refresh() called via update_panels().
      * There is some problem with screen redraw in ncurses-based mc in this situation.
      */
-    was_sigwinch = tty_got_winch ();
-    tty_flush_winch ();
+    was_sigwinch = tty_flush_winch ();
 
 #ifdef ENABLE_SUBSHELL
     if (mc_global.tty.use_subshell)