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;
static int window_x, window_y;
-static void IN_Activate (qboolean grab);
-
static qboolean mouseinitialized;
#ifdef SUPPORTDIRECTX
//====================================
-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)
{
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)
{
CHECKGLERROR
if (!fActive)
{
- IN_Activate (false);
+ VID_SetMouse(false, false, false);
if (vid_isfullscreen)
{
ChangeDisplaySettings (NULL, 0);
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:
pixelformat = 0;
newpixelformat = 0;
- for (windowpass = 0;windowpass < 2;windowpass++)
+ // 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)
{
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 = "";
if (qwglGetExtensionsStringARB)
gl_platformextensions = (const char *)qwglGetExtensionsStringARB(baseDC);
+ if (!gl_extensions)
+ gl_extensions = "";
+ if (!gl_platformextensions)
+ gl_platformextensions = "";
+
// now some nice Windows pain:
// we have created a window, we needed one to find out if there are
// any multisample pixel formats available, the problem is that to
}
}
- 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);
//vid_menudrawfn = VID_MenuDraw;
//vid_menukeyfn = VID_MenuKey;
vid_usingmouse = false;
+ vid_usinghidecursor = false;
vid_usingvsync = false;
vid_hidden = false;
vid_initialized = true;
if(vid_initialized == false)
return;
+ VID_SetMouse(false, false, false);
VID_RestoreSystemGamma();
vid_initialized = false;
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];
if (!mouseinitialized)
return;
- if (grab)
+ if (relative)
{
if (!vid_usingmouse)
{
SetCapture (mainwindow);
ClipCursor (&window_rect);
}
- ShowCursor (false);
}
}
else
ClipCursor (NULL);
ReleaseCapture ();
}
- ShowCursor (true);
}
}
+
+ if (vid_usinghidecursor != hidecursor)
+ {
+ vid_usinghidecursor = hidecursor;
+ ShowCursor (!hidecursor);
+ }
}
*/
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)
DIDEVICEOBJECTDATA od;
DWORD dwElements;
HRESULT hr;
- mx = 0;
- my = 0;
for (;;)
{
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:
if ((mstate_di ^ mouse_oldbuttonstate) & (1<<i))
Key_Event (buttonremap[i], 0, (mstate_di & (1<<i)) != 0);
mouse_oldbuttonstate = mstate_di;
-
- in_mouse_x = mx;
- in_mouse_y = my;
}
else
#endif
{
- GetCursorPos (¤t_pos);
- mx = current_pos.x - (window_x + vid.width / 2);
- my = current_pos.y - (window_y + vid.height / 2);
-
- in_mouse_x = mx;
- in_mouse_y = my;
+ in_mouse_x += in_windowmouse_x - (int)(vid.width / 2);
+ in_mouse_y += in_windowmouse_y - (int)(vid.height / 2);
// if the mouse has moved, force it to the center, so there's room to move
- if (!cl.csqc_wantsmousemove)
- if (mx || my)
+ if (in_mouse_x || in_mouse_y)
SetCursorPos ((window_x + vid.width / 2), (window_y + vid.height / 2));
}
}
static void IN_Shutdown(void)
{
- IN_Activate (false);
-
#ifdef SUPPORTDIRECTX
if (g_pMouse)
IDirectInputDevice_Release(g_pMouse);
projects / xonotic / darkplaces.git / blobdiff