static qboolean vid_initialized = false;
static qboolean vid_wassuspended = false;
static int vid_usingmouse;
-extern qboolean mouseactive; // from in_win.c
static HICON hIcon;
HWND mainwindow;
+static HDC baseDC;
+static HGLRC baseRC;
//HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
int mouse_buttons;
int mouse_oldbuttonstate;
POINT current_pos;
-int mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum;
+int mouse_x, mouse_y, old_mouse_x, old_mouse_y;
static qboolean restore_spi;
static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
void VID_Finish (void)
{
- HDC hdc;
int vid_usemouse;
static int old_vsync = -1;
{
if (r_speeds.integer || gl_finish.integer)
qglFinish();
- hdc = GetDC(mainwindow);
- SwapBuffers(hdc);
- ReleaseDC(mainwindow, hdc);
+ SwapBuffers(baseDC);
}
// handle the mouse state when windowed if that's changed
};
int pixelformat;
DWORD WindowStyle, ExWindowStyle;
- HGLRC baseRC;
int CenterX, CenterY;
const char *gldrivername;
int depth;
// fix the leftover Alt from any Alt-Tab or the like that switched us away
ClearAllStates ();
- hdc = GetDC(mainwindow);
+ baseDC = GetDC(mainwindow);
- if ((pixelformat = ChoosePixelFormat(hdc, &pfd)) == 0)
+ if ((pixelformat = ChoosePixelFormat(baseDC, &pfd)) == 0)
{
VID_Shutdown();
- Con_Printf("ChoosePixelFormat(%d, %p) failed\n", hdc, &pfd);
+ Con_Printf("ChoosePixelFormat(%d, %p) failed\n", baseDC, &pfd);
return false;
}
- if (SetPixelFormat(hdc, pixelformat, &pfd) == false)
+ if (SetPixelFormat(baseDC, pixelformat, &pfd) == false)
{
VID_Shutdown();
- Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", hdc, pixelformat, &pfd);
+ Con_Printf("SetPixelFormat(%d, %d, %p) failed\n", baseDC, pixelformat, &pfd);
return false;
}
return false;
}
- baseRC = qwglCreateContext(hdc);
+ baseRC = qwglCreateContext(baseDC);
if (!baseRC)
{
VID_Shutdown();
Con_Print("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
return false;
}
- if (!qwglMakeCurrent(hdc, baseRC))
+ if (!qwglMakeCurrent(baseDC, baseRC))
{
VID_Shutdown();
- Con_Printf("wglMakeCurrent(%d, %d) failed\n", hdc, baseRC);
+ Con_Printf("wglMakeCurrent(%d, %d) failed\n", baseDC, baseRC);
return false;
}
gl_videosyncavailable = false;
if (qwglGetExtensionsStringARB)
- gl_platformextensions = qwglGetExtensionsStringARB(hdc);
+ gl_platformextensions = qwglGetExtensionsStringARB(baseDC);
// COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control
gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
- ReleaseDC(mainwindow, hdc);
+ //ReleaseDC(mainwindow, hdc);
GL_Init ();
static void IN_Shutdown(void);
void VID_Shutdown (void)
{
- HGLRC hRC = 0;
- HDC hDC = 0;
-
if(vid_initialized == false)
return;
vid_initialized = false;
IN_Shutdown();
- if (qwglGetCurrentContext)
- hRC = qwglGetCurrentContext();
- if (qwglGetCurrentDC)
- hDC = qwglGetCurrentDC();
if (qwglMakeCurrent)
qwglMakeCurrent(NULL, NULL);
- if (hRC && qwglDeleteContext)
- qwglDeleteContext(hRC);
+ if (baseRC && qwglDeleteContext)
+ qwglDeleteContext(baseRC);
// close the library before we get rid of the window
GL_CloseLibrary();
- if (hDC && mainwindow)
- ReleaseDC(mainwindow, hDC);
+ if (baseDC && mainwindow)
+ ReleaseDC(mainwindow, baseDC);
AppActivate(false, false);
if (mainwindow)
DestroyWindow(mainwindow);
mouseinitialized = true;
-// COMMANDLINEOPTION: Windows Input: -dinput uses DirectInput (instead of GDI) for mouse/joystick input, may be more precise or responsive, but probably not
- if (COM_CheckParm ("-dinput"))
+// COMMANDLINEOPTION: Windows Input: -nodinput disables DirectInput for mouse/joystick input, gl_finish 1 mode recommended if this option is used as otherwise it tends to stutter due to input backlog.
+ if (!COM_CheckParm ("-nodinput"))
{
dinput = IN_InitDInput ();
if (mouseparmsvalid)
{
-// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (ignored with -dinput, windows only)
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (-nodinput only, windows only)
if ( COM_CheckParm ("-noforcemspd") )
newmouseparms[2] = originalmouseparms[2];
-// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (ignored with -dinput, windows only)
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (-nodinput only, windows only)
if ( COM_CheckParm ("-noforcemaccel") )
{
newmouseparms[0] = originalmouseparms[0];
newmouseparms[1] = originalmouseparms[1];
}
-// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (ignored with -dinput, windows only)
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (-nodinput only, windows only)
if ( COM_CheckParm ("-noforcemparms") )
{
newmouseparms[0] = originalmouseparms[0];
else
{
GetCursorPos (¤t_pos);
- mx = current_pos.x - window_center_x + mx_accum;
- my = current_pos.y - window_center_y + my_accum;
- mx_accum = 0;
- my_accum = 0;
+ mx = current_pos.x - window_center_x;
+ my = current_pos.y - window_center_y;
}
IN_Mouse(cmd, mx, my);
}
-/*
-===========
-IN_Accumulate
-===========
-*/
-void IN_Accumulate (void)
-{
- if (mouseactive)
- {
- if (!dinput)
- {
- GetCursorPos (¤t_pos);
-
- mx_accum += current_pos.x - window_center_x;
- my_accum += current_pos.y - window_center_y;
-
- // force the mouse to the center, so there's room to move
- SetCursorPos (window_center_x, window_center_y);
- }
- }
-}
-
-
/*
===================
IN_ClearStates
void IN_ClearStates (void)
{
if (mouseactive)
- {
- mx_accum = 0;
- my_accum = 0;
mouse_oldbuttonstate = 0;
- }
}
projects / xonotic / darkplaces.git / blobdiff