Merge pull request joncampbell123#2516 from Wengier/master

Add menu option to restart DOSBox-X with selected config file

Author: joncampbell123

CHANGELOG

@@ -7,7 +7,15 @@
     4DOS, BIN, DEBUG, DOS, SYSTEM, TEXTUTIL. Most files
     that previously appeared on the root directory of
     Z drive are now categorized into directories, with
-    addition of some files/programs. (Wengier)
+    addition of some files/programs, such as additional
+    4DOS files, text utilties in TEXTUTIL directory and
+    TITLE command to change window title. (Wengier)
+  - The return value of AL in Int21/AX=0Eh is no longer
+    fixed. The game Jurassic Park may run after moving
+    Z drive to a different letter (e.g. E:). (Wengier)
+  - Added "Restart DOSBox-X with config file..." menu
+    option to start DOSBox-X with the specified config
+    file automatically from the menu. (Wengier)
   - Added "Refresh rate..." menu option (under "Video")
     to set the video refresh rate. (Wengier)
   - Added "Enable A20 gate" menu option (under "DOS")
@@ -25,6 +33,8 @@
   - Added menu options "Generate NMI interrupt" & "Hook
     INT 2Fh calls" ("Help" => "Debugging options") for
     more debugging options. (Wengier)
+  - Fixed issues related to screen dimensions in TTF
+    output in CGA/EGA modes since 0.83.12. (Wengier)
   - Integrated SVN commits (Allofich)
     - r4443: Improve detection of Paradise SVGA in some
     installers with additional signature.

contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in

@@ -10,7 +10,7 @@
     <category>Emulation</category>
   </categories>
   <releases>
-          <release version="@PACKAGE_VERSION@" date="2021-5-7"/>
+          <release version="@PACKAGE_VERSION@" date="2021-5-9"/>
   </releases>
   <screenshots>
 	  <screenshot type="default">

contrib/windows/installer/dosbox-x.reference.setup.conf

@@ -536,7 +536,8 @@ freesizecap                                     = cap
 #DOSBOX-X-ADV:#                                                      This can be used to help diagnose whether or not the DOS game is page flipping properly according to vertical retrace if the display on-screen is flickering.
 #DOSBOX-X-ADV:#                  vertical retrace poll debug line: VGA debugging switch. If set, an inverse green dotted line will be drawn on the exact scanline that the CRTC status port (0x3DA) was read.
 #DOSBOX-X-ADV:#                                                      This can be used to help diagnose whether the DOS game is propertly waiting for vertical retrace.
-#DOSBOX-X-ADV:#                                           cgasnow: When machine=cga, determines whether or not to emulate CGA snow in 80x25 text mode
+#DOSBOX-X-ADV:#                                           cgasnow: When machine=cga, determines whether or not to emulate CGA snow in 80x25 text mode.
+#DOSBOX-X-ADV:#                                                      This parameter is also changeable from the builtin CGASNOW command in CGA mode.
 #DOSBOX-X-ADV:#                            vga 3da undefined bits: VGA status port 3BA/3DAh only defines bits 0 and 3. This setting allows you to assign a bit pattern to the undefined bits.
 #DOSBOX-X-ADV:#                                                      The purpose of this hack is to deal with demos that read and handle port 3DAh in ways that might crash if all are zero.
 #DOSBOX-X-ADV:#                             rom bios 8x8 CGA font: If set, or mainline DOSBox compatible BIOS mapping, a legacy 8x8 CGA font (first 128 characters) is stored at 0xF000:0xFA6E. DOS programs that do not use INT 10h to locate fonts might require that font to be located there.

dosbox-x.reference.full.conf

@@ -536,7 +536,8 @@ enable pci bus                                  = true
 #                                                      This can be used to help diagnose whether or not the DOS game is page flipping properly according to vertical retrace if the display on-screen is flickering.
 #                  vertical retrace poll debug line: VGA debugging switch. If set, an inverse green dotted line will be drawn on the exact scanline that the CRTC status port (0x3DA) was read.
 #                                                      This can be used to help diagnose whether the DOS game is propertly waiting for vertical retrace.
-#                                           cgasnow: When machine=cga, determines whether or not to emulate CGA snow in 80x25 text mode
+#                                           cgasnow: When machine=cga, determines whether or not to emulate CGA snow in 80x25 text mode.
+#                                                      This parameter is also changeable from the builtin CGASNOW command in CGA mode.
 #                            vga 3da undefined bits: VGA status port 3BA/3DAh only defines bits 0 and 3. This setting allows you to assign a bit pattern to the undefined bits.
 #                                                      The purpose of this hack is to deal with demos that read and handle port 3DAh in ways that might crash if all are zero.
 #                             rom bios 8x8 CGA font: If set, or mainline DOSBox compatible BIOS mapping, a legacy 8x8 CGA font (first 128 characters) is stored at 0xF000:0xFA6E. DOS programs that do not use INT 10h to locate fonts might require that font to be located there.

include/build_timestamp.h

@@ -1,4 +1,4 @@
 /*auto-generated*/
-#define UPDATED_STR "May 7, 2021 4:03:25am"
-#define GIT_COMMIT_HASH "b13972f"
+#define UPDATED_STR "May 9, 2021 1:26:40am"
+#define GIT_COMMIT_HASH "b778192"
 #define COPYRIGHT_END_YEAR "2021"

src/dos/dos.cpp

@@ -1008,7 +1008,11 @@ static Bitu DOS_21Handler(void) {
             break;  
         case 0x0e:      /* Select Default Drive */
             DOS_SetDefaultDrive(reg_dl);
-            reg_al=DOS_DRIVES;
+            {
+                int drive=maxdrive>=1&&maxdrive<=26?maxdrive:1;
+                for (uint16_t i=drive;i<DOS_DRIVES;i++) if (Drives[i]) drive=i+1;
+                reg_al=drive;
+            }
             break;
         case 0x0f:      /* Open File using FCB */
             if(DOS_FCBOpen(SegValue(ds),reg_dx)){

src/dos/dos_programs.cpp

@@ -90,7 +90,7 @@ bool qmount = false;
 bool nowarn = false;
 extern bool mountfro[26], mountiro[26];
 
-void DOS_EnableDriveMenu(char drv);
+void DOS_EnableDriveMenu(char drv), GFX_SetTitle(int32_t cycles, int frameskip, Bits timing, bool paused);
 void runBoot(const char *str), runMount(const char *str), runImgmount(const char *str), runRescan(const char *str);
 
 #if defined(OS2)
@@ -177,7 +177,7 @@ void DetachFromBios(imageDisk* image) {
     }
 }
 
-extern std::string hidefiles;
+extern std::string hidefiles, dosbox_title;
 extern int swapInDisksSpecificDrive;
 extern bool dos_kernel_disabled, clearline;
 void MSCDEX_SetCDInterface(int intNr, int forceCD);
@@ -5860,7 +5860,7 @@ void MODE::Run(void) {
     else if (strcasecmp(temp_line.c_str(),"con")==0 || strcasecmp(temp_line.c_str(),"con:")==0) {
         if (IS_PC98_ARCH) return;
         int LINES = 25, COLS = 80;
-        LINES=real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS)+1;
+        LINES=(IS_EGAVGA_ARCH?real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS):24)+1;
         COLS=real_readw(BIOSMEM_SEG,BIOSMEM_NB_COLS);
         if (cmd->GetCount()<2) {
             WriteOut("Status for device CON:\n----------------------\nColumns=%d\nLines=%d\n\nCode page operation not supported on this device\n", COLS, LINES);
@@ -6456,6 +6456,39 @@ static void TREE_ProgramStart(Program * * make) {
     *make=new TREE;
 }
 
+class TITLE : public Program {
+public:
+    void Run(void);
+private:
+	void PrintUsage() {
+        constexpr const char *msg =
+           "Sets the window title for the DOSBox-X window.\n\n"
+           "TITLE [string]\n\n"
+           "  string       Specifies the title for the DOSBox-X window.\n";
+        WriteOut(msg);
+	}
+};
+
+void TITLE::Run()
+{
+	// Hack To allow long commandlines
+	ChangeToLongCmd();
+
+	// Usage
+	if (cmd->FindExist("-?", false) || cmd->FindExist("/?", false)) {
+		PrintUsage();
+		return;
+	}
+	char *args=(char *)cmd->GetRawCmdline().c_str();
+    dosbox_title=trim(args);
+    SetVal("dosbox", "title", dosbox_title);
+    GFX_SetTitle(-1,-1,-1,false);
+}
+
+static void TITLE_ProgramStart(Program * * make) {
+    *make=new TITLE;
+}
+
 class COLOR : public Program {
 public:
     void Run(void);
@@ -7665,6 +7698,7 @@ void DOS_SetupPrograms(void) {
 	}
 
     PROGRAMS_MakeFile("COLOR.COM",COLOR_ProgramStart,"/BIN/");
+    PROGRAMS_MakeFile("TITLE.COM",TITLE_ProgramStart,"/BIN/");
     PROGRAMS_MakeFile("LS.COM",LS_ProgramStart,"/BIN/");
     PROGRAMS_MakeFile("ADDKEY.COM",ADDKEY_ProgramStart,"/BIN/");
     PROGRAMS_MakeFile("CFGTOOL.COM",CFGTOOL_ProgramStart,"/SYSTEM/");

src/dosbox.cpp

@@ -1815,7 +1815,8 @@ void DOSBOX_SetupConfigSections(void) {
             "This can be used to help diagnose whether the DOS game is propertly waiting for vertical retrace.");
 
     Pbool = secprop->Add_bool("cgasnow",Property::Changeable::WhenIdle,true);
-    Pbool->Set_help("When machine=cga, determines whether or not to emulate CGA snow in 80x25 text mode");
+    Pbool->Set_help("When machine=cga, determines whether or not to emulate CGA snow in 80x25 text mode.\n"
+                    "This parameter is also changeable from the builtin CGASNOW command in CGA mode.");
 
     /* Default changed to 0x04 for "Blues Brothers" at Allofich's request [https://github.com/joncampbell123/dosbox-x/issues/1273] */
     Phex = secprop->Add_hex("vga 3da undefined bits",Property::Changeable::WhenIdle,0x04);

src/gui/menu.cpp

@@ -135,8 +135,7 @@ static const char *def_menu_main[] =
 #endif
 #if !defined(C_EMSCRIPTEN)//FIXME: Shutdown causes problems with Emscripten
     "--",
-#endif
-#if !defined(C_EMSCRIPTEN)//FIXME: Shutdown causes problems with Emscripten
+    "restartconf",
     "mapper_shutdown",
 #endif
     NULL

src/gui/sdl_gui.cpp

@@ -127,7 +127,7 @@ void RebootConfig(std::string filename, bool confirm=false) {
 #if defined(WIN32)
         ShellExecute(NULL, "open", exepath.c_str(), para.c_str(), NULL, SW_NORMAL);
 #else
-        system((exepath+" "+para).c_str());
+        system((exepath+" "+para+ " &").c_str());
 #endif
         throw(0);
     }

src/gui/sdlmain.cpp

@@ -3440,18 +3440,6 @@ bool setColors(const char *colorArray, int n) {
 	return true;
 }
 
-bool readTTFStyle(unsigned long size, void* font, FILE * fh) {
-    size = ftell(fh);
-    if(size != -1L) {
-        font = malloc((size_t)size);
-        if(font && !fseek(fh, 0, SEEK_SET) && fread(font, 1, (size_t)size, fh) == (size_t)size) {
-            fclose(fh);
-            return true;
-        }
-    }
-    return false;
-}
-
 std::string failName="";
 bool readTTF(const char *fName, bool bold, bool ital) {
 	FILE * ttf_fh = NULL;
@@ -3535,28 +3523,17 @@ bool readTTF(const char *fName, bool bold, bool ital) {
             ttf_fh = fopen(ttfPath, "rb");
         }
     }
-    if(ttf_fh) {
-        if(!fseek(ttf_fh, 0, SEEK_END))
-        {
-            if(bold && ital) {
-                if(readTTFStyle(ttfSizebi, ttfFontbi, ttf_fh))
-                    return true;
-            }
-            else if(bold && !ital) {
-                if(readTTFStyle(ttfSizeb, ttfFontb, ttf_fh))
-                    return true;
-            }
-            else if(!bold && ital) {
-                if(readTTFStyle(ttfSizei, ttfFonti, ttf_fh))
-                    return true;
-            }
-            else {
-                if(readTTFStyle(ttfSize, ttfFont, ttf_fh))
-                    return true;
-            }
-        }
-        fclose(ttf_fh);
-    }
+    if (ttf_fh) {
+		if (!fseek(ttf_fh, 0, SEEK_END))
+			if (((bold&&ital?ttfSizebi:(bold&&!ital?ttfSizeb:(!bold&&ital?ttfSizei:ttfSize))) = ftell(ttf_fh)) != -1L)
+				if ((bold&&ital?ttfFontbi:(bold&&!ital?ttfFontb:(!bold&&ital?ttfFonti:ttfFont))) = malloc((size_t)(bold&&ital?ttfSizebi:(bold&&!ital?ttfSizeb:(!bold&&ital?ttfSizei:ttfSize)))))
+					if (!fseek(ttf_fh, 0, SEEK_SET))
+						if (fread((bold&&ital?ttfFontbi:(bold&&!ital?ttfFontb:(!bold&&ital?ttfFonti:ttfFont))), 1, (size_t)(bold&&ital?ttfSizebi:(bold&&!ital?ttfSizeb:(!bold&&ital?ttfSizei:ttfSize))), ttf_fh) == (size_t)(bold&&ital?ttfSizebi:(bold&&!ital?ttfSizeb:(!bold&&ital?ttfSizei:ttfSize)))) {
+							fclose(ttf_fh);
+							return true;
+						}
+		fclose(ttf_fh);
+	}
     if (!failName.size()||failName.compare(fName)) {
         failName=std::string(fName);
         std::string message="Could not load font file: "+std::string(fName)+(strlen(fName)<5||strcasecmp(fName+strlen(fName)-4, ".ttf")?".ttf":"");
@@ -3694,6 +3671,7 @@ void OUTPUT_TTF_Select(int fsize=-1) {
 
         ttf.lins = render_section->Get_int("ttf.lins");
         ttf.cols = render_section->Get_int("ttf.cols");
+        if (fsize&&!IS_PC98_ARCH&&!IS_EGAVGA_ARCH) ttf.lins = 25;
         if ((!CurMode||CurMode->type!=M_TEXT)&&!IS_PC98_ARCH) {
             if (ttf.cols<1) ttf.cols=80;
             if (ttf.lins<1) ttf.lins=25;
@@ -3706,7 +3684,7 @@ void OUTPUT_TTF_Select(int fsize=-1) {
                 r=real_readb(0x60,0x113) & 0x01 ? 25 : 20;
             } else {
                 c=real_readw(BIOSMEM_SEG,BIOSMEM_NB_COLS);
-                r=(uint16_t)real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS)+1;
+                r=(uint16_t)(IS_EGAVGA_ARCH?real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS):24)+1;
             }
             if (ttf.lins<1||ttf.cols<1)	{
                 if (ttf.cols<1)
@@ -3732,7 +3710,7 @@ void OUTPUT_TTF_Select(int fsize=-1) {
                 }
                 if (!IS_PC98_ARCH) {
                     real_writeb(BIOSMEM_SEG,BIOSMEM_NB_COLS,ttf.cols);
-                    real_writeb(BIOSMEM_SEG,BIOSMEM_NB_ROWS,ttf.lins-1);
+                    if (IS_EGAVGA_ARCH) real_writeb(BIOSMEM_SEG,BIOSMEM_NB_ROWS,ttf.lins-1);
                 }
             }
             firstset=false;
@@ -3743,7 +3721,7 @@ void OUTPUT_TTF_Select(int fsize=-1) {
                 r=real_readb(0x60,0x113) & 0x01 ? 25 : 20;
             } else {
                 c=real_readw(BIOSMEM_SEG,BIOSMEM_NB_COLS);
-                r=(uint16_t)real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS)+1;
+                r=(uint16_t)(IS_EGAVGA_ARCH?real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS):24)+1;
             }
             ttf.cols=c;
             ttf.lins=r;
@@ -5352,7 +5330,7 @@ static void GUI_StartUp() {
 
 #if !defined(C_EMSCRIPTEN)//FIXME: Shutdown causes problems with Emscripten
     MAPPER_AddHandler(KillSwitch,MK_f9,MMOD1,"shutdown","Quit from DOSBox-X", &item); /* KEEP: Most DOSBox-X users may have muscle memory for this */
-    item->set_text("Quit");
+    item->set_text("Quit from DOSBox-X");
 #endif
 
     MAPPER_AddHandler(CaptureMouse,MK_f10,MMOD1,"capmouse","Capture mouse", &item); /* KEEP: Most DOSBox-X users may have muscle memory for this */
@@ -6263,7 +6241,7 @@ void ClipKeySelect(int sym) {
         if (sym==SDLK_LEFT && (selmark?selecol:selscol)>0) (selmark?selecol:selscol)--;
         else if (sym==SDLK_RIGHT && (selmark?selecol:selscol)<(IS_PC98_ARCH?80:real_readw(BIOSMEM_SEG,BIOSMEM_NB_COLS))-1) (selmark?selecol:selscol)++;
         else if (sym==SDLK_UP && (selmark?selerow:selsrow)>0) (selmark?selerow:selsrow)--;
-        else if (sym==SDLK_DOWN && (selmark?selerow:selsrow)<(IS_PC98_ARCH?(real_readb(0x60,0x113)&0x01?25:20)-1:real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS))) (selmark?selerow:selsrow)++;
+        else if (sym==SDLK_DOWN && (selmark?selerow:selsrow)<(IS_PC98_ARCH?(real_readb(0x60,0x113)&0x01?25:20)-1:(IS_EGAVGA_ARCH?real_readb(BIOSMEM_SEG,BIOSMEM_NB_ROWS):24))) (selmark?selerow:selsrow)++;
         Mouse_Select(selscol, selsrow, selmark?selecol:selscol, selmark?selerow:selsrow, -1, -1, true);
     }
 }
@@ -10328,6 +10306,42 @@ void Load_mapper_file() {
 #endif
 }
 
+void Restart_config_file() {
+    Section_prop* section = static_cast<Section_prop*>(control->GetSection("sdl"));
+    assert(section != NULL);
+
+#if !defined(HX_DOS)
+    char CurrentDir[512];
+    char * Temp_CurrentDir = CurrentDir;
+    getcwd(Temp_CurrentDir, 512);
+    std::string cwd = std::string(Temp_CurrentDir)+CROSS_FILESPLIT;
+    const char *lFilterPatterns[] = {"*.conf","*.CONF"};
+    const char *lFilterDescription = "DOSBox-X config files (*.map)";
+    char const * lTheOpenFileName = tinyfd_openFileDialog("Select config file",cwd.c_str(),2,lFilterPatterns,lFilterDescription,0);
+
+    if (lTheOpenFileName) {
+        /* Windows will fill lpstrFile with the FULL PATH.
+           The full path should be given to the pixelshader setting unless it's just
+           the same base path it was given: <cwd>\shaders in which case just cut it
+           down to the filename. */
+        const char* name = lTheOpenFileName;
+        std::string tmp = "";
+
+        /* filenames in Windows are case insensitive so do the comparison the same */
+        if (!strncasecmp(name, cwd.c_str(), cwd.size())) {
+            name += cwd.size();
+            while (*name == CROSS_FILESPLIT) name++;
+        }
+
+        if (*name) {
+            void RebootConfig(std::string filename, bool confirm=false);
+            RebootConfig(name, true);
+        }
+    }
+    chdir( Temp_CurrentDir );
+#endif
+}
+
 bool vid_pc98_graphics_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
     (void)menu;//UNUSED
     (void)menuitem;//UNUSED
@@ -10542,7 +10556,7 @@ bool clear_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuit
     if (CurMode->mode>7&&CurMode->mode!=0x0019&&CurMode->mode!=0x0043&&CurMode->mode!=0x0054&&CurMode->mode!=0x0055&&CurMode->mode!=0x0064)
         return true;
     if (CurMode->type==M_TEXT || dos_kernel_disabled) {
-        const auto rows = real_readb(BIOSMEM_SEG, BIOSMEM_NB_ROWS);
+        const auto rows = (IS_EGAVGA_ARCH?real_readb(BIOSMEM_SEG, BIOSMEM_NB_ROWS):24);
         const auto cols = real_readw(BIOSMEM_SEG, BIOSMEM_NB_COLS);
         INT10_ScrollWindow(0, 0, rows, static_cast<uint8_t>(cols), -rows, 0x7, 0xff);
         INT10_SetCursorPos(0, 0, 0);
@@ -10569,8 +10583,10 @@ bool intensity_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const me
     (void)menu;//UNUSED
     const char *mname = menuitem->get_name().c_str();
     uint16_t oldax=reg_ax, oldbx=reg_bx;
-    if (IS_PC98_ARCH||(CurMode->mode>7&&CurMode->mode!=0x0019&&CurMode->mode!=0x0043&&CurMode->mode!=0x0054&&CurMode->mode!=0x0055&&CurMode->mode!=0x0064))
+    if (IS_PC98_ARCH||machine==MCH_CGA||(CurMode->mode>7&&CurMode->mode!=0x0019&&CurMode->mode!=0x0043&&CurMode->mode!=0x0054&&CurMode->mode!=0x0055&&CurMode->mode!=0x0064)) {
+        systemmessagebox("Warning", "High intensity is not supported for the current video mode.", "ok","warning", 1);
         return true;
+    }
     if (!strcmp(mname, "text_background"))
         reg_bl = 0;
     else
@@ -10646,7 +10662,7 @@ void ttf_setlines(int cols, int lins) {
     firstset=true;
     ttf_reset();
     real_writeb(BIOSMEM_SEG,BIOSMEM_NB_COLS,ttf.cols);
-    real_writeb(BIOSMEM_SEG,BIOSMEM_NB_ROWS,ttf.lins-1);
+    if (IS_EGAVGA_ARCH) real_writeb(BIOSMEM_SEG,BIOSMEM_NB_ROWS,ttf.lins-1);
     vga.draw.address_add = ttf.cols * 2;
 }
 #endif
@@ -11373,6 +11389,13 @@ bool showdetails_menu_callback(DOSBoxMenu * const xmenu, DOSBoxMenu::item * cons
     return true;
 }
 
+bool restartconf_menu_callback(DOSBoxMenu * const xmenu, DOSBoxMenu::item * const menuitem) {
+    (void)xmenu;//UNUSED
+    (void)menuitem;//UNUSED
+    Restart_config_file();
+    return true;
+}
+
 bool alwaysontop_menu_callback(DOSBoxMenu * const menu, DOSBoxMenu::item * const menuitem) {
     (void)menu;//UNUSED
     (void)menuitem;//UNUSED
@@ -13527,6 +13550,7 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
         /* more */
         std::string doubleBufString = std::string("desktop.doublebuf");
         mainMenu.alloc_item(DOSBoxMenu::item_type_id,"showdetails").set_text("Show FPS and RT speed in title bar").set_callback_function(showdetails_menu_callback).check(!menu.hidecycles && menu.showrt);
+        mainMenu.alloc_item(DOSBoxMenu::item_type_id,"restartconf").set_text("Restart DOSBox-X with config file...").set_callback_function(restartconf_menu_callback);
         mainMenu.alloc_item(DOSBoxMenu::item_type_id,"auto_lock_mouse").set_text("Autolock mouse").set_callback_function(autolock_mouse_menu_callback).check(sdl.mouse.autoenable);
 #if defined (WIN32) || defined(MACOSX) || defined(C_SDL2)
         mainMenu.alloc_item(DOSBoxMenu::item_type_id,"clipboard_right").set_text("Via right mouse button").set_callback_function(right_mouse_clipboard_menu_callback).check(mbutton==3);