X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_wgl.c;h=0eebe7d098cf61cd1975c0e92cbb201b9e08f336;hb=756dc9eb6b0a36c9dcb08cf588cf3b4f7aa14a25;hp=9d9184128ac34362a74e0dfce185503b770d927b;hpb=eff3c43c56896fcf7cd7e9c74bf89dfdcc55fe35;p=xonotic%2Fdarkplaces.git diff --git a/vid_wgl.c b/vid_wgl.c index 9d918412..0eebe7d0 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -17,10 +17,16 @@ 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 SUPPORTDIRECTX +// Include DX libs +#pragma comment(lib, "dinput8.lib") +#pragma comment(lib, "dxguid.lib") +#ifndef DIRECTINPUT_VERSION +# define DIRECTINPUT_VERSION 0x0500 /* Version 5.0 */ +#endif +#endif #include "quakedef.h" #include @@ -244,17 +250,17 @@ static void IN_StartupMouse (void); void VID_Finish (void) { - vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; - if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) + vid_usevsync = vid_vsync.integer && !cls.timedemo && qwglSwapIntervalEXT; + if (vid_usingvsync != vid_usevsync) { vid_usingvsync = vid_usevsync; qwglSwapIntervalEXT (vid_usevsync); } - if (r_render.integer && !vid_hidden) + if (!vid_hidden) { CHECKGLERROR - if (r_speeds.integer || gl_finish.integer) + if (r_speeds.integer == 2 || gl_finish.integer) { qglFinish();CHECKGLERROR } @@ -389,11 +395,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_hidden = minimize != FALSE; // enable/disable sound on focus gain/loss - if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer)) + if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer) { if (!sound_active) { @@ -480,8 +486,8 @@ 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]; + unsigned char asciichar[4]; int vkey; int charlength; qboolean down = false; @@ -781,7 +787,7 @@ void VID_Init(void) IN_Init(); } -int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) +qboolean VID_InitMode(viddef_mode_t *mode) { int i; HDC hdc; @@ -810,7 +816,7 @@ 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; @@ -821,6 +827,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"); @@ -1209,10 +1222,8 @@ 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 (); @@ -1227,10 +1238,10 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat 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); } @@ -1302,7 +1313,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso 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); + restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0) != FALSE; } else restore_spi = false; @@ -1378,7 +1389,7 @@ static qboolean IN_InitDInput (void) if (!pDirectInputCreate) { - pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA"); + pDirectInputCreate = (HRESULT (__stdcall *)(HINSTANCE,DWORD,LPDIRECTINPUT *,LPUNKNOWN))GetProcAddress(hInstDI,"DirectInputCreateA"); if (!pDirectInputCreate) { @@ -1396,7 +1407,11 @@ static qboolean IN_InitDInput (void) } // 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)) { @@ -1652,7 +1667,7 @@ static void IN_StartupJoystick (void) // save the joystick's number of buttons and POV status joy_numbuttons = jc.wNumButtons; - joy_haspov = jc.wCaps & JOYCAPS_HASPOV; + joy_haspov = (jc.wCaps & JOYCAPS_HASPOV) != 0; // old button and POV states default to no buttons pressed joy_oldbuttonstate = joy_oldpovstate = 0; @@ -2068,3 +2083,32 @@ static void IN_Shutdown(void) g_pdi = NULL; #endif } + +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; +}