X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_wgl.c;h=7a4840886f0165fae39591890a582419c42a50a7;hp=0c55110216efe94480c7e30982e55de0cd7590d7;hb=563fb48299f453ecb3b81168079df8d30c0ac311;hpb=facaed0509e7b7c30d6ec3f9d3438ee21f77c6e8 diff --git a/vid_wgl.c b/vid_wgl.c index 0c551102..7a484088 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -17,10 +17,22 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// gl_vidnt.c -- NT GL vid component +// vid_wgl.c -- NT GL vid component -// we don't need a very new dinput -#define DIRECTINPUT_VERSION 0x0300 +#ifdef _MSC_VER +#pragma comment(lib, "comctl32.lib") +#endif + +#ifdef SUPPORTDIRECTX +// Include DX libs +#ifdef _MSC_VER +#pragma comment(lib, "dinput8.lib") +#pragma comment(lib, "dxguid.lib") +#endif +#ifndef DIRECTINPUT_VERSION +# define DIRECTINPUT_VERSION 0x0500 /* Version 5.0 */ +#endif +#endif #include "quakedef.h" #include @@ -33,9 +45,31 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef SUPPORTDIRECTX #include #endif +#include "dpsoftrast.h" + +#ifdef SUPPORTD3D +#include + +cvar_t vid_dx9 = {CVAR_SAVE, "vid_dx9", "0", "use Microsoft Direct3D9(r) for rendering"}; +cvar_t vid_dx9_hal = {CVAR_SAVE, "vid_dx9_hal", "1", "enables hardware rendering (1), otherwise software reference rasterizer (0 - very slow), note that 0 is necessary when using NVPerfHUD (which renders in hardware but requires this option to enable it)"}; +cvar_t vid_dx9_softvertex = {CVAR_SAVE, "vid_dx9_softvertex", "0", "enables software vertex processing (for compatibility testing? or if you have a very fast CPU), usually you want this off"}; +cvar_t vid_dx9_triplebuffer = {CVAR_SAVE, "vid_dx9_triplebuffer", "0", "enables triple buffering when using vid_vsync in fullscreen, this options adds some latency and only helps when framerate is below 60 so you usually don't want it"}; +//cvar_t vid_dx10 = {CVAR_SAVE, "vid_dx10", "1", "use Microsoft Direct3D10(r) for rendering"}; +//cvar_t vid_dx11 = {CVAR_SAVE, "vid_dx11", "1", "use Microsoft Direct3D11(r) for rendering"}; + +D3DPRESENT_PARAMETERS vid_d3dpresentparameters; + +// we declare this in vid_shared.c because it is required by dedicated server and all clients when SUPPORTD3D is defined +extern LPDIRECT3DDEVICE9 vid_d3d9dev; + +LPDIRECT3D9 vid_d3d9; +D3DCAPS9 vid_d3d9caps; +qboolean vid_d3ddevicelost; +#endif extern HINSTANCE global_hInstance; +static HINSTANCE gldll; #ifndef WM_MOUSEWHEEL #define WM_MOUSEWHEEL 0x020A @@ -92,9 +126,11 @@ static dllfunction_t wglpixelformatfuncs[] = }; static DEVMODE gdevmode, initialdevmode; +static vid_mode_t desktop_mode; static qboolean vid_initialized = false; static qboolean vid_wassuspended = false; static qboolean vid_usingmouse = false; +static qboolean vid_usinghidecursor = false; static qboolean vid_usingvsync = false; static qboolean vid_usevsync = false; static HICON hIcon; @@ -105,6 +141,11 @@ HWND mainwindow; static HDC baseDC; static HGLRC baseRC; +static HDC vid_softhdc; +static HGDIOBJ vid_softhdc_backup; +static BITMAPINFO vid_softbmi; +static HBITMAP vid_softdibhandle; + //HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow); static qboolean vid_isfullscreen; @@ -112,10 +153,11 @@ static qboolean vid_isfullscreen; //void VID_MenuDraw (void); //void VID_MenuKey (int key); -//LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -//void AppActivate(BOOL fActive, BOOL minimize); -//void ClearAllStates (void); -//void VID_UpdateWindowStatus (void); +LONG WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +void AppActivate(BOOL fActive, BOOL minimize); +static void ClearAllStates(void); +qboolean VID_InitModeGL(viddef_mode_t *mode); +qboolean VID_InitModeSOFT(viddef_mode_t *mode); //==================================== @@ -164,102 +206,114 @@ static qboolean dinput_acquired; static unsigned int mstate_di; #endif -// joystick defines and variables -// where should defines be moved? -#define JOY_ABSOLUTE_AXIS 0x00000000 // control like a joystick -#define JOY_RELATIVE_AXIS 0x00000010 // control like a mouse, spinner, trackball -#define JOY_MAX_AXES 6 // X, Y, Z, R, U, V -#define JOY_AXIS_X 0 -#define JOY_AXIS_Y 1 -#define JOY_AXIS_Z 2 -#define JOY_AXIS_R 3 -#define JOY_AXIS_U 4 -#define JOY_AXIS_V 5 - -enum _ControlList -{ - AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn -}; - -static DWORD dwAxisFlags[JOY_MAX_AXES] = -{ - JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, JOY_RETURNR, JOY_RETURNU, JOY_RETURNV -}; - -static DWORD dwAxisMap[JOY_MAX_AXES]; -static DWORD dwControlMap[JOY_MAX_AXES]; -static PDWORD pdwRawValue[JOY_MAX_AXES]; - -// none of these cvars are saved over a session -// this means that advanced controller configuration needs to be executed -// 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", "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 cvar_t vid_forcerefreshrate = {0, "vid_forcerefreshrate", "0", "try to set the given vid_refreshrate even if Windows doesn't list it as valid video mode"}; -static qboolean joy_avail, joy_advancedinit, joy_haspov; -static DWORD joy_oldbuttonstate, joy_oldpovstate; - -static int joy_id; -static DWORD joy_flags; -static DWORD joy_numbuttons; - #ifdef SUPPORTDIRECTX static LPDIRECTINPUT g_pdi; static LPDIRECTINPUTDEVICE g_pMouse; static HINSTANCE hInstDI; #endif -static JOYINFOEX ji; - // forward-referenced functions -static void IN_StartupJoystick (void); -static void Joy_AdvancedUpdate_f (void); -static void IN_JoyMove (void); static void IN_StartupMouse (void); - +static void AdjustWindowBounds(int fullscreen, int *width, int *height, viddef_mode_t *mode, DWORD WindowStyle, RECT *rect); //==================================== +qboolean vid_reallyhidden = true; +#ifdef SUPPORTD3D +qboolean vid_begunscene = false; +#endif void VID_Finish (void) { - qboolean vid_usemouse; +#ifdef SUPPORTD3D + HRESULT hr; +#endif + vid_hidden = vid_reallyhidden; - vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; - if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) - { - vid_usingvsync = vid_usevsync; - qwglSwapIntervalEXT (vid_usevsync); - } + vid_usevsync = vid_vsync.integer && !cls.timedemo && qwglSwapIntervalEXT; - if (r_render.integer && !vid_hidden) + if (!vid_hidden) { - CHECKGLERROR - if (r_speeds.integer || gl_finish.integer) + switch(vid.renderpath) { - qglFinish();CHECKGLERROR + case RENDERPATH_GL11: + case RENDERPATH_GL13: + case RENDERPATH_GL20: + case RENDERPATH_GLES1: + case RENDERPATH_GLES2: + if (vid_usingvsync != vid_usevsync) + { + vid_usingvsync = vid_usevsync; + qwglSwapIntervalEXT (vid_usevsync); + } + if (r_speeds.integer == 2 || gl_finish.integer) + GL_Finish(); + SwapBuffers(baseDC); + break; + case RENDERPATH_D3D9: +#ifdef SUPPORTD3D + if (vid_begunscene) + { + IDirect3DDevice9_EndScene(vid_d3d9dev); + vid_begunscene = false; + } + if (!vid_reallyhidden) + { + if (!vid_d3ddevicelost) + { + vid_hidden = vid_reallyhidden; + hr = IDirect3DDevice9_Present(vid_d3d9dev, NULL, NULL, NULL, NULL); + if (hr == D3DERR_DEVICELOST) + { + vid_d3ddevicelost = true; + vid_hidden = true; + Sleep(100); + } + } + else + { + hr = IDirect3DDevice9_TestCooperativeLevel(vid_d3d9dev); + switch(hr) + { + case D3DERR_DEVICELOST: + vid_d3ddevicelost = true; + vid_hidden = true; + Sleep(100); + break; + case D3DERR_DEVICENOTRESET: + vid_d3ddevicelost = false; + vid_hidden = vid_reallyhidden; + R_Modules_DeviceLost(); + IDirect3DDevice9_Reset(vid_d3d9dev, &vid_d3dpresentparameters); + R_Modules_DeviceRestored(); + break; + case D3D_OK: + vid_hidden = vid_reallyhidden; + IDirect3DDevice9_Present(vid_d3d9dev, NULL, NULL, NULL, NULL); + break; + } + } + if (!vid_begunscene && !vid_hidden) + { + IDirect3DDevice9_BeginScene(vid_d3d9dev); + vid_begunscene = true; + } + } +#endif + break; + case RENDERPATH_D3D10: + break; + case RENDERPATH_D3D11: + break; + case RENDERPATH_SOFT: + DPSOFTRAST_Finish(); +// baseDC = GetDC(mainwindow); + BitBlt(baseDC, 0, 0, vid.width, vid.height, vid_softhdc, 0, 0, SRCCOPY); +// ReleaseDC(mainwindow, baseDC); +// baseDC = NULL; + break; } - SwapBuffers(baseDC); } // make sure a context switch can happen every frame - Logitech drivers @@ -267,25 +321,23 @@ void VID_Finish (void) // without this help Sleep(0); - VID_UpdateGamma(false, 256); + VID_UpdateGamma(); } //========================================================================== - - static unsigned char 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 - 'q' ,'w' ,'e' ,'r' ,'t' ,'y' ,'u' ,'i' ,'o' ,'p' ,'[' ,']' ,13 ,K_CTRL ,'a' ,'s' ,//1 - 'd' ,'f' ,'g' ,'h' ,'j' ,'k' ,'l' ,';' ,'\'' ,'`' ,K_SHIFT ,'\\' ,'z' ,'x' ,'c' ,'v' ,//2 - 'b' ,'n' ,'m' ,',' ,'.' ,'/' ,K_SHIFT,'*' ,K_ALT ,' ' ,0 ,K_F1 ,K_F2 ,K_F3 ,K_F4 ,K_F5 ,//3 - K_F6 ,K_F7 ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0 ,K_HOME,K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5,K_RIGHTARROW,K_KP_PLUS ,K_END,//4 - K_DOWNARROW,K_PGDN,K_INS,K_DEL,0 ,0 ,0 ,K_F11 ,K_F12 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//5 - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//6 - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 //7 +// 0 1 2 3 4 5 6 7 8 9 A B C D E F + 0 ,K_ESCAPE,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,K_TAB,//0 + 'q' ,'w' ,'e' ,'r' ,'t' ,'y' ,'u' ,'i' ,'o' ,'p' ,'[' ,']' ,K_ENTER,K_CTRL ,'a' ,'s' ,//1 + 'd' ,'f' ,'g' ,'h' ,'j' ,'k' ,'l' ,';' ,'\'' ,'`' ,K_SHIFT ,'\\' ,'z' ,'x' ,'c' ,'v' ,//2 + 'b' ,'n' ,'m' ,',' ,'.' ,'/' ,K_SHIFT ,'*' ,K_ALT ,' ' ,K_CAPSLOCK,K_F1 ,K_F2 ,K_F3 ,K_F4 ,K_F5 ,//3 + K_F6 ,K_F7 ,K_F8 ,K_F9 ,K_F10,K_PAUSE,K_SCROLLOCK,K_HOME,K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5 ,K_RIGHTARROW,K_KP_PLUS ,K_END,//4 + K_DOWNARROW,K_PGDN ,K_INS,K_DEL,0 ,0 ,0 ,K_F11 ,K_F12 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//5 + 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//6 + 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 //7 }; @@ -315,6 +367,9 @@ static int MapKey (int key, int virtualkey) if ( !is_extended ) { + if(((GetKeyState(VK_NUMLOCK)) & 0xffff) == 0) + return result; + switch ( result ) { case K_HOME: @@ -343,6 +398,9 @@ static int MapKey (int key, int virtualkey) } else { + if(virtualkey == VK_NUMLOCK) + return K_NUMLOCK; + switch ( result ) { case 0x0D: @@ -371,7 +429,7 @@ ClearAllStates */ static void ClearAllStates (void) { - Key_ClearStates (); + Key_ReleaseAll(); if (vid_usingmouse) mouse_oldbuttonstate = 0; } @@ -390,11 +448,11 @@ void AppActivate(BOOL fActive, BOOL minimize) { static qboolean sound_active = false; // initially blocked by Sys_InitConsole() - vid_activewindow = fActive; - vid_hidden = minimize; + vid_activewindow = fActive != FALSE; + vid_reallyhidden = minimize != FALSE; // enable/disable sound on focus gain/loss - if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer)) + if ((!vid_reallyhidden && vid_activewindow) || !snd_mutewhenidle.integer) { if (!sound_active) { @@ -418,24 +476,28 @@ void AppActivate(BOOL fActive, BOOL minimize) if (vid_wassuspended) { vid_wassuspended = false; - ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN); - ShowWindow(mainwindow, SW_SHOWNORMAL); + if (gldll) + { + 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); + if (gldll) + MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false); } } if (!fActive) { - VID_GrabMouse(false); + VID_SetMouse(false, false, false); if (vid_isfullscreen) { - ChangeDisplaySettings (NULL, 0); + if (gldll) + ChangeDisplaySettings (NULL, CDS_FULLSCREEN); vid_wassuspended = true; } - VID_RestoreSystemGamma(); } } @@ -454,7 +516,9 @@ void Sys_SendKeyEvents (void) } } +#ifdef CONFIG_CD LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +#endif static keynum_t buttonremap[16] = { @@ -481,8 +545,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LONG lRet = 1; int fActive, fMinimized, temp; - char state[256]; - char asciichar[4]; + unsigned char state[256]; + const unsigned int UNICODE_BUFFER_LENGTH = 4; + WCHAR unicode[UNICODE_BUFFER_LENGTH]; int vkey; int charlength; qboolean down = false; @@ -501,9 +566,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_MOVE: - window_x = (int) LOWORD(lParam); - window_y = (int) HIWORD(lParam); - VID_GrabMouse(false); + window_x = (short) LOWORD(lParam); + window_y = (short) HIWORD(lParam); + VID_SetMouse(false, false, false); break; case WM_KEYDOWN: @@ -515,13 +580,13 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) GetKeyboardState (state); // alt/ctrl/shift tend to produce funky ToAscii values, // and if it's not a single character we don't know care about it - charlength = ToAscii (wParam, lParam >> 16, state, (LPWORD)asciichar, 0); - if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || charlength == 0) - asciichar[0] = 0; - else if( charlength == 2 ) { - asciichar[0] = asciichar[1]; - } - Key_Event (vkey, asciichar[0], down); + charlength = ToUnicode(wParam, lParam >> 16, state, unicode, UNICODE_BUFFER_LENGTH, 0); + if(vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || charlength == 0) + unicode[0] = 0; + else if(charlength == 2) + unicode[0] = unicode[1]; + if (!VID_JoyBlockEmulatedKeys(vkey)) + Key_Event(vkey, unicode[0], down); break; case WM_SYSCHAR: @@ -580,9 +645,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) temp |= 512; #ifdef SUPPORTDIRECTX - if (vid_usingmouse && !dinput_acquired) -#else - if (vid_usingmouse) + if (!dinput_acquired) #endif { // perform button actions @@ -632,7 +695,9 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) // break; case MM_MCINOTIFY: +#ifdef CONFIG_CD lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam); +#endif break; default: @@ -645,33 +710,18 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return lRet; } -int VID_SetGamma(unsigned short *ramps, int rampsize) -{ - HDC hdc = GetDC (NULL); - int i = SetDeviceGammaRamp(hdc, ramps); - ReleaseDC (NULL, hdc); - return i; // return success or failure -} - -int VID_GetGamma(unsigned short *ramps, int rampsize) -{ - HDC hdc = GetDC (NULL); - int i = GetDeviceGammaRamp(hdc, ramps); - ReleaseDC (NULL, hdc); - return i; // return success or failure -} - -static HINSTANCE gldll; - static void GL_CloseLibrary(void) { - FreeLibrary(gldll); - gldll = 0; - gl_driver[0] = 0; - qwglGetProcAddress = NULL; - gl_extensions = ""; - gl_platform = ""; - gl_platformextensions = ""; + if (gldll) + { + FreeLibrary(gldll); + gldll = 0; + gl_driver[0] = 0; + qwglGetProcAddress = NULL; + gl_extensions = ""; + gl_platform = ""; + gl_platformextensions = ""; + } } static int GL_OpenLibrary(const char *name) @@ -689,12 +739,17 @@ static int GL_OpenLibrary(const char *name) void *GL_GetProcAddress(const char *name) { - void *p = NULL; - if (qwglGetProcAddress != NULL) - p = (void *) qwglGetProcAddress(name); - if (p == NULL) - p = (void *) GetProcAddress(gldll, name); - return p; + if (gldll) + { + void *p = NULL; + if (qwglGetProcAddress != NULL) + p = (void *) qwglGetProcAddress(name); + if (p == NULL) + p = (void *) GetProcAddress(gldll, name); + return p; + } + else + return NULL; } #ifndef WGL_ARB_pixel_format @@ -760,6 +815,15 @@ void VID_Init(void) { WNDCLASS wc; +#ifdef SUPPORTD3D + Cvar_RegisterVariable(&vid_dx9); + Cvar_RegisterVariable(&vid_dx9_hal); + Cvar_RegisterVariable(&vid_dx9_softvertex); + Cvar_RegisterVariable(&vid_dx9_triplebuffer); +// Cvar_RegisterVariable(&vid_dx10); +// Cvar_RegisterVariable(&vid_dx11); +#endif + InitCommonControls(); hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1)); @@ -781,10 +845,17 @@ void VID_Init(void) memset(&initialdevmode, 0, sizeof(initialdevmode)); EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &initialdevmode); + desktop_mode.width = initialdevmode.dmPelsWidth; + desktop_mode.height = initialdevmode.dmPelsHeight; + desktop_mode.bpp = initialdevmode.dmBitsPerPel; + desktop_mode.refreshrate = initialdevmode.dmDisplayFrequency; + desktop_mode.pixelheight_num = 1; + desktop_mode.pixelheight_denom = 1; // Win32 apparently does not provide this (FIXME) + IN_Init(); } -int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) +qboolean VID_InitModeGL(viddef_mode_t *mode) { int i; HDC hdc; @@ -813,9 +884,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat }; int windowpass; int pixelformat, newpixelformat; - int numpixelformats; + UINT numpixelformats; DWORD WindowStyle, ExWindowStyle; - int CenterX, CenterY; const char *gldrivername; int depth; DEVMODE thismode; @@ -824,6 +894,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat float *af; int attribs[128]; float attribsf[16]; + int bpp = mode->bitsperpixel; + int width = mode->width; + int height = mode->height; + int refreshrate = (int)floor(mode->refreshrate+0.5); + int stereobuffer = mode->stereobuffer; + int samples = mode->samples; + int fullscreen = mode->fullscreen; if (vid_initialized) Sys_Error("VID_InitMode called when video is already initialised"); @@ -920,7 +997,15 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat vid_isfullscreen = false; if (fullscreen) { - if(vid_forcerefreshrate.integer) + if(vid_desktopfullscreen.integer) + { + foundmode = true; + gdevmode = initialdevmode; + width = mode->width = gdevmode.dmPelsWidth; + height = mode->height = gdevmode.dmPelsHeight; + bpp = mode->bitsperpixel = gdevmode.dmBitsPerPel; + } + else if(vid_forcerefreshrate.integer) { foundmode = true; gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; @@ -951,24 +1036,24 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat Con_DPrintf("enumerating modes yielded a bogus item... please debug this\n"); continue; } - if(developer.integer >= 100) - Con_Printf("Found mode %dx%dx%dbpp %dHz... ", (int)thismode.dmPelsWidth, (int)thismode.dmPelsHeight, (int)thismode.dmBitsPerPel, (int)thismode.dmDisplayFrequency); + if(developer_extra.integer) + Con_DPrintf("Found mode %dx%dx%dbpp %dHz... ", (int)thismode.dmPelsWidth, (int)thismode.dmPelsHeight, (int)thismode.dmBitsPerPel, (int)thismode.dmDisplayFrequency); if(thismode.dmBitsPerPel != (DWORD)bpp) { - if(developer.integer >= 100) - Con_Printf("wrong bpp\n"); + if(developer_extra.integer) + Con_DPrintf("wrong bpp\n"); continue; } if(thismode.dmPelsWidth != (DWORD)width) { - if(developer.integer >= 100) - Con_Printf("wrong width\n"); + if(developer_extra.integer) + Con_DPrintf("wrong width\n"); continue; } if(thismode.dmPelsHeight != (DWORD)height) { - if(developer.integer >= 100) - Con_Printf("wrong height\n"); + if(developer_extra.integer) + Con_DPrintf("wrong height\n"); continue; } @@ -977,14 +1062,14 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat // if we have a good mode, make sure this mode is better than the previous one, and allowed by the refreshrate if(thismode.dmDisplayFrequency > (DWORD)refreshrate) { - if(developer.integer >= 100) - Con_Printf("too high refresh rate\n"); + if(developer_extra.integer) + Con_DPrintf("too high refresh rate\n"); continue; } else if(thismode.dmDisplayFrequency <= gdevmode.dmDisplayFrequency) { - if(developer.integer >= 100) - Con_Printf("doesn't beat previous best match (too low)\n"); + if(developer_extra.integer) + Con_DPrintf("doesn't beat previous best match (too low)\n"); continue; } } @@ -993,8 +1078,8 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat // we do have one, but it isn't good... make sure it has a lower frequency than the previous one if(thismode.dmDisplayFrequency >= gdevmode.dmDisplayFrequency) { - if(developer.integer >= 100) - Con_Printf("doesn't beat previous best match (too high)\n"); + if(developer_extra.integer) + Con_DPrintf("doesn't beat previous best match (too high)\n"); continue; } } @@ -1005,12 +1090,12 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat foundgoodmode = true; else { - if(developer.integer >= 100) - Con_Printf("(out of range)\n"); + if(developer_extra.integer) + Con_DPrintf("(out of range)\n"); } foundmode = true; - if(developer.integer >= 100) - Con_Printf("accepted\n"); + if(developer_extra.integer) + Con_DPrintf("accepted\n"); } } @@ -1054,32 +1139,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat ExWindowStyle = 0; } - rect.top = 0; - rect.left = 0; - rect.right = width; - rect.bottom = height; - AdjustWindowRectEx(&rect, WindowStyle, false, 0); - - if (fullscreen) - { - CenterX = 0; - CenterY = 0; - } - else - { - CenterX = (GetSystemMetrics(SM_CXSCREEN) - (rect.right - rect.left)) / 2; - CenterY = (GetSystemMetrics(SM_CYSCREEN) - (rect.bottom - rect.top)) / 2; - } - CenterX = max(0, CenterX); - CenterY = max(0, CenterY); - - // x and y may be changed by WM_MOVE messages - window_x = CenterX; - window_y = CenterY; - rect.left += CenterX; - rect.right += CenterX; - rect.top += CenterY; - rect.bottom += CenterY; + AdjustWindowBounds(fullscreen, &width, &height, mode, WindowStyle, &rect); pixelformat = 0; newpixelformat = 0; @@ -1092,7 +1152,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL); if (!mainwindow) { - Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %d, %p) failed\n", (int)ExWindowStyle, "DarkPlacesWindowClass", gamename, (int)WindowStyle, (int)(rect.left), (int)(rect.top), (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), NULL, NULL, (int)global_hInstance, NULL); + Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %p, %p) failed\n", (int)ExWindowStyle, "DarkPlacesWindowClass", gamename, (int)WindowStyle, (int)(rect.left), (int)(rect.top), (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), (void *)NULL, (void *)NULL, (void *)global_hInstance, (void *)NULL); VID_Shutdown(); return false; } @@ -1105,14 +1165,14 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat if (!pixelformat) { VID_Shutdown(); - Con_Printf("ChoosePixelFormat(%d, %p) failed\n", (int)baseDC, &pfd); + Con_Printf("ChoosePixelFormat(%p, %p) failed\n", (void *)baseDC, (void *)&pfd); return false; } if (SetPixelFormat(baseDC, pixelformat, &pfd) == false) { VID_Shutdown(); - Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", (int)baseDC, pixelformat, &pfd); + Con_Printf("SetPixelFormat(%p, %d, %p) failed\n", (void *)baseDC, pixelformat, (void *)&pfd); return false; } @@ -1133,7 +1193,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat if (!qwglMakeCurrent(baseDC, baseRC)) { VID_Shutdown(); - Con_Printf("wglMakeCurrent(%d, %d) failed\n", (int)baseDC, (int)baseRC); + Con_Printf("wglMakeCurrent(%p, %p) failed\n", (void *)baseDC, (void *)baseRC); return false; } @@ -1212,194 +1272,797 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat // fix the leftover Alt from any Alt-Tab or the like that switched us away ClearAllStates (); - gl_videosyncavailable = false; - // COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control - gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false); + GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false); GL_Init (); //vid_menudrawfn = VID_MenuDraw; //vid_menukeyfn = VID_MenuKey; vid_usingmouse = false; + vid_usinghidecursor = false; vid_usingvsync = false; - vid_hidden = false; + vid_reallyhidden = vid_hidden = false; vid_initialized = true; IN_StartupMouse (); - IN_StartupJoystick (); - if (gl_videosyncavailable) + if (qwglSwapIntervalEXT) { - vid_usevsync = vid_vsync.integer; - vid_usingvsync = vid_vsync.integer; + vid_usevsync = vid_vsync.integer != 0; + vid_usingvsync = vid_vsync.integer != 0; qwglSwapIntervalEXT (vid_usevsync); } return true; } -static void IN_Shutdown(void); -void VID_Shutdown (void) -{ - if(vid_initialized == false) - return; - - VID_GrabMouse(false); - VID_RestoreSystemGamma(); - - vid_initialized = false; - IN_Shutdown(); - if (qwglMakeCurrent) - qwglMakeCurrent(NULL, NULL); - if (baseRC && qwglDeleteContext) - qwglDeleteContext(baseRC); - // close the library before we get rid of the window - GL_CloseLibrary(); - if (baseDC && mainwindow) - ReleaseDC(mainwindow, baseDC); - AppActivate(false, false); - if (mainwindow) - DestroyWindow(mainwindow); - mainwindow = 0; - if (vid_isfullscreen) - ChangeDisplaySettings (NULL, 0); - vid_isfullscreen = false; -} - -void VID_GrabMouse(qboolean grab) +static void AdjustWindowBounds(int fullscreen, int *width, int *height, viddef_mode_t *mode, DWORD WindowStyle, RECT *rect) { - static qboolean restore_spi; - static int originalmouseparms[3]; + int CenterX, CenterY; - if (!mouseinitialized) - return; + rect->top = 0; + rect->left = 0; + rect->right = *width; + rect->bottom = *height; + AdjustWindowRectEx(rect, WindowStyle, false, 0); - if (grab) + if (fullscreen) { - if (!vid_usingmouse) - { - vid_usingmouse = true; - cl_ignoremousemoves = 2; -#ifdef SUPPORTDIRECTX - if (dinput && g_pMouse) - { - IDirectInputDevice_Acquire(g_pMouse); - dinput_acquired = true; - } - else -#endif - { - RECT window_rect; - window_rect.left = window_x; - window_rect.top = window_y; - window_rect.right = window_x + vid.width; - window_rect.bottom = window_y + vid.height; - - // change mouse settings to turn off acceleration -// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only) - if (!COM_CheckParm ("-noforcemparms") && SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0)) - { - int newmouseparms[3]; - newmouseparms[0] = 0; // threshold to double movement (only if accel level is >= 1) - newmouseparms[1] = 0; // threshold to quadruple movement (only if accel level is >= 2) - newmouseparms[2] = 0; // maximum level of acceleration (0 = off) - restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0); - } - else - restore_spi = false; - SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2)); - - SetCapture (mainwindow); - ClipCursor (&window_rect); - } - ShowCursor (false); - } + CenterX = 0; + CenterY = 0; } else { - if (vid_usingmouse) + RECT workArea; + SystemParametersInfo(SPI_GETWORKAREA, NULL, &workArea, 0); + int workWidth = workArea.right - workArea.left; + int workHeight = workArea.bottom - workArea.top; + + // if height/width matches physical screen height/width, adjust it to available desktop size + // and allow 2 pixels on top for the title bar so the window can be moved + const int titleBarPixels = 2; + if (*width == GetSystemMetrics(SM_CXSCREEN) && (*height == GetSystemMetrics(SM_CYSCREEN) || *height == workHeight - titleBarPixels)) { - vid_usingmouse = false; - cl_ignoremousemoves = 2; -#ifdef SUPPORTDIRECTX - if (dinput_acquired) - { - IDirectInputDevice_Unacquire(g_pMouse); - dinput_acquired = false; - } - else -#endif - { - // restore system mouseparms if we changed them - if (restore_spi) - SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0); - restore_spi = false; - ClipCursor (NULL); - ReleaseCapture (); - } - ShowCursor (true); + rect->right -= *width - workWidth; + *width = mode->width = workWidth; + rect->bottom -= *height - (workHeight - titleBarPixels); + *height = mode->height = workHeight - titleBarPixels; + CenterX = 0; + CenterY = titleBarPixels; + } + else + { + CenterX = max(0, (workWidth - *width) / 2); + CenterY = max(0, (workHeight - *height) / 2); } } + + // x and y may be changed by WM_MOVE messages + window_x = CenterX; + window_y = CenterY; + rect->left += CenterX; + rect->right += CenterX; + rect->top += CenterY; + rect->bottom += CenterY; } +#ifdef SUPPORTD3D +static D3DADAPTER_IDENTIFIER9 d3d9adapteridentifier; -#ifdef SUPPORTDIRECTX -/* -=========== -IN_InitDInput -=========== -*/ -static qboolean IN_InitDInput (void) +extern cvar_t gl_info_extensions; +extern cvar_t gl_info_vendor; +extern cvar_t gl_info_renderer; +extern cvar_t gl_info_version; +extern cvar_t gl_info_platform; +extern cvar_t gl_info_driver; +qboolean VID_InitModeDX(viddef_mode_t *mode, int version) { - HRESULT hr; - DIPROPDWORD dipdw = { - { - sizeof(DIPROPDWORD), // diph.dwSize - sizeof(DIPROPHEADER), // diph.dwHeaderSize - 0, // diph.dwObj - DIPH_DEVICE, // diph.dwHow - }, - DINPUT_BUFFERSIZE, // dwData - }; + int deviceindex; + RECT rect; + MSG msg; + DWORD WindowStyle, ExWindowStyle; + int bpp = mode->bitsperpixel; + int width = mode->width; + int height = mode->height; + int refreshrate = (int)floor(mode->refreshrate+0.5); +// int stereobuffer = mode->stereobuffer; + int samples = mode->samples; + int fullscreen = mode->fullscreen; + int numdevices; - if (!hInstDI) - { - hInstDI = LoadLibrary("dinput.dll"); + if (vid_initialized) + Sys_Error("VID_InitMode called when video is already initialised"); - if (hInstDI == NULL) - { - Con_Print("Couldn't load dinput.dll\n"); - return false; - } + vid_isfullscreen = fullscreen != 0; + if (fullscreen) + { + WindowStyle = WS_POPUP; + ExWindowStyle = WS_EX_TOPMOST; } - - if (!pDirectInputCreate) + else { - pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA"); - - if (!pDirectInputCreate) - { - Con_Print("Couldn't get DI proc addr\n"); - return false; - } + WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + ExWindowStyle = 0; } -// register with DirectInput and get an IDirectInput to play with. - hr = iDirectInputCreate(global_hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL); + AdjustWindowBounds(fullscreen, &width, &height, mode, WindowStyle, &rect); - if (FAILED(hr)) + gl_extensions = ""; + gl_platformextensions = ""; + + mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL); + if (!mainwindow) { + Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %p, %p) failed\n", (int)ExWindowStyle, "DarkPlacesWindowClass", gamename, (int)WindowStyle, (int)(rect.left), (int)(rect.top), (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), (void *)NULL, (void *)NULL, global_hInstance, (void *)NULL); + VID_Shutdown(); return false; } -// obtain an interface to the system mouse device. - hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL); + baseDC = GetDC(mainwindow); - if (FAILED(hr)) + vid_d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + if (!vid_d3d9) + Sys_Error("VID_InitMode: Direct3DCreate9 failed"); + + numdevices = IDirect3D9_GetAdapterCount(vid_d3d9); + vid_d3d9dev = NULL; + memset(&d3d9adapteridentifier, 0, sizeof(d3d9adapteridentifier)); + for (deviceindex = 0;deviceindex < numdevices && !vid_d3d9dev;deviceindex++) { - Con_Print("Couldn't open DI mouse device\n"); - return false; + memset(&vid_d3dpresentparameters, 0, sizeof(vid_d3dpresentparameters)); +// vid_d3dpresentparameters.Flags = D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL; + vid_d3dpresentparameters.Flags = 0; + vid_d3dpresentparameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + vid_d3dpresentparameters.hDeviceWindow = mainwindow; + vid_d3dpresentparameters.BackBufferWidth = width; + vid_d3dpresentparameters.BackBufferHeight = height; + vid_d3dpresentparameters.MultiSampleType = samples > 1 ? (D3DMULTISAMPLE_TYPE)samples : D3DMULTISAMPLE_NONE; + vid_d3dpresentparameters.BackBufferCount = fullscreen ? (vid_dx9_triplebuffer.integer ? 3 : 2) : 1; + vid_d3dpresentparameters.FullScreen_RefreshRateInHz = fullscreen ? refreshrate : 0; + vid_d3dpresentparameters.Windowed = !fullscreen; + vid_d3dpresentparameters.EnableAutoDepthStencil = true; + vid_d3dpresentparameters.AutoDepthStencilFormat = bpp > 16 ? D3DFMT_D24S8 : D3DFMT_D16; + vid_d3dpresentparameters.BackBufferFormat = fullscreen?D3DFMT_X8R8G8B8:D3DFMT_UNKNOWN; + vid_d3dpresentparameters.PresentationInterval = vid_vsync.integer ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; + + memset(&d3d9adapteridentifier, 0, sizeof(d3d9adapteridentifier)); + IDirect3D9_GetAdapterIdentifier(vid_d3d9, deviceindex, 0, &d3d9adapteridentifier); + + IDirect3D9_CreateDevice(vid_d3d9, deviceindex, vid_dx9_hal.integer ? D3DDEVTYPE_HAL : D3DDEVTYPE_REF, mainwindow, vid_dx9_softvertex.integer ? D3DCREATE_SOFTWARE_VERTEXPROCESSING : D3DCREATE_HARDWARE_VERTEXPROCESSING, &vid_d3dpresentparameters, &vid_d3d9dev); + } + + if (!vid_d3d9dev) + { + VID_Shutdown(); + return false; + } + + IDirect3DDevice9_GetDeviceCaps(vid_d3d9dev, &vid_d3d9caps); + + Con_Printf("Using D3D9 device: %s\n", d3d9adapteridentifier.Description); + gl_extensions = ""; + gl_platform = "D3D9"; + gl_platformextensions = ""; + + ShowWindow (mainwindow, SW_SHOWDEFAULT); + UpdateWindow (mainwindow); + + // now we try to make sure we get the focus on the mode switch, because + // sometimes in some systems we don't. We grab the foreground, then + // finish setting up, pump all our messages, and sleep for a little while + // to let messages finish bouncing around the system, then we put + // ourselves at the top of the z order, then grab the foreground again, + // Who knows if it helps, but it probably doesn't hurt + SetForegroundWindow (mainwindow); + + while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage (&msg); + DispatchMessage (&msg); + } + + Sleep (100); + + SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOCOPYBITS); + + SetForegroundWindow (mainwindow); + + // fix the leftover Alt from any Alt-Tab or the like that switched us away + ClearAllStates (); + + gl_renderer = d3d9adapteridentifier.Description; + gl_vendor = d3d9adapteridentifier.Driver; + gl_version = ""; + gl_extensions = ""; + + Con_Printf("D3D9 adapter info:\n"); + Con_Printf("Description: %s\n", d3d9adapteridentifier.Description); + Con_Printf("DeviceId: %x\n", (unsigned int)d3d9adapteridentifier.DeviceId); + Con_Printf("DeviceName: %p\n", d3d9adapteridentifier.DeviceName); + Con_Printf("Driver: %s\n", d3d9adapteridentifier.Driver); + Con_Printf("DriverVersion: %08x%08x\n", (unsigned int)d3d9adapteridentifier.DriverVersion.u.HighPart, (unsigned int)d3d9adapteridentifier.DriverVersion.u.LowPart); + Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions); + Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions); + + // clear the extension flags + memset(&vid.support, 0, sizeof(vid.support)); + Cvar_SetQuick(&gl_info_extensions, ""); + + // D3D9 requires BGRA + vid.forcetextype = TEXTYPE_BGRA; + + vid.forcevbo = false; + vid.support.arb_depth_texture = true; + vid.support.arb_draw_buffers = vid_d3d9caps.NumSimultaneousRTs > 1; + vid.support.arb_occlusion_query = true; // can't find a cap for this + vid.support.arb_query_buffer_object = true; + vid.support.arb_shadow = true; + vid.support.arb_texture_compression = true; + vid.support.arb_texture_cube_map = true; + vid.support.arb_texture_non_power_of_two = (vid_d3d9caps.TextureCaps & D3DPTEXTURECAPS_POW2) == 0; + vid.support.arb_vertex_buffer_object = true; + vid.support.ext_blend_subtract = true; + vid.support.ext_draw_range_elements = true; + vid.support.ext_framebuffer_object = true; + + vid.support.ext_texture_3d = true; + vid.support.ext_texture_compression_s3tc = true; + vid.support.ext_texture_filter_anisotropic = true; + vid.support.ati_separate_stencil = (vid_d3d9caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED) != 0; + vid.support.ext_texture_srgb = false; // FIXME use D3DSAMP_SRGBTEXTURE if CheckDeviceFormat agrees + + vid.maxtexturesize_2d = min(vid_d3d9caps.MaxTextureWidth, vid_d3d9caps.MaxTextureHeight); + vid.maxtexturesize_3d = vid_d3d9caps.MaxVolumeExtent; + vid.maxtexturesize_cubemap = vid.maxtexturesize_2d; + vid.texunits = 4; + vid.teximageunits = vid_d3d9caps.MaxSimultaneousTextures; + vid.texarrayunits = 8; // can't find a caps field for this? + vid.max_anisotropy = vid_d3d9caps.MaxAnisotropy; + vid.maxdrawbuffers = vid_d3d9caps.NumSimultaneousRTs; + + vid.texunits = bound(4, vid.texunits, MAX_TEXTUREUNITS); + vid.teximageunits = bound(16, vid.teximageunits, MAX_TEXTUREUNITS); + vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS); + Con_DPrintf("Using D3D9.0 rendering path - %i texture matrix, %i texture images, %i texcoords, shadowmapping supported%s\n", vid.texunits, vid.teximageunits, vid.texarrayunits, vid.maxdrawbuffers > 1 ? ", MRT detected (allows prepass deferred lighting)" : ""); + vid.renderpath = RENDERPATH_D3D9; + vid.sRGBcapable2D = false; + vid.sRGBcapable3D = true; + vid.useinterleavedarrays = true; + + Cvar_SetQuick(&gl_info_vendor, gl_vendor); + Cvar_SetQuick(&gl_info_renderer, gl_renderer); + Cvar_SetQuick(&gl_info_version, gl_version); + Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : ""); + Cvar_SetQuick(&gl_info_driver, gl_driver); + + // LordHavoc: report supported extensions + Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions ); + + // clear to black (loading plaque will be seen over this) + IDirect3DDevice9_Clear(vid_d3d9dev, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); + IDirect3DDevice9_BeginScene(vid_d3d9dev); + IDirect3DDevice9_EndScene(vid_d3d9dev); + IDirect3DDevice9_Present(vid_d3d9dev, NULL, NULL, NULL, NULL); + // because the only time we end/begin scene is in VID_Finish, we'd better start a scene now... + IDirect3DDevice9_BeginScene(vid_d3d9dev); + vid_begunscene = true; + + //vid_menudrawfn = VID_MenuDraw; + //vid_menukeyfn = VID_MenuKey; + vid_usingmouse = false; + vid_usinghidecursor = false; + vid_usingvsync = false; + vid_hidden = vid_reallyhidden = false; + vid_initialized = true; + + IN_StartupMouse (); + + return true; +} +#endif + +qboolean VID_InitModeSOFT(viddef_mode_t *mode) +{ + int i; + HDC hdc; + RECT rect; + MSG msg; + int pixelformat, newpixelformat; + DWORD WindowStyle, ExWindowStyle; + int depth; + DEVMODE thismode; + qboolean foundmode, foundgoodmode; + int bpp = mode->bitsperpixel; + int width = mode->width; + int height = mode->height; + int refreshrate = (int)floor(mode->refreshrate+0.5); + int fullscreen = mode->fullscreen; + + if (vid_initialized) + Sys_Error("VID_InitMode called when video is already initialised"); + + memset(&gdevmode, 0, sizeof(gdevmode)); + + vid_isfullscreen = false; + if (fullscreen) + { + if(vid_forcerefreshrate.integer) + { + foundmode = true; + gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + gdevmode.dmBitsPerPel = bpp; + gdevmode.dmPelsWidth = width; + gdevmode.dmPelsHeight = height; + gdevmode.dmSize = sizeof (gdevmode); + if(refreshrate) + { + gdevmode.dmFields |= DM_DISPLAYFREQUENCY; + gdevmode.dmDisplayFrequency = refreshrate; + } + } + else + { + if(refreshrate == 0) + refreshrate = initialdevmode.dmDisplayFrequency; // default vid_refreshrate to the rate of the desktop + + foundmode = false; + foundgoodmode = false; + + thismode.dmSize = sizeof(thismode); + thismode.dmDriverExtra = 0; + for(i = 0; EnumDisplaySettings(NULL, i, &thismode); ++i) + { + if(~thismode.dmFields & (DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY)) + { + Con_DPrintf("enumerating modes yielded a bogus item... please debug this\n"); + continue; + } + if(developer_extra.integer) + Con_DPrintf("Found mode %dx%dx%dbpp %dHz... ", (int)thismode.dmPelsWidth, (int)thismode.dmPelsHeight, (int)thismode.dmBitsPerPel, (int)thismode.dmDisplayFrequency); + if(thismode.dmBitsPerPel != (DWORD)bpp) + { + if(developer_extra.integer) + Con_DPrintf("wrong bpp\n"); + continue; + } + if(thismode.dmPelsWidth != (DWORD)width) + { + if(developer_extra.integer) + Con_DPrintf("wrong width\n"); + continue; + } + if(thismode.dmPelsHeight != (DWORD)height) + { + if(developer_extra.integer) + Con_DPrintf("wrong height\n"); + continue; + } + + if(foundgoodmode) + { + // if we have a good mode, make sure this mode is better than the previous one, and allowed by the refreshrate + if(thismode.dmDisplayFrequency > (DWORD)refreshrate) + { + if(developer_extra.integer) + Con_DPrintf("too high refresh rate\n"); + continue; + } + else if(thismode.dmDisplayFrequency <= gdevmode.dmDisplayFrequency) + { + if(developer_extra.integer) + Con_DPrintf("doesn't beat previous best match (too low)\n"); + continue; + } + } + else if(foundmode) + { + // we do have one, but it isn't good... make sure it has a lower frequency than the previous one + if(thismode.dmDisplayFrequency >= gdevmode.dmDisplayFrequency) + { + if(developer_extra.integer) + Con_DPrintf("doesn't beat previous best match (too high)\n"); + continue; + } + } + // otherwise, take anything + + memcpy(&gdevmode, &thismode, sizeof(gdevmode)); + if(thismode.dmDisplayFrequency <= (DWORD)refreshrate) + foundgoodmode = true; + else + { + if(developer_extra.integer) + Con_DPrintf("(out of range)\n"); + } + foundmode = true; + if(developer_extra.integer) + Con_DPrintf("accepted\n"); + } + } + + if (!foundmode) + { + VID_Shutdown(); + Con_Printf("Unable to find the requested mode %dx%dx%dbpp\n", width, height, bpp); + return false; + } + else if(ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) + { + VID_Shutdown(); + Con_Printf("Unable to change to requested mode %dx%dx%dbpp\n", width, height, bpp); + return false; + } + + vid_isfullscreen = true; + WindowStyle = WS_POPUP; + ExWindowStyle = WS_EX_TOPMOST; + } + else + { + hdc = GetDC (NULL); + i = GetDeviceCaps(hdc, RASTERCAPS); + depth = GetDeviceCaps(hdc, PLANES) * GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC (NULL, hdc); + if (i & RC_PALETTE) + { + VID_Shutdown(); + Con_Print("Can't run in non-RGB mode\n"); + return false; + } + if (bpp > depth) + { + VID_Shutdown(); + Con_Print("A higher desktop depth is required to run this video mode\n"); + return false; + } + + WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + ExWindowStyle = 0; + } + + AdjustWindowBounds(fullscreen, &width, &height, mode, WindowStyle, &rect); + + pixelformat = 0; + newpixelformat = 0; + gl_extensions = ""; + gl_platformextensions = ""; + + mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL); + if (!mainwindow) + { + Con_Printf("CreateWindowEx(%d, %s, %s, %d, %d, %d, %d, %d, %p, %p, %p, %p) failed\n", (int)ExWindowStyle, "DarkPlacesWindowClass", gamename, (int)WindowStyle, (int)(rect.left), (int)(rect.top), (int)(rect.right - rect.left), (int)(rect.bottom - rect.top), (void *)NULL, (void *)NULL, (void *)global_hInstance, (void *)NULL); + VID_Shutdown(); + return false; + } + + baseDC = GetDC(mainwindow); + vid.softpixels = NULL; + memset(&vid_softbmi, 0, sizeof(vid_softbmi)); + vid_softbmi.bmiHeader.biSize = sizeof(vid_softbmi.bmiHeader); + vid_softbmi.bmiHeader.biWidth = width; + vid_softbmi.bmiHeader.biHeight = -height; // negative to make a top-down bitmap + vid_softbmi.bmiHeader.biPlanes = 1; + vid_softbmi.bmiHeader.biBitCount = 32; + vid_softbmi.bmiHeader.biCompression = BI_RGB; + vid_softbmi.bmiHeader.biSizeImage = width*height*4; + vid_softbmi.bmiHeader.biClrUsed = 256; + vid_softbmi.bmiHeader.biClrImportant = 256; + vid_softdibhandle = CreateDIBSection(baseDC, &vid_softbmi, DIB_RGB_COLORS, (void **)&vid.softpixels, NULL, 0); + if (!vid_softdibhandle) + { + Con_Printf("CreateDIBSection failed\n"); + VID_Shutdown(); + return false; + } + + vid_softhdc = CreateCompatibleDC(baseDC); + vid_softhdc_backup = SelectObject(vid_softhdc, vid_softdibhandle); + if (!vid_softhdc_backup) + { + Con_Printf("SelectObject failed\n"); + VID_Shutdown(); + return false; + } +// ReleaseDC(mainwindow, baseDC); +// baseDC = NULL; + + vid.softdepthpixels = (unsigned int *)calloc(1, mode->width * mode->height * 4); + if (DPSOFTRAST_Init(mode->width, mode->height, vid_soft_threads.integer, vid_soft_interlace.integer, (unsigned int *)vid.softpixels, (unsigned int *)vid.softdepthpixels) < 0) + { + Con_Printf("Failed to initialize software rasterizer\n"); + VID_Shutdown(); + return false; + } + + VID_Soft_SharedSetup(); + + ShowWindow (mainwindow, SW_SHOWDEFAULT); + UpdateWindow (mainwindow); + + // now we try to make sure we get the focus on the mode switch, because + // sometimes in some systems we don't. We grab the foreground, then + // finish setting up, pump all our messages, and sleep for a little while + // to let messages finish bouncing around the system, then we put + // ourselves at the top of the z order, then grab the foreground again, + // Who knows if it helps, but it probably doesn't hurt + SetForegroundWindow (mainwindow); + + while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage (&msg); + DispatchMessage (&msg); + } + + Sleep (100); + + SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0, SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOCOPYBITS); + + SetForegroundWindow (mainwindow); + + // fix the leftover Alt from any Alt-Tab or the like that switched us away + ClearAllStates (); + + //vid_menudrawfn = VID_MenuDraw; + //vid_menukeyfn = VID_MenuKey; + vid_usingmouse = false; + vid_usinghidecursor = false; + vid_usingvsync = false; + vid_reallyhidden = vid_hidden = false; + vid_initialized = true; + + IN_StartupMouse (); + + return true; +} + +qboolean VID_InitMode(viddef_mode_t *mode) +{ +#ifdef SSE_POSSIBLE + if (vid_soft.integer) + return VID_InitModeSOFT(mode); +#endif +#ifdef SUPPORTD3D +// if (vid_dx11.integer) +// return VID_InitModeDX(mode, 11); +// if (vid_dx10.integer) +// return VID_InitModeDX(mode, 10); + if (vid_dx9.integer) + return VID_InitModeDX(mode, 9); +#endif + return VID_InitModeGL(mode); +} + + +static void IN_Shutdown(void); +void VID_Shutdown (void) +{ + qboolean isgl; + if(vid_initialized == false) + return; + + VID_EnableJoystick(false); + VID_SetMouse(false, false, false); + + vid_initialized = false; + isgl = gldll != NULL; + IN_Shutdown(); + gl_driver[0] = 0; + gl_extensions = ""; + gl_platform = ""; + gl_platformextensions = ""; + if (vid_softhdc) + { + SelectObject(vid_softhdc, vid_softhdc_backup); + ReleaseDC(mainwindow, vid_softhdc); + } + vid_softhdc = NULL; + vid_softhdc_backup = NULL; + if (vid_softdibhandle) + DeleteObject(vid_softdibhandle); + vid_softdibhandle = NULL; + vid.softpixels = NULL; + if (vid.softdepthpixels) + free(vid.softdepthpixels); + vid.softdepthpixels = NULL; +#ifdef SUPPORTD3D + if (vid_d3d9dev) + { + if (vid_begunscene) + IDirect3DDevice9_EndScene(vid_d3d9dev); + vid_begunscene = false; +// Cmd_ExecuteString("r_texturestats", src_command, true); +// Cmd_ExecuteString("memlist", src_command, true); + IDirect3DDevice9_Release(vid_d3d9dev); + } + vid_d3d9dev = NULL; + if (vid_d3d9) + IDirect3D9_Release(vid_d3d9); + vid_d3d9 = NULL; +#endif + if (qwglMakeCurrent) + qwglMakeCurrent(NULL, NULL); + qwglMakeCurrent = NULL; + if (baseRC && qwglDeleteContext) + qwglDeleteContext(baseRC); + qwglDeleteContext = NULL; + // close the library before we get rid of the window + GL_CloseLibrary(); + if (baseDC && mainwindow) + ReleaseDC(mainwindow, baseDC); + baseDC = NULL; + AppActivate(false, false); + if (mainwindow) + DestroyWindow(mainwindow); + mainwindow = 0; + if (vid_isfullscreen && isgl) + ChangeDisplaySettings (NULL, CDS_FULLSCREEN); + vid_isfullscreen = false; +} + +void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) +{ + static qboolean restore_spi; + static int originalmouseparms[3]; + + if (!mouseinitialized) + return; + + if (relative) + { + if (!vid_usingmouse) + { + vid_usingmouse = true; + cl_ignoremousemoves = 2; +#ifdef SUPPORTDIRECTX + if (dinput && g_pMouse) + { + IDirectInputDevice_Acquire(g_pMouse); + dinput_acquired = true; + } + else +#endif + { + RECT window_rect; + window_rect.left = window_x; + window_rect.top = window_y; + window_rect.right = window_x + vid.width; + window_rect.bottom = window_y + vid.height; + + // change mouse settings to turn off acceleration +// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only) + if (!COM_CheckParm ("-noforcemparms") && SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0)) + { + int newmouseparms[3]; + newmouseparms[0] = 0; // threshold to double movement (only if accel level is >= 1) + newmouseparms[1] = 0; // threshold to quadruple movement (only if accel level is >= 2) + newmouseparms[2] = 0; // maximum level of acceleration (0 = off) + restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0) != FALSE; + } + else + restore_spi = false; + SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2)); + + SetCapture (mainwindow); + ClipCursor (&window_rect); + } + } + } + else + { + if (vid_usingmouse) + { + vid_usingmouse = false; + cl_ignoremousemoves = 2; +#ifdef SUPPORTDIRECTX + if (dinput_acquired) + { + IDirectInputDevice_Unacquire(g_pMouse); + dinput_acquired = false; + } + else +#endif + { + // restore system mouseparms if we changed them + if (restore_spi) + SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0); + restore_spi = false; + ClipCursor (NULL); + ReleaseCapture (); + } + } + } + + if (vid_usinghidecursor != hidecursor) + { + vid_usinghidecursor = hidecursor; + ShowCursor (!hidecursor); + } +} + +void VID_BuildJoyState(vid_joystate_t *joystate) +{ + VID_Shared_BuildJoyState_Begin(joystate); + VID_Shared_BuildJoyState_Finish(joystate); +} + +void VID_EnableJoystick(qboolean enable) +{ + int index = joy_enable.integer > 0 ? joy_index.integer : -1; + qboolean success = false; + int sharedcount = 0; + sharedcount = VID_Shared_SetJoystick(index); + if (index >= 0 && index < sharedcount) + success = true; + + // update cvar containing count of XInput joysticks + if (joy_detected.integer != sharedcount) + Cvar_SetValueQuick(&joy_detected, sharedcount); + + if (joy_active.integer != (success ? 1 : 0)) + Cvar_SetValueQuick(&joy_active, success ? 1 : 0); +} + +#ifdef SUPPORTDIRECTX +/* +=========== +IN_InitDInput +=========== +*/ +static qboolean IN_InitDInput (void) +{ + HRESULT hr; + DIPROPDWORD dipdw = { + { + sizeof(DIPROPDWORD), // diph.dwSize + sizeof(DIPROPHEADER), // diph.dwHeaderSize + 0, // diph.dwObj + DIPH_DEVICE, // diph.dwHow + }, + DINPUT_BUFFERSIZE, // dwData + }; + + if (!hInstDI) + { + hInstDI = LoadLibrary("dinput.dll"); + + if (hInstDI == NULL) + { + Con_Print("Couldn't load dinput.dll\n"); + return false; + } + } + + if (!pDirectInputCreate) + { + pDirectInputCreate = (HRESULT (__stdcall *)(HINSTANCE,DWORD,LPDIRECTINPUT *,LPUNKNOWN))GetProcAddress(hInstDI,"DirectInputCreateA"); + + if (!pDirectInputCreate) + { + Con_Print("Couldn't get DI proc addr\n"); + return false; + } + } + +// register with DirectInput and get an IDirectInput to play with. + hr = iDirectInputCreate(global_hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL); + + if (FAILED(hr)) + { + return false; + } + +// obtain an interface to the system mouse device. +#ifdef __cplusplus + hr = IDirectInput_CreateDevice(g_pdi, GUID_SysMouse, &g_pMouse, NULL); +#else + hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL); +#endif + + if (FAILED(hr)) + { + Con_Print("Couldn't open DI mouse device\n"); + return false; } // set the data format to "mouse format". @@ -1450,7 +2113,7 @@ static void IN_StartupMouse (void) mouseinitialized = true; #ifdef SUPPORTDIRECTX -// COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse/joystick input +// COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse input if (COM_CheckParm ("-dinput")) dinput = IN_InitDInput (); @@ -1507,57 +2170,31 @@ static void IN_MouseMove (void) /* Look at the element to see what happened */ - switch (od.dwOfs) + if ((int)od.dwOfs == DIMOFS_X) + in_mouse_x += (LONG) od.dwData; + if ((int)od.dwOfs == DIMOFS_Y) + in_mouse_y += (LONG) od.dwData; + if ((int)od.dwOfs == DIMOFS_Z) { - case DIMOFS_X: - in_mouse_x += (LONG) od.dwData; - break; - - case DIMOFS_Y: - in_mouse_y += (LONG) od.dwData; - break; - - case DIMOFS_Z: - if((LONG) od.dwData < 0) - { - Key_Event (K_MWHEELDOWN, 0, true); - Key_Event (K_MWHEELDOWN, 0, false); - } - else if((LONG) od.dwData > 0) - { - Key_Event (K_MWHEELUP, 0, true); - Key_Event (K_MWHEELUP, 0, false); - } - break; - - case DIMOFS_BUTTON0: - if (od.dwData & 0x80) - mstate_di |= 1; - else - mstate_di &= ~1; - break; - - case DIMOFS_BUTTON1: - if (od.dwData & 0x80) - mstate_di |= (1<<1); - else - mstate_di &= ~(1<<1); - break; - - case DIMOFS_BUTTON2: - if (od.dwData & 0x80) - mstate_di |= (1<<2); - else - mstate_di &= ~(1<<2); - break; - - case DIMOFS_BUTTON3: - if (od.dwData & 0x80) - mstate_di |= (1<<3); - else - mstate_di &= ~(1<<3); - break; + if((LONG)od.dwData < 0) + { + Key_Event(K_MWHEELDOWN, 0, true); + Key_Event(K_MWHEELDOWN, 0, false); + } + else if((LONG)od.dwData > 0) + { + Key_Event(K_MWHEELUP, 0, true); + Key_Event(K_MWHEELUP, 0, false); + } } + if ((int)od.dwOfs == DIMOFS_BUTTON0) + mstate_di = (mstate_di & ~1) | ((od.dwData & 0x80) >> 7); + if ((int)od.dwOfs == DIMOFS_BUTTON1) + mstate_di = (mstate_di & ~2) | ((od.dwData & 0x80) >> 6); + if ((int)od.dwOfs == DIMOFS_BUTTON2) + mstate_di = (mstate_di & ~4) | ((od.dwData & 0x80) >> 5); + if ((int)od.dwOfs == DIMOFS_BUTTON3) + mstate_di = (mstate_di & ~8) | ((od.dwData & 0x80) >> 4); } // perform button actions @@ -1586,472 +2223,19 @@ IN_Move */ void IN_Move (void) { - if (vid_activewindow && !vid_hidden) - { + vid_joystate_t joystate; + if (vid_activewindow && !vid_reallyhidden) IN_MouseMove (); - IN_JoyMove (); - } -} - - -/* -=============== -IN_StartupJoystick -=============== -*/ -static void IN_StartupJoystick (void) -{ - int numdevs; - JOYCAPS jc; - MMRESULT mmr; - mmr = 0; - - // assume no joystick - joy_avail = false; - - // abort startup if user requests no joystick -// COMMANDLINEOPTION: Windows Input: -nojoy disables joystick support, may be a small speed increase - if (COM_CheckParm ("-nojoy")) - return; - - // verify joystick driver is present - if ((numdevs = joyGetNumDevs ()) == 0) - { - Con_Print("\njoystick not found -- driver not present\n\n"); - return; - } - - // cycle through the joystick ids for the first valid one - for (joy_id=0 ; joy_id 14000.0) - fTemp = 14000.0; - // restore direction information - fAxisValue = (fAxisValue > 0.0) ? fTemp : -fTemp; - } - } - - // convert range from -32768..32767 to -1..1 - fAxisValue /= 32768.0; - - switch (dwAxisMap[i]) - { - case AxisForward: - if ((joy_advanced.integer == 0) && mouselook) - { - // user wants forward control to become look control - if (fabs(fAxisValue) > joy_pitchthreshold.value) - { - // if mouse invert is on, invert the joystick pitch value - // only absolute control support here (joy_advanced is false) - if (m_pitch.value < 0.0) - { - cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value; - } - else - { - cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value; - } - V_StopPitchDrift(); - } - else - { - // no pitch movement - // disable pitch return-to-center unless requested by user - // *** this code can be removed when the lookspring bug is fixed - // *** the bug always has the lookspring feature on - if(lookspring.value == 0.0) - V_StopPitchDrift(); - } - } - else - { - // user wants forward control to be forward control - if (fabs(fAxisValue) > joy_forwardthreshold.value) - { - cl.cmd.forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value; - } - } - break; - - case AxisSide: - if (fabs(fAxisValue) > joy_sidethreshold.value) - { - cl.cmd.sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; - } - break; - - case AxisTurn: - if ((in_strafe.state & 1) || (lookstrafe.integer && mouselook)) - { - // user wants turn control to become side control - if (fabs(fAxisValue) > joy_sidethreshold.value) - { - cl.cmd.sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; - } - } - else - { - // user wants turn control to be turn control - if (fabs(fAxisValue) > joy_yawthreshold.value) - { - if(dwControlMap[i] == JOY_ABSOLUTE_AXIS) - { - cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * aspeed * cl_yawspeed.value; - } - else - { - cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * speed * 180.0; - } - - } - } - break; - - case AxisLook: - if (mouselook) - { - if (fabs(fAxisValue) > joy_pitchthreshold.value) - { - // pitch movement detected and pitch movement desired by user - if(dwControlMap[i] == JOY_ABSOLUTE_AXIS) - { - cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value; - } - else - { - cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * speed * 180.0; - } - V_StopPitchDrift(); - } - else - { - // no pitch movement - // disable pitch return-to-center unless requested by user - // *** this code can be removed when the lookspring bug is fixed - // *** the bug always has the lookspring feature on - if(lookspring.integer == 0) - V_StopPitchDrift(); - } - } - break; - - default: - break; - } - } -} - static void IN_Init(void) { uiWheelMessage = RegisterWindowMessage ( "MSWHEEL_ROLLMSG" ); - - // joystick variables - Cvar_RegisterVariable (&in_joystick); - Cvar_RegisterVariable (&joy_name); - Cvar_RegisterVariable (&joy_advanced); - Cvar_RegisterVariable (&joy_advaxisx); - Cvar_RegisterVariable (&joy_advaxisy); - Cvar_RegisterVariable (&joy_advaxisz); - Cvar_RegisterVariable (&joy_advaxisr); - Cvar_RegisterVariable (&joy_advaxisu); - Cvar_RegisterVariable (&joy_advaxisv); - Cvar_RegisterVariable (&joy_forwardthreshold); - Cvar_RegisterVariable (&joy_sidethreshold); - Cvar_RegisterVariable (&joy_pitchthreshold); - Cvar_RegisterVariable (&joy_yawthreshold); - Cvar_RegisterVariable (&joy_forwardsensitivity); - Cvar_RegisterVariable (&joy_sidesensitivity); - Cvar_RegisterVariable (&joy_pitchsensitivity); - Cvar_RegisterVariable (&joy_yawsensitivity); - Cvar_RegisterVariable (&joy_wwhack1); - Cvar_RegisterVariable (&joy_wwhack2); Cvar_RegisterVariable (&vid_forcerefreshrate); - Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f, "applies current joyadv* cvar settings to the joystick driver"); } static void IN_Shutdown(void) @@ -2066,3 +2250,37 @@ static void IN_Shutdown(void) g_pdi = NULL; #endif } + +vid_mode_t *VID_GetDesktopMode(void) +{ + return &desktop_mode; +} + +size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) +{ + int i; + size_t k; + DEVMODE thismode; + + thismode.dmSize = sizeof(thismode); + thismode.dmDriverExtra = 0; + k = 0; + for(i = 0; EnumDisplaySettings(NULL, i, &thismode); ++i) + { + if(~thismode.dmFields & (DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY)) + { + Con_DPrintf("enumerating modes yielded a bogus item... please debug this\n"); + continue; + } + if(k >= maxcount) + break; + modes[k].width = thismode.dmPelsWidth; + modes[k].height = thismode.dmPelsHeight; + modes[k].bpp = thismode.dmBitsPerPel; + modes[k].refreshrate = thismode.dmDisplayFrequency; + modes[k].pixelheight_num = 1; + modes[k].pixelheight_denom = 1; // Win32 apparently does not provide this (FIXME) + ++k; + } + return k; +}