X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fdos%2Fkeyb.c;h=a13ef81c0faabef5c9cf2466f869ce64b44b831c;hp=9ec20a9de8d136081a2db11a5008d637ae100c67;hb=637ca39c29b03bd3a2beb99521753e83c043283f;hpb=8a64d603ee67cd98070360b40938e123ea845154

diff --git a/src/dos/keyb.c b/src/dos/keyb.c
index 9ec20a9..a13ef81 100644
--- a/src/dos/keyb.c
+++ b/src/dos/keyb.c
@@ -20,11 +20,22 @@ along with the program. If not, see <http://www.gnu.org/licenses/>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <conio.h>
 #include <dos.h>
+
+#ifdef __WATCOMC__
 #include <i86.h>
+#endif
+#ifdef __DJGPP__
+#include <dpmi.h>
+#include <go32.h>
+#include <pc.h>
+#endif
+
 #include "keyb.h"
 #include "scancode.h"
+#include "inttypes.h"
 
 #define KB_INTR		0x9
 #define KB_PORT		0x60
@@ -32,11 +43,24 @@ along with the program. If not, see <http://www.gnu.org/licenses/>
 #define PIC1_CMD_PORT	0x20
 #define OCW2_EOI		(1 << 5)
 
+#ifdef __WATCOMC__
+#define INTERRUPT __interrupt __far
+
 #define DONE_INIT	(prev_handler)
+static void (INTERRUPT *prev_handler)();
+#endif
 
-static void __interrupt __far kbintr();
+#ifdef __DJGPP__
+#define INTERRUPT
 
-static void (__interrupt __far *prev_handler)();
+#define DONE_INIT prev_intr.pm_offset
+static _go32_dpmi_seginfo intr, prev_intr;
+
+#define outp(p, v)	outportb(p, v)
+#define inp(p)	inportb(p)
+#endif
+
+static void INTERRUPT kbintr();
 
 static int *buffer;
 static int buffer_size, buf_ridx, buf_widx;
@@ -67,8 +91,17 @@ int kb_init(int bufsz)
 
 	/* set our interrupt handler */
 	_disable();
+#ifdef __WATCOMC__
 	prev_handler = _dos_getvect(KB_INTR);
 	_dos_setvect(KB_INTR, kbintr);
+#endif
+#ifdef __DJGPP__
+	_go32_dpmi_get_protected_mode_interrupt_vector(KB_INTR, &prev_intr);
+	intr.pm_offset = (intptr_t)kbintr;
+	intr.pm_selector = _go32_my_cs();
+	_go32_dpmi_allocate_iret_wrapper(&intr);
+	_go32_dpmi_set_protected_mode_interrupt_vector(KB_INTR, &intr);
+#endif
 	_enable();
 
 	return 0;
@@ -82,7 +115,13 @@ void kb_shutdown(void)
 
 	/* restore the original interrupt handler */
 	_disable();
+#ifdef __WATCOMC__
 	_dos_setvect(KB_INTR, prev_handler);
+#endif
+#ifdef __DJGPP__
+	_go32_dpmi_set_protected_mode_interrupt_vector(KB_INTR, &prev_intr);
+	_go32_dpmi_free_iret_wrapper(&intr);
+#endif
 	_enable();
 
 	free(buffer);
@@ -100,9 +139,24 @@ int kb_isdown(int key)
 	case KB_CTRL:
 		return keystate[KB_LCTRL] + keystate[KB_RCTRL];
 	}
+
+	if(isalpha(key)) {
+		key = tolower(key);
+	}
 	return keystate[key];
 }
 
+#ifdef __WATCOMC__
+void halt(void);
+#pragma aux halt = \
+	"sti" \
+	"hlt";
+#endif
+
+#ifdef __DJGPP__
+#define halt() asm volatile("sti\n\thlt\n\t")
+#endif
+
 void kb_wait(void)
 {
 	int key;
@@ -110,10 +164,7 @@ void kb_wait(void)
 		/* put the processor to sleep while waiting for keypresses, but first
 		 * make sure interrupts are enabled, or we'll sleep forever
 		 */
-		__asm {
-			sti
-			hlt
-		}
+		halt();
 	}
 	kb_putback(key);
 }
@@ -157,10 +208,10 @@ void kb_putback(int key)
 	}
 }
 
-static void __interrupt __far kbintr()
+static void INTERRUPT kbintr()
 {
 	unsigned char code;
-	int key, press;
+	int key, c, press;
 
 	code = inp(KB_PORT);
 
@@ -178,12 +229,13 @@ static void __interrupt __far kbintr()
 	}
 
 	key = scantbl[code];
+	c = (keystate[KB_LSHIFT] | keystate[KB_RSHIFT]) ? scantbl_shift[code] : key;
 
 	if(press) {
 		/* append to buffer */
-		last_key = key;
+		last_key = c;
 		if(buffer_size > 0) {
-			buffer[buf_widx] = key;
+			buffer[buf_widx] = c;
 			ADVANCE(buf_widx);
 			/* if the write end overtook the read end, advance the read end
 			 * too, to discard the oldest keypress from the buffer