X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwindows.c;h=df67411da45ef6d7010b0dadea3e38c5a5f3b362;hb=e6a78faa3052eff39bcadcaf81e2e3b5249071a7;hp=efba9190ecbce74ef7f2a3cf703075534689af15;hpb=3b2c82991c9ab169b33248c7be840a9bcd351e6d;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index efba919..df67411 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,47 +384,70 @@ 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 struct Win init_win(struct WinMeta * wmeta, char * title,
- int16_t height, int16_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;
+ 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;
+ w->frame.size.x = wmeta->padframe.size.x + width;
}
else
{
- w.frame.size.x = wmeta->padframe.size.x;
+ w->frame.size.x = wmeta->padframe.size.x;
}
if (0 < height && height <= wmeta->padframe.size.y - 1)
{
- w.frame.size.y = height;
+ w->frame.size.y = height;
}
else if (0 > height && wmeta->padframe.size.y + (height - 1) > 0)
{
- w.frame.size.y = wmeta->padframe.size.y + (height - 1);
+ 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;
+ }
+ *wp = w;
+ return 0;
+}
+
+
+
+extern void free_win(struct Win * win)
+{
+ if (0 != win->frame.curses_win)
+ {
+ delwin(win->frame.curses_win);
}
- return w;
+ free(win->_title);
+ free(win);
}