X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fwindows.c;h=efba9190ecbce74ef7f2a3cf703075534689af15;hb=3b2c82991c9ab169b33248c7be840a9bcd351e6d;hp=64251aec7e4389b90e28c260be82247573a528e0;hpb=6b2ad52fe945a3c9cacea6cbdfc7fbf6d783ccaf;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index 64251ae..efba919 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;
}
@@ -389,7 +389,7 @@ extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
extern struct Win init_win(struct WinMeta * wmeta, char * title,
- uint16_t height, uint16_t width,
+ int16_t height, int16_t width,
void * data, void * func)
{
struct Win w;
@@ -399,18 +399,26 @@ extern struct Win init_win(struct WinMeta * wmeta, char * title,
w._title = title;
w.data = data;
w._draw = func;
- if (width > 0)
+ 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 (height > 0 && height <= wmeta->padframe.size.y - 1)
+ 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)
+ {
+ w.frame.size.y = wmeta->padframe.size.y + (height - 1);
+ }
else
{
w.frame.size.y = wmeta->padframe.size.y - 1;
@@ -506,18 +514,18 @@ 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)
{
if (0 != wmeta->active)
{
- if ('n' == dir)
+ if ('f' == dir)
{
if (wmeta->active->_next != 0)
{
@@ -547,8 +555,7 @@ extern void cycle_active_win(struct WinMeta * wmeta, char dir)
extern uint8_t shift_active_win(struct WinMeta * wmeta, char dir)
{
if ( 0 == wmeta->active /* No shifting with < 2 */
- || wmeta->_chain_start == wmeta->_chain_end /* windows visible or */
- || (dir != 'f' && dir != 'b')) /* wrong direction char. */
+ || wmeta->_chain_start == wmeta->_chain_end) /* windows visible. */
{
return 0;
}