static qboolean windowed, leavecurrentmode;
static qboolean vid_canalttab = false;
static qboolean vid_wassuspended = false;
-static int windowed_mouse;
+static int usingmouse;
extern qboolean mouseactive; // from in_win.c
static HICON hIcon;
//====================================
-cvar_t vid_mode = {"vid_mode","0", false};
// Note that 0 is MODE_WINDOWED
//cvar_t _vid_default_mode = {"_vid_default_mode","0", true};
// Note that 3 is MODE_FULLSCREEN_DEFAULT
//cvar_t _vid_default_mode_win = {"_vid_default_mode_win","3", true};
-cvar_t _windowed_mouse = {"_windowed_mouse","1", true};
int window_center_x, window_center_y, window_x, window_y, window_width, window_height;
RECT window_rect;
// Set either the fullscreen or windowed mode
if (modelist[modenum].type == MS_WINDOWED)
{
- if (_windowed_mouse.value && key_dest == key_game)
- {
- stat = VID_SetWindowedMode(modenum);
- IN_ActivateMouse ();
- IN_HideMouse ();
- }
- else
- {
- IN_DeactivateMouse ();
- IN_ShowMouse ();
- stat = VID_SetWindowedMode(modenum);
- }
+// if (vid_mouse.value && key_dest == key_game)
+// {
+// stat = VID_SetWindowedMode(modenum);
+// usingmouse = true;
+// IN_ActivateMouse ();
+// IN_HideMouse ();
+// }
+// else
+// {
+// usingmouse = false;
+// IN_DeactivateMouse ();
+// IN_ShowMouse ();
+// stat = VID_SetWindowedMode(modenum);
+// }
+ stat = VID_SetWindowedMode(modenum);
}
else if (modelist[modenum].type == MS_FULLDIB)
{
stat = VID_SetFullDIBMode(modenum);
- IN_ActivateMouse ();
- IN_HideMouse ();
+// usingmouse = true;
+// IN_ActivateMouse ();
+// IN_HideMouse ();
}
else
Sys_Error ("VID_SetMode: Bad mode type in modelist");
void GL_EndRendering (void)
{
+ int usemouse;
if (r_render.value && !scr_skipupdate)
SwapBuffers(maindc);
// handle the mouse state when windowed if that's changed
- if (modestate == MS_WINDOWED)
+ usemouse = false;
+ if (vid_mouse.value && key_dest == key_game)
+ usemouse = true;
+ if (modestate == MS_FULLDIB)
+ usemouse = true;
+ if (!ActiveApp)
+ usemouse = false;
+ if (usemouse)
{
- if (!_windowed_mouse.value)
+ if (!usingmouse)
{
- if (windowed_mouse)
- {
- IN_DeactivateMouse ();
- IN_ShowMouse ();
- windowed_mouse = false;
- }
+ usingmouse = true;
+ IN_ActivateMouse ();
+ IN_HideMouse();
}
- else
+ }
+ else
+ {
+ if (usingmouse)
{
- windowed_mouse = true;
- if (key_dest == key_game && !mouseactive && ActiveApp)
- {
- IN_ActivateMouse ();
- IN_HideMouse ();
- }
- else if (mouseactive && key_dest != key_game)
- {
- IN_DeactivateMouse ();
- IN_ShowMouse ();
- }
+ usingmouse = false;
+ IN_DeactivateMouse ();
+ IN_ShowMouse();
}
}
}
IN_DeactivateMouse ();
}
+void VID_RestoreSystemGamma(void);
void VID_Shutdown (void)
{
wglMakeCurrent(NULL, NULL);
// LordHavoc: free textures before closing (may help NVIDIA)
- for (i = 0;i < 8192;i++) temp[i] = i+1;
+ for (i = 0;i < 8192;i++)
+ temp[i] = i+1;
glDeleteTextures(8192, temp);
if (hRC)
ReleaseDC (mainwindow, maindc);
AppActivate(false, false);
+
+ VID_RestoreSystemGamma();
}
}
IN_ClearStates ();
}
+void VID_RestoreGameGamma(void);
+
void AppActivate(BOOL fActive, BOOL minimize)
/****************************************************************************
*
{
if (modestate == MS_FULLDIB)
{
- IN_ActivateMouse ();
- IN_HideMouse ();
- if (vid_canalttab && vid_wassuspended) {
+// usingmouse = true;
+// IN_ActivateMouse ();
+// IN_HideMouse ();
+ if (vid_canalttab && vid_wassuspended)
+ {
vid_wassuspended = false;
ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN);
ShowWindow(mainwindow, SW_SHOWNORMAL);
// 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) && _windowed_mouse.value && key_dest == key_game)
- {
- IN_ActivateMouse ();
- IN_HideMouse ();
- }
+// else if ((modestate == MS_WINDOWED) && vid_mouse.value && key_dest == key_game)
+// {
+// usingmouse = true;
+// IN_ActivateMouse ();
+// IN_HideMouse ();
+// }
+ VID_RestoreGameGamma();
}
if (!fActive)
{
+ usingmouse = false;
+ IN_DeactivateMouse ();
+ IN_ShowMouse ();
if (modestate == MS_FULLDIB)
{
- IN_DeactivateMouse ();
- IN_ShowMouse ();
- if (vid_canalttab) {
+// usingmouse = false;
+// IN_DeactivateMouse ();
+// IN_ShowMouse ();
+ if (vid_canalttab)
+ {
ChangeDisplaySettings (NULL, 0);
vid_wassuspended = true;
}
}
- else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
- {
- IN_DeactivateMouse ();
- IN_ShowMouse ();
- }
+// else if ((modestate == MS_WINDOWED) && vid_mouse.value)
+// {
+// usingmouse = false;
+// IN_DeactivateMouse ();
+// IN_ShowMouse ();
+// }
+ VID_RestoreSystemGamma();
}
}
LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* main window procedure */
-LONG WINAPI MainWndProc (
- HWND hWnd,
- UINT uMsg,
- WPARAM wParam,
- LPARAM lParam)
+LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
LONG lRet = 1;
int fActive, fMinimized, temp;
Con_SafePrintf ("No fullscreen DIB modes found\n");
}
+static int grabsysgamma = true;
+WORD systemgammaramps[3][256], currentgammaramps[3][256];
+
+int VID_SetGamma(float prescale, float gamma, float scale, float base)
+{
+ int i;
+ HDC hdc;
+ hdc = GetDC (NULL);
+
+ BuildGammaTable16(prescale, gamma, scale, base, ¤tgammaramps[0][0]);
+ for (i = 0;i < 256;i++)
+ currentgammaramps[1][i] = currentgammaramps[2][i] = currentgammaramps[0][i];
+
+ i = SetDeviceGammaRamp(hdc, ¤tgammaramps[0][0]);
+
+ ReleaseDC (NULL, hdc);
+ return i; // return success or failure
+}
+
+void VID_RestoreGameGamma(void)
+{
+ VID_UpdateGamma(true);
+}
+
+void VID_GetSystemGamma(void)
+{
+ HDC hdc;
+ hdc = GetDC (NULL);
+
+ GetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
+
+ ReleaseDC (NULL, hdc);
+}
+
+void VID_RestoreSystemGamma(void)
+{
+ HDC hdc;
+ hdc = GetDC (NULL);
+
+ SetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
+
+ ReleaseDC (NULL, hdc);
+}
+
/*
===================
VID_Init
===================
*/
-void VID_Init ()
+void VID_Init (void)
{
int i;
// int existingmode;
memset(&devmode, 0, sizeof(devmode));
- Cvar_RegisterVariable (&vid_mode);
// Cvar_RegisterVariable (&_vid_default_mode);
// Cvar_RegisterVariable (&_vid_default_mode_win);
- Cvar_RegisterVariable (&_windowed_mouse);
Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);
Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f);
Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f);
Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f);
+ VID_GetSystemGamma();
+
hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
InitCommonControls();
}
}
- M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*2,
- "Video modes must be set from the");
- M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3,
- "command line with -width <width>");
- M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4,
- "and -bpp <bits-per-pixel>");
- M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6,
- "Select windowed mode with -window");
+ M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*2, "Video modes must be set from the");
+ M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3, "command line with -width <width>");
+ M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4, "and -bpp <bits-per-pixel>");
+ M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6, "Select windowed mode with -window");
}