From c6f9142ab0c868ac9edffc67070ae151e87c8169 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 16 Jun 2013 04:27:11 +0000 Subject: [PATCH] Move around view functions --- src/view.c | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/src/view.c b/src/view.c index 1c29d54..86180f8 100644 --- a/src/view.c +++ b/src/view.c @@ -104,6 +104,40 @@ static int get_color(const char *cat) match(cat, "work") ? COLOR_WORK : COLOR_OTHER ; } +static int view_set(int num) +{ + if (ACTIVE != num) { + ACTIVE = num; + set_enum("view", 0, "active", ACTIVE, + names, N_ELEMENTS(names)); + view_draw(); + } + return 1; +} + +/* Curses functions */ +void wmvresize(WINDOW *win, int top, int left, int rows, int cols) +{ + int y = getpary(win); + if (top < y) + mvderwin(win, top, left); + wresize(win, rows, cols); + if (top > y) + mvderwin(win, top, left); +} + +void wshrink(WINDOW *win, int top) +{ + int x = getparx(win); + int y = getpary(win); + int r = getmaxy(win); + int c = getmaxx(win); + int rows = r + (y - top); + if (top < y) mvderwin(win, top, x); + if (rows != r) wresize(win, rows, c); + if (top > y) mvderwin(win, top, x); +} + /* Helper functions */ void event_box(WINDOW *win, event_t *event, int y, int x, int h, int w) { @@ -198,29 +232,6 @@ void todo_line(WINDOW *win, todo_t *todo, int y, int x, int w, int full) mvwprintw(win, y, x, "%s", desc); } -/* Curses functions */ -void wmvresize(WINDOW *win, int top, int left, int rows, int cols) -{ - int y = getpary(win); - if (top < y) - mvderwin(win, top, left); - wresize(win, rows, cols); - if (top > y) - mvderwin(win, top, left); -} - -void wshrink(WINDOW *win, int top) -{ - int x = getparx(win); - int y = getpary(win); - int r = getmaxy(win); - int c = getmaxx(win); - int rows = r + (y - top); - if (top < y) mvderwin(win, top, x); - if (rows != r) wresize(win, rows, c); - if (top > y) mvderwin(win, top, x); -} - /* View init */ void view_init(void) { @@ -269,18 +280,6 @@ void view_draw(void) wrefresh(views[ACTIVE].win); } -/* View set */ -int view_set(int num) -{ - if (ACTIVE != num) { - ACTIVE = num; - set_enum("view", 0, "active", ACTIVE, - names, N_ELEMENTS(names)); - view_draw(); - } - return 1; -} - /* View run */ int view_run(int key, mmask_t btn, int row, int col) { -- 2.43.2