X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=visor;a=blobdiff_plain;f=visor%2Fsrc%2Fmain_unix.c;h=96d59cb7a09e85c596ccd4877208f71bdc404a10;hp=37406a0d3206d802c1502e659220cde9be4a0eb2;hb=94c867869ece77f27cf3c8b637d44e13d86f5b88;hpb=05b4673efbeb372387b0a9359af5046afb87c8cf

diff --git a/visor/src/main_unix.c b/visor/src/main_unix.c
index 37406a0..96d59cb 100644
--- a/visor/src/main_unix.c
+++ b/visor/src/main_unix.c
@@ -1,95 +1,203 @@
 #include <stdio.h>
-#include <signal.h>
-#include <errno.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include "term.h"
+#include "visor.h"
+
+struct file {
+	int fd;
+	void *maddr;
+	size_t msize;
+};
+
+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;
+/* file operations */
+static vi_file *file_open(const char *path, unsigned int flags);
+static void file_close(vi_file *file);
+static long file_size(vi_file *file);
+static void *file_map(vi_file *file);
+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);
+
+static struct visor *vi;
+
+static int num_fpaths;
+static char **fpaths;
+
+static struct vi_alloc alloc = {
+	malloc, free, realloc
+};
+
+static struct vi_fileops fops = {
+	file_open, file_close, file_size,
+	file_map, file_unmap,
+	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
+};
+*/
 
 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");
+	if(term_init(0) == -1) {
 		return -1;
 	}
-	if(tcgetattr(ttyfd, &term) == -1) {
-		perror("failed to get terminal attr");
-		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;
-
-	if(tcsetattr(ttyfd, TCSAFLUSH, &term) == -1) {
-		perror("failed to change terminal attributes");
+	term_clear();
+
+	if(!(vi = vi_create(&alloc))) {
 		return -1;
 	}
+	vi_set_fileops(vi, &fops);
 
-	ioctl(1, TIOCGWINSZ, &winsz);
-	term_width = winsz.ws_col;
-	term_height = winsz.ws_row;
+	for(i=0; i<num_fpaths; i++) {
+		if(!vi_new_buf(vi, fpaths[i])) {
+			return -1;
+		}
+		printf("loaded file: %s\n", fpaths[i]);
+	}
+	return 0;
+}
 
-	signal(SIGWINCH, sighandler);
+static void cleanup(void)
+{
+	if(vi) {
+		vi_destroy(vi);
+	}
+	term_cleanup();
+}
 
-	write(ttyfd, "\033[2J", 4);
+static vi_file *file_open(const char *path, unsigned int flags)
+{
+	struct file *file;
 
-	return 0;
+	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 cleanup(void)
+static void file_close(vi_file *vif)
 {
-	tcsetattr(ttyfd, TCSAFLUSH, &saved_term);
-	close(ttyfd);
+	struct file *file = vif;
+	if(!file) return;
+
+	if(file->fd >= 0) {
+		if(file->maddr) {
+			file_unmap(file);
+		}
+		close(file->fd);
+	}
+	free(file);
 }
 
-static void sighandler(int s)
+static long file_size(vi_file *vif)
 {
-	struct winsize winsz;
+	struct file *file = vif;
+	struct stat st;
 
-	signal(s, sighandler);
+	if(fstat(file->fd, &st) == -1) {
+		return -1;
+	}
+	return st.st_size;
+}
 
-	switch(s) {
-	case SIGWINCH:
-		ioctl(1, TIOCGWINSZ, &winsz);
-		term_width = winsz.ws_col;
-		term_height = winsz.ws_row;
-		/* redraw */
-		break;
+static void *file_map(vi_file *vif)
+{
+	struct file *file = vif;
+	long sz;
+
+	if((sz = file_size(file)) == -1) {
+		return 0;
+	}
+	if((file->maddr = mmap(0, sz, PROT_READ, MAP_PRIVATE, file->fd, 0)) == (void*)-1) {
+		return 0;
+	}
+	file->msize = sz;
+	return file->maddr;
+}
 
-	default:
-		break;
+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_read(vi_file *vif, void *buf, long count)
+{
+	struct file *file = vif;
+	return read(file->fd, buf, count);
+}
+
+static long file_write(vi_file *vif, void *buf, long count)
+{
+	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);
 }