diff --git a/include/QF/vid.h b/include/QF/vid.h index bc2fcaa30..5e1599aed 100644 --- a/include/QF/vid.h +++ b/include/QF/vid.h @@ -38,6 +38,8 @@ struct cvar_s; extern byte *vid_basepal; extern byte *vid_colormap; +extern struct cvar_s *vid_fullscreen; + typedef struct vrect_s { int x,y,width,height; struct vrect_s *pnext; diff --git a/include/context_x11.h b/include/context_x11.h index bd99a90da..3bd8b96b7 100644 --- a/include/context_x11.h +++ b/include/context_x11.h @@ -46,7 +46,6 @@ extern int x_screen; extern int x_shmeventtype; extern qboolean doShm; extern qboolean oktodraw; -extern struct cvar_s *vid_fullscreen; void GetEvent (void); diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c index 678c46828..b04bdd049 100644 --- a/libs/video/targets/context_x11.c +++ b/libs/video/targets/context_x11.c @@ -102,7 +102,6 @@ static qboolean vidmode_avail = false; static qboolean vidmode_active = false; -cvar_t *vid_fullscreen; cvar_t *vid_system_gamma; qboolean vid_fullscreen_active; static qboolean vid_context_created = false; diff --git a/libs/video/targets/in_common.c b/libs/video/targets/in_common.c index d2167f003..f5ab41ca8 100644 --- a/libs/video/targets/in_common.c +++ b/libs/video/targets/in_common.c @@ -56,6 +56,7 @@ static const char rcsid[] = #include "QF/joystick.h" #include "QF/keys.h" #include "QF/mathlib.h" +#include "QF/vid.h" cvar_t *in_grab; cvar_t *in_amp; @@ -76,8 +77,6 @@ static float in_old_mouse_x, in_old_mouse_y; static int input_grabbed; -extern cvar_t *vid_fullscreen; - void // called from context_x11.c IN_UpdateGrab (cvar_t *var) { diff --git a/libs/video/targets/vid.c b/libs/video/targets/vid.c index e49376449..ad7eeacc8 100644 --- a/libs/video/targets/vid.c +++ b/libs/video/targets/vid.c @@ -56,6 +56,7 @@ int scr_width, scr_height; cvar_t *vid_width; cvar_t *vid_height; +cvar_t *vid_fullscreen; void VID_GetWindowSize (int def_w, int def_h) diff --git a/libs/video/targets/vid_fbdev.c b/libs/video/targets/vid_fbdev.c index f411ab0e3..583918a6c 100644 --- a/libs/video/targets/vid_fbdev.c +++ b/libs/video/targets/vid_fbdev.c @@ -99,7 +99,6 @@ static int UseDisplay = 1; static cvar_t *vid_mode; static cvar_t *vid_redrawfull; static cvar_t *vid_waitforrefresh; -cvar_t *vid_fullscreen; static char *framebuffer_ptr; diff --git a/libs/video/targets/vid_mgl.c b/libs/video/targets/vid_mgl.c index 80ab85989..9f563d3a3 100644 --- a/libs/video/targets/vid_mgl.c +++ b/libs/video/targets/vid_mgl.c @@ -111,7 +111,6 @@ cvar_t *vid_config_x; cvar_t *vid_config_y; cvar_t *vid_stretch_by_2; cvar_t *in_grab; -cvar_t *vid_fullscreen_mode; cvar_t *vid_windowed_mode; cvar_t *block_switch; cvar_t *vid_window_x; diff --git a/libs/video/targets/vid_sdl.c b/libs/video/targets/vid_sdl.c index a70e8e444..1fca91408 100644 --- a/libs/video/targets/vid_sdl.c +++ b/libs/video/targets/vid_sdl.c @@ -58,7 +58,6 @@ HWND mainwindow; // static float oldin_grab = 0; -cvar_t *vid_fullscreen; cvar_t *vid_system_gamma; extern viddef_t vid; // global video state diff --git a/libs/video/targets/vid_sdl32.c b/libs/video/targets/vid_sdl32.c index bc950d71d..01b7725bd 100644 --- a/libs/video/targets/vid_sdl32.c +++ b/libs/video/targets/vid_sdl32.c @@ -60,7 +60,6 @@ HWND mainwindow; // static float oldin_grab = 0; -cvar_t *vid_fullscreen; cvar_t *vid_bitdepth; extern viddef_t vid; // global video state diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c index f669596fb..07dc9c96e 100644 --- a/libs/video/targets/vid_sgl.c +++ b/libs/video/targets/vid_sgl.c @@ -64,7 +64,6 @@ HWND mainwindow; #define WARP_WIDTH 320 #define WARP_HEIGHT 200 -cvar_t *vid_fullscreen; cvar_t *vid_system_gamma; int VID_options_items = 1; diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c index 71d6f5551..027784464 100644 --- a/libs/video/targets/vid_svgalib.c +++ b/libs/video/targets/vid_svgalib.c @@ -65,8 +65,6 @@ static const char rcsid[] = void VGA_UpdatePlanarScreen (void *srcbuffer); -cvar_t *vid_fullscreen; - cvar_t *vid_system_gamma; static int num_modes, current_mode;