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 <windows.h>
if (r_render.integer && !vid_hidden)
{
CHECKGLERROR
- if (r_speeds.integer || gl_finish.integer)
+ if (r_speeds.integer == 2 || gl_finish.integer)
{
qglFinish();CHECKGLERROR
}
{
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)
{
if (gl_videosyncavailable)
{
- 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);
}
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;
if (!pDirectInputCreate)
{
- pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA");
+ pDirectInputCreate = (HRESULT (__stdcall *)(HINSTANCE,DWORD,LPDIRECTINPUT *,LPUNKNOWN))GetProcAddress(hInstDI,"DirectInputCreateA");
if (!pDirectInputCreate)
{
}
// 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))
{
// 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;
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;
+}