WebSVN – SvarDOS – Diff – /install/trunk/install.c

 #include <stdio.h>   /* printf() and friends */
 #include <stdlib.h>  /* system() */
 #include <string.h>  /* memcpy() */
 #include <unistd.h>
+#include "mdr\cout.h"
 #include "mdr\dos.h"
 #include "svarlang.lib\svarlang.h"
-#include "video.h"
 /* keyboard layouts and locales */
 #include "keylay.h"
 #include "keyoff.h"
 /* prototype of the int24hdl() function defined in int24hdl.asm */
 void int24hdl(void);
 /* color scheme (color, mono) */
-static unsigned short COLOR_TITLEBAR[2] = {0x7000,0x7000};
+static unsigned char COLOR_TITLEBAR[2] = {0x70,0x70};
-static unsigned short COLOR_BODY[2] = {0x1700,0x0700};
+static unsigned char COLOR_BODY[2] = {0x07,0x17};
-static unsigned short COLOR_SELECT[2] = {0x7000,0x7000};
+static unsigned char COLOR_SELECT[2] = {0x70,0x70};
-static unsigned short COLOR_SELECTCUR[2] = {0x1F00,0x0700};
+static unsigned char COLOR_SELECTCUR[2] = {0x07,0x1F};
-/* mono flag */
+/* mono flag (0=mono 1=color) */
-static int mono = 0;
+static unsigned char mono = 0;
 /* how much disk space does SvarDOS require (in MiB) */
 #define SVARDOS_DISK_REQ 8
 /* menu screens can output only one of these: */
   int keyblen;
   unsigned int keybid;
 };
+/* put a string on screen and fill it until w chars with whilte space */
+static void video_putstringfix(unsigned char y, unsigned char x, unsigned char attr, const char *s, unsigned char w) {
+  unsigned char i;
+  /* print the string up to w characters */
+  i = mdr_cout_str(y, x, s, attr, w);
+  /* fill in left space (if any) with blanks */
+  mdr_cout_char_rep(y, x + i, ' ', attr, w - i);
+}
 /* reboot the computer */
 static void reboot(void) {
   void ((far *bootroutine)()) = (void (far *)()) 0xFFFF0000L;
   int far *rstaddr = (int far *)0x00400072L; /* BIOS boot flag is at 0040:0072 */
   *rstaddr = 0x1234; /* 0x1234 = warm boot, 0 = cold boot */
   (*bootroutine)(); /* jump to the BIOS reboot routine at FFFF:0000 */
+}
 /* outputs a string to screen with taking care of word wrapping. returns amount of lines. */
-static int putstringwrap(int y, int x, unsigned short attr, const char *s) {
+static unsigned char putstringwrap(unsigned char y, unsigned char x, unsigned char attr, const char *s) {
-  int linew, lincount;
+  unsigned char linew, lincount;
-  linew = 80;
-  if (x >= 0) linew -= (x << 1);
+  linew = 80 - (x << 1);
   for (lincount = 1; y+lincount < 25; lincount++) {
     int i, len = linew;
     for (i = 0; i <= linew; i++) {
       if (s[i] == ' ') len = i;
       if (s[i] == 0) {
         len = i;
         break;
+      }
+    }
-    video_putstring(y++, x, attr, s, len);
+    mdr_cout_str(y++, x, s, attr, len);
     s += len;
     if (*s == 0) break;
     s += 1; /* skip the whitespace char */
+  }
   return(lincount);
+}
 /* an NLS wrapper around video_putstring(), also performs line wrapping when
  * needed. returns the amount of lines that were output */
-static int putstringnls(int y, int x, unsigned short attr, int nlsmaj, int nlsmin) {
+static unsigned char putstringnls(unsigned char y, unsigned char x, unsigned char attr, unsigned char nlsmaj, unsigned char nlsmin) {
   const char *s = svarlang_str(nlsmaj, nlsmin);
   if (s == NULL) s = "";
   return(putstringwrap(y, x, attr, s));
+}
   if (fd2 != NULL) fclose(fd2);
   return(res);
+}
-static int menuselect(int ypos, int xpos, int height, const char **list, int listlen) {
+static int menuselect(unsigned char ypos, int xpos, unsigned char height, const char **list, int listlen) {
   int i, offset = 0, res = 0, count, width = 0;
+  unsigned char y;
   /* count how many positions there is, and check their width */
   for (count = 0; (list[count] != NULL) && (count != listlen); count++) {
     int len = strlen(list[count]);
     if (len > width) width = len;
+  }
   /* if xpos negative, means 'center out' */
   if (xpos < 0) xpos = 39 - (width >> 1);
-  video_putchar(ypos, xpos+width+2, COLOR_SELECT[mono], 0xBF);         /*       \ */
+  mdr_cout_char(ypos, xpos+width+2, 0xBF, COLOR_SELECT[mono]);         /*       \ */
-  video_putchar(ypos, xpos-1, COLOR_SELECT[mono], 0xDA);               /*  /      */
+  mdr_cout_char(ypos, xpos-1, 0xDA, COLOR_SELECT[mono]);               /*  /      */
-  video_putchar(ypos+height-1, xpos-1, COLOR_SELECT[mono], 0xC0);      /*  \      */
+  mdr_cout_char(ypos+height-1, xpos-1, 0xC0, COLOR_SELECT[mono]);      /*  \      */
-  video_putchar(ypos+height-1, xpos+width+2, COLOR_SELECT[mono], 0xD9);/*      /  */
+  mdr_cout_char(ypos+height-1, xpos+width+2, 0xD9, COLOR_SELECT[mono]);/*      /  */
-  video_putcharmulti(ypos, xpos, COLOR_SELECT[mono], 0xC4, width + 2, 1);
+  mdr_cout_char_rep(ypos, xpos, 0xC4, COLOR_SELECT[mono], width + 2);
-  video_putcharmulti(ypos+height-1, xpos, COLOR_SELECT[mono], 0xC4, width + 2, 1);
+  mdr_cout_char_rep(ypos+height-1, xpos, 0xC4, COLOR_SELECT[mono], width + 2);
+  for (y = ypos + 1; y < (ypos + height - 1); y++) {
-  video_putcharmulti(ypos+1, xpos-1, COLOR_SELECT[mono], 0xB3, height - 2, 80);
+    mdr_cout_char(y, xpos-1, 0xB3, COLOR_SELECT[mono]);
-  video_putcharmulti(ypos+1, xpos+width+2, COLOR_SELECT[mono], 0xB3, height - 2, 80);
+    mdr_cout_char(y, xpos+width+2, 0xB3, COLOR_SELECT[mono]);
+  }
   for (;;) {
     int key;
     /* list of selectable items */
     for (i = 0; i < height - 2; i++) {
       if (i + offset == res) {
-        video_putchar(ypos + 1 + i, xpos, COLOR_SELECTCUR[mono], 16);
+        mdr_cout_char(ypos + 1 + i, xpos, 16, COLOR_SELECTCUR[mono]);
-        video_putchar(ypos + 1 + i, xpos+width+1, COLOR_SELECTCUR[mono], 17);
+        mdr_cout_char(ypos + 1 + i, xpos+width+1, 17, COLOR_SELECTCUR[mono]);
-        video_movecursor(ypos + 1 + i, xpos);
+        mdr_cout_locate(ypos + 1 + i, xpos);
         video_putstringfix(ypos + 1 + i, xpos+1, COLOR_SELECTCUR[mono], list[i + offset], width);
       } else if (i + offset < count) {
-        video_putchar(ypos + 1 + i, xpos, COLOR_SELECT[mono], ' ');
+        mdr_cout_char(ypos + 1 + i, xpos, ' ', COLOR_SELECT[mono]);
-        video_putchar(ypos + 1 + i, xpos+width+1, COLOR_SELECT[mono], ' ');
+        mdr_cout_char(ypos + 1 + i, xpos+width+1, ' ', COLOR_SELECT[mono]);
         video_putstringfix(ypos + 1 + i, xpos+1, COLOR_SELECT[mono], list[i + offset], width);
       } else {
-        video_putcharmulti(ypos + 1 + i, xpos, COLOR_SELECT[mono], ' ', width+2, 1);
+        mdr_cout_char_rep(ypos + 1 + i, xpos, ' ', COLOR_SELECT[mono], width+2);
+      }
+    }
     key = mdr_dos_getkey();
     if (key == 0x0D) { /* ENTER */
       return(res);
       video_putstring(1, 0, COLOR_BODY[mono], buf, -1);
     }*/
+  }
+}
-static void newscreen(int statusbartype) {
+static void newscreen(unsigned char statusbartype) {
   const char *msg;
+  mdr_cout_cls(COLOR_BODY[mono]);
   msg = svarlang_strid(0x00); /* "SVARDOS INSTALLATION" */
-  video_putcharmulti(0, 0, COLOR_TITLEBAR[mono], ' ', 80, 1);
+  mdr_cout_char_rep(0, 0, ' ', COLOR_TITLEBAR[mono], 80);
-  video_putstring(0, 40 - (strlen(msg) >> 1), COLOR_TITLEBAR[mono], msg, -1);
+  mdr_cout_str(0, 40 - (strlen(msg) >> 1), msg, COLOR_TITLEBAR[mono], 80);
-  video_clear(COLOR_BODY[mono], 80, -80);
   switch (statusbartype) {
     case 1:
       msg = svarlang_strid(0x000B); /* "Up/Down = Select entry | Enter = Validate your choice | ESC = Quit to DOS" */
       break;
     case 2:
       break;
     default:
       msg = svarlang_strid(0x000A); /* "Up/Down = Select entry | Enter = Validate your choice | ESC = Previous screen" */
       break;
+  }
-  video_putchar(24, 0, COLOR_TITLEBAR[mono], ' ');
+  mdr_cout_char(24, 0, ' ', COLOR_TITLEBAR[mono]);
   video_putstringfix(24, 1, COLOR_TITLEBAR[mono], msg, 79);
-  video_movecursor(25,0);
+  mdr_cout_locate(25,0);
+}
 /* fills a slocales struct accordingly to the value of its keyboff member */
 static void kblay2slocal(struct slocales *locales) {
   const char *m;
   };
   newscreen(1);
   msg = svarlang_strid(0x0100); /* "Welcome to SvarDOS" */
   x = 40 - (strlen(msg) >> 1);
-  video_putstring(4, x, COLOR_BODY[mono], msg, -1);
+  mdr_cout_str(4, x, msg, COLOR_BODY[mono], 80);
-  video_putcharmulti(5, x, COLOR_BODY[mono], '=', strlen(msg), 1);
+  mdr_cout_char_rep(5, x, '=', COLOR_BODY[mono], strlen(msg));
+  /* center out the string "Please select your language..." */
-  putstringnls(8, -1, COLOR_BODY[mono], 1, 1); /* "Please select your language from the list below:" */
+  msg = svarlang_str(1, 1); /* "Please select your language from the list below:" */
+  if (strlen(msg) > 74) {
+    putstringwrap(8, 1, COLOR_BODY[mono], msg);
+  } else {
+    mdr_cout_str(8, 40 - (strlen(msg) / 2), msg, COLOR_BODY[mono], 80);
+  }
   choice = menuselect(11, -1, 11, langlist, -1);
   if (choice < 0) return(MENUPREV);
   /* populate locales with default values */
   memset(locales, 0, sizeof(struct slocales));
   switch (choice) {
         case 0:
           sprintf(buff, "FDISK /PRI:MAX %d", driveid);
           system(buff);
           break;
         case 1:
-          video_clear(0x0700, 0, 0);
+          mdr_cout_cls(0x07);
-          video_movecursor(0, 0);
+          mdr_cout_locate(0, 0);
           sprintf(buff, "FDISK %d", driveid);
           system(buff);
           break;
         case 2:
           return(MENUQUIT);
       reboot();
       return(MENUQUIT);
     } else if (driveremovable > 0) {
       newscreen(2);
       snprintf(buff, sizeof(buff), svarlang_strid(0x0302), cselecteddrive); /* "ERROR: Drive %c: is a removable device */
-      video_putstring(9, 1, COLOR_BODY[mono], buff, -1);
+      mdr_cout_str(9, 1, buff, COLOR_BODY[mono], 80);
       putstringnls(11, 2, COLOR_BODY[mono], 0, 5); /* "Press any key..." */
       return(MENUQUIT);
+    }
     /* if not formatted, propose to format it right away (try to create a directory) */
     if (test_drive_write(cselecteddrive, buff) != 0) {
       const char *list[3];
       newscreen(0);
       snprintf(buff, sizeof(buff), svarlang_str(3, 3), cselecteddrive); /* "ERROR: Drive %c: seems to be unformated. Do you wish to format it?") */
-      video_putstring(7, 1, COLOR_BODY[mono], buff, -1);
+      mdr_cout_str(7, 1, buff, COLOR_BODY[mono], 80);
       snprintf(buff, sizeof(buff), svarlang_strid(0x0007), cselecteddrive); /* "Format drive %c:" */
       list[0] = buff;
       list[1] = svarlang_strid(0x0002); /* "Quit to DOS" */
       list[2] = NULL;
       choice = menuselect(12, -1, 4, list, -1);
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
-      video_clear(0x0700, 0, 0);
+      mdr_cout_cls(0x07);
-      video_movecursor(0, 0);
+      mdr_cout_locate(0, 0);
       snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
       system(buff);
       continue;
+    }
     /* check total disk space */
       list[2] = NULL;
       choice = menuselect(++y, -1, 4, list, -1);
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
-      video_clear(0x0700, 0, 0);
+      mdr_cout_cls(0x07);
-      video_movecursor(0, 0);
+      mdr_cout_locate(0, 0);
       snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
       system(buff);
       continue;
     } else {
       /* final confirmation */
       const char *list[3];
       list[0] = svarlang_strid(0x0001); /* Install SvarDOS */
       list[1] = svarlang_strid(0x0002); /* Quit to DOS */
       list[2] = NULL;
       snprintf(buff, sizeof(buff), svarlang_strid(0x0306), cselecteddrive); /* "The installation of SvarDOS to %c: is about to begin." */
-      video_putstring(7, -1, COLOR_BODY[mono], buff, -1);
+      mdr_cout_str(7, 40 - strlen(buff), buff, COLOR_BODY[mono], 80);
       choice = menuselect(10, -1, 4, list, -1);
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
       snprintf(buff, sizeof(buff), "SYS %c: %c: > NUL", sourcedrv, cselecteddrive);
       system(buff);
   char *pkgptr;
   newscreen(3);
   /* load pkg list */
   fd = fopen("install.lst", "rb");
   if (fd == NULL) {
-    video_putstring(10, 30, COLOR_BODY[mono], "ERROR: INSTALL.LST NOT FOUND", -1);
+    mdr_cout_str(10, 30, "ERROR: INSTALL.LST NOT FOUND", COLOR_BODY[mono], 80);
     mdr_dos_getkey();
     return(-1);
+  }
   pkglistflen = fread(pkglist, 1, sizeof(pkglist) - 2, fd);
   fclose(fd);
   if (pkglistflen == sizeof(pkglist) - 2) {
-    video_putstring(10, 30, COLOR_BODY[mono], "ERROR: INSTALL.LST TOO LARGE", -1);
+    mdr_cout_str(10, 30, "ERROR: INSTALL.LST TOO LARGE", COLOR_BODY[mono], 80);
     mdr_dos_getkey();
     return(-1);
+  }
   /* mark the end of list */
   pkglist[pkglistflen] = 0;
+    }
     /* install the package */
     snprintf(buff, sizeof(buff), svarlang_strid(0x0400), i+1, pkglistlen, pkgptr); /* "Installing package %d/%d: %s" */
     strcat(buff, "       ");
-    video_putstringfix(10, 1, COLOR_BODY[mono], buff, sizeof(buff));
+    mdr_cout_str(10, 1, buff, COLOR_BODY[mono], 40);
     /* proceed with package copy */
     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_cout_str(10, 30, "READ ERROR", COLOR_BODY[mono], 80);
       mdr_dos_getkey();
       fclose(fd);
       return(-1);
+    }
     /* write install instruction to post-install script */
 static void loadcp(const struct slocales *locales) {
   char buff[64];
   if (locales->codepage == 437) return;
-  video_movecursor(1, 0);
+  mdr_cout_locate(1, 0);
   if (locales->egafile == 1) {
     snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) EGA.CPX) > NUL", locales->codepage);
   } else {
     snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) EGA%d.CPX) > NUL", locales->codepage, locales->egafile);
+  }
   if (argc != 1) buildstring = argv[1];
   sourcedrv = get_cur_drive() + 'A';
   /* init screen and detect mono status */
-  mono = video_init();
+  mono = mdr_cout_init(NULL, NULL);
  SelectLang:
   action = selectlang(&locales); /* welcome to svardos, select your language */
   if (action != MENUNEXT) goto Quit;
   loadcp(&locales);
   /*localcfg();*/ /* show local params (currency, etc), and propose to change them (based on localcfg) */
   /*netcfg();*/ /* basic networking config */
   finalreboot(); /* remove the CD and reboot */
  Quit:
-  video_clear(0x0700, 0, 0);
+  mdr_cout_locate(0, 0);
-  video_movecursor(0, 0);
+  mdr_cout_close();
   return(0);
+}

Subversion Repositories SvarDOS

(root)/install/trunk/install.c – Rev 1661 → 1662