more refactoring

[apps/madtty.git] / demo / boxshell.c

diff --git a/demo/boxshell.c b/demo/boxshell.c
index 42c2579..44a9d9c 100644 (file)
--- a/demo/boxshell.c
+++ b/demo/boxshell.c
@@ -9,6 +9,8 @@
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
+#include <sys/time.h>
+#include <time.h>
 
 #include <madtty/madtty.h>
 
@@ -23,13 +25,15 @@ void sigchld(int signo __attribute__((unused)))
 
 int main(int argc, char *argv[])
 {
-    RoteTerm *rt;
-    int i, j, ch, w, h;
+    struct timeval next = { 0, 0 };
+    madtty_t *rt;
+    int i, j, ch, w, h, pos;
+    char buf[BUFSIZ];
 
     signal(SIGCHLD, sigchld);
 
     w = 80;
-    h = 50;
+    h = 40;
     if (argc > 1) {
         char *p = argv[1];
         w = strtol(p, &p, 10);
@@ -37,65 +41,70 @@ int main(int argc, char *argv[])
             h = strtol(p, &p, 10);
     }
 
-    initscr();
-    noecho();
-    start_color();
-    raw();
-    nodelay(stdscr, TRUE);       /* prevents getch() from blocking; rather
-                                  * it will return ERR when there is no
-                                  * keypress available */
-
-    keypad(stdscr, TRUE);        /* necessary to use rote_vt_keypress */
+    madtty_initialize();
     getmaxyx(stdscr, screen_h, screen_w);
 
-    /* initialize the color pairs the way rote_vt_draw expects it. You might
-     * initialize them differently, but in that case you would need
-     * to supply a custom conversion function for rote_vt_draw to
-     * call when setting attributes. The idea of this "default" mapping
-     * is to map (fg, bg) to the color pair bg * 8 + 7 - fg. This way,
-     * the pair (white, black) ends up mapped to 0, which means that
-     * it does not need a color pair (since it is the default). Since
-     * there are only 63 available color pairs (and 64 possible fg/bg
-     * combinations), we really have to save 1 pair by assigning no pair
-     * to the combination white/black. */
-    for (i = 0; i < 8; i++) for (j = 0; j < 8; j++)
-        if (i != 7 || j != 0)
-            init_pair(j*8+7-i, i, j);
-
     /* paint the screen blue */
-    attrset(COLOR_PAIR(32));
+    attrset(COLOR_PAIR(004));
     for (i = 0; i < screen_h; i++)
         for (j = 0; j < screen_w; j++)
             addch(' ');
     refresh();
 
     /* create a window with a frame */
-    term_win = newwin(h + 2, w + 2, 1, 2);
-    wattrset(term_win, COLOR_PAIR(7*8+7-0)); /* black over white */
-    wborder(term_win, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
+    term_win = newwin(h, w, 2, 3);
     mvwprintw(term_win, 0, 27, " Term In a Box ");
     wrefresh(term_win);
 
-    /* create the terminal and have it run bash */
-    rt = rote_vt_create(h, w);
+    rt = madtty_create(h, w);
     {
-        const char *path = "/bin/bash";
-        const char *args[] = {"/bin/bash", "--login", NULL};
+        const char *path = getenv("SHELL") ?: "/bin/sh";
+        const char *args[] = { path, "--login", NULL};
 
-        rote_vt_forkpty(rt, path, args);
+        madtty_forkpty(rt, path, args);
     }
 
     /* keep reading keypresses from the user and passing them to the terminal;
      * also, redraw the terminal to the window at each iteration */
     ch = '\0';
+    pos = 0;
     while (!getout) {
-        usleep(10000);
-        rote_vt_draw(rt, term_win, 1, 1, NULL);
-        wrefresh(term_win);
-
-        ch = getch();
-        if (ch != ERR) 
-            rote_vt_keypress(rt, ch); /* pass the keypress for handling */
+        fd_set rfds;
+        struct timeval tv = { 0 , 1000 }, t;
+
+        FD_ZERO(&rfds);
+        FD_SET(rt->pty, &rfds);
+
+        if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) {
+            int nb;
+
+            nb = madtty_read(rt, buf + pos, sizeof(buf) - pos);
+            if (nb <= 0)
+                continue;
+            pos += nb;
+
+            nb = madtty_inject(rt, buf, pos);
+            if (nb <= 0)
+                continue;
+            memmove(buf, buf + nb, pos - nb);
+            pos -= nb;
+        }
+
+        while ((ch = getch()) != ERR) {
+            madtty_keypress(rt, ch); /* pass the keypress for handling */
+        }
+
+        gettimeofday(&t, NULL);
+        if (timercmp(&t, &next, >=)) {
+            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++;
+            }
+        }
     }
 
     endwin();