X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=demo%2Fboxshell.c;h=c8ef22aeae47d70ddf8e0c339361304b3c8a5190;hb=7a634f01490ab34dcddffdde5b5a3d5dd10f6de5;hp=dbb47e4690644720f2e002173841a7bfa1108dd6;hpb=f38bb36465858ae6af3776175010e8c09e70f980;p=apps%2Fmadtty.git

diff --git a/demo/boxshell.c b/demo/boxshell.c
index dbb47e4..c8ef22a 100644
--- a/demo/boxshell.c
+++ b/demo/boxshell.c
@@ -6,10 +6,13 @@
  */
 
 #include <ncurses.h>
-#include <stdio.h>
+
 #include <signal.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/ioctl.h>
 #include <sys/time.h>
+#include <termios.h>
 #include <time.h>
 
 #include <madtty/madtty.h>
@@ -18,19 +21,24 @@ static unsigned char getout = 0;
 static int screen_w, screen_h;
 static WINDOW *term_win;
 
-void sigchld(int signo __attribute__((unused)))
+void handler(int signo)
 {
-    getout = 1;
+    switch (signo) {
+      case SIGCHLD:
+        getout = 1;
+        break;
+      case SIGWINCH:
+        break;
+    }
 }
 
 int main(void)
 {
-    struct timeval next = { 0, 0 };
     madtty_t *rt;
-    int pos = 0;
-    char buf[BUFSIZ];
+    int dirty = 0;
 
-    signal(SIGCHLD, sigchld);
+    signal(SIGCHLD, handler);
+    signal(SIGWINCH, handler);
 
     madtty_initialize();
     getmaxyx(stdscr, screen_h, screen_w);
@@ -47,34 +55,42 @@ int main(void)
 
     /* keep reading keypresses from the user and passing them to the terminal;
      * also, redraw the terminal to the window at each iteration */
-    pos = 0;
     while (!getout) {
         fd_set rfds;
-        struct timeval tv = { 0 , 1000 }, t;
+        struct timeval tv = { 0, 1000 * 1000 / 50 };
         int ch;
 
         FD_ZERO(&rfds);
         FD_SET(rt->pty, &rfds);
 
         if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) {
-            if (madtty_process(rt))
-                break;
+            if (FD_ISSET(rt->pty, &rfds)) {
+                madtty_process(rt);
+                dirty = 1;
+            }
         }
 
         while ((ch = getch()) != ERR) {
+#if 0
+            if (ch == KEY_F(1)) {
+                struct winsize ws = {
+                    .ws_row = --rt->rows,
+                    .ws_col = --rt->cols,
+                };
+
+                erase();
+                ioctl(rt->pty, TIOCSWINSZ, &ws);
+                wresize(term_win, rt->rows, rt->cols);
+            }
+#endif
             madtty_keypress(rt, ch); /* pass the keypress for handling */
+            dirty = 1;
         }
 
-        gettimeofday(&t, NULL);
-        if (timercmp(&t, &next, >=)) {
+        if (dirty) {
             madtty_draw(rt, term_win, 0, 0);
             wrefresh(term_win);
-            gettimeofday(&next, NULL);
-            next.tv_usec += 1000 * 1000 / 50;
-            if (next.tv_usec > 1000 * 1000) {
-                next.tv_usec -= 1000 * 1000;
-                next.tv_sec++;
-            }
+            dirty = 0;
         }
     }