move vid_fullcreen definition from *.c to vid.c and declaration from

context_x11.h to vid.h and remove all extern decls from *.c
This commit is contained in:
Bill Currie 2001-09-28 16:54:31 +00:00
parent f1454ae93c
commit c7031b20f3
11 changed files with 4 additions and 11 deletions

View file

@ -38,6 +38,8 @@ struct cvar_s;
extern byte *vid_basepal; extern byte *vid_basepal;
extern byte *vid_colormap; extern byte *vid_colormap;
extern struct cvar_s *vid_fullscreen;
typedef struct vrect_s { typedef struct vrect_s {
int x,y,width,height; int x,y,width,height;
struct vrect_s *pnext; struct vrect_s *pnext;

View file

@ -46,7 +46,6 @@ extern int x_screen;
extern int x_shmeventtype; extern int x_shmeventtype;
extern qboolean doShm; extern qboolean doShm;
extern qboolean oktodraw; extern qboolean oktodraw;
extern struct cvar_s *vid_fullscreen;
void GetEvent (void); void GetEvent (void);

View file

@ -102,7 +102,6 @@ static qboolean vidmode_avail = false;
static qboolean vidmode_active = false; static qboolean vidmode_active = false;
cvar_t *vid_fullscreen;
cvar_t *vid_system_gamma; cvar_t *vid_system_gamma;
qboolean vid_fullscreen_active; qboolean vid_fullscreen_active;
static qboolean vid_context_created = false; static qboolean vid_context_created = false;

View file

@ -56,6 +56,7 @@ static const char rcsid[] =
#include "QF/joystick.h" #include "QF/joystick.h"
#include "QF/keys.h" #include "QF/keys.h"
#include "QF/mathlib.h" #include "QF/mathlib.h"
#include "QF/vid.h"
cvar_t *in_grab; cvar_t *in_grab;
cvar_t *in_amp; cvar_t *in_amp;
@ -76,8 +77,6 @@ static float in_old_mouse_x, in_old_mouse_y;
static int input_grabbed; static int input_grabbed;
extern cvar_t *vid_fullscreen;
void // called from context_x11.c void // called from context_x11.c
IN_UpdateGrab (cvar_t *var) IN_UpdateGrab (cvar_t *var)
{ {

View file

@ -56,6 +56,7 @@ int scr_width, scr_height;
cvar_t *vid_width; cvar_t *vid_width;
cvar_t *vid_height; cvar_t *vid_height;
cvar_t *vid_fullscreen;
void void
VID_GetWindowSize (int def_w, int def_h) VID_GetWindowSize (int def_w, int def_h)

View file

@ -99,7 +99,6 @@ static int UseDisplay = 1;
static cvar_t *vid_mode; static cvar_t *vid_mode;
static cvar_t *vid_redrawfull; static cvar_t *vid_redrawfull;
static cvar_t *vid_waitforrefresh; static cvar_t *vid_waitforrefresh;
cvar_t *vid_fullscreen;
static char *framebuffer_ptr; static char *framebuffer_ptr;

View file

@ -111,7 +111,6 @@ cvar_t *vid_config_x;
cvar_t *vid_config_y; cvar_t *vid_config_y;
cvar_t *vid_stretch_by_2; cvar_t *vid_stretch_by_2;
cvar_t *in_grab; cvar_t *in_grab;
cvar_t *vid_fullscreen_mode;
cvar_t *vid_windowed_mode; cvar_t *vid_windowed_mode;
cvar_t *block_switch; cvar_t *block_switch;
cvar_t *vid_window_x; cvar_t *vid_window_x;

View file

@ -58,7 +58,6 @@ HWND mainwindow;
// static float oldin_grab = 0; // static float oldin_grab = 0;
cvar_t *vid_fullscreen;
cvar_t *vid_system_gamma; cvar_t *vid_system_gamma;
extern viddef_t vid; // global video state extern viddef_t vid; // global video state

View file

@ -60,7 +60,6 @@ HWND mainwindow;
// static float oldin_grab = 0; // static float oldin_grab = 0;
cvar_t *vid_fullscreen;
cvar_t *vid_bitdepth; cvar_t *vid_bitdepth;
extern viddef_t vid; // global video state extern viddef_t vid; // global video state

View file

@ -64,7 +64,6 @@ HWND mainwindow;
#define WARP_WIDTH 320 #define WARP_WIDTH 320
#define WARP_HEIGHT 200 #define WARP_HEIGHT 200
cvar_t *vid_fullscreen;
cvar_t *vid_system_gamma; cvar_t *vid_system_gamma;
int VID_options_items = 1; int VID_options_items = 1;

View file

@ -65,8 +65,6 @@ static const char rcsid[] =
void VGA_UpdatePlanarScreen (void *srcbuffer); void VGA_UpdatePlanarScreen (void *srcbuffer);
cvar_t *vid_fullscreen;
cvar_t *vid_system_gamma; cvar_t *vid_system_gamma;
static int num_modes, current_mode; static int num_modes, current_mode;