static vmode_t modelist[MAX_MODE_LIST];
static int nummodes;
-static vmode_t *pcurrentmode;
+//static vmode_t *pcurrentmode;
static vmode_t badmode;
static DEVMODE gdevmode;
HGLRC baseRC;
HDC maindc;
-glvert_t glv;
-
HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
viddef_t vid; // global video state
-float gldepthmin, gldepthmax;
-
modestate_t modestate = MS_UNINIT;
void VID_MenuDraw (void);
height = rect.bottom - rect.top;
// Create the DIB window
- mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlaces", "DarkPlacesGL", WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
+ mainwindow = CreateWindowEx (ExWindowStyle, gamename, gamename, WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
if (!mainwindow)
Sys_Error ("Couldn't create DIB window");
vid.conheight = modelist[modenum].height;
if (vid.conwidth > modelist[modenum].width)
vid.conwidth = modelist[modenum].width;
- vid.width = vid.conwidth;
- vid.height = vid.conheight;
SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
height = rect.bottom - rect.top;
// Create the DIB window
- mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlaces", "DarkPlacesGL", WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
+ mainwindow = CreateWindowEx (ExWindowStyle, gamename, gamename, WindowStyle, rect.left, rect.top, width, height, NULL, NULL, global_hInstance, NULL);
if (!mainwindow)
Sys_Error ("Couldn't create DIB window");
vid.conheight = modelist[modenum].height;
if (vid.conwidth > modelist[modenum].width)
vid.conwidth = modelist[modenum].width;
- vid.width = vid.conwidth;
- vid.height = vid.conheight;
// needed because we're not getting WM_MOVE messages fullscreen on NT
window_x = 0;
int VID_SetMode (int modenum)
{
int original_mode, temp;
- qboolean stat;
+ qboolean stat = 0;
MSG msg;
if ((windowed && (modenum != 0)) || (!windowed && (modenum < 1)) || (!windowed && (modenum >= nummodes)))
// Set either the fullscreen or windowed mode
if (modelist[modenum].type == MS_WINDOWED)
{
-// if (vid_mouse.value && key_dest == key_game)
+// if (vid_mouse.integer && key_dest == key_game)
// {
// stat = VID_SetWindowedMode(modenum);
// usingmouse = true;
if (!msg_suppress_1)
Con_SafePrintf ("Video mode %s initialized.\n", VID_GetModeDescription (vid_modenum));
- vid.recalc_refdef = 1;
+// vid.recalc_refdef = 1;
return true;
}
/*
=================
-GL_BeginRendering
-
+VID_GetWindowSize
=================
*/
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
+void VID_GetWindowSize (int *x, int *y, int *width, int *height)
{
*x = *y = 0;
*width = WindowRect.right - WindowRect.left;
*height = WindowRect.bottom - WindowRect.top;
-
-// if (!wglMakeCurrent( maindc, baseRC ))
-// Sys_Error ("wglMakeCurrent failed");
-
-// glViewport (*x, *y, *width, *height);
}
-void GL_EndRendering (void)
+void VID_Finish (void)
{
int usemouse;
- if (r_render.value && !scr_skipupdate)
+ if (r_render.integer && !scr_skipupdate)
+ {
+ glFinish();
SwapBuffers(maindc);
+ }
// handle the mouse state when windowed if that's changed
usemouse = false;
- if (vid_mouse.value && key_dest == key_game)
+ if (vid_mouse.integer && key_dest == key_game)
usemouse = true;
if (modestate == MS_FULLDIB)
usemouse = true;
-byte scantokey[128] =
+qbyte scantokey[128] =
{
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
0 ,27 ,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,9 , // 0
};
/*
-byte shiftscantokey[128] =
+qbyte shiftscantokey[128] =
{
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
0 ,27 ,'!' ,'@' ,'#' ,'$' ,'%' ,'^' ,'&' ,'*' ,'(' ,')' ,'_' ,'+' ,K_BACKSPACE,9 , // 0
}
void VID_RestoreGameGamma(void);
+extern qboolean host_loopactive;
void AppActivate(BOOL fActive, BOOL minimize)
/****************************************************************************
// LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
}
-// else if ((modestate == MS_WINDOWED) && vid_mouse.value && key_dest == key_game)
+// else if ((modestate == MS_WINDOWED) && vid_mouse.integer && key_dest == key_game)
// {
// usingmouse = true;
// IN_ActivateMouse ();
// IN_HideMouse ();
// }
- VID_RestoreGameGamma();
+ if (host_loopactive)
+ VID_RestoreGameGamma();
}
if (!fActive)
vid_wassuspended = true;
}
}
-// else if ((modestate == MS_WINDOWED) && vid_mouse.value)
+// else if ((modestate == MS_WINDOWED) && vid_mouse.integer)
// {
// usingmouse = false;
// IN_DeactivateMouse ();
wc.hCursor = LoadCursor (NULL,IDC_ARROW);
wc.hbrBackground = NULL;
wc.lpszMenuName = 0;
- wc.lpszClassName = "DarkPlaces";
+ wc.lpszClassName = gamename;
if (!RegisterClass (&wc) )
Sys_Error ("Couldn't register window class");
Con_SafePrintf ("No fullscreen DIB modes found\n");
}
-static int grabsysgamma = true;
+//static int grabsysgamma = true;
WORD systemgammaramps[3][256], currentgammaramps[3][256];
int VID_SetGamma(float prescale, float gamma, float scale, float base)
{
int i;
// int existingmode;
- int basenummodes, width, height, bpp, findbpp, done;
+ int basenummodes, width, height = 0, bpp, findbpp, done;
HDC hdc;
DEVMODE devmode;
extern void M_Print (int cx, int cy, char *str);
extern void M_PrintWhite (int cx, int cy, char *str);
extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
+extern void M_DrawPic (int x, int y, char *picname);
-static int vid_line, vid_wmodes;
+static int vid_wmodes;
typedef struct
{
*/
void VID_MenuDraw (void)
{
- qpic_t *p;
- char *ptr;
- int lnummodes, i, k, column, row;
- vmode_t *pv;
+ cachepic_t *p;
+ char *ptr;
+ int lnummodes, i, k, column, row;
+ vmode_t *pv;
p = Draw_CachePic ("gfx/vidmodes.lmp");
- M_DrawPic ( (320-p->width)/2, 4, p);
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/vidmodes.lmp");
vid_wmodes = 0;
lnummodes = VID_NumModes ();
-
+
for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
{
ptr = VID_GetModeDescription (i);
projects / xonotic / darkplaces.git / blobdiff