X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwindows.c;h=48d17f0589c310fd99cb2c832a3f55b711ece916;hb=cd36b7aea78655cccff83f554d3e6631212d66d0;hp=50a48e3e5fc8afc810a0982495a7121ec103dc1f;hpb=76642a2046d8f9a4774cd561ea2899a2890b3370;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index 50a48e3..48d17f0 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,
@@ -365,23 +365,23 @@ static void shift_win_backward(struct WinMeta * wmeta)
extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
{
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;
return 0;
}
@@ -405,7 +405,7 @@ extern struct Win init_win(struct WinMeta * wmeta, char * title,
}
else
{
- w.frame.size.x = 1;
+ w.frame.size.x = wmeta->padframe.size.x;
}
if (height > 0 && height <= wmeta->padframe.size.y - 1)
{
@@ -506,11 +506,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)