ncurses 5.9 - patch 20120303

[ncurses.git] / ncurses / base / resizeterm.c

diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c
index 3f1d36e89d7adb1d18d9d812e82d336d8d56da95..daa4ae54ab64bd78432dd561a44edecece0aec46 100644 (file)
--- a/ncurses/base/resizeterm.c
+++ b/ncurses/base/resizeterm.c
@@ -45,7 +45,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: resizeterm.c,v 1.43 2011/01/10 01:34:49 tom Exp $")
+MODULE_ID("$Id: resizeterm.c,v 1.44 2011/09/03 18:29:11 tom Exp $")
 
 /*
  * If we're trying to be reentrant, do not want any local statics.
@@ -365,58 +365,71 @@ NCURSES_SP_NAME(resize_term) (NCURSES_SP_DCLx int ToLines, int ToCols)
        }
 #endif
        if (ToLines > screen_lines(SP_PARM)) {
-           increase_size(NCURSES_SP_ARGx
-                         myLines = ToLines, myCols, was_stolen EXTRA_ARGS);
+           result = increase_size(NCURSES_SP_ARGx
+                                  myLines = ToLines,
+                                  myCols,
+                                  was_stolen EXTRA_ARGS);
            CurLines = myLines;
            CurCols = myCols;
        }
 
-       if (ToCols > screen_columns(SP_PARM)) {
-           increase_size(NCURSES_SP_ARGx
-                         myLines, myCols = ToCols, was_stolen EXTRA_ARGS);
+       if ((result == OK)
+           && (ToCols > screen_columns(SP_PARM))) {
+           result = increase_size(NCURSES_SP_ARGx
+                                  myLines,
+                                  myCols = ToCols,
+                                  was_stolen EXTRA_ARGS);
            CurLines = myLines;
            CurCols = myCols;
        }
 
-       if (ToLines < myLines ||
-           ToCols < myCols) {
-           decrease_size(NCURSES_SP_ARGx ToLines, ToCols, was_stolen EXTRA_ARGS);
+       if ((result == OK)
+           && (ToLines < myLines ||
+               ToCols < myCols)) {
+           result = decrease_size(NCURSES_SP_ARGx
+                                  ToLines,
+                                  ToCols,
+                                  was_stolen EXTRA_ARGS);
        }
 
-       screen_lines(SP_PARM) = (NCURSES_SIZE_T) ToLines;
-       screen_columns(SP_PARM) = (NCURSES_SIZE_T) ToCols;
+       if (result == OK) {
+           screen_lines(SP_PARM) = (NCURSES_SIZE_T) ToLines;
+           screen_columns(SP_PARM) = (NCURSES_SIZE_T) ToCols;
 
 #ifdef USE_TERM_DRIVER
-       CallDriver_2(SP_PARM, setsize, ToLines, ToCols);
+           CallDriver_2(SP_PARM, setsize, ToLines, ToCols);
 #else
-       lines = (NCURSES_SIZE_T) ToLines;
-       columns = (NCURSES_SIZE_T) ToCols;
+           lines = (NCURSES_SIZE_T) ToLines;
+           columns = (NCURSES_SIZE_T) ToCols;
 #endif
 
-       SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen);
+           SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen);
 
-       if (SP_PARM->oldhash) {
-           FreeAndNull(SP_PARM->oldhash);
-       }
-       if (SP_PARM->newhash) {
-           FreeAndNull(SP_PARM->newhash);
-       }
+           if (SP_PARM->oldhash) {
+               FreeAndNull(SP_PARM->oldhash);
+           }
+           if (SP_PARM->newhash) {
+               FreeAndNull(SP_PARM->newhash);
+           }
 #ifdef TRACE
-       if (USE_TRACEF(TRACE_UPDATE)) {
-           SET_LINES(ToLines - was_stolen);
-           SET_COLS(ToCols);
-           show_window_sizes("after");
-           _nc_unlock_global(tracef);
-       }
+           if (USE_TRACEF(TRACE_UPDATE)) {
+               SET_LINES(ToLines - was_stolen);
+               SET_COLS(ToCols);
+               show_window_sizes("after");
+               _nc_unlock_global(tracef);
+           }
 #endif
+       }
     }
 
-    /*
-     * Always update LINES, to allow for call from lib_doupdate.c which
-     * needs to have the count adjusted by the stolen (ripped off) lines.
-     */
-    SET_LINES(ToLines - was_stolen);
-    SET_COLS(ToCols);
+    if (result == OK) {
+       /*
+        * Always update LINES, to allow for call from lib_doupdate.c which
+        * needs to have the count adjusted by the stolen (ripped off) lines.
+        */
+       SET_LINES(ToLines - was_stolen);
+       SET_COLS(ToCols);
+    }
 
     _nc_nonsp_unlock_global(curses);