X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=ansitris;a=blobdiff_plain;f=src%2Fmain.c;h=461f27c40cbdc4a0639f0a2fd34e492082f8c114;hp=6f27d73c04d1d774df69cde37b0279744c240cfb;hb=89a2e7ae300a4cabbb308b5ec2b83ee539fdd07c;hpb=f71c261ce691d78fccb3f377ae5299edbf0e0062

diff --git a/src/main.c b/src/main.c
index 6f27d73..461f27c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,33 +1,66 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <termios.h>
 #include <sys/stat.h>
+#include <sys/select.h>
+#include <sys/time.h>
 #include "game.h"
 
 int init(void);
 void cleanup(void);
+int parse_args(int argc, char **argv);
+void print_usage(const char *argv0);
+long get_msec(void);
 
-const char *termfile = "/dev/tty";
-struct termios saved_term;
+static const char *termfile = "/dev/tty";
+static struct termios saved_term;
+static struct timeval tv0;
 
 int main(int argc, char **argv)
 {
-	if(argc > 1) {
-		termfile = argv[1];
+	int res, c;
+	long msec, next;
+	struct timeval tv;
+
+	if(parse_args(argc, argv) == -1) {
+		return 1;
 	}
 
 	if(init() == -1) {
 		return 1;
 	}
 
+	gettimeofday(&tv0, 0);
+
+	tv.tv_sec = tick_interval / 1000;
+	tv.tv_usec = (tick_interval % 1000) * 1000;
+
 	for(;;) {
-		proc_input();
-		if(quit) break;
+		fd_set rdset;
+		FD_ZERO(&rdset);
+		FD_SET(0, &rdset);
+
+		while((res = select(1, &rdset, 0, 0, &tv)) == -1 && errno == EINTR);
+
+		if(res > 0 && FD_ISSET(0, &rdset)) {
+			while((c = fgetc(stdin)) >= 0) {
+				game_input(c);
+				if(quit) goto end;
+			}
+		}
+
+		msec = get_msec();
+		next = update(msec);
+
+		tv.tv_sec = next / 1000;
+		tv.tv_usec = (next % 1000) * 1000;
 	}
 
+end:
 	cleanup();
 	return 0;
 }
@@ -37,7 +70,7 @@ int init(void)
 	int fd;
 	struct termios term;
 
-	if((fd = open(termfile, O_RDWR)) == -1) {
+	if((fd = open(termfile, O_RDWR | O_NONBLOCK)) == -1) {
 		fprintf(stderr, "failed to open terminal device: %s: %s\n", termfile, strerror(errno));
 		return -1;
 	}
@@ -64,7 +97,7 @@ int init(void)
 	dup(fd);
 
 	umask(002);
-	open("ansitris.log", O_WRONLY | O_CREAT, 0664);
+	open("ansitris.log", O_WRONLY | O_CREAT | O_TRUNC, 0664);
 
 
 	if(init_game() == -1) {
@@ -79,3 +112,60 @@ void cleanup(void)
 	cleanup_game();
 	tcsetattr(0, TCSAFLUSH, &saved_term);
 }
+
+int parse_args(int argc, char **argv)
+{
+	int i;
+
+	for(i=1; i<argc; i++) {
+		if(argv[i][0] == '-') {
+			if(argv[i][2] == 0) {
+				switch(argv[i][1]) {
+				case 't':
+					termfile = argv[++i];
+					break;
+
+				case 'b':
+					use_bell = 1;
+					break;
+
+				case 'h':
+					print_usage(argv[0]);
+					exit(0);
+
+				default:
+					fprintf(stderr, "invalid option: %s\n", argv[i]);
+					print_usage(argv[0]);
+					return -1;
+				}
+			} else {
+				fprintf(stderr, "invalid option: %s\n", argv[i]);
+				print_usage(argv[0]);
+				return -1;
+			}
+		} else {
+			fprintf(stderr, "unexpected argument: %s\n", argv[i]);
+			print_usage(argv[0]);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+void print_usage(const char *argv0)
+{
+	printf("Usage: %s [options]\n", argv0);
+	printf("Options:\n");
+	printf(" -t <dev>: terminal device (default: /dev/tty)\n");
+	printf(" -b: use bell for sound ques (default: off)\n");
+	printf(" -h: print usage information and exit\n");
+}
+
+long get_msec(void)
+{
+	struct timeval tv;
+
+	gettimeofday(&tv, 0);
+
+	return (tv.tv_sec - tv0.tv_sec) * 1000 + (tv.tv_usec - tv0.tv_usec) / 1000;
+}