From: Andy Spencer <andy753421@gmail.com>
Date: Fri, 5 Oct 2012 07:42:01 +0000 (+0000)
Subject: Fix resize
X-Git-Url: http://pileus.org/git/?p=lackey;a=commitdiff_plain;h=03fa51304d454d74e6aa2f7a8f49506ee070701e

Fix resize
---

diff --git a/makefile b/makefile
index 8512942..46df956 100644
--- a/makefile
+++ b/makefile
@@ -18,7 +18,7 @@ all: $(PROG) $(TEST)
 
 run-$(PROG): $(PROG)
 	@urxvt -e ./$<
-	@cat lackey.log
+	@cat /tmp/lackey.log
 
 run-$(TEST): $(TEST)
 	./$<
diff --git a/src/main.c b/src/main.c
index 6ae9798..d1a1fce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _POSIX_C_SOURCE 1
 #include <stdarg.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -40,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);
@@ -81,13 +67,8 @@ 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);
@@ -113,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 */