X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=8eda95e58fcf1822f99edbd788668770de54c1c2;hb=503f6fef27f5b87b9d71aa290f5a0890b159ff15;hp=05c5bea5b0e0b3eb784e95708ed2a7dad3f5209c;hpb=9c8b4bcf2b8614917b5a79f5cf7f4c30e76d7e85;p=xonotic%2Fdarkplaces.git

diff --git a/vid_shared.c b/vid_shared.c
index 05c5bea5..8eda95e5 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -67,6 +67,7 @@ cvar_t vid_gl13 = {0, "vid_gl13", "1", "enables faster rendering using OpenGL 1.
 cvar_t vid_gl20 = {0, "vid_gl20", "1", "enables faster rendering using OpenGL 2.0 features (such as GL_ARB_fragment_shader extension)"};
 cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each rendered frame (can help with strange input or video lag problems on some machines)"};
 
+cvar_t vid_touchscreen = {0, "vid_touchscreen", "0", "Use touchscreen-style input (no mouse grab, track mouse motion only while button is down, screen areas for mimicing joystick axes and buttons"};
 cvar_t vid_stick_mouse = {CVAR_SAVE, "vid_stick_mouse", "0", "have the mouse stuck in the center of the screen" };
 cvar_t vid_resizable = {CVAR_SAVE, "vid_resizable", "0", "0: window not resizable, 1: resizable, 2: window can be resized but the framebuffer isn't adjusted" };
 
@@ -1211,6 +1212,7 @@ void VID_Shared_Init(void)
 	Cvar_RegisterVariable(&vid_vsync);
 	Cvar_RegisterVariable(&vid_mouse);
 	Cvar_RegisterVariable(&vid_grabkeyboard);
+	Cvar_RegisterVariable(&vid_touchscreen);
 	Cvar_RegisterVariable(&vid_stick_mouse);
 	Cvar_RegisterVariable(&vid_resizable);
 	Cvar_RegisterVariable(&vid_minwidth);
@@ -1279,6 +1281,7 @@ static void VID_CloseSystems(void)
 }
 
 qboolean vid_commandlinecheck = true;
+extern qboolean vid_opened;
 
 void VID_Restart_f(void)
 {
@@ -1286,6 +1289,12 @@ void VID_Restart_f(void)
 	if (vid_commandlinecheck)
 		return;
 
+	if (!vid_opened)
+	{
+		SCR_BeginLoadingPlaque();
+		return;
+	}
+
 	Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp%s%s, to %s %dx%dx%dbpp%s%s.\n",
 		vid.mode.fullscreen ? "fullscreen" : "window", vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.fullscreen && vid.mode.userefreshrate ? va("x%.2fhz", vid.mode.refreshrate) : "", vid.mode.samples > 1 ? va(" (%ix AA)", vid.mode.samples) : "",
 		vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_fullscreen.integer && vid_userefreshrate.integer ? va("x%.2fhz", vid_refreshrate.value) : "", vid_samples.integer > 1 ? va(" (%ix AA)", vid_samples.integer) : "");
@@ -1311,7 +1320,7 @@ const char *vidfallbacks[][2] =
 	{NULL, NULL}
 };
 
-// this is only called once by Host_StartVideo
+// this is only called once by Host_StartVideo and again on each FS_GameDir_f
 void VID_Start(void)
 {
 	int i, width, height, success;
@@ -1361,6 +1370,12 @@ void VID_Start(void)
 	VID_OpenSystems();
 }
 
+void VID_Stop(void)
+{
+	VID_CloseSystems();
+	VID_Shutdown();
+}
+
 int VID_SortModes_Compare(const void *a_, const void *b_)
 {
 	vid_mode_t *a = (vid_mode_t *) a_;