X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=demo%2Fboxshell.c;h=00a11a099d4c2d98d1eba162cd5fd1cdc7a7c479;hb=800cf6341f10d4c927c5ee77a5351b684a431ac1;hp=a1d746e2c0627c4d18ccb9615a076ca62a6e910c;hpb=1f877e6f07a48bc78f0b38d4fba4306d3a4688a2;p=apps%2Fmadtty.git

diff --git a/demo/boxshell.c b/demo/boxshell.c
index a1d746e..00a11a0 100644
--- a/demo/boxshell.c
+++ b/demo/boxshell.c
@@ -6,11 +6,13 @@
  */
 
 #include <ncurses.h>
-#include <locale.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>
@@ -19,116 +21,77 @@ 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(int argc, char *argv[])
+int main(void)
 {
-    struct timeval next = { 0, 0 };
-    RoteTerm *rt;
-    int i, j, ch, w, h, pos;
-    char buf[BUFSIZ];
-
-    signal(SIGCHLD, sigchld);
-
-    w = 80;
-    h = 40;
-    if (argc > 1) {
-        char *p = argv[1];
-        w = strtol(p, &p, 10);
-        if (*p++ == 'x')
-            h = strtol(p, &p, 10);
-    }
+    madtty_t *rt;
+    int dirty = 0;
 
-    setlocale(LC_ALL, "");
-    initscr();
-    noecho();
-    start_color();
-    raw();
-    nodelay(stdscr, TRUE);       /* prevents getch() from blocking; rather
-                                  * it will return ERR when there is no
-                                  * keypress available */
+    signal(SIGCHLD, handler);
+    signal(SIGWINCH, handler);
 
-    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));
-    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, 2, 3);
-    wborder(term_win, '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0');
-    mvwprintw(term_win, 0, 27, " Term In a Box ");
-    wrefresh(term_win);
-
-    rt = rote_vt_create(h, w);
+    term_win = newwin(screen_h - 2, screen_w - 2, 1, 1);
+    rt = madtty_create(screen_h - 2, screen_w - 2);
     {
         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) {
         fd_set rfds;
-        struct timeval tv = { 0 , 1000 }, t;
+        struct timeval tv = { 0, 1000 * 1000 / 50 };
+        int ch;
 
         FD_ZERO(&rfds);
+        FD_SET(0, &rfds);
         FD_SET(rt->pty, &rfds);
 
         if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) {
-            int nb;
-
-            nb = rote_vt_read(rt, buf + pos, sizeof(buf) - pos);
-            if (nb <= 0)
-                continue;
-            pos += nb;
-
-            nb = rote_vt_inject(rt, buf, pos);
-            if (nb <= 0)
-                continue;
-            memmove(buf, buf + nb, pos - nb);
-            pos -= nb;
+            if (FD_ISSET(rt->pty, &rfds)) {
+                madtty_process(rt);
+                dirty = 1;
+            }
         }
 
         while ((ch = getch()) != ERR) {
-            rote_vt_keypress(rt, ch); /* pass the keypress for handling */
+#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, >=)) {
-            rote_vt_draw(rt, term_win, 1, 1);
+        if (dirty) {
+            madtty_draw(rt, term_win, 0, 0);
             wrefresh(term_win);
-            gettimeofday(&next, NULL);
-            next.tv_usec += 1000 * 1000 / 100;
-            if (next.tv_usec > 1000 * 1000) {
-                next.tv_usec -= 1000 * 1000;
-                next.tv_sec++;
-            }
+            dirty = 0;
         }
     }