X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fwindows.c;h=74fb6cfd53c5407a516b658ccf1bc1bcda6b4039;hb=8d8eba7405f426c45fd059a17d2f00cfb21c5253;hp=9e9fd1270964f3592db93f02f40752f788bc160c;hpb=f7959fe464c88c7917b39b47691c2f33278093d1;p=plomrogue
diff --git a/src/windows.c b/src/windows.c
index 9e9fd12..74fb6cf 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -1,7 +1,7 @@
/* windows.c */
#include "windows.h"
-#include /* for uint16_t, uint32_t */
+#include /* for uint8_t, uint16_t, uint32_t */
#include /* for typedefs WINDOW, chtype, wresize(), getmaxx(), */
/* getmaxy(), supbad(), delwin(), mvwaddch(), */
/* mvwaddstr(), newpad(), wnoutrefres(), erase(), */
@@ -13,16 +13,18 @@
/* Fit virtual screen's width to minimum width demanded by current windows'
- * geometries.
+ * geometries. Returns 0 on success, 1 on (pad memory allocation) error.
*/
-static void refit_pad(struct WinMeta * wmeta);
+static uint8_t refit_pad(struct WinMeta * wmeta);
/* Update geometry (sizes, positions) of window "w" and its successors in the
* window chain. For the positioning algorithm place_win() is used.
+ *
+ * update_wins() returns 0 on success, 1 on (pad/window memory alloc.) error.
*/
-static void update_wins(struct WinMeta * wmeta, struct Win * w);
+static uint8_t update_wins(struct WinMeta * wmeta, struct Win * w);
static void place_win(struct WinMeta * wmeta, struct Win * w);
@@ -56,7 +58,13 @@ static void draw_wins_bordercorners(struct Win * w, WINDOW * pad);
-static void refit_pad(struct WinMeta * wmeta)
+/* Shift active window forwards / backwards in window chain. */
+static void shift_win_forward(struct WinMeta * wmeta);
+static void shift_win_backward(struct WinMeta * wmeta);
+
+
+
+static uint8_t refit_pad(struct WinMeta * wmeta)
{
/* Determine rightmost window column. */
uint16_t lastwincol = 0;
@@ -73,28 +81,39 @@ static void refit_pad(struct WinMeta * wmeta)
/* Only resize the pad if the rightmost window column has changed. */
if (getmaxx(wmeta->padframe.curses_win) != lastwincol)
{
- wresize(wmeta->padframe.curses_win,
- getmaxy(wmeta->padframe.curses_win), lastwincol + 2);
+ return (ERR == wresize(wmeta->padframe.curses_win,
+ getmaxy(wmeta->padframe.curses_win),
+ lastwincol + 2));
}
+ return 0;
}
-static void update_wins(struct WinMeta * wmeta, struct Win * w)
+static uint8_t update_wins(struct WinMeta * wmeta, struct Win * w)
{
if (0 != w->frame.curses_win)
{
destroy_win(w);
}
place_win(wmeta, w);
- refit_pad(wmeta);
- w->frame.curses_win = subpad(wmeta->padframe.curses_win,
- w->frame.size.y, w->frame.size.x,
- w->start.y, w->start.x);
+ if (0 != refit_pad(wmeta))
+ {
+ return 1;
+ }
+ WINDOW * test = subpad(wmeta->padframe.curses_win,
+ w->frame.size.y, w->frame.size.x,
+ w->start.y, w->start.x);
+ if (NULL == test)
+ {
+ return 1;
+ }
+ w->frame.curses_win = test;
if (0 != w->next)
{
- update_wins(wmeta, w->next);
+ return update_wins(wmeta, w->next);
}
+ return 0;
}
@@ -165,7 +184,7 @@ static void place_win(struct WinMeta * wmeta, struct Win * w)
-static void destroy_win (struct Win * w)
+static void destroy_win(struct Win * w)
{
delwin(w->frame.curses_win);
w->frame.curses_win = 0;
@@ -173,7 +192,7 @@ static void destroy_win (struct Win * w)
-static void draw_wins (struct Win * w)
+static void draw_wins(struct Win * w)
{
w->draw(w);
if (0 != w->next)
@@ -256,18 +275,105 @@ static void draw_wins_bordercorners(struct Win * w, WINDOW * pad)
-extern struct WinMeta init_win_meta(WINDOW * screen)
+static void shift_win_forward(struct WinMeta * wmeta)
+{
+ if (wmeta->active == wmeta->chain_end)
+ {
+ wmeta->chain_end = wmeta->active->prev;
+ wmeta->chain_end->next = 0;
+ wmeta->active->next = wmeta->chain_start;
+ wmeta->active->next->prev = wmeta->active;
+ wmeta->chain_start = wmeta->active;
+ wmeta->chain_start->prev = 0;
+ }
+ else
+ {
+ struct Win * old_prev = wmeta->active->prev;
+ struct Win * old_next = wmeta->active->next;
+ if (wmeta->chain_end == wmeta->active->next)
+ {
+ wmeta->chain_end = wmeta->active;
+ wmeta->active->next = 0;
+ }
+ else
+ {
+ wmeta->active->next = old_next->next;
+ wmeta->active->next->prev = wmeta->active;
+ }
+ if (wmeta->chain_start == wmeta->active)
+ {
+ wmeta->chain_start = old_next;
+ }
+ else
+ {
+ old_prev->next = old_next;
+ }
+ old_next->prev = old_prev;
+ old_next->next = wmeta->active;
+ wmeta->active->prev = old_next;
+ }
+}
+
+
+
+static void shift_win_backward(struct WinMeta * wmeta)
+{
+ if (wmeta->active == wmeta->chain_start)
+ {
+ wmeta->chain_start = wmeta->active->next;
+ wmeta->chain_start->prev = 0;
+ wmeta->active->prev = wmeta->chain_end;
+ wmeta->active->prev->next = wmeta->active;
+ wmeta->chain_end = wmeta->active;
+ wmeta->chain_end->next = 0;
+ }
+ else
+ {
+ struct Win * old_prev = wmeta->active->prev;
+ struct Win * old_next = wmeta->active->next;
+ if (wmeta->chain_start == wmeta->active->prev)
+ {
+ wmeta->chain_start = wmeta->active;
+ wmeta->active->prev = 0;
+ }
+ else
+ {
+ wmeta->active->prev = old_prev->prev;
+ wmeta->active->prev->next = wmeta->active;
+ }
+ if (wmeta->chain_end == wmeta->active)
+ {
+ wmeta->chain_end = old_prev;
+ }
+ else
+ {
+ old_next->prev = old_prev;
+ }
+ old_prev->next = old_next;
+ old_prev->prev = wmeta->active;
+ wmeta->active->next = old_prev;
+ }
+}
+
+
+
+extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
{
- struct WinMeta wmeta;
- wmeta.screen = screen;
- wmeta.padframe.size.y = getmaxy(screen);
- wmeta.padframe.size.x = getmaxx(screen);
- wmeta.chain_start = 0;
- wmeta.chain_end = 0;
- wmeta.pad_offset = 0;
- wmeta.padframe.curses_win = newpad(wmeta.padframe.size.y, 1);
- wmeta.active = 0;
- return wmeta;
+ wmeta->screen = screen;
+ wmeta->padframe.size.y = getmaxy(screen);
+ wmeta->padframe.size.x = getmaxx(screen);
+ wmeta->chain_start = 0;
+ wmeta->chain_end = 0;
+ wmeta->pad_offset = 0;
+ WINDOW * test;
+ test = newpad(wmeta->padframe.size.y, 1);
+ if (NULL == test)
+ {
+ return 1;
+ }
+ wmeta->padframe.curses_win = test;
+ wmeta->active = 0;
+ return 0;
}
@@ -304,7 +410,7 @@ extern struct Win init_win(struct WinMeta * wmeta, char * title,
-extern void append_win(struct WinMeta * wmeta, struct Win * w)
+extern uint8_t append_win(struct WinMeta * wmeta, struct Win * w)
{
if (0 != wmeta->chain_start)
{
@@ -317,12 +423,12 @@ extern void append_win(struct WinMeta * wmeta, struct Win * w)
wmeta->chain_start = w;
}
wmeta->chain_end = w;
- update_wins(wmeta, w);
+ return update_wins(wmeta, w);
}
-extern void suspend_win(struct WinMeta * wmeta, struct Win * w)
+extern uint8_t suspend_win(struct WinMeta * wmeta, struct Win * w)
{
destroy_win(w);
@@ -342,10 +448,13 @@ extern void suspend_win(struct WinMeta * wmeta, struct Win * w)
{
wmeta->active = w->next;
}
- update_wins(wmeta, w->next); /* Positioning of successor windows may */
- pad_refitted = 1; /* be affected / need correction. Note */
- } /* that update_wins() already refits the */
- else /* pad, voiding later need for that. */
+ if (0 != update_wins(wmeta, w->next)) /* Positioning of successor */
+ { /* windows may be affected / */
+ return 1; /* need correction. */
+ } /* Note that update_wins() */
+ pad_refitted = 1; /* already refits the pad, */
+ } /* voiding later need for that. */
+ else
{
wmeta->chain_end = w->prev;
if (wmeta->active == w)
@@ -359,8 +468,9 @@ extern void suspend_win(struct WinMeta * wmeta, struct Win * w)
if (0 == pad_refitted)
{
- refit_pad(wmeta);
+ return refit_pad(wmeta);
}
+ return 0;
}
@@ -378,17 +488,18 @@ extern void reset_pad_offset(struct WinMeta * wmeta, uint16_t new_offset)
-extern void resize_active_win(struct WinMeta * wmeta, struct yx_uint16 size)
+extern uint8_t resize_active_win(struct WinMeta * wmeta, struct yx_uint16 size)
{
if (0 != wmeta->active
&& size.x > 0 && size.y > 0
&& size.y < wmeta->padframe.size.y)
{
wmeta->active->frame.size = size;
- update_wins(wmeta, wmeta->chain_start); /* Positioning of successor */
- } /* windows may be affected. */
-}
-
+ return update_wins(wmeta, wmeta->chain_start); /* Succeeding windows' */
+ } /* positioning may be */
+ return 0; /* affected. */
+} /* TODO: Why start at */
+ /* chain_start then? */
extern void cycle_active_win(struct WinMeta * wmeta, char dir)
@@ -424,85 +535,26 @@ extern void cycle_active_win(struct WinMeta * wmeta, char dir)
extern void shift_active_win(struct WinMeta * wmeta, char dir)
{
- if (0 != wmeta->active /* No shifting with less */
- && wmeta->chain_start != wmeta->chain_end /* than one window visible. */
- && (dir == 'f' || dir == 'b'))
+ if ( 0 == wmeta->active /* No shifting with less */
+ || wmeta->chain_start == wmeta->chain_end /* than two windows visible */
+ || (dir != 'f' && dir != 'b')) /* or wrong direction char. */
{
- struct Win * w_shift = wmeta->active, * w_p, * w_p_next;
-
- /* Check if shifting will lead to wrapping. */
- char wrap = 0;
- if ( (dir == 'f' && w_shift == wmeta->chain_end)
- || (dir == 'b' && w_shift == wmeta->chain_start))
- {
- wrap = 1;
- }
-
- /* Suspend all visible windows, remember their order in wins[]. */
- uint16_t i, i_max;
- for (w_p = wmeta->chain_start, i_max = 1;
- w_p != wmeta->chain_end;
- w_p = w_p->next)
- {
- i_max++;
- }
- struct Win ** wins = malloc(i_max * sizeof(struct Win *));
- for (i = 0, w_p = wmeta->chain_start;
- i < i_max;
- i++)
- {
- w_p_next = w_p->next;
- suspend_win(wmeta, w_p);
- wins[i] = w_p;
- w_p = w_p_next;
- }
-
- /* Re-append all previously visible windows in the new order. */
- if (wrap)
- {
- if (dir == 'f')
- {
- append_win(wmeta, w_shift);
- for (i = 0; i < i_max - 1; i++)
- {
- append_win(wmeta, wins[i]);
- }
- }
- else
- {
- for (i = 1; i < i_max; i++)
- {
- append_win(wmeta, wins[i]);
- }
- append_win(wmeta, w_shift);
- }
- }
- else
- {
- for (i = 0; i < i_max; i++)
- {
- if ( (dir == 'f' && w_shift == wins[i])
- || (dir == 'b' && w_shift == wins[i+1]))
- {
- append_win(wmeta, wins[i+1]);
- append_win(wmeta, wins[i]);
- i++;
- }
- else
- {
- append_win(wmeta, wins[i]);
- }
- }
- }
- free(wins);
-
- wmeta->active = w_shift; /* Otherwise lastly appended win is active. */
+ return;
}
+ if ('f' == dir)
+ {
+ shift_win_forward(wmeta);
+ }
+ else
+ {
+ shift_win_backward(wmeta);
+ }
+ update_wins(wmeta, wmeta->chain_start);
}
-extern void draw_all_wins(struct WinMeta * wmeta)
+extern uint8_t draw_all_wins(struct WinMeta * wmeta)
{
/* Empty everything before filling it a-new. */
erase();
@@ -520,17 +572,23 @@ extern void draw_all_wins(struct WinMeta * wmeta)
/* Draw virtual screen scroll hints. */
if (wmeta->pad_offset > 0)
{
- draw_scroll_hint(&wmeta->padframe,
- wmeta->pad_offset, wmeta->pad_offset + 1, '<');
+ if (draw_scroll_hint(&wmeta->padframe,
+ wmeta->pad_offset, wmeta->pad_offset + 1, '<'))
+ {
+ return 1;
+ }
}
if (wmeta->pad_offset + wmeta->padframe.size.x
< getmaxx(wmeta->padframe.curses_win) - 1)
{
- draw_scroll_hint(&wmeta->padframe,
- wmeta->pad_offset + wmeta->padframe.size.x - 1,
- getmaxx(wmeta->padframe.curses_win)
- - (wmeta->pad_offset + wmeta->padframe.size.x),
- '>');
+ if (draw_scroll_hint(&wmeta->padframe,
+ wmeta->pad_offset + wmeta->padframe.size.x - 1,
+ getmaxx(wmeta->padframe.curses_win)
+ - (wmeta->pad_offset + wmeta->padframe.size.x),
+ '>'))
+ {
+ return 1;
+ }
}
/* Write virtual screen segment to be shown on physical screen into */
@@ -541,12 +599,13 @@ extern void draw_all_wins(struct WinMeta * wmeta)
/* Only at the end write accumulated changes to the physical screen. */
doupdate();
+ return 0;
}
-extern void draw_scroll_hint(struct Frame * frame, uint16_t pos, uint32_t dist,
- char dir)
+extern uint8_t draw_scroll_hint(struct Frame * frame, uint16_t pos,
+ uint32_t dist, char dir)
{
/* Decide on alignment (vertical/horizontal?), thereby scroll hint text. */
char * more = "more";
@@ -561,6 +620,10 @@ extern void draw_scroll_hint(struct Frame * frame, uint16_t pos, uint32_t dist,
}
char * scrolldsc = malloc((4 * sizeof(char)) + strlen(more) + strlen(unit)
+ 10); /* 10 = uint32 max strlen */
+ if (NULL == scrolldsc)
+ {
+ return 1;
+ }
sprintf(scrolldsc, " %d %s %s ", dist, more, unit);
/* Decide on offset of the description text inside the scroll hint line. */
@@ -593,4 +656,5 @@ extern void draw_scroll_hint(struct Frame * frame, uint16_t pos, uint32_t dist,
}
free(scrolldsc);
+ return 0;
}