Add a new ciolib_initial_mode global variable

For graphical modes, this requests that ciolib be initialized in
the specified mode.  For text-based modes (ANSI, Curses, Win32 Console),
this is not used and "current" is used instead.

src/conio/ciolib.c

@@ -88,6 +88,7 @@ CIOLIBEXPORT const char *ciolib_appname=NULL;
 CIOLIBEXPORT int ciolib_initial_window_height = -1;
 CIOLIBEXPORT int ciolib_initial_window_width = -1;
 CIOLIBEXPORT int ciolib_initial_scaling = 0;
+CIOLIBEXPORT int ciolib_initial_mode = C80;
 CIOLIBEXPORT const uint32_t *ciolib_r2yptr;
 CIOLIBEXPORT const uint32_t *ciolib_y2rptr;
 

src/conio/ciolib.h

@@ -407,6 +407,7 @@ CIOLIBEXPORTVAR const char *ciolib_appname;
 CIOLIBEXPORTVAR int ciolib_initial_window_height;
 CIOLIBEXPORTVAR int ciolib_initial_window_width;
 CIOLIBEXPORTVAR int ciolib_initial_scaling;
+CIOLIBEXPORTVAR int ciolib_initial_mode;
 CIOLIBEXPORTVAR const uint32_t *ciolib_r2yptr;
 CIOLIBEXPORTVAR const uint32_t *ciolib_y2rptr;
 

src/conio/sdl_con.c

@@ -409,7 +409,7 @@ int sdl_init(int mode)
 	_beginthread(sdl_video_event_thread, 0, NULL);
 #endif
 	sdl_user_func_ret(SDL_USEREVENT_INIT);
-	sdl_init_mode(3, true);
+	sdl_init_mode(ciolib_initial_mode, true);
 
 	if(sdl_init_good) {
 		cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL;

src/conio/win32gdi.c

@@ -961,7 +961,7 @@ gdi_init(int mode)
 	CreatePipe(&rch, &wch, NULL, 0);
 
 	bitmap_drv_init(gdi_drawrect, gdi_flush);
-	gdi_textmode(C80);
+	gdi_textmode(ciolib_initial_mode);
 
 	// code that tells windows we're High DPI aware so it doesn't scale our windows
 	// taken from Yamagi Quake II
@@ -1005,7 +1005,7 @@ gdi_init(int mode)
 	WaitForSingleObject(init_sem, INFINITE);
 	CloseHandle(init_sem);
 	if (init_success) {
-		gdi_textmode(C80);
+		gdi_textmode(ciolib_initial_mode);
 
 		cio_api.mode=CIOLIB_MODE_GDI;
 		FreeConsole();

src/conio/x_events.c

@@ -557,7 +557,7 @@ static int video_init()
 		x_cvstat.scaling = vstat.scaling = 1;
 	pthread_mutex_unlock(&vstatlock);
 	/* Initialize mode 3 (text, 80x25, 16 colors) */
-	if(load_vmode(&vstat, C80))
+	if(load_vmode(&vstat, ciolib_initial_mode))
 		return(-1);
 	x_cvstat = vstat;
 	if(init_window())

src/syncterm/syncterm.c

@@ -1554,6 +1554,7 @@ main(int argc, char **argv)
 		text_mode = screen_to_ciolib(settings.startup_mode);
 	else
 		text_mode = _ORIGMODE;
+	ciolib_initial_mode = text_mode;
 
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] == '-'