X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwindows.c;h=af710dd34657e6c06ae2b9fdcdd61b2adbbb6b6a;hb=f8325a4ea617b15315183d7a8027c0b913c91034;hp=efba9190ecbce74ef7f2a3cf703075534689af15;hpb=3b2c82991c9ab169b33248c7be840a9bcd351e6d;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index efba919..af710dd 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -388,42 +388,46 @@ extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
-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 * w, 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;
+ 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, title, strlen(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;
}
- return w;
+ return 0;
}