X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=vid.h;h=3ede535d9238c7c179a87b12ea27024e4ab377b5;hb=1c5e917527c135ba00c06a49800d57870020f7c2;hp=b8cd2308d46d8fbaf1d86e2c12893afb55876192;hpb=e9ef9da90a206204b283dacd15c35bd3fd1fe5c9;p=xonotic%2Fdarkplaces.git

diff --git a/vid.h b/vid.h
index b8cd2308..3ede535d 100644
--- a/vid.h
+++ b/vid.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stddef.h>
 #include "qtypes.h"
-#include "cmd.h"
+struct cmd_state_s;
 
 #define ENGINE_ICON ( (gamemode == GAME_NEXUIZ) ? nexuiz_xpm : darkplaces_xpm )
 
@@ -41,6 +41,7 @@ renderpath_t;
 
 typedef struct viddef_support_s
 {
+	int glversion; // this is at least 32
 	int glshaderversion; // this is at least 150 (GL 3.2)
 	qbool amd_texture_texture4;
 	qbool arb_texture_gather;
@@ -95,6 +96,9 @@ typedef struct viddef_s
 	viddef_support_t support;
 
 	int forcetextype; // always use GL_BGRA for D3D, always use GL_RGBA for GLES, etc
+
+	int xPos, yPos; // current virtual position of the top left corner of the SDL window
+	unsigned char displayindex; // the monitor it's on currently
 } viddef_t;
 
 // global video state
@@ -129,6 +133,9 @@ int VID_Shared_SetJoystick(int index);
 qbool VID_JoyBlockEmulatedKeys(int keycode);
 void VID_EnableJoystick(qbool enable);
 
+extern cvar_t cl_demo_mousegrab;
+extern qbool scr_loading;
+
 extern qbool vid_hidden;
 extern qbool vid_activewindow;
 extern qbool vid_supportrefreshrate;
@@ -147,6 +154,7 @@ extern cvar_t vid_touchscreen_ydpi;
 extern cvar_t vid_vsync;
 extern cvar_t vid_mouse;
 extern cvar_t vid_mouse_clickthrough;
+extern cvar_t vid_minimize_on_focus_loss;
 extern cvar_t vid_grabkeyboard;
 extern cvar_t vid_touchscreen;
 extern cvar_t vid_touchscreen_showkeyboard;
@@ -154,6 +162,8 @@ extern cvar_t vid_touchscreen_supportshowkeyboard;
 extern cvar_t vid_stick_mouse;
 extern cvar_t vid_resizable;
 extern cvar_t vid_desktopfullscreen;
+extern cvar_t vid_display;
+extern cvar_t vid_info_displaycount;
 #ifdef WIN32
 extern cvar_t vid_ignore_taskbar;
 #endif
@@ -178,18 +188,19 @@ extern cvar_t v_color_white_r;
 extern cvar_t v_color_white_g;
 extern cvar_t v_color_white_b;
 
+extern cvar_t gl_info_vendor;
+extern cvar_t gl_info_renderer;
+extern cvar_t gl_info_version;
+extern cvar_t gl_info_extensions;
+extern cvar_t gl_info_driver;
+
 // brand of graphics chip
 extern const char *gl_vendor;
 // graphics chip model and other information
 extern const char *gl_renderer;
 // begins with 1.0.0, 1.1.0, 1.2.0, 1.2.1, 1.3.0, 1.3.1, or 1.4.0
 extern const char *gl_version;
-// extensions list, space separated
-extern const char *gl_extensions;
-// WGL, GLX, or AGL
-extern const char *gl_platform;
-// name of driver library (opengl32.dll, libGL.so.1, or whatever)
-extern char gl_driver[256];
+
 
 void *GL_GetProcAddress(const char *name);
 qbool GL_CheckExtension(const char *name, const char *disableparm, int silent);
@@ -197,6 +208,7 @@ qbool GL_ExtensionSupported(const char *name);
 
 void VID_Shared_Init(void);
 
+void GL_InitFunctions(void);
 void GL_Setup(void);
 
 void VID_ClearExtensions(void);
@@ -223,10 +235,9 @@ qbool VID_HasScreenKeyboardSupport(void);
 void VID_ShowKeyboard(qbool show);
 qbool VID_ShowingKeyboard(void);
 
-void VID_SetMouse (qbool fullscreengrab, qbool relative, qbool hidecursor);
 void VID_Finish (void);
 
-void VID_Restart_f(cmd_state_t *cmd);
+void VID_Restart_f(struct cmd_state_s *cmd);
 
 void VID_Start(void);
 void VID_Stop(void);
@@ -242,7 +253,7 @@ typedef struct
 	int pixelheight_num, pixelheight_denom;
 }
 vid_mode_t;
-vid_mode_t *VID_GetDesktopMode(void);
+vid_mode_t VID_GetDesktopMode(void);
 size_t VID_ListModes(vid_mode_t *modes, size_t maxcount);
 size_t VID_SortModes(vid_mode_t *modes, size_t count, qbool usebpp, qbool userefreshrate, qbool useaspect);
 void VID_Soft_SharedSetup(void);