Merge branch 'master' into fix_libc++19

maron2000 · Nov 1, 2024 · 8f879c3 · 8f879c3
2 parents 5597913 + 2d94a7f
commit 8f879c3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 Next
   - Fixed build failure with libc++ 19 (@DimitryAndric)
+  - Fixed fullscreen mode not responding when launched in TTF mode 
+    in Windows (maron2000)
   - Fixed crashes when changing floppies mounted by drive numbers on
     a booted guest OS (maron2000)
   - Fixed launching host programs with white spaces in path (Windows)

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
@@ -124,10 +124,10 @@ static const char *def_menu__toplevel[] =
     "VideoMenu",
     "SoundMenu",
     "DOSMenu",
+    "DriveMenu",
 #if !defined(C_EMSCRIPTEN)
     "CaptureMenu",
 #endif
-    "DriveMenu",
 #if C_DEBUG
     "DebugMenu",
 #endif
@@ -709,9 +709,9 @@ static const char *def_menu_capture[] =
     "mapper_capnetrf",
     "--",
 #endif
-    "saveoptionmenu",
     "mapper_savestate",
     "mapper_loadstate",
+    "saveoptionmenu",
     "saveslotmenu",
     "autosavecfg",
     "browsesavefile",
@@ -860,7 +860,7 @@ static const char* def_menu_help_debug[] =
 static const char *def_menu_help[] =
 {
     "help_intro",
-    "HelpCommandMenu",
+    "help_about",
 #if !defined(HX_DOS)
     "--",
     "help_homepage",
@@ -880,7 +880,7 @@ static const char *def_menu_help[] =
 #if C_PCAP || C_PRINTER && defined(WIN32) || !C_DEBUG && !defined(MACOSX) && !defined(LINUX) && !defined(HX_DOS) && !defined(C_EMSCRIPTEN)
     "--",
 #endif
-    "help_about",
+    "HelpCommandMenu",
     NULL
 };
 

diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
@@ -3809,8 +3809,12 @@ static void GUI_StartUp() {
     posy = -1;
     const char* windowposition = section->Get_string("windowposition");
     LOG_MSG("Configured windowposition: %s", windowposition);
-    if (windowposition && !strcmp(windowposition, "-"))
+    if(windowposition && !strcmp(windowposition, "-"))
+#if defined (WIN32) && !defined(C_SDL2)
+        posx = posy = -1;
+#else
         posx = posy = -2;
+#endif
     else if (windowposition && *windowposition && strcmp(windowposition, ",")) {
         char result[100];
         safe_strncpy(result, windowposition, sizeof(result));

diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
@@ -880,7 +880,7 @@ void DOS_Shell::Prepare(void) {
                     }
                 }
             }
-			if (country>0&&!control->opt_noconfig) {
+            if (country>0&&!control->opt_noconfig) {
 				countryNo = country;
 				DOS_SetCountry(countryNo);
 			}
@@ -1139,7 +1139,6 @@ class AUTOEXEC:public Module_base {
                 }
                 if (control->opt_prerun) cmd += "\n";
             }
-
             autoexec_auto_bat.Install(cmd);
         }
         dos.loaded_codepage = cp;
@@ -1264,7 +1263,12 @@ class AUTOEXEC:public Module_base {
 #else
 		if (secure) autoexec[i++].Install("z:\\system\\config.com -securemode");
 #endif
-
+#if defined(WIN32)
+        if(TTF_using()) {
+            autoexec[i++].Install("@config -set output=surface");
+            autoexec[i++].Install("@config -set output=ttf");
+        }
+#endif
 		if (addexit) autoexec[i++].Install("exit");
 
 		assert(i <= 17); /* FIXME: autoexec[] should not be fixed size */