X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwindows.c;h=080880c8fff35f766ae791b5ede7152753a93604;hb=87142d2899b2b778a656f56cb7934bf46a53aa87;hp=f75544bd4753fa06d64f46382499a8b92f7fbfec;hpb=0399a31b31047ab82348f733d6c56524258d1188;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index f75544b..080880c 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -79,7 +79,7 @@ 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 (getmaxx(wmeta->padframe.curses_win) + 1 != lastwincol)
{
if (lastwincol + 2 > UINT16_MAX)
{
@@ -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,6 +384,7 @@ extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
}
wmeta->padframe.curses_win = pad_test;
wmeta->active = 0;
+ *wmp = wmeta;
return 0;
}
@@ -412,34 +414,38 @@ extern uint8_t init_win(struct WinMeta * wmeta, struct Win ** wp, char * title,
{
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
- {
- 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);
}