foo

[visor] / visor / src / main_unix.c

diff --git a/visor/src/main_unix.c b/visor/src/main_unix.c
index 6430272..9a9e91f 100644 (file)
--- a/visor/src/main_unix.c
+++ b/visor/src/main_unix.c
@@ -1,10 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
 #include "term.h"
 #include "visor.h"
 
 struct file {
-       FILE *fp;
+       int fd;
        void *maddr;
        size_t msize;
 };
@@ -12,6 +16,7 @@ struct file {
 static int parse_args(int argc, char **argv);
 static int init(void);
 static void cleanup(void);
+static void resized(int x, int y);
 /* file operations */
 static vi_file *file_open(const char *path, unsigned int flags);
 static void file_close(vi_file *file);
@@ -21,6 +26,19 @@ static void file_unmap(vi_file *file);
 static long file_read(vi_file *file, void *buf, long count);
 static long file_write(vi_file *file, void *buf, long count);
 static long file_seek(vi_file *file, long offs, int whence);
+/* tty operations */
+static void tty_clear(void *cls);
+static void tty_clear_line(void *cls);
+static void tty_clear_line_at(int y, void *cls);
+static void tty_setcursor(int x, int y, void *cls);
+static void tty_putchar(char c, void *cls);
+static void tty_putchar_at(int x, int y, char c, void *cls);
+static void tty_scroll(int nlines, void *cls);
+static void tty_del_back(void *cls);
+static void tty_del_fwd(void *cls);
+static void tty_status(char *s, void *cls);
+static void tty_flush(void *cls);
+
 
 static struct visor *vi;
 
@@ -37,13 +55,11 @@ static struct vi_fileops fops = {
        file_read, file_write, file_seek
 };
 
-/*
 static struct vi_ttyops ttyops = {
        tty_clear, tty_clear_line, tty_clear_line_at,
        tty_setcursor, tty_putchar, tty_putchar_at,
-       tty_scroll, tty_del_back, tty_del_fwd, tty_status
+       tty_scroll, tty_del_back, tty_del_fwd, tty_status, tty_flush
 };
-*/
 
 int main(int argc, char **argv)
 {
@@ -54,12 +70,15 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       vi_redraw(vi);
+
        for(;;) {
                int c = term_getchar();
 
                switch(c) {
                case 27:
                case 'q':
+               case -1:
                        goto end;
                }
        }
@@ -99,10 +118,15 @@ static int init(void)
                return -1;
        }
        vi_set_fileops(vi, &fops);
+       vi_set_ttyops(vi, &ttyops);
 
        for(i=0; i<num_fpaths; i++) {
-               /* open fpaths[i] */
+               if(!vi_new_buf(vi, fpaths[i])) {
+                       return -1;
+               }
        }
+
+       term_resize_func(resized);
        return 0;
 }
 
@@ -114,68 +138,147 @@ static void cleanup(void)
        term_cleanup();
 }
 
+static void resized(int x, int y)
+{
+       vi_term_size(vi, x, y);
+}
+
 static vi_file *file_open(const char *path, unsigned int flags)
 {
        struct file *file;
-       const char *attr;
 
-       switch(flags & 0xff) {
-       case VI_RDONLY:
-               attr = "rb";
-               break;
+       if(!(file = calloc(1, sizeof *file))) {
+               return 0;
+       }
+       if((file->fd = open(path, flags)) == -1) {
+               free(file);
+               return 0;
+       }
+       return (vi_file*)file;
+}
+
+static void file_close(vi_file *vif)
+{
+       struct file *file = vif;
+       if(!file) return;
 
-       case VI_WRONLY:
-               attr = (flags & VI_CREAT) ? "w+b" : "wb";
-               break;
+       if(file->fd >= 0) {
+               if(file->maddr) {
+                       file_unmap(file);
+               }
+               close(file->fd);
+       }
+       free(file);
+}
 
-       case VI_RDWR:
-               attr = (flags & VI_CREAT) ? "w+b" : "r+b";
-               break;
+static long file_size(vi_file *vif)
+{
+       struct file *file = vif;
+       struct stat st;
 
-       default:
-               return 0;
+       if(fstat(file->fd, &st) == -1) {
+               return -1;
        }
+       return st.st_size;
+}
 
+static void *file_map(vi_file *vif)
+{
+       struct file *file = vif;
+       long sz;
 
-       if(!(file = calloc(1, sizeof *file))) {
+       if((sz = file_size(file)) == -1) {
                return 0;
        }
-       if(!(file->fp = fopen(path, attr))) {
-               free(file);
+       if((file->maddr = mmap(0, sz, PROT_READ, MAP_PRIVATE, file->fd, 0)) == (void*)-1) {
                return 0;
        }
-       return file;
+       file->msize = sz;
+       return file->maddr;
 }
 
-static void file_close(vi_file *file)
+static void file_unmap(vi_file *vif)
 {
+       struct file *file = vif;
+       if(file->maddr) {
+               munmap(file->maddr, file->msize);
+       }
+       file->maddr = 0;
 }
 
-static long file_size(vi_file *file)
+static long file_read(vi_file *vif, void *buf, long count)
 {
-       return -1;
+       struct file *file = vif;
+       return read(file->fd, buf, count);
 }
 
-static void *file_map(vi_file *file)
+static long file_write(vi_file *vif, void *buf, long count)
 {
-       return 0;
+       struct file *file = vif;
+       return write(file->fd, buf, count);
+}
+
+static long file_seek(vi_file *vif, long offs, int whence)
+{
+       struct file *file = vif;
+       return lseek(file->fd, offs, whence);
+}
+
+/* tty operations */
+
+static void tty_clear(void *cls)
+{
+       term_clear();
+}
+
+static void tty_clear_line(void *cls)
+{
+       /* TODO */
+}
+
+static void tty_clear_line_at(int y, void *cls)
+{
+       term_setcursor(y, 0);
+       /* TODO */
+}
+
+static void tty_setcursor(int x, int y, void *cls)
+{
+       term_setcursor(y, x);
+}
+
+static void tty_putchar(char c, void *cls)
+{
+       term_putchar(c);
+}
+
+static void tty_putchar_at(int x, int y, char c, void *cls)
+{
+       term_setcursor(y, x);
+       term_putchar(c);
+}
+
+static void tty_scroll(int nlines, void *cls)
+{
+       /* TODO */
 }
 
-static void file_unmap(vi_file *file)
+static void tty_del_back(void *cls)
 {
+       /* TODO */
 }
 
-static long file_read(vi_file *file, void *buf, long count)
+static void tty_del_fwd(void *cls)
 {
-       return -1;
+       /* TODO */
 }
 
-static long file_write(vi_file *file, void *buf, long count)
+static void tty_status(char *s, void *cls)
 {
-       return -1;
+       /* TODO */
 }
 
-static long file_seek(vi_file *file, long offs, int whence)
+static void tty_flush(void *cls)
 {
-       return -1;
+       term_flush();
 }