X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwindows.c;h=df67411da45ef6d7010b0dadea3e38c5a5f3b362;hb=e6a78faa3052eff39bcadcaf81e2e3b5249071a7;hp=50a48e3e5fc8afc810a0982495a7121ec103dc1f;hpb=76642a2046d8f9a4774cd561ea2899a2890b3370;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index 50a48e3..df67411 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -81,8 +81,8 @@ 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 (lastwincol + 2 > UINT16_MAX) /* Abort if pad would grow beyond */
- { /* yx_uint16 confines. */
+ if (lastwincol + 2 > UINT16_MAX)
+ {
return 2;
}
return (ERR == wresize(wmeta->padframe.curses_win,
@@ -362,60 +362,92 @@ 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;
- wmeta->padframe.size.y = getmaxy(screen);
- wmeta->padframe.size.x = getmaxx(screen);
- if ( wmeta->padframe.size.y > UINT16_MAX
- || wmeta->padframe.size.x > UINT16_MAX)
+ uint32_t maxy_test = getmaxy(screen);
+ uint32_t maxx_test = getmaxx(screen);
+ if (maxy_test > UINT16_MAX || maxx_test > UINT16_MAX)
{
return 2;
}
+ wmeta->padframe.size.y = maxy_test;
+ wmeta->padframe.size.x = maxx_test;
wmeta->_chain_start = 0;
wmeta->_chain_end = 0;
wmeta->pad_offset = 0;
- WINDOW * test;
- test = newpad(wmeta->padframe.size.y, 1);
- if (NULL == test)
+ WINDOW * pad_test = newpad(wmeta->padframe.size.y, 1);
+ if (NULL == pad_test)
{
return 1;
}
- wmeta->padframe.curses_win = test;
+ wmeta->padframe.curses_win = pad_test;
wmeta->active = 0;
+ *wmp = wmeta;
return 0;
}
-extern struct Win init_win(struct WinMeta * wmeta, char * title,
- uint16_t height, uint16_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;
- if (width > 0)
+ 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)
{
- w.frame.size.x = width;
+ return 1;
+ }
+ sprintf(w->_title, "%s", title);
+ w->data = data;
+ w->_draw = func;
+ if (0 < width)
+ {
+ w->frame.size.x = width;
+ }
+ else if (0 > width)
+ {
+ w->frame.size.x = wmeta->padframe.size.x + width;
}
else
{
- w.frame.size.x = 1;
+ w->frame.size.x = wmeta->padframe.size.x;
+ }
+ if (0 < height && height <= wmeta->padframe.size.y - 1)
+ {
+ w->frame.size.y = height;
}
- if (height > 0 && height <= wmeta->padframe.size.y - 1)
+ else if (0 > height && wmeta->padframe.size.y + (height - 1) > 0)
{
- w.frame.size.y = height;
+ 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;
+ *wp = w;
+ return 0;
+}
+
+
+
+extern void free_win(struct Win * win)
+{
+ if (0 != win->frame.curses_win)
+ {
+ delwin(win->frame.curses_win);
+ }
+ free(win->_title);
+ free(win);
}
@@ -506,11 +538,11 @@ extern uint8_t resize_active_win(struct WinMeta * wmeta, struct yx_uint16 size)
&& size.y < wmeta->padframe.size.y)
{
wmeta->active->frame.size = size;
- return update_wins(wmeta, wmeta->_chain_start); /* Following windows' */
- } /* positioning may be */
- return 0; /* affected. */
-} /* TODO: Why start at */
- /* chain_start then? */
+ return update_wins(wmeta, wmeta->active); /* Positioning of following */
+ } /* windows may be affected. */
+ return 0;
+}
+
extern void cycle_active_win(struct WinMeta * wmeta, char dir)