Moved freeing of winmeta into windows library.

[plomrogue] / src / windows.c

diff --git a/src/windows.c b/src/windows.c
index 41eaae9b5982c6ccb2fcd969217b0fec81a06465..389637b31b357e19bf6dfa886db749b257b944ca 100644 (file)
--- a/src/windows.c
+++ b/src/windows.c
@@ -81,8 +81,8 @@ static uint8_t refit_pad(struct WinMeta * wmeta)
     /* Only resize the pad if the rightmost window column has changed. */
     if (getmaxx(wmeta->padframe.curses_win) != lastwincol)
     {
-        if (lastwincol + 2 > UINT16_MAX) /* Abort if pad would grow beyond */
-        {                                /* yx_uint16 confines. */
+        if (lastwincol + 2 > UINT16_MAX)
+        {
             return 2;
         }
         return (ERR == wresize(wmeta->padframe.curses_win,
@@ -362,60 +362,100 @@ static void shift_win_backward(struct WinMeta * wmeta)
 
 
 
-extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
+extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta ** wmp)
 {
+    struct WinMeta * wmeta = malloc(sizeof(struct WinMeta));
     wmeta->_screen             = screen;
-    wmeta->padframe.size.y     = getmaxy(screen);
-    wmeta->padframe.size.x     = getmaxx(screen);
-    if (   wmeta->padframe.size.y > UINT16_MAX
-        || wmeta->padframe.size.x > UINT16_MAX)
+    uint32_t maxy_test         = getmaxy(screen);
+    uint32_t maxx_test         = getmaxx(screen);
+    if (maxy_test > UINT16_MAX || maxx_test > UINT16_MAX)
     {
         return 2;
     }
+    wmeta->padframe.size.y     = maxy_test;
+    wmeta->padframe.size.x     = maxx_test;
     wmeta->_chain_start        = 0;
     wmeta->_chain_end          = 0;
     wmeta->pad_offset          = 0;
-    WINDOW * test;
-    test = newpad(wmeta->padframe.size.y, 1);
-    if (NULL == test)
+    WINDOW * pad_test          = newpad(wmeta->padframe.size.y, 1);
+    if (NULL == pad_test)
     {
         return 1;
     }
-    wmeta->padframe.curses_win = test;
+    wmeta->padframe.curses_win = pad_test;
     wmeta->active              = 0;
+    *wmp = wmeta;
     return 0;
 }
 
 
 
-extern struct Win init_win(struct WinMeta * wmeta, char * title,
-                           uint16_t height, uint16_t width,
-                           void * data, void * func)
+extern uint8_t init_win(struct WinMeta * wmeta, struct Win ** wp, char * title,
+                        int16_t height, int16_t width,
+                        void * data, void * func)
 {
-    struct Win w;
-    w._prev             = 0;
-    w._next             = 0;
-    w.frame.curses_win  = 0;
-    w._title            = title;
-    w.data              = data;
-    w._draw             = func;
-    if (width > 0)
+    struct Win * w = malloc(sizeof(struct Win));
+    if (NULL == w)
+    {
+        return 1;
+    }
+    w->_prev             = 0;
+    w->_next             = 0;
+    w->frame.curses_win  = 0;
+    w->_title             = malloc(strlen(title) + 1);
+    if (NULL == w->_title)
+    {
+        return 1;
+    }
+    sprintf(w->_title, "%s", title);
+    w->data              = data;
+    w->_draw             = func;
+    if      (0 < width)
     {
-        w.frame.size.x = width;
+        w->frame.size.x = width;
+    }
+    else if (0 > width)
+    {
+        w->frame.size.x = wmeta->padframe.size.x + width;
     }
     else
     {
-        w.frame.size.x = 1;
+        w->frame.size.x = wmeta->padframe.size.x;
+    }
+    if      (0 < height && height <= wmeta->padframe.size.y - 1)
+    {
+        w->frame.size.y = height;
     }
-    if (height > 0 && height <= wmeta->padframe.size.y - 1)
+    else if (0 > height && wmeta->padframe.size.y + (height - 1) > 0)
     {
-        w.frame.size.y = height;
+        w->frame.size.y = wmeta->padframe.size.y + (height - 1);
     }
     else
     {
-        w.frame.size.y = wmeta->padframe.size.y - 1;
+        w->frame.size.y = wmeta->padframe.size.y - 1;
     }
-    return w;
+    *wp = w;
+    return 0;
+}
+
+
+
+extern void free_winmeta(struct WinMeta * wmeta)
+{
+    delwin(wmeta->padframe.curses_win);
+    free(wmeta);
+}
+
+
+
+extern void free_win(struct Win * win)
+{
+    if (0 != win->frame.curses_win)
+    {
+        delwin(win->frame.curses_win);
+    }
+    free(win->_title);
+    free(win);
 }
 
 
@@ -506,11 +546,11 @@ extern uint8_t resize_active_win(struct WinMeta * wmeta, struct yx_uint16 size)
         && size.y < wmeta->padframe.size.y)
     {
         wmeta->active->frame.size = size;
-        return update_wins(wmeta, wmeta->_chain_start); /* Following windows' */
-    }                                                   /* positioning may be */
-    return 0;                                           /* affected.          */
-}                                                       /* TODO: Why start at */
-                                                        /* chain_start then?  */
+        return update_wins(wmeta, wmeta->active); /* Positioning of following */
+    }                                             /* windows may be affected. */
+    return 0;
+}
+
 
 
 extern void cycle_active_win(struct WinMeta * wmeta, char dir)
@@ -547,8 +587,7 @@ extern void cycle_active_win(struct WinMeta * wmeta, char dir)
 extern uint8_t shift_active_win(struct WinMeta * wmeta, char dir)
 {
     if (   0 == wmeta->active                        /* No shifting with < 2  */
-        || wmeta->_chain_start == wmeta->_chain_end  /* windows visible or    */
-        || (dir != 'f' && dir != 'b'))               /* wrong direction char. */
+        || wmeta->_chain_start == wmeta->_chain_end) /* windows visible.      */
     {
         return 0;
     }