Merge branch 'master' of https://github.com/86Box/86Box into cleanup30

# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c

src/86box.c

@@ -17,6 +17,7 @@
  *		Copyright 2008-2020 Sarah Walker.
  *		Copyright 2016-2020 Miran Grca.
  *		Copyright 2017-2020 Fred N. van Kempen.
+ *		Copyright 2021 Laci bá'
  */
 #include <inttypes.h>
 #include <stdarg.h>
@@ -395,7 +396,8 @@ pc_init(int argc, char *argv[])
 	int c, vmrp = 0;
 	int ng = 0, lvmp = 0;
 	uint32_t *uid, *shwnd;
-
+	uint32_t lang_init = 0;
+	
 	/* Grab the executable's full path. */
 	plat_get_exe_name(exe_path, sizeof(exe_path)-1);
 	p = plat_get_filename(exe_path);
@@ -432,6 +434,7 @@ usage:
 			printf("-E or --nographic    - forces the old behavior\n");
 #endif
 			printf("-F or --fullscreen   - start in fullscreen mode\n");
+			printf("-G or --lang langid  - start with specified language (e.g. en-US, or system)\n");
 #ifdef _WIN32
 			printf("-H or --hwnd id,hwnd - sends back the main dialog's hwnd\n");
 #endif
@@ -512,7 +515,20 @@ usage:
 			uid = (uint32_t *) &unique_id;
 			shwnd = (uint32_t *) &source_hwnd;
 			sscanf(argv[++c], "%08X%08X,%08X%08X", uid + 1, uid, shwnd + 1, shwnd);
+		} else if (!strcasecmp(argv[c], "--lang") ||
+			   !strcasecmp(argv[c], "-G")) {
+
+
 #endif
+		  //This function is currently unimplemented for *nix but has placeholders.
+
+		  lang_init = plat_language_code(argv[++c]);
+		  if (!lang_init)
+			 printf("\nWarning: Invalid language code, ignoring --lang parameter.\n\n");
+
+		  //The return value of 0 only means that the code is invalid,
+		  //  not related to that translation is exists or not for the
+          //  selected language.
 		} else if (!strcasecmp(argv[c], "--test")) {
 			/* some (undocumented) test function here.. */
 
@@ -689,7 +705,16 @@ usage:
 
 	/* Load the configuration file. */
 	config_load();
-
+	
+	/* Load the desired language */
+	if (lang_init)
+		lang_id = lang_init;
+	
+	lang_init = lang_id;
+	lang_id = 0;
+	if (lang_init)
+		set_language(lang_init);
+	
 	/* All good! */
 	return(1);
 }
@@ -724,6 +749,28 @@ pc_init_modules(void)
 	wchar_t temp[512];
 	char tempc[512];
 
+#ifdef PRINT_MISSING_MACHINES_AND_VIDEO_CARDS
+	c = m = 0;
+	while (machine_get_internal_name_ex(c) != NULL) {
+		m = machine_available(c);
+		if (!m)
+			pclog("Missing machine: %s\n", machine_getname_ex(c));
+		c++;
+	}
+
+	c = m = 0;
+	while (video_get_internal_name(c) != NULL) {
+		memset(tempc, 0, sizeof(tempc));
+		device_get_name(video_card_getdevice(c), 0, tempc);
+		if ((c > 1) && !(tempc[0]))
+			break;
+		m = video_card_available(c);
+		if (!m)
+			pclog("Missing video card: %s\n", tempc);
+		c++;
+	}
+#endif
+
 	pc_log("Scanning for ROM images:\n");
 	c = m = 0;
 	while (machine_get_internal_name_ex(m) != NULL) {
@@ -894,8 +941,6 @@ pc_reset_hard_close(void)
 void
 pc_reset_hard_init(void)
 {
-	wchar_t wcpufamily[2048], wcpu[2048], wmachine[2048], *wcp;
-
 	/*
 	 * First, we reset the modules that are not part of
 	 * the actual machine, but which support some of the
@@ -997,7 +1042,14 @@ pc_reset_hard_init(void)
 	pc_full_speed();
 
 	cycles = cycles_main = 0;
+	
+	update_mouse_msg();
+}
 
+void update_mouse_msg()
+{
+	wchar_t wcpufamily[2048], wcpu[2048], wmachine[2048], *wcp;
+	
 	mbstowcs(wmachine, machine_getname(), strlen(machine_getname())+1);
 
 	if (!cpu_override)
@@ -1009,6 +1061,7 @@ pc_reset_hard_init(void)
 	if (wcp) /* remove parentheses */
 		*(wcp - 1) = L'\0';
 	mbstowcs(wcpu, cpu_s->name, strlen(cpu_s->name)+1);
+	
 	swprintf(mouse_msg[0], sizeof_w(mouse_msg[0]), L"%ls v%ls - %%i%%%% - %ls - %ls/%ls - %ls",
 		EMU_NAME_W, EMU_VERSION_FULL_W, wmachine, wcpufamily, wcpu,
 		plat_get_string(IDS_2077));
@@ -1019,7 +1072,6 @@ pc_reset_hard_init(void)
 		EMU_NAME_W, EMU_VERSION_FULL_W, wmachine, wcpufamily, wcpu);
 }
 
-
 void
 pc_reset_hard(void)
 {