Set default escape key delay

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index 75fb53c6de7ec1c6ff590709cc570c330920e9e9..3071fbff370d560711bbbda3a88759c4d645f118 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,29 +1,39 @@
 /*
  * Copyright (C) 2012 Andy Spencer <andy753421@gmail.com>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * 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"
 #include "date.h"
-#include "event.h"
-#include "screen.h"
+#include "cal.h"
+#include "view.h"
+
+/* Config parser */
+static void on_config(const char *group, const char *name, const char *key, const char *value)
+{
+       view_config(group, name, key, value);
+       cal_config(group, name, key, value);
+}
 
 /* Control-C handler, so we don't hose the therminal */
 static void on_sigint(int signum)
@@ -38,6 +48,10 @@ 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();
@@ -52,23 +66,32 @@ int main(int argc, char **argv)
        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);
+
        /* Initialize */
        util_init();
+       conf_init();
        date_init();
-       event_init();
-       screen_init();
+       cal_init();
+       view_init();
 
-       /* Draw initial screen */
-       screen_draw();
+       /* Draw initial view */
+       view_draw();
 
        /* Run */
        while (1) {
                MEVENT btn;
+               conf_sync();
                int chr = getch();
                if (chr == 'q')
                        break;
@@ -81,22 +104,23 @@ int main(int argc, char **argv)
                        case KEY_RESIZE:
                                endwin();
                                refresh();
-                               screen_resize();
-                               screen_draw();
+                               view_resize();
+                               view_draw();
                                continue;
-                       case '\14':
+                       case '\14': // Ctrl-L
                                clear();
-                       case '\7':
-                               screen_draw();
+                       case '\7':  // Ctrl-G
+                               view_resize();
+                               view_draw();
                                continue;
                }
-               if (screen_run(chr, btn.bstate, btn.y, btn.x))
+               if (view_run(chr, btn.bstate, btn.y, btn.x))
                        continue;
-               debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>\n",
+               debug("main: Unhandled key - Dec %3d,  Hex %02x,  Oct %03o,  Chr <%c>",
                                chr, chr, chr, chr);
        }
 
-       /* Cleanup, see also on_sigint */
+       /* Cleanup, see also on_sigint, error */
        endwin();
        return 0;
 }