}
/* Only resize the pad if the rightmost window column has changed. */
- if (getmaxx(wmeta->padframe.curses_win) != lastwincol)
+ if (getmaxx(wmeta->padframe.curses_win) + 1 != lastwincol)
{
if (lastwincol + 2 > UINT16_MAX)
{
-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;
uint32_t maxy_test = getmaxy(screen);
uint32_t maxx_test = getmaxx(screen);
}
wmeta->padframe.curses_win = pad_test;
wmeta->active = 0;
+ *wmp = wmeta;
return 0;
}
-extern uint8_t init_win(struct WinMeta * wmeta, struct Win * w, char * title,
+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 = malloc(sizeof(struct Win));
+ if (NULL == w)
+ {
+ return 1;
+ }
w->_prev = 0;
w->_next = 0;
w->frame.curses_win = 0;
{
w->frame.size.x = width;
}
- else if (0 > width)
+ else if (0 >= width)
{
w->frame.size.x = wmeta->padframe.size.x + width;
}
- else
- {
- w->frame.size.x = wmeta->padframe.size.x;
- }
if (0 < height && height <= wmeta->padframe.size.y - 1)
{
w->frame.size.y = height;
}
- else if (0 > height && wmeta->padframe.size.y + (height - 1) > 0)
+ else if (0 >= height && wmeta->padframe.size.y + (height - 1) > 0)
{
w->frame.size.y = wmeta->padframe.size.y + (height - 1);
}
- else
+ *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)
{
- w->frame.size.y = wmeta->padframe.size.y - 1;
+ delwin(win->frame.curses_win);
}
- return 0;
+ free(win->_title);
+ free(win);
}