ncurses 6.2 - patch 20210213

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

diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index 72d8af84b70314d67a20e146bf1c3fc65c688bfd..580d033b7d44b6141c1fce9ecef4c433550a5903 100644 (file)
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -43,7 +44,7 @@
 #include <curses.priv.h>
 #include <stddef.h>
 
 #include <curses.priv.h>
 #include <stddef.h>
 

-MODULE_ID("$Id: lib_newwin.c,v 1.69 2011/03/07 21:58:17 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.75 2020/02/02 23:34:34 tom Exp $")

 
 #define window_is(name) ((sp)->_##name == win)
 
 
 #define window_is(name) ((sp)->_##name == win)
 


@@ -91,8 +92,6 @@ remove_window_from_screen(WINDOW *win)
 NCURSES_EXPORT(int)
 _nc_freewin(WINDOW *win)
 {
 NCURSES_EXPORT(int)
 _nc_freewin(WINDOW *win)
 {

-    WINDOWLIST *p, *q;
-    int i;

     int result = ERR;
 #ifdef USE_SP_WINDOWLIST
     SCREEN *sp = _nc_screen_of(win);   /* pretend this is parameter */
     int result = ERR;
 #ifdef USE_SP_WINDOWLIST
     SCREEN *sp = _nc_screen_of(win);   /* pretend this is parameter */


@@ -101,17 +100,23 @@ _nc_freewin(WINDOW *win)
     T((T_CALLED("_nc_freewin(%p)"), (void *) win));
 
     if (win != 0) {
     T((T_CALLED("_nc_freewin(%p)"), (void *) win));
 
     if (win != 0) {

+

        if (_nc_nonsp_try_global(curses) == 0) {
        if (_nc_nonsp_try_global(curses) == 0) {

+           WINDOWLIST *p, *q;
+

            q = 0;
            q = 0;

-           for (each_window(SP_PARM, p)) {
+           for (each_window(sp, p)) {
+

                if (&(p->win) == win) {
                    remove_window_from_screen(win);
                    if (q == 0)
                if (&(p->win) == win) {
                    remove_window_from_screen(win);
                    if (q == 0)

-                       WindowList(SP_PARM) = p->next;
+                       WindowList(sp) = p->next;

                    else
                        q->next = p->next;
 
                    if (!(win->_flags & _SUBWIN)) {
                    else
                        q->next = p->next;
 
                    if (!(win->_flags & _SUBWIN)) {

+                       int i;
+

                        for (i = 0; i <= win->_maxy; i++)
                            FreeIfNeeded(win->_line[i].text);
                    }
                        for (i = 0; i <= win->_maxy; i++)
                            FreeIfNeeded(win->_line[i].text);
                    }


@@ -141,7 +146,11 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
     T((T_CALLED("newwin(%p, %d,%d,%d,%d)"), (void *) SP_PARM, num_lines, num_columns,
        begy, begx));
 
     T((T_CALLED("newwin(%p, %d,%d,%d,%d)"), (void *) SP_PARM, num_lines, num_columns,
        begy, begx));
 

-    if (begy < 0 || begx < 0 || num_lines < 0 || num_columns < 0)
+    if (begy < 0
+       || begx < 0
+       || num_lines < 0
+       || num_columns < 0
+       || SP_PARM == 0)

        returnWin(0);
 
     if (num_lines == 0)
        returnWin(0);
 
     if (num_lines == 0)


@@ -235,10 +244,15 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
 NCURSES_EXPORT(WINDOW *)
 subwin(WINDOW *w, int l, int c, int y, int x)
 {
 NCURSES_EXPORT(WINDOW *)
 subwin(WINDOW *w, int l, int c, int y, int x)
 {

+    WINDOW *result = 0;
+

     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x));
     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x));

-    T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));
+    if (w != 0) {
+       T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));

 
 

-    returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx));
+       result = derwin(w, l, c, y - w->_begy, x - w->_begx);
+    }
+    returnWin(result);

 }
 
 static bool
 }
 
 static bool


@@ -375,18 +389,18 @@ NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
 NCURSES_EXPORT(WINDOW *)
 _nc_curscr_of(SCREEN *sp)
 {
 NCURSES_EXPORT(WINDOW *)
 _nc_curscr_of(SCREEN *sp)
 {

-    return sp == 0 ? 0 : CurScreen(sp);
+    return (sp == 0) ? NULL : CurScreen(sp);

 }
 
 NCURSES_EXPORT(WINDOW *)
 _nc_newscr_of(SCREEN *sp)
 {
 }
 
 NCURSES_EXPORT(WINDOW *)
 _nc_newscr_of(SCREEN *sp)
 {

-    return sp == 0 ? 0 : NewScreen(sp);
+    return (sp == 0) ? NULL : NewScreen(sp);

 }
 
 NCURSES_EXPORT(WINDOW *)
 _nc_stdscr_of(SCREEN *sp)
 {
 }
 
 NCURSES_EXPORT(WINDOW *)
 _nc_stdscr_of(SCREEN *sp)
 {

-    return sp == 0 ? 0 : StdScreen(sp);
+    return (sp == 0) ? NULL : StdScreen(sp);

 }
 #endif
 }
 #endif