Set default escape key delay

[lackey] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3a20fe87feaa9ae6fa00efd4c68dd8a9bf0ccd93..3071fbff370d560711bbbda3a88759c4d645f118 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,16 +15,26 @@
  * 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 "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();
@@ -61,8 +75,12 @@ int main(int argc, char **argv)
        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();
        cal_init();
        view_init();
@@ -73,6 +91,7 @@ int main(int argc, char **argv)
        /* Run */
        while (1) {
                MEVENT btn;
+               conf_sync();
                int chr = getch();
                if (chr == 'q')
                        break;
@@ -88,19 +107,20 @@ int main(int argc, char **argv)
                                view_resize();
                                view_draw();
                                continue;
-                       case '\14':
+                       case '\14': // Ctrl-L
                                clear();
-                       case '\7':
+                       case '\7':  // Ctrl-G
+                               view_resize();
                                view_draw();
                                continue;
                }
                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;
 }