From ba788dd38a53b29c8d573d8e78da4a8e5723a0a9 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 6 Jan 2014 16:11:56 +0000 Subject: [PATCH] gui: Kill struct gui_window->beg{xy}. These values are only needed in init_wins(), so we might as well use local variables for them. --- gui.c | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/gui.c b/gui.c index 01af3227..c4678452 100644 --- a/gui.c +++ b/gui.c @@ -34,8 +34,6 @@ static int signal_pipe; static struct gui_window { WINDOW *win; - size_t begx; - size_t begy; size_t cols; size_t lines; } top, bot, sb, in, sep; @@ -595,53 +593,37 @@ __noreturn __printf_2_3 static void msg_n_exit(int ret, const char* fmt, ...) */ static void init_wins(int top_lines) { - top.lines = top_lines; - top.cols = COLS; - top.begy = 0; - top.begx = 0; + int top_y = 0, bot_y = top_lines + 1, sb_y = LINES - 2, + in_y = LINES - 1, sep_y = top_lines; + top.lines = top_lines; bot.lines = LINES - top.lines - 3; - bot.cols = COLS; - bot.begy = top.lines + 1; - bot.begx = 0; - - sb.lines = 1; - sb.cols = COLS; - sb.begy = LINES - 2; - sb.begx = 0; - - in.lines = 1; - in.cols = COLS; - in.begy = LINES - 1; - in.begx = 0; + sb.lines = in.lines = sep.lines = 1; - sep.lines = 1; - sep.cols = COLS; - sep.begy = top.lines; - sep.begx = 0; + top.cols = bot.cols = sb.cols = in.cols = sep.cols = COLS; assume_default_colors(theme.default_fg, theme.default_bg); if (top.win) { wresize(top.win, top.lines, top.cols); - mvwin(top.win, top.begy, top.begx); + mvwin(top.win, top_y, 0); wresize(sb.win, sb.lines, sb.cols); - mvwin(sb.win, sb.begy, sb.begx); + mvwin(sb.win, sb_y, 0); wresize(sep.win, sep.lines, sep.cols); - mvwin(sep.win, sep.begy, sep.begx); + mvwin(sep.win, sep_y, 0); wresize(bot.win, bot.lines, bot.cols); - mvwin(bot.win, bot.begy, bot.begx); + mvwin(bot.win, bot_y, 0); wresize(in.win, in.lines, in.cols); - mvwin(in.win, in.begy, in.begx); + mvwin(in.win, in_y, 0); } else { - sep.win = newwin(sep.lines, sep.cols, sep.begy, sep.begx); - top.win = newwin(top.lines, top.cols, top.begy, top.begx); - bot.win = newwin(bot.lines, bot.cols, bot.begy, bot.begx); - sb.win = newwin(sb.lines, sb.cols, sb.begy, sb.begx); - in.win = newwin(in.lines, in.cols, in.begy, in.begx); + sep.win = newwin(sep.lines, sep.cols, sep_y, 0); + top.win = newwin(top.lines, top.cols, top_y, 0); + bot.win = newwin(bot.lines, bot.cols, bot_y, 0); + sb.win = newwin(sb.lines, sb.cols, sb_y, 0); + in.win = newwin(in.lines, in.cols, in_y, 0); if (!top.win || !bot.win || !sb.win || !in.win || !sep.win) msg_n_exit(1, "Error: Cannot create curses windows\n"); wclear(bot.win); -- 2.30.2