X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fscreen.c;h=68a8c7f78a2139ba23c8c56794088f67f7b36f1b;hp=a949fc467a127e14ee51764ca8c0931a72be79ca;hb=73f97e0d9dc83cad4aa7b53d900ea28390afed4f;hpb=757e7697c9a4434df6f3fdf3234de504bb4636bc

diff --git a/src/screen.c b/src/screen.c
index a949fc4..68a8c7f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,14 +1,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #include "screen.h"
 #include "demo.h"
 
 struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
+struct screen *grise_screen(void);
+struct screen *polytest_screen(void);
+struct screen *plasma_screen(void);
+struct screen *bump_screen(void);
+struct screen *thunder_screen(void);
+struct screen *metaballs_screen(void);
+struct screen *greets_screen(void);
+struct screen *infcubes_screen(void);
+struct screen *hairball_screen(void);
 
-#define NUM_SCR	32
+#define NUM_SCR 32
 static struct screen *scr[NUM_SCR];
+static int num_screens;
 
 static struct screen *cur, *prev, *next;
 static long trans_start, trans_dur;
@@ -23,9 +34,39 @@ int scr_init(void)
 	if(!(scr[idx++] = fract_screen())) {
 		return -1;
 	}
+	if (!(scr[idx++] = grise_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = polytest_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = plasma_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = bump_screen())) {
+		return -1;
+	}
+	if (!(scr[idx++] = thunder_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = metaballs_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = greets_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = infcubes_screen())) {
+		return -1;
+	}
+	if(!(scr[idx++] = hairball_screen())) {
+		return -1;
+	}
+	num_screens = idx;
 
-	for(i=0; i<NUM_SCR; i++) {
-		if(scr[i] && scr[i]->init() == -1) {
+	assert(num_screens <= NUM_SCR);
+
+	for(i=0; i<num_screens; i++) {
+		if(scr[i]->init() == -1) {
 			return -1;
 		}
 	}
@@ -35,15 +76,14 @@ int scr_init(void)
 void scr_shutdown(void)
 {
 	int i;
-	for(i=0; i<NUM_SCR; i++) {
-		if(!scr[i]) break;
+	for(i=0; i<num_screens; i++) {
 		scr[i]->shutdown();
 	}
 }
 
 void scr_update(void)
 {
-	if(prev) {	/* we're in the middle of a transition */
+	if(prev) {  /* we're in the middle of a transition */
 		long interval = time_msec - trans_start;
 		if(interval >= trans_dur) {
 			if(next->start) {
@@ -56,16 +96,28 @@ void scr_update(void)
 	}
 }
 
+
 void scr_draw(void)
 {
-	if(cur) cur->draw();
+	if(cur) {
+		cur->draw();
+
+		/* print screen name */
+		cs_puts(fb_pixels, 0, 0, cur->name);
+	}
+}
+
+void scr_keypress(int key)
+{
+	if(cur && cur->keypress) {
+		cur->keypress(key);
+	}
 }
 
 struct screen *scr_lookup(const char *name)
 {
 	int i;
-	for(i=0; i<NUM_SCR; i++) {
-		if(!scr[i]) break;
+	for(i=0; i<num_screens; i++) {
 		if(strcmp(scr[i]->name, name) == 0) {
 			return scr[i];
 		}
@@ -73,23 +125,30 @@ struct screen *scr_lookup(const char *name)
 	return 0;
 }
 
+struct screen *scr_screen(int idx)
+{
+	return scr[idx];
+}
+
+int scr_num_screens(void)
+{
+	return num_screens;
+}
+
 int scr_change(struct screen *s, long trans_time)
 {
 	if(!s) return -1;
 	if(s == cur) return 0;
 
 	if(trans_time) {
-		trans_dur = trans_time / 2;	/* half for each part transition out then in */
+		trans_dur = trans_time / 2; /* half for each part transition out then in */
 		trans_start = time_msec;
 	} else {
 		trans_dur = 0;
 	}
 
-	if(cur) {
-		if(cur->stop) {
-			cur->stop(trans_dur);
-		}
-
+	if(cur && cur->stop) {
+		cur->stop(trans_dur);
 		prev = cur;
 		next = s;
 	} else {