Move main loop and curses init to view

diff --git a/src/date.c b/src/date.c
index 4df8ce4241343cacbafe882f2b7d15ae5089724b..84414413dd43c3b488dc1401b0cc7cc32bb55ef5 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -35,6 +35,8 @@ void date_init(void)
        SEL.year  = tm->tm_year+1900;
        SEL.month = tm->tm_mon;
        SEL.day   = tm->tm_mday-1;
+
+       date_sync();
 }
 
 void date_sync(void)

diff --git a/src/main.c b/src/main.c
index 7d8d517d5f9772a9d0179563bda550b50e7d5ba2..c10ea67135d785c86882d3d72cefa13d7e024018 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,12 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _XOPEN_SOURCE
-
 #include <stdlib.h>
 #include <signal.h>
-#include <locale.h>
-#include <ncurses.h>
 
 #include "util.h"
 #include "conf.h"
@@ -38,7 +34,7 @@ static void on_config(const char *group, const char *name, const char *key, cons
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
 {
-       endwin();
+       view_exit();
        exit(0);
 }
 
@@ -48,34 +44,6 @@ int main(int argc, char **argv)
        /* Misc setup */
        signal(SIGINT, on_sigint);
 
-       /* Set default escape timeout */
-       if (!getenv("ESCDELAY"))
-               putenv("ESCDELAY=25");
-
-       /* Setup Curses */
-       setlocale(LC_ALL, "");
-       initscr();
-       cbreak();
-       noecho();
-       keypad(stdscr, TRUE);
-       start_color();
-       curs_set(false);
-       timeout(100);
-       use_default_colors();
-       mousemask(ALL_MOUSE_EVENTS, NULL);
-
-       init_pair(COLOR_TITLE, COLOR_GREEN,   -1);
-       init_pair(COLOR_ERROR, COLOR_RED,     -1);
-
-       init_pair(COLOR_NEW,   COLOR_RED,     -1);
-       init_pair(COLOR_WIP,   COLOR_YELLOW,  -1);
-       init_pair(COLOR_DONE,  COLOR_GREEN,   -1);
-
-       init_pair(COLOR_CLASS, COLOR_BLUE,    -1);
-       init_pair(COLOR_EC,    COLOR_GREEN,   -1);
-       init_pair(COLOR_WORK,  COLOR_MAGENTA, -1);
-       init_pair(COLOR_OTHER, COLOR_RED,     -1);
-
        /* Configuration */
        conf_setup(argc, argv, ".lackeyrc", on_config);
 
@@ -84,46 +52,11 @@ int main(int argc, char **argv)
        conf_init();
        date_init();
        cal_init();
-       view_init();
 
-       /* Draw initial view */
-       date_sync();
-       view_draw();
-
-       /* Run */
-       while (1) {
-               MEVENT btn;
-               conf_sync();
-               int chr = getch();
-               date_sync();
-               if (chr == 'q')
-                       break;
-               if (chr == KEY_MOUSE)
-                       if (getmouse(&btn) != OK)
-                               continue;
-               switch (chr) {
-                       case KEY_RESIZE:
-                               endwin();
-                               refresh();
-                               view_resize();
-                               view_draw();
-                               continue;
-                       case '\14': // Ctrl-L
-                               clear();
-                       case '\7':  // Ctrl-G
-                               view_resize();
-                               view_draw();
-                               continue;
-               }
-               if (view_run(chr, btn.bstate, btn.y, btn.x))
-                       continue;
-               if (chr == ERR) // timeout
-                       continue;
-               debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>",
-                               chr, chr, chr, chr);
-       }
+       /* Run view main */
+       view_init();
+       view_main();
+       view_exit();
 
-       /* Cleanup, see also on_sigint, error */
-       endwin();
        return 0;
 }

diff --git a/src/util.c b/src/util.c
index 37b004d94896899b95312fdc3abc387fe5d725b6..1ebecfc02dae764fead047a08765eecbc4c0e3ca 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -20,20 +20,22 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
-#include <ncurses.h>
 
 #include "date.h"
 #include "cal.h"
 #include "view.h"
 #include "util.h"
 
-/* For testing */
-#pragma weak COMPACT
+#pragma weak view_debug
 
 /* Static data */
 static FILE *debug_fd = NULL;
 
+/* View debugging */
+extern void view_debug(const char *fmt, va_list ap);
+
 /* Helper functions */
 static void message(FILE *output_fd, const char *prefix, const char *fmt, va_list ap)
 {
@@ -58,17 +60,9 @@ static void message(FILE *output_fd, const char *prefix, const char *fmt, va_lis
        }
 
        /* Log to status bar */
-       if (&COMPACT && stdscr) {
-               int rev = COMPACT ? A_BOLD : 0;
+       if (&view_debug) {
                va_copy(tmp, ap);
-               if (!COMPACT)
-                       mvhline(LINES-2, 0, ACS_HLINE, COLS);
-               move(LINES-1, 0);
-               attron(COLOR_PAIR(COLOR_ERROR) | rev);
-               vwprintw(stdscr, fmt, tmp);
-               attroff(COLOR_PAIR(COLOR_ERROR) | rev);
-               if (!COMPACT)
-                       clrtoeol();
+               view_debug(fmt, tmp);
        }
 }
 
@@ -161,9 +155,6 @@ void error(char *fmt, ...)
        fflush(stderr);
        message(stderr, "error", fmt, ap);
        va_end(ap);
-       if (stdscr) {
-               getch();
-               endwin();
-       }
+       view_exit();
        exit(-1);
 }

diff --git a/src/view.c b/src/view.c
index 7c62671f32d4631ae8957c27737d3bb18bf2baef..ceb9fec7328019bc154f067645e234fea3d68d80 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -15,9 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE
 #define _XOPEN_SOURCE_EXTENDED
 
+#include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 #include <ncurses.h>
 
 #include "util.h"
@@ -89,9 +92,10 @@ int MORNING = 8;
 edit_t EDIT = EDIT_NONE;
 
 /* Local data */
-view_t *view   = &day_view;
-view_t *active = &day_view;
-view_t *popup  = NULL;
+view_t *view    = &day_view;
+view_t *active  = &day_view;
+view_t *popup   = NULL;
+int     running = 0;
 
 /* Local functions */
 static void draw_header(void)
@@ -137,21 +141,110 @@ static int get_color(const char *cat)
               match(cat, "work")  ? COLOR_WORK  : COLOR_OTHER ;
 }
 
+static void update_sizes(void)
+{
+       int hdr = COMPACT ? 1 : 2;
+       for (int i = 0; i < N_ELEMENTS(views); i++) {
+               wresize(views[i]->win, LINES-hdr, COLS);
+               mvwin(views[i]->win, hdr, 0);
+               views[i]->size(LINES-hdr, COLS);
+       }
+}
+
+static void draw_view(void)
+{
+       draw_header();
+       werase(view->win);
+       view->draw();
+       wrefresh(view->win);
+}
+
 static int set_view(view_t *_active, view_t *_popup)
 {
        view = _popup ?: _active;
        if (active != _active) {
                active = _active;
                set_string("view", 0, "active", active->name);
-               view_draw();
+               draw_view();
        }
        if (popup != _popup) {
                popup = _popup;
-               view_draw();
+               draw_view();
        }
        return 1;
 }
 
+static int process(int key, mmask_t btn, int row, int col)
+{
+       /* Refresh timestamp */
+       draw_header();
+
+       /* Check for mouse events on the menu */
+       if (key == KEY_MOUSE && row == 0) {
+               int start = 1;
+               for (int i = 0; i < N_ELEMENTS(menu); i++) {
+                       int end = start + strlen(menu[i]->name) - 1;
+                       if (start <= col && col <= end && menu[i]->draw)
+                               return set_view(menu[i], NULL);
+                       start = end + 2;
+               }
+       }
+
+       /* Look though menu for hotkeys */
+       for (int i = 0; i < N_ELEMENTS(menu); i++) {
+               for (int j = 0; j < N_ELEMENTS(menu[i]->keys); j++)
+                       if (menu[i]->keys[j] == key)
+                               return set_view(menu[i], NULL);
+       }
+
+       /* Shift windows with left/right keys */
+       int shift = key == KEY_RIGHT ? +1 :
+                   key == KEY_LEFT  ? -1 : 0;
+       if (shift) {
+               int num = 0;
+               for (int i = 0; i < N_ELEMENTS(menu); i++)
+                       if (menu[i] == active)
+                               num = i;
+               do  {
+                       num += shift;
+                       num += N_ELEMENTS(menu);
+                       num %= N_ELEMENTS(menu);
+               } while (menu[num] == &spacer);
+               return set_view(menu[num], NULL);
+       }
+
+       /* Handle other keys */
+       switch (key) {
+               case KEY_RESIZE:
+                       endwin();
+                       refresh();
+                       update_sizes();
+                       draw_view();
+                       return 1;
+               case '\14': // Ctrl-L
+                       clear();
+               case '\7':  // Ctrl-G
+                       update_sizes();
+                       draw_view();
+                       return 1;
+               case '\033': // escape
+                       return set_view(active, NULL);
+               case '?':    // help
+                       return set_view(active, &help_view);
+               case 'c':
+                       COMPACT ^= 1;
+                       set_bool("view", 0, "compact", COMPACT);
+                       update_sizes();
+                       draw_view();
+                       return 1;
+               case 'e':    // edit
+                       return set_view(active, &edit_view);
+       }
+
+       /* Pass key to active view */
+       return view->run(key, btn, row, col);
+}
+
 /* Curses functions */
 void wmvresize(WINDOW *win, int top, int left, int rows, int cols)
 {
@@ -293,8 +386,39 @@ void todo_line(WINDOW *win, todo_t *todo, int y, int x, int w, int flags)
 /* View init */
 void view_init(void)
 {
-       int hdr = COMPACT ? 1 : 2;
+       /* Set default escape timeout */
+       if (!getenv("ESCDELAY"))
+               putenv("ESCDELAY=25");
+
+       /* Setup Curses */
+       setlocale(LC_ALL, "");
+       initscr();
+       cbreak();
+       noecho();
+       keypad(stdscr, TRUE);
+       start_color();
+       curs_set(false);
+       timeout(100);
+       use_default_colors();
+       mousemask(ALL_MOUSE_EVENTS, NULL);
+
+       init_pair(COLOR_TITLE, COLOR_GREEN,   -1);
+       init_pair(COLOR_ERROR, COLOR_RED,     -1);
+
+       init_pair(COLOR_NEW,   COLOR_RED,     -1);
+       init_pair(COLOR_WIP,   COLOR_YELLOW,  -1);
+       init_pair(COLOR_DONE,  COLOR_GREEN,   -1);
+
+       init_pair(COLOR_CLASS, COLOR_BLUE,    -1);
+       init_pair(COLOR_EC,    COLOR_GREEN,   -1);
+       init_pair(COLOR_WORK,  COLOR_MAGENTA, -1);
+       init_pair(COLOR_OTHER, COLOR_RED,     -1);
+
+       running = 1;
+
+       /* Setup windows */
        for (int i = 0; i < N_ELEMENTS(views); i++) {
+               int hdr = COMPACT ? 1 : 2;
                views[i]->win = newwin(LINES-hdr, COLS, hdr, 0);
                views[i]->init(views[i]->win);
                views[i]->size(LINES-hdr, COLS);
@@ -321,89 +445,58 @@ void view_config(const char *group, const char *name, const char *key, const cha
        }
 }
 
-/* View draw */
-void view_resize(void)
-{
-       int hdr = COMPACT ? 1 : 2;
-       for (int i = 0; i < N_ELEMENTS(views); i++) {
-               wresize(views[i]->win, LINES-hdr, COLS);
-               mvwin(views[i]->win, hdr, 0);
-               views[i]->size(LINES-hdr, COLS);
-       }
-}
-
-/* View draw */
-void view_draw(void)
+/* View event */
+void view_edit(edit_t mode)
 {
-       draw_header();
-       werase(view->win);
-       view->draw();
-       wrefresh(view->win);
+       EDIT = mode;
+       set_view(active, &edit_view);
 }
 
-/* View run */
-int view_run(int key, mmask_t btn, int row, int col)
+void view_main(void)
 {
-       /* Refresh timestamp */
-       draw_header();
-
-       /* Check for mouse events on the menu */
-       if (key == KEY_MOUSE && row == 0) {
-               int start = 1;
-               for (int i = 0; i < N_ELEMENTS(menu); i++) {
-                       int end = start + strlen(menu[i]->name) - 1;
-                       if (start <= col && col <= end && menu[i]->draw)
-                               return set_view(menu[i], NULL);
-                       start = end + 2;
-               }
-       }
-
-       /* Look though menu for hotkeys */
-       for (int i = 0; i < N_ELEMENTS(menu); i++) {
-               for (int j = 0; j < N_ELEMENTS(menu[i]->keys); j++)
-                       if (menu[i]->keys[j] == key)
-                               return set_view(menu[i], NULL);
-       }
-
-       /* Shift windows with left/right keys */
-       int shift = key == KEY_RIGHT ? +1 :
-                   key == KEY_LEFT  ? -1 : 0;
-       if (shift) {
-               int num = 0;
-               for (int i = 0; i < N_ELEMENTS(menu); i++)
-                       if (menu[i] == active)
-                               num = i;
-               do  {
-                       num += shift;
-                       num += N_ELEMENTS(menu);
-                       num %= N_ELEMENTS(menu);
-               } while (menu[num] == &spacer);
-               return set_view(menu[num], NULL);
+       /* Draw initial view */
+       draw_view();
+
+       /* Run */
+       while (1) {
+               MEVENT btn;
+               conf_sync();
+               int chr = getch();
+               date_sync();
+               if (chr == KEY_MOUSE)
+                       if (getmouse(&btn) != OK)
+                               continue;
+               if (process(chr, btn.bstate, btn.y, btn.x))
+                       continue;
+               if (chr == ERR) // timeout
+                       continue;
+               if (chr == 'q')
+                       break;
+               debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>",
+                               chr, chr, chr, chr);
        }
 
-       /* Handle other keys */
-       switch (key) {
-               case 'c':
-                       COMPACT ^= 1;
-                       set_bool("view", 0, "compact", COMPACT);
-                       view_resize();
-                       view_draw();
-                       return 1;
-               case '\033': // escape
-                       return set_view(active, NULL);
-               case '?':    // help
-                       return set_view(active, &help_view);
-               case 'e':    // edit
-                       return set_view(active, &edit_view);
-       }
+       /* Cleanup window */
+       view_exit();
+}
 
-       /* Pass key to active view */
-       return view->run(key, btn, row, col);
+void view_exit(void)
+{
+       if (running)
+               endwin();
 }
 
-/* View event */
-void view_edit(edit_t mode)
+void view_debug(const char *fmt, va_list ap)
 {
-       EDIT = mode;
-       set_view(active, &edit_view);
+       if (running) {
+               int rev = COMPACT ? A_BOLD : 0;
+               if (!COMPACT)
+                       mvhline(LINES-2, 0, ACS_HLINE, COLS);
+               move(LINES-1, 0);
+               attron(COLOR_PAIR(COLOR_ERROR) | rev);
+               vwprintw(stdscr, fmt, ap);
+               attroff(COLOR_PAIR(COLOR_ERROR) | rev);
+               if (!COMPACT)
+                       clrtoeol();
+       }
 }

diff --git a/src/view.h b/src/view.h
index d225323436b3e33163721ccc118631a6981b65e7..b896beaffb8dd048f69a7a8a776015991cadd336 100644 (file)
--- a/src/view.h
+++ b/src/view.h
@@ -47,6 +47,9 @@ extern int MORNING; // first line to display
 /* Global data */
 extern edit_t EDIT; // edit mode 0=cal 1=event 3=todo
 
+/* Curses typedefs */
+typedef struct _win_st WINDOW;
+
 /* Curses functions */
 void wmvresize(WINDOW *win, int top, int left, int rows, int cols);
 void wshrink(WINDOW *win, int top);
@@ -58,8 +61,7 @@ void todo_line(WINDOW *win, todo_t *todo, int y, int x, int w, int flags);
 
 /* View functions */
 void view_init(void);
+void view_main(void);
+void view_exit(void);
 void view_config(const char *group, const char *name, const char *key, const char *value);
-void view_resize(void);
-void view_draw(void);
-int  view_run(int key, mmask_t btn, int row, int col);
 void view_edit(edit_t mode);