X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwindows.c;h=501f78795c5a0eadc4cdad466d36d12792eac2c7;hb=49b5e356e86c521db231dbbb3779d9d8d2a23cd6;hp=46124c5639a8b4c0b984e274adc573d5aa4bf235;hpb=ff4658e5e98a8fbd1e0c768cc00163512e24aadc;p=plomrogue diff --git a/src/windows.c b/src/windows.c index 46124c5..501f787 100644 --- a/src/windows.c +++ b/src/windows.c @@ -9,29 +9,6 @@ -/* Stores a window's border corners. This is a helper to draw_all_wins() (and - * filled by its helper draw_wins_borders()) which draws the horizontal and - * vertical lines of all windows' borders first and the corner characters of - * all windows only afterwards (so that corners are not overwritten by lines). - * This delay of corner drawing necessitates temporarily storing their - * coordinates (harvested during the previous border drawing activities) in a - * series of such Corners structs to be released at the end. - * - * TODO: Maybe replace this complicated method by dropping the harvesting of - * corners from draw_wins_borders() and instead collecting them in a second - * border drawing cycle that repeats some cycles but works in a much more - * straightforward way. - */ -struct Corners -{ - struct yx_uint16 tl; - struct yx_uint16 tr; - struct yx_uint16 bl; - struct yx_uint16 br; -}; - - - /* Fit virtual screen's width to minimum width demanded by current windows' * geometries. */ @@ -57,20 +34,22 @@ static void draw_wins(struct Win * w); -/* draw_win_borders() Draws the vertical and horizontal borders of window "w" - * sans corners, and draws the top border line as the windows' title bar - * (highlighted if the window is described active by "active" being set). - * draw_wins_borders(). +/* draw_win_borderlines() draws the vertical and horizontal borders of window + * "w" sans corners into the virtual screen "pad", and draws the top border + * line as the windows' title bar (highlighted if the window is described + * active by "active" being set). draw_wins_borderlines(). + * + * draw_wins_borderlines() calls draw_win_borderlines() recursively on all + * windows from "w" on. "w_active" is a pointer to the one window that + * draw_win_borderlines() is supposed to handle as the active window. * - * draw_wins_borders() calls draw_win_borders() recursively on all windows from - * "w" on. It also fills "corners" with coordinates of each window's corners, - * iterating over its Corners structs via the "i" index incremented by 1 over - * each handled window. "w_active" is a pointer to the one window that - * draw_win_borders() is supposed to handle as the active window. + * Finally, draw_wins_bordercorners draws into "pad" the borders of window "w" + * and all its successors. */ -static void draw_win_borders(struct Win * w, char active); -static void draw_wins_borders(struct Win * w, struct Win * w_active, - struct Corners * corners, uint16_t i); +static void draw_win_borderlines(struct Win * w, char active, WINDOW * pad); +static void draw_wins_borderlines(struct Win * w, struct Win * w_active, + WINDOW * pad); +static void draw_wins_bordercorners(struct Win * w, WINDOW * pad); @@ -202,21 +181,19 @@ static void draw_wins (struct Win * w) -static void draw_win_borders(struct Win * w, char active) +static void draw_win_borderlines(struct Win * w, char active, WINDOW * pad) { /* Draw vertical and horizontal border lines. */ uint16_t y, x; for (y = w->start.y; y <= w->start.y + w->frame.size.y; y++) { - mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x - 1, '|'); - mvwaddch(wgetparent(w->frame.curses_win), - y, w->start.x + w->frame.size.x, '|'); + mvwaddch(pad, y, w->start.x - 1, '|'); + mvwaddch(pad, y, w->start.x + w->frame.size.x, '|'); } for (x = w->start.x; x <= w->start.x + w->frame.size.x; x++) { - mvwaddch(wgetparent(w->frame.curses_win), w->start.y - 1, x, '-'); - mvwaddch(wgetparent(w->frame.curses_win), - w->start.y + w->frame.size.y, x, '-'); + mvwaddch(pad, w->start.y - 1, x, '-'); + mvwaddch(pad, w->start.y + w->frame.size.y, x, '-'); } /* Draw as much as possible of the title into center of top border line. */ @@ -238,33 +215,39 @@ static void draw_win_borders(struct Win * w, char active) memcpy(title + 1, w->title, length_visible); title[0] = title[length_visible + 1] = decoration; title[length_visible + 2] = '\0'; - mvwaddstr(wgetparent(w->frame.curses_win), - w->start.y - 1, w->start.x + title_offset, title); + mvwaddstr(pad, w->start.y - 1, w->start.x + title_offset, title); } } -static void draw_wins_borders(struct Win * w, struct Win * w_active, - struct Corners * corners, uint16_t i) +static void draw_wins_borderlines(struct Win * w, struct Win * w_active, + WINDOW * pad) { char active = 0; if (w == w_active) { active = 1; } - draw_win_borders(w, active); - corners[i].tl.y = w->start.y - 1; - corners[i].tl.x = w->start.x - 1; - corners[i].tr.y = w->start.y - 1; - corners[i].tr.x = w->start.x + w->frame.size.x; - corners[i].bl.y = w->start.y + w->frame.size.y; - corners[i].bl.x = w->start.x - 1; - corners[i].br.y = w->start.y + w->frame.size.y; - corners[i].br.x = w->start.x + w->frame.size.x; + draw_win_borderlines(w, active, pad); + if (0 != w->next) + { + draw_wins_borderlines (w->next, w_active, pad); + } +} + + + +static void draw_wins_bordercorners(struct Win * w, WINDOW * pad) +{ + mvwaddch(pad, w->start.y - 1, w->start.x - 1, '+'); + mvwaddch(pad, w->start.y - 1, w->start.x + w->frame.size.x, '+'); + mvwaddch(pad, w->start.y + w->frame.size.y, w->start.x - 1, '+'); + mvwaddch(pad, + w->start.y + w->frame.size.y, w->start.x + w->frame.size.x, '+'); if (0 != w->next) { - draw_wins_borders (w->next, w_active, corners, i + 1); + draw_wins_bordercorners(w->next, pad); } } @@ -436,16 +419,18 @@ extern void shift_active_win(struct WinMeta * wmeta, char dir) wrap = 1; } - /* Suspend all visible windows. */ + /* Suspend all visible windows, remember their order in wins[]. */ uint16_t i, i_max; - for (i_max = 1, w_p = wmeta->chain_start; + for (w_p = wmeta->chain_start, i_max = 1; w_p != wmeta->chain_end; - i_max++) + w_p = w_p->next) { - 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++) + for (i = 0, w_p = wmeta->chain_start; + i < i_max; + i++) { w_p_next = w_p->next; suspend_win(wmeta, w_p); @@ -492,7 +477,7 @@ extern void shift_active_win(struct WinMeta * wmeta, char dir) } free(wins); - wmeta->active = w_shift; /* TODO: Is this necessary? If so, why? */ + wmeta->active = w_shift; /* Otherwise lastly appended win is active. */ } } @@ -507,31 +492,11 @@ extern void draw_all_wins(struct WinMeta * wmeta) if (wmeta->chain_start) { - /* Only draw the windows' *contents* first. */ - draw_wins (wmeta->chain_start); - - /* Draw windows' borders. Lines first, then line crossings / corners. */ - uint16_t n_wins = 1, i; - struct Win * win_p = wmeta->chain_start; - while (0 != win_p->next) - { - win_p = win_p->next; - n_wins++; - } - struct Corners * all_corners = malloc(sizeof(struct Corners) * n_wins); - draw_wins_borders (wmeta->chain_start, wmeta->active, all_corners, 0); - for (i = 0; i < n_wins; i++) - { - mvwaddch(wmeta->pad.curses_win, - all_corners[i].tl.y, all_corners[i].tl.x, '+'); - mvwaddch(wmeta->pad.curses_win, - all_corners[i].tr.y, all_corners[i].tr.x, '+'); - mvwaddch(wmeta->pad.curses_win, - all_corners[i].bl.y, all_corners[i].bl.x, '+'); - mvwaddch(wmeta->pad.curses_win, - all_corners[i].br.y, all_corners[i].br.x, '+'); - } - free(all_corners); + /* Draw windows' contents first, then their borders. */ + draw_wins(wmeta->chain_start); + draw_wins_borderlines(wmeta->chain_start, wmeta->active, + wmeta->pad.curses_win); + draw_wins_bordercorners(wmeta->chain_start, wmeta->pad.curses_win); /* Draw virtual screen scroll hints. */ if (wmeta->pad_offset > 0)