Use nl_langinfo properly to detect if the charset is utf8

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

diff --git a/demo/boxshell.c b/demo/boxshell.c
index 76af914..15fbc41 100644 (file)
--- a/demo/boxshell.c
+++ b/demo/boxshell.c
@@ -8,6 +8,7 @@
 #include <ncurses.h>
 
 #include <fcntl.h>
+#include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -56,13 +57,23 @@ static int is_expired(struct timeval now, struct timeval expiry)
 int main(void)
 {
     madtty_t *rt;
-    int dirty = 0;
+    int dirty = 0, pty;
     struct timeval next;
 
     signal(SIGCHLD, handler);
     signal(SIGWINCH, handler);
 
-    madtty_initialize();
+    setlocale(LC_ALL, "");
+    initscr();
+    start_color();
+    noecho();
+    raw();
+    nodelay(stdscr, TRUE);
+    keypad(stdscr, TRUE);
+    curs_set(0);
+    ESCDELAY=50;
+    madtty_init_vt100_graphics();
+    madtty_init_colors();
     getmaxyx(stdscr, screen_h, screen_w);
 
     /* create a window with a frame */
@@ -72,7 +83,7 @@ int main(void)
         const char *path = getenv("SHELL") ?: "/bin/sh";
         const char *args[] = { path, "--login", NULL};
 
-        madtty_forkpty(rt, path, args);
+        madtty_forkpty(rt, path, args, &pty);
     }
 
     /* keep reading keypresses from the user and passing them to the terminal;
@@ -85,10 +96,10 @@ int main(void)
 
         FD_ZERO(&rfds);
         FD_SET(0, &rfds);
-        FD_SET(rt->pty, &rfds);
+        FD_SET(pty, &rfds);
 
-        if (select(rt->pty + 1, &rfds, NULL, NULL, &tv) > 0) {
-            if (FD_ISSET(rt->pty, &rfds)) {
+        if (select(pty + 1, &rfds, NULL, NULL, &tv) > 0) {
+            if (FD_ISSET(pty, &rfds)) {
                 madtty_process(rt);
                 dirty = 1;
             }