foo

[visor] / visor / src / main_unix.c

diff --git a/visor/src/main_unix.c b/visor/src/main_unix.c
index 37406a0..9db4e36 100644 (file)
--- a/visor/src/main_unix.c
+++ b/visor/src/main_unix.c
@@ -1,95 +1,70 @@
 #include <stdio.h>
-#include <signal.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <sys/ioctl.h>
+#include "term.h"
 
+static int parse_args(int argc, char **argv);
 static int init(void);
 static void cleanup(void);
-static void sighandler(int s);
 
-int term_width, term_height;
-int ttyfd;
-struct termios saved_term;
+static int num_fpaths;
+static char **fpaths;
 
 int main(int argc, char **argv)
 {
-       int res;
-       char c;
-
+       if(parse_args(argc, argv) == -1) {
+               return 1;
+       }
        if(init() == -1) {
                return 1;
        }
 
        for(;;) {
-               if((res = read(ttyfd, &c, 1)) == 0 || (res < 0 && errno != EINTR)) {
-                       break;
+               int c = term_getchar();
+
+               switch(c) {
+               case 27:
+               case 'q':
+                       goto end;
                }
-               /* proc input */
        }
+end:
 
        cleanup();
        return 0;
 }
 
+static int parse_args(int argc, char **argv)
+{
+       int i;
+
+       fpaths = argv + 1;
+       num_fpaths = 0;
+       for(i=1; i<argc; i++) {
+               if(argv[i][0] == '-') {
+                       fprintf(stderr, "invalid option: %s\n", argv[i]);
+                       return -1;
+               } else {
+                       argv[++num_fpaths] = argv[i];
+               }
+       }
+       return 0;
+}
+
 static int init(void)
 {
-       struct termios term;
-       struct winsize winsz;
+       int i;
 
-       if((ttyfd = open("/dev/tty", O_RDWR)) == -1) {
-               perror("failed to open /dev/tty");
-               return -1;
-       }
-       if(tcgetattr(ttyfd, &term) == -1) {
-               perror("failed to get terminal attr");
+       if(term_init(0) == -1) {
                return -1;
        }
-       saved_term = term;
-       term.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
-       term.c_oflag &= ~OPOST;
-       term.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
-       term.c_cflag = (term.c_cflag & ~(CSIZE | PARENB)) | CS8;
+       term_clear();
 
-       if(tcsetattr(ttyfd, TCSAFLUSH, &term) == -1) {
-               perror("failed to change terminal attributes");
-               return -1;
+       for(i=0; i<num_fpaths; i++) {
+               /* open fpaths[i] */
        }
-
-       ioctl(1, TIOCGWINSZ, &winsz);
-       term_width = winsz.ws_col;
-       term_height = winsz.ws_row;
-
-       signal(SIGWINCH, sighandler);
-
-       write(ttyfd, "\033[2J", 4);
-
        return 0;
 }
 
 static void cleanup(void)
 {
-       tcsetattr(ttyfd, TCSAFLUSH, &saved_term);
-       close(ttyfd);
-}
-
-static void sighandler(int s)
-{
-       struct winsize winsz;
-
-       signal(s, sighandler);
-
-       switch(s) {
-       case SIGWINCH:
-               ioctl(1, TIOCGWINSZ, &winsz);
-               term_width = winsz.ws_col;
-               term_height = winsz.ws_row;
-               /* redraw */
-               break;
-
-       default:
-               break;
-       }
+       term_cleanup();
 }