X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_wgl.c;h=c52d0d99e8bfd6bd24bfbd8a67eebe8d1478967f;hp=8c1180084e5fe19ddcb4624e63459b50b8473bbe;hb=6b73170803d39d73032de4a52995aad52d1e6e88;hpb=7a326060eaf7fee38b91dd9dfb6bf10bcad7e108 diff --git a/vid_wgl.c b/vid_wgl.c index 8c118008..c52d0d99 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -24,9 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include +#include #include #include "resource.h" #include +#include extern void S_BlockSound (void); extern void S_UnblockSound (void); @@ -40,6 +42,8 @@ extern HINSTANCE global_hInstance; // Tell startup code that we have a client int cl_available = true; +qboolean vid_supportrefreshrate = true; + static int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *); static int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); //static int (WINAPI *qwglGetPixelFormat)(HDC); @@ -113,8 +117,6 @@ static qboolean dinput; // input code -#include - #define DINPUT_BUFFERSIZE 16 #define iDirectInputCreate(a,b,c,d) pDirectInputCreate(a,b,c,d) @@ -145,7 +147,7 @@ static int mouse_buttons; static int mouse_oldbuttonstate; static qboolean restore_spi; -static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1}; +static int originalmouseparms[3], newmouseparms[3] = {0, 0, 0}; static unsigned int uiWheelMessage; static qboolean mouseparmsvalid; @@ -184,25 +186,25 @@ static PDWORD pdwRawValue[JOY_MAX_AXES]; // each time. this avoids any problems with getting back to a default usage // or when changing from one controller to another. this way at least something // works. -static cvar_t in_joystick = {CVAR_SAVE, "joystick","0"}; -static cvar_t joy_name = {0, "joyname", "joystick"}; -static cvar_t joy_advanced = {0, "joyadvanced", "0"}; -static cvar_t joy_advaxisx = {0, "joyadvaxisx", "0"}; -static cvar_t joy_advaxisy = {0, "joyadvaxisy", "0"}; -static cvar_t joy_advaxisz = {0, "joyadvaxisz", "0"}; -static cvar_t joy_advaxisr = {0, "joyadvaxisr", "0"}; -static cvar_t joy_advaxisu = {0, "joyadvaxisu", "0"}; -static cvar_t joy_advaxisv = {0, "joyadvaxisv", "0"}; -static cvar_t joy_forwardthreshold = {0, "joyforwardthreshold", "0.15"}; -static cvar_t joy_sidethreshold = {0, "joysidethreshold", "0.15"}; -static cvar_t joy_pitchthreshold = {0, "joypitchthreshold", "0.15"}; -static cvar_t joy_yawthreshold = {0, "joyyawthreshold", "0.15"}; -static cvar_t joy_forwardsensitivity = {0, "joyforwardsensitivity", "-1.0"}; -static cvar_t joy_sidesensitivity = {0, "joysidesensitivity", "-1.0"}; -static cvar_t joy_pitchsensitivity = {0, "joypitchsensitivity", "1.0"}; -static cvar_t joy_yawsensitivity = {0, "joyyawsensitivity", "-1.0"}; -static cvar_t joy_wwhack1 = {0, "joywwhack1", "0.0"}; -static cvar_t joy_wwhack2 = {0, "joywwhack2", "0.0"}; +static cvar_t in_joystick = {CVAR_SAVE, "joystick","0", "enables joysticks"}; +static cvar_t joy_name = {0, "joyname", "joystick", "name of joystick to use (informational only, used only by joyadvanced 1 mode)"}; +static cvar_t joy_advanced = {0, "joyadvanced", "0", "use more than 2 axis joysticks (configuring this is very technical)"}; +static cvar_t joy_advaxisx = {0, "joyadvaxisx", "0", "axis mapping for joyadvanced 1 mode"}; +static cvar_t joy_advaxisy = {0, "joyadvaxisy", "0", "axis mapping for joyadvanced 1 mode"}; +static cvar_t joy_advaxisz = {0, "joyadvaxisz", "0", "axis mapping for joyadvanced 1 mode"}; +static cvar_t joy_advaxisr = {0, "joyadvaxisr", "0", "axis mapping for joyadvanced 1 mode"}; +static cvar_t joy_advaxisu = {0, "joyadvaxisu", "0", "axis mapping for joyadvanced 1 mode"}; +static cvar_t joy_advaxisv = {0, "joyadvaxisv", "0", "axis mapping for joyadvanced 1 mode"}; +static cvar_t joy_forwardthreshold = {0, "joyforwardthreshold", "0.15", "minimum joystick movement necessary to move forward"}; +static cvar_t joy_sidethreshold = {0, "joysidethreshold", "0.15", "minimum joystick movement necessary to move sideways (strafing)"}; +static cvar_t joy_pitchthreshold = {0, "joypitchthreshold", "0.15", "minimum joystick movement necessary to look up/down"}; +static cvar_t joy_yawthreshold = {0, "joyyawthreshold", "0.15", "minimum joystick movement necessary to turn left/right"}; +static cvar_t joy_forwardsensitivity = {0, "joyforwardsensitivity", "-1.0", "how fast the joystick moves forward"}; +static cvar_t joy_sidesensitivity = {0, "joysidesensitivity", "-1.0", "how fast the joystick moves sideways (strafing)"}; +static cvar_t joy_pitchsensitivity = {0, "joypitchsensitivity", "1.0", "how fast the joystick looks up/down"}; +static cvar_t joy_yawsensitivity = {0, "joyyawsensitivity", "-1.0", "how fast the joystick turns left/right"}; +static cvar_t joy_wwhack1 = {0, "joywwhack1", "0.0", "special hack for wingman warrior"}; +static cvar_t joy_wwhack2 = {0, "joywwhack2", "0.0", "special hack for wingman warrior"}; static qboolean joy_avail, joy_advancedinit, joy_haspov; static DWORD joy_oldbuttonstate, joy_oldpovstate; @@ -260,7 +262,7 @@ static void IN_StartupMouse (void); //==================================== -void VID_Finish (void) +void VID_Finish (qboolean allowmousegrab) { qboolean vid_usemouse; @@ -273,7 +275,7 @@ void VID_Finish (void) // handle the mouse state when windowed if that's changed vid_usemouse = false; - if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback) + if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback)) vid_usemouse = true; if (vid_isfullscreen) vid_usemouse = true; @@ -283,10 +285,15 @@ void VID_Finish (void) if (r_render.integer && !vid_hidden) { + CHECKGLERROR if (r_speeds.integer || gl_finish.integer) - qglFinish(); + { + qglFinish();CHECKGLERROR + } SwapBuffers(baseDC); } + + VID_UpdateGamma(false, 256); } //========================================================================== @@ -645,7 +652,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return lRet; } -int VID_SetGamma(unsigned short *ramps) +int VID_SetGamma(unsigned short *ramps, int rampsize) { HDC hdc = GetDC (NULL); int i = SetDeviceGammaRamp(hdc, ramps); @@ -653,7 +660,7 @@ int VID_SetGamma(unsigned short *ramps) return i; // return success or failure } -int VID_GetGamma(unsigned short *ramps) +int VID_GetGamma(unsigned short *ramps, int rampsize) { HDC hdc = GetDC (NULL); int i = GetDeviceGammaRamp(hdc, ramps); @@ -723,7 +730,7 @@ void VID_Init(void) IN_Init(); } -int VID_InitMode (int fullscreen, int width, int height, int bpp) +int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrate) { int i; HDC hdc; @@ -787,10 +794,11 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp) vid_isfullscreen = false; if (fullscreen) { - gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY; gdevmode.dmBitsPerPel = bpp; gdevmode.dmPelsWidth = width; gdevmode.dmPelsHeight = height; + gdevmode.dmDisplayFrequency = refreshrate; gdevmode.dmSize = sizeof (gdevmode); if (ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) { @@ -1303,6 +1311,7 @@ static void IN_MouseMove (void) in_mouse_y = my; // if the mouse has moved, force it to the center, so there's room to move + if (!cl.csqc_wantsmousemove) if (mx || my) SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2)); } @@ -1619,7 +1628,7 @@ static void IN_JoyMove (void) else speed = 1; // LordHavoc: viewzoom affects sensitivity for sniping - aspeed = speed * host_realframetime * cl.viewzoom; + aspeed = speed * cl.realframetime * cl.viewzoom; // loop through the axes for (i = 0; i < JOY_MAX_AXES; i++) @@ -1780,7 +1789,7 @@ static void IN_Init(void) Cvar_RegisterVariable (&joy_yawsensitivity); Cvar_RegisterVariable (&joy_wwhack1); Cvar_RegisterVariable (&joy_wwhack2); - Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f); + Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f, "applies current joyadv* cvar settings to the joystick driver"); } static void IN_Shutdown(void)