X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=d1a1fce62dd51e89f00c37766e6343109c69bc54;hb=03fa51304d454d74e6aa2f7a8f49506ee070701e;hp=1327a8240a6327882cb237a3800cf8b39224ffc3;hpb=011e995ee05e3fd9a990a39c85d4b279e16fd86e;p=lackey
diff --git a/src/main.c b/src/main.c
index 1327a82..d1a1fce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,15 +15,20 @@
* along with this program. If not, see .
*/
-#define _POSIX_C_SOURCE 1
#include
#include
#include
+#include
#include
#include "main.h"
#include "screen.h"
+/* Debugging */
+int YEAR = 2012;
+int MONTH = 8;
+int DAY = 29;
+
/* Static data */
static FILE *debug_fd = NULL;
@@ -34,25 +39,12 @@ static void on_sigint(int signum)
exit(0);
}
-/* Window change */
-static void on_sigwinch(int signum)
-{
- endwin();
- refresh();
- screen_resize();
- screen_draw();
-}
-
/* Debugging functions */
int debug(char *fmt, ...)
{
int rval;
va_list ap;
- /* Open log file */
- if (!debug_fd)
- debug_fd = fopen("lackey.log", "w+");
-
/* Log to debug file */
va_start(ap, fmt);
vfprintf(debug_fd, "debug: ", ap);
@@ -75,13 +67,15 @@ int debug(char *fmt, ...)
int main(int argc, char **argv)
{
/* Misc setup */
- struct sigaction act;
- sigemptyset(&act.sa_mask);
- act.sa_flags = 0;
- act.sa_handler = on_sigint;
- sigaction(SIGINT, &act, NULL);
- act.sa_handler = on_sigwinch;
- sigaction(SIGWINCH, &act, NULL);
+ signal(SIGINT, on_sigint);
+ debug_fd = fopen("/tmp/lackey.log", "w+");
+
+ /* Time setup */
+ time_t sec = time(NULL);
+ struct tm *tm = localtime(&sec);
+ YEAR = tm->tm_year+1900;
+ MONTH = tm->tm_mon;
+ DAY = tm->tm_mday-1;
/* Curses setup */
initscr();
@@ -100,24 +94,31 @@ int main(int argc, char **argv)
while (1) {
MEVENT btn;
int chr = getch();
+ if (chr == 'q')
+ break;
if (chr == KEY_MOUSE)
if (getmouse(&btn) != OK)
continue;
- if (chr == 'q')
- break;
- if (KEY_MOUSE)
- //debug("mouse xyz=%d,%d,%d id=%hd state=%lx\n",
- // btn.x, btn.y, btn.z, btn.id, btn.bstate);
switch (chr) {
+ case ERR:
+ continue;
+ case KEY_RESIZE:
+ endwin();
+ refresh();
+ screen_resize();
+ screen_draw();
+ continue;
case 'L':
clear();
case 'l':
+ case '\7':
screen_draw();
- break;
- default:
- screen_run(chr, btn.bstate, btn.y, btn.x);
- break;
+ continue;
}
+ if (screen_run(chr, btn.bstate, btn.y, btn.x))
+ continue;
+ //debug("Unhandled key: Dec %3d, Hex %02x, Oct %03o, Chr <%c>\n",
+ // chr, chr, chr, chr);
}
/* Cleanup, see also on_sigint */