X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwindows.c;h=389637b31b357e19bf6dfa886db749b257b944ca;hb=f44e1046dd5fafc71ac481490633ae544c5e5b0c;hp=bb78a8bee0624ea791aadffc5084201b00abeefb;hpb=e6b7840265f17e8934500815030a2fc0553feb81;p=plomrogue diff --git a/src/windows.c b/src/windows.c index bb78a8b..389637b 100644 --- a/src/windows.c +++ b/src/windows.c @@ -362,8 +362,9 @@ 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; uint32_t maxy_test = getmaxy(screen); uint32_t maxx_test = getmaxx(screen); @@ -383,15 +384,21 @@ extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta) } 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; @@ -427,11 +434,32 @@ extern uint8_t init_win(struct WinMeta * wmeta, struct Win * w, char * title, { w->frame.size.y = wmeta->padframe.size.y - 1; } + *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); +} + + + extern uint8_t append_win(struct WinMeta * wmeta, struct Win * w) { if (0 != wmeta->_chain_start)