X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_wgl.c;h=1902eef76d7a3c1f71296175105f979621d3a255;hb=e25ec73b388ad038b3999b26d70c03c4a1b9c482;hp=d876ad6cf4601d30b1ac659c3381e67e0aef34ae;hpb=d2c15e1b10b1f7a62829958959a307ad8272ba87;p=xonotic%2Fdarkplaces.git diff --git a/vid_wgl.c b/vid_wgl.c index d876ad6c..1902eef7 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 @@ -95,6 +101,7 @@ static DEVMODE gdevmode, initialdevmode; 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; @@ -121,8 +128,6 @@ static qboolean vid_isfullscreen; static int window_x, window_y; -static void IN_Activate (qboolean grab); - static qboolean mouseinitialized; #ifdef SUPPORTDIRECTX @@ -243,31 +248,19 @@ static void IN_StartupMouse (void); //==================================== -void VID_Finish (qboolean allowmousegrab) +void VID_Finish (void) { - qboolean vid_usemouse; - - 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); } -// handle the mouse state when windowed if that's changed - vid_usemouse = false; - if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback)) - vid_usemouse = true; - if (vid_isfullscreen) - vid_usemouse = true; - if (!vid_activewindow) - vid_usemouse = false; - IN_Activate(vid_usemouse); - - 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 } @@ -402,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) { @@ -441,7 +434,7 @@ void AppActivate(BOOL fActive, BOOL minimize) if (!fActive) { - IN_Activate (false); + VID_SetMouse(false, false, false); if (vid_isfullscreen) { ChangeDisplaySettings (NULL, 0); @@ -493,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; @@ -515,7 +508,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_MOVE: window_x = (int) LOWORD(lParam); window_y = (int) HIWORD(lParam); - IN_Activate(false); + VID_SetMouse(false, false, false); break; case WM_KEYDOWN: @@ -592,9 +585,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 @@ -796,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; @@ -825,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; @@ -836,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"); @@ -963,24 +961,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; } @@ -989,14 +987,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; } } @@ -1005,8 +1003,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; } } @@ -1017,12 +1015,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"); } } @@ -1098,10 +1096,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat // start out at the final windowpass if samples is 1 as it's the only feature we need extended pixel formats for for (windowpass = samples == 1;windowpass < 2;windowpass++) { + 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, %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), NULL, NULL, global_hInstance, NULL); VID_Shutdown(); return false; } @@ -1114,19 +1115,17 @@ 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", baseDC, &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", baseDC, pixelformat, &pfd); return false; } - gl_extensions = ""; - gl_platformextensions = ""; if (!GL_CheckExtension("wgl", wglfuncs, NULL, false)) { VID_Shutdown(); @@ -1144,7 +1143,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", baseDC, baseRC); return false; } @@ -1157,9 +1156,6 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat if ((qwglGetExtensionsStringARB = (const char *(WINAPI *)(HDC hdc))GL_GetProcAddress("wglGetExtensionsStringARB")) == NULL) Con_Print("wglGetExtensionsStringARB not found\n"); - gl_renderer = (const char *)qglGetString(GL_RENDERER); - gl_vendor = (const char *)qglGetString(GL_VENDOR); - gl_version = (const char *)qglGetString(GL_VERSION); gl_extensions = (const char *)qglGetString(GL_EXTENSIONS); gl_platform = "WGL"; gl_platformextensions = ""; @@ -1195,12 +1191,6 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat } } - Con_DPrintf("GL_VENDOR: %s\n", gl_vendor); - Con_DPrintf("GL_RENDERER: %s\n", gl_renderer); - Con_DPrintf("GL_VERSION: %s\n", gl_version); - Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions); - Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions); - /* if (!fullscreen) SetWindowPos (mainwindow, NULL, CenterX, CenterY, 0, 0,SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME); @@ -1232,16 +1222,15 @@ 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_initialized = true; @@ -1249,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); } @@ -1265,6 +1254,7 @@ void VID_Shutdown (void) if(vid_initialized == false) return; + VID_SetMouse(false, false, false); VID_RestoreSystemGamma(); vid_initialized = false; @@ -1286,7 +1276,7 @@ void VID_Shutdown (void) vid_isfullscreen = false; } -static void IN_Activate (qboolean grab) +void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) { static qboolean restore_spi; static int originalmouseparms[3]; @@ -1294,7 +1284,7 @@ static void IN_Activate (qboolean grab) if (!mouseinitialized) return; - if (grab) + if (relative) { if (!vid_usingmouse) { @@ -1323,7 +1313,7 @@ static void IN_Activate (qboolean grab) 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; @@ -1332,7 +1322,6 @@ static void IN_Activate (qboolean grab) SetCapture (mainwindow); ClipCursor (&window_rect); } - ShowCursor (false); } } else @@ -1357,9 +1346,14 @@ static void IN_Activate (qboolean grab) ClipCursor (NULL); ReleaseCapture (); } - ShowCursor (true); } } + + if (vid_usinghidecursor != hidecursor) + { + vid_usinghidecursor = hidecursor; + ShowCursor (!hidecursor); + } } @@ -1395,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) { @@ -1413,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)) { @@ -1490,15 +1488,14 @@ IN_MouseMove */ static void IN_MouseMove (void) { - int mx, my; POINT current_pos; + GetCursorPos (¤t_pos); + in_windowmouse_x = current_pos.x - window_x; + in_windowmouse_y = current_pos.y - window_y; + if (!vid_usingmouse) - { - //GetCursorPos (¤t_pos); - //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y); return; - } #ifdef SUPPORTDIRECTX if (dinput_acquired) @@ -1507,8 +1504,6 @@ static void IN_MouseMove (void) DIDEVICEOBJECTDATA od; DWORD dwElements; HRESULT hr; - mx = 0; - my = 0; for (;;) { @@ -1532,11 +1527,11 @@ static void IN_MouseMove (void) switch (od.dwOfs) { case DIMOFS_X: - mx += (LONG) od.dwData; + in_mouse_x += (LONG) od.dwData; break; case DIMOFS_Y: - my += (LONG) od.dwData; + in_mouse_y += (LONG) od.dwData; break; case DIMOFS_Z: @@ -1587,23 +1582,15 @@ static void IN_MouseMove (void) if ((mstate_di ^ mouse_oldbuttonstate) & (1<= 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; +}