From: sparky4 <sparky4@cock.li>
Date: Mon, 8 Sep 2014 18:22:02 +0000 (-0500)
Subject: 	modified:   16/modex16/dos_kb.c
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=78d7f1823f3bef840773b5e9bf6ba40d270f28eb;p=16.git

	modified:   16/modex16/dos_kb.c
	modified:   16/modex16/pcxtest.exe
	modified:   16/modex16/scroll.c
	modified:   16/modex16/scroll.exe
	modified:   16/modex16/test.exe
	modified:   16/modex16/test2.exe
---

diff --git a/16/modex16/dos_kb.c b/16/modex16/dos_kb.c
index b6eac792..7c6030ae 100644
--- a/16/modex16/dos_kb.c
+++ b/16/modex16/dos_kb.c
@@ -19,6 +19,7 @@ static void interrupt (far *oldkb)(void) = NULL; /* BIOS keyboard handler */
  * to be included.
  */
 //#define TESTING
+#define TESTING2
 
 /*****************NEW KEYBOARD 09h ISR***********************/
 void interrupt newkb(void){
@@ -35,8 +36,8 @@ void interrupt newkb(void){
 	outp(0x61, qx);	   /* Toggle acknowledge bit low */
 
 	/* Interpret the scan code and set our flags */
-	#ifdef TESTING
-	//printf("%d[%d]\n",kee,key[kee]);
+	#ifdef TESTING2
+	printf("%d[%d]\n",kee,key[kee]);
 	#endif
 	if(kee & 0x80)
 		key[kee & 0x7F] = 0; // a key is released
@@ -59,15 +60,15 @@ void setkb(int vq){
 		_dos_setvect(9, oldkb);
 		/* Reset our function pointer to contain no valid address */
 		oldkb = NULL;
-		#ifdef TESTING
+		#ifdef TESTING2
 		/* Print the key heap */
-		/*printf("\n");
+		printf("\n");
 		for(i=0; i<NUM_SCANCODES; i++){
 			if(i==NUM_SCANCODES/2) printf("================================\n");
 			printf("%03d[%d][%d]",i+1,key[i],kea[i]);
 			if(key[i]==1)printf("====");
 			printf(",\n");
-		}*/
+		}
 		#endif
 	}else if(vq == 1){ // initiation
 		byte far *lock_key;
diff --git a/16/modex16/pcxtest.exe b/16/modex16/pcxtest.exe
index 89c7beff..4ab5474e 100644
Binary files a/16/modex16/pcxtest.exe and b/16/modex16/pcxtest.exe differ
diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
index cea92abb..d3cb8eea 100644
--- a/16/modex16/scroll.c
+++ b/16/modex16/scroll.c
@@ -52,14 +52,14 @@ void main() {
 	int x, y;
 	//int ch=0x0;
 	byte ch;
-	int q=0;
+	int q=0;
 	page_t screen,screen2;
 	map_t map;
 	map_view_t mv, mv2;
 	map_view_t *draw, *show, *tmp;
 	byte *ptr;
 	
-
+
 	setkb(1);
 	/* create the map */
 	map = allocMap(40,30);
@@ -69,7 +69,7 @@ void main() {
 
 	/* draw the tiles */
 	ptr = map.data;
-	modexEnter();
+	//modexEnter();
 	screen = modexDefaultPage();
 	screen.width = 352;
 	mv.page = &screen;
@@ -84,11 +84,12 @@ void main() {
 	draw = &mv2;
 
 	while(!keyp(1)) {
-	if(keyp(77)){
+	/*if(keyp(77)){
 		for(q=0; q<16; q++) {
 		mapScrollRight(draw, 1);
 		modexShowPage(draw->page);
-		SWAP(draw, show);
+		//mapScrollRight(draw, 1);
+		//SWAP(draw, show);
 		}
 	}
 
@@ -96,8 +97,8 @@ void main() {
 		for(q=0; q<16; q++) {
  		mapScrollLeft(draw, 1);
 		modexShowPage(draw->page);
- 		mapScrollLeft(show, 1);
-		SWAP(draw, show);
+ 		//mapScrollLeft(show, 1);
+		//SWAP(draw, show);
 		}
 	}
 
@@ -105,8 +106,8 @@ void main() {
 		for(q=0; q<16; q++) {
 		mapScrollDown(draw, 1);
 		modexShowPage(draw->page);
-		mapScrollDown(show, 1);
-		SWAP(draw, show);
+		//mapScrollDown(show, 1);
+		//SWAP(draw, show);
 		}
 	}
 
@@ -115,17 +116,16 @@ void main() {
 		for(q=0; q<16; q++) {
 		mapScrollUp(draw, 1);
 		modexShowPage(draw->page);
-		mapScrollUp(show, 1);
-		SWAP(draw, show);
-
+		//mapScrollUp(show, 1);
+		//SWAP(draw, show);
 		}
-	}
+	}*/
 
-	//keyp(ch);
+	keyp(ch);
 
 	}
 
-	modexLeave();
+	//modexLeave();
 	setkb(0);
 }
 
diff --git a/16/modex16/scroll.exe b/16/modex16/scroll.exe
index 1b3e8e9e..40f86bd0 100755
Binary files a/16/modex16/scroll.exe and b/16/modex16/scroll.exe differ
diff --git a/16/modex16/test.exe b/16/modex16/test.exe
index dbc7ed27..b0247b18 100644
Binary files a/16/modex16/test.exe and b/16/modex16/test.exe differ
diff --git a/16/modex16/test2.exe b/16/modex16/test2.exe
index a0f75a1e..23ca0df0 100644
Binary files a/16/modex16/test2.exe and b/16/modex16/test2.exe differ