WebSVN – SvarDOS – Path Comparison – / – /install/ Rev 1661 and /install/ Rev 1660

Ignore whitespace Rev 1661 → Rev 1660

/install/trunk/mdr/cout.h
File deleted

/install/trunk/mdr/rs232.h
File deleted

/install/trunk/mdr/trigint.h
File deleted

/install/trunk/mdr/timer.h
File deleted

/install/trunk/mdr/readme.txt
File deleted

/install/trunk/mdr/vid12.h
File deleted

/install/trunk/mdr/dos.h
File deleted

/install/trunk/mdr/mouse.h
File deleted

/install/trunk/mdr/history.txt
File deleted

/install/trunk/mdr/pcx.h
File deleted

/install/trunk/mdr/opl.h
File deleted

/install/trunk/mdr/mdrs2024.lib
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/install/trunk/mdr/bios.h
File deleted

/install/trunk/mdr/ver.h
File deleted

/install/trunk/mdr/sbdigi.h
File deleted

/install/trunk/mdr/wave.h
File deleted

/install/trunk/mdr/unzip.h
File deleted

/install/trunk/mdr/video.h
File deleted

/install/trunk/mdr/xms.h
File deleted

 /install/trunk/input.c
 ,0 → 1,37
+/*
+ * input keyboard routines used by the SvarDOS installer.
+ * Copyright (C) 2016 Mateusz Viste
+ */
+#ifndef input_h_sentinel
+#define input_h_sentinel
+#include <dos.h>
+#include "input.h" /* include self for control */
+/* waits for a keypress and return it. Returns 0x1xx for extended keys */
+int input_getkey(void) {
+  union REGS regs;
+  int res;
+  regs.h.ah = 0x08;
+  int86(0x21, &regs, &regs);
+  res = regs.h.al;
+  if (res == 0) { /* extended key - poll again */
+    regs.h.ah = 0x08;
+    int86(0x21, &regs, &regs);
+    res = regs.h.al | 0x100;
+  }
+  return(res);
+}
+/* poll the keyboard, and return the next input key in buffer, or -1 if none */
+int input_getkeyifany(void) {
+  union REGS regs;
+  regs.h.ah = 0x0B;
+  int86(0x21, &regs, &regs);
+  if (regs.h.al == 0xFF) return(input_getkey());
+  return(-1);
+}
+#endif

 /install/trunk/input.h
 ,0 → 1,11
+/*
+ * input keyboard routines used by the SvarDOS installer.
+ * Copyright (C) 2016 Mateusz Viste
+ */
+/* waits for a keypress and return it. Returns 0 for extended keystroke, then
+   function must be called again to return scan code. */
+int input_getkey(void);
+/* poll the keyboard, and return the next input key if any, or -1 */
+int input_getkeyifany(void);

 /install/trunk/install.c
 ,9 → 33,9
 #include <string.h>  /* memcpy() */
 #include <unistd.h>
-#include "mdr\dos.h"
 #include "svarlang.lib\svarlang.h"
+#include "input.h"
 #include "video.h"
 /* keyboard layouts and locales */
 ,7 → 192,7
         video_putcharmulti(ypos + 1 + i, xpos, COLOR_SELECT[mono], ' ', width+2, 1);
       }
     }
-    key = mdr_dos_getkey();
+    key = input_getkey();
     if (key == 0x0D) { /* ENTER */
       return(res);
     } else if (key == 0x148) { /* up */
 ,7 → 549,7
       newscreen(2);
       putstringnls(10, 10, COLOR_BODY[mono], 3, 1); /* "Your computer will reboot now." */
       putstringnls(12, 10, COLOR_BODY[mono], 0, 5); /* "Press any key..." */
-      mdr_dos_getkey();
+      input_getkey();
       reboot();
       return(MENUQUIT);
     } else if (driveremovable > 0) {
 ,7 → 588,7
       snprintf(buff, sizeof(buff), svarlang_strid(0x0304), cselecteddrive, SVARDOS_DISK_REQ); /* "ERROR: Drive %c: is not big enough! SvarDOS requires a disk of at least %d MiB." */
       y += putstringwrap(y, 1, COLOR_BODY[mono], buff);
       putstringnls(++y, 1, COLOR_BODY[mono], 0, 5); /* "Press any key..." */
-      mdr_dos_getkey();
+      input_getkey();
       return(MENUQUIT);
     }
     /* is the disk empty? */
 ,7 → 756,7
   fd = fopen("install.lst", "rb");
   if (fd == NULL) {
     video_putstring(10, 30, COLOR_BODY[mono], "ERROR: INSTALL.LST NOT FOUND", -1);
-    mdr_dos_getkey();
+    input_getkey();
     return(-1);
   }
   pkglistflen = fread(pkglist, 1, sizeof(pkglist) - 2, fd);
 ,7 → 763,7
   fclose(fd);
   if (pkglistflen == sizeof(pkglist) - 2) {
     video_putstring(10, 30, COLOR_BODY[mono], "ERROR: INSTALL.LST TOO LARGE", -1);
-    mdr_dos_getkey();
+    input_getkey();
     return(-1);
   }
   /* mark the end of list */
 ,7 → 814,7
       /* end of list? ask for next floppy, there's nothing interesting left on this one */
       if (*pkgptr == 0xff) {
         putstringnls(12, 1, COLOR_BODY[mono], 4, 1); /* "INSERT THE DISK THAT CONTAINS THE REQUIRED FILE AND PRESS ANY KEY" */
-        mdr_dos_getkey();
+        input_getkey();
         video_putstringfix(12, 1, COLOR_BODY[mono], "", 80); /* erase the 'insert disk' message */
         goto RETRY_ENTIRE_LIST;
       }
 ,7 → 830,7
     sprintf(buff, "%c:\\temp\\%s.svp", targetdrv, pkgptr);
     if (fcopy(buff, buff + 7, buff, sizeof(buff)) != 0) {
       video_putstring(10, 30, COLOR_BODY[mono], "READ ERROR", -1);
-      mdr_dos_getkey();
+      input_getkey();
       fclose(fd);
       return(-1);
     }
 ,7 → 882,7
   newscreen(2);
   y += putstringnls(y, 1, COLOR_BODY[mono], 5, 0); /* "Your computer will reboot now.\nPlease remove the installation disk from your drive" */
   putstringnls(++y, 1, COLOR_BODY[mono], 0, 5); /* "Press any key..." */
-  mdr_dos_getkey();
+  input_getkey();
   reboot();
 }

 /install/trunk/makefile
 ,8 → 9,8
 all: install.com
-install.com: keylay.h install.c video.c deflang.c int24hdl.obj
-        wcl -0 -y -cc -wx -mt -lr -we -d0 -ox install.c video.c deflang.c int24hdl.obj mdr\mdrs2024.lib svarlang.lib\svarlngs.lib
+install.com: keylay.h install.c input.c video.c deflang.c int24hdl.obj
+        wcl -0 -y -cc -wx -mt -lr -we -d0 -ox install.c input.c video.c deflang.c int24hdl.obj svarlang.lib\svarlngs.lib
         upx --8086 -9 install.com
 int24hdl.obj: int24hdl.asm

Subversion Repositories SvarDOS

Compare Revisions

Ignore whitespace Rev 1661 → Rev 1660