// gl_vidnt.c -- NT GL vid component
#include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
#include "resource.h"
#include <commctrl.h>
+extern void S_BlockSound (void);
+extern void S_UnblockSound (void);
+extern HINSTANCE global_hInstance;
+
+
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL 0x020A
+#endif
+
+// Tell startup code that we have a client
int cl_available = true;
int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *);
{NULL, NULL}
};
-void VID_RestoreGameGamma(void);
-void VID_GetSystemGamma(void);
-void VID_RestoreSystemGamma(void);
-
qboolean scr_skipupdate;
static DEVMODE gdevmode;
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);
HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter);
+// LordHavoc: thanks to backslash for this support for mouse buttons 4 and 5
+/* backslash :: imouse explorer buttons */
+/* These are #ifdefed out for non-Win2K in the February 2001 version of
+ MS's platform SDK, but we need them for compilation. . . */
+#ifndef WM_XBUTTONDOWN
+ #define WM_XBUTTONDOWN 0x020B
+ #define WM_XBUTTONUP 0x020C
+#endif
+#ifndef MK_XBUTTON1
+ #define MK_XBUTTON1 0x0020
+ #define MK_XBUTTON2 0x0040
+// LordHavoc: lets hope this allows more buttons in the future...
+ #define MK_XBUTTON3 0x0080
+ #define MK_XBUTTON4 0x0100
+ #define MK_XBUTTON5 0x0200
+ #define MK_XBUTTON6 0x0400
+ #define MK_XBUTTON7 0x0800
+#endif
+/* :: backslash */
+
// mouse variables
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 (old_vsync != vid_vsync.integer)
+ {
+ old_vsync = bound(0, vid_vsync.integer, 1);
+ Cvar_SetValueQuick(&vid_vsync, old_vsync);
+ if (gl_videosyncavailable)
+ qwglSwapIntervalEXT (old_vsync);
+ }
+
if (r_render.integer && !scr_skipupdate)
{
- qglFinish();
- hdc = GetDC(mainwindow);
- SwapBuffers(hdc);
- ReleaseDC(mainwindow, hdc);
+ if (r_speeds.integer || gl_finish.integer)
+ qglFinish();
+ SwapBuffers(baseDC);
}
// handle the mouse state when windowed if that's changed
qbyte scantokey[128] =
{
-// 0 1 2 3 4 5 6 7 8 9 A B C D E F
- 0 ,27 ,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,9 , // 0
- 'q' ,'w' ,'e' ,'r' ,'t' ,'y' ,'u' ,'i' ,'o' ,'p' ,'[' ,']' ,13 ,K_CTRL ,'a' ,'s' , // 1
- 'd' ,'f' ,'g' ,'h' ,'j' ,'k' ,'l' ,';' ,'\'' ,'`' ,K_SHIFT,'\\' ,'z' ,'x' ,'c' ,'v' , // 2
- 'b' ,'n' ,'m' ,',' ,'.' ,'/' ,K_SHIFT,'*' ,K_ALT ,' ' ,0 ,K_F1 ,K_F2 ,K_F3 ,K_F4 ,K_F5 , // 3
- K_F6 ,K_F7 ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0 ,K_HOME,K_UPARROW,K_PGUP,'-' ,K_LEFTARROW,'5' ,K_RIGHTARROW,'+' ,K_END , // 4
- K_DOWNARROW,K_PGDN,K_INS,K_DEL,0 ,0 ,0 ,K_F11 ,K_F12 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , // 5
- 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , // 6
- 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 // 7
+// 0 1 2 3 4 5 6 7 8 9 A B C D E F
+ 0 ,27 ,'1' ,'2' ,'3' ,'4' ,'5' ,'6' ,'7' ,'8' ,'9' ,'0' ,'-' ,'=' ,K_BACKSPACE,9 ,//0
+ 'q' ,'w' ,'e' ,'r' ,'t' ,'y' ,'u' ,'i' ,'o' ,'p' ,'[' ,']' ,13 ,K_CTRL ,'a' ,'s' ,//1
+ 'd' ,'f' ,'g' ,'h' ,'j' ,'k' ,'l' ,';' ,'\'' ,'`' ,K_SHIFT ,'\\' ,'z' ,'x' ,'c' ,'v' ,//2
+ 'b' ,'n' ,'m' ,',' ,'.' ,'/' ,K_SHIFT,'*' ,K_ALT ,' ' ,0 ,K_F1 ,K_F2 ,K_F3 ,K_F4 ,K_F5 ,//3
+ K_F6 ,K_F7 ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0 ,K_HOME,K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5,K_RIGHTARROW,K_KP_PLUS ,K_END,//4
+ K_DOWNARROW,K_PGDN,K_INS,K_DEL,0 ,0 ,0 ,K_F11 ,K_F12 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//5
+ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,//6
+ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 //7
};
Map from windows to quake keynums
=======
*/
-int MapKey (int key, int virtualkey)
+static int MapKey (int key, int virtualkey)
{
- key = (key>>16)&255;
- if (key > 127)
- return 0;
- if (scantokey[key] == 0)
- Con_DPrintf("key 0x%02x has no translation\n", key);
- return scantokey[key];
+ int result;
+ int modified = (key >> 16) & 255;
+ qboolean is_extended = false;
+
+ if (modified < 128 && scantokey[modified])
+ result = scantokey[modified];
+ else
+ {
+ result = 0;
+ Con_DPrintf("key 0x%02x (0x%8x, 0x%8x) has no translation\n", modified, key, virtualkey);
+ }
+
+ if (key & (1 << 24))
+ is_extended = true;
+
+ if ( !is_extended )
+ {
+ switch ( result )
+ {
+ case K_HOME:
+ return K_KP_HOME;
+ case K_UPARROW:
+ return K_KP_UPARROW;
+ case K_PGUP:
+ return K_KP_PGUP;
+ case K_LEFTARROW:
+ return K_KP_LEFTARROW;
+ case K_RIGHTARROW:
+ return K_KP_RIGHTARROW;
+ case K_END:
+ return K_KP_END;
+ case K_DOWNARROW:
+ return K_KP_DOWNARROW;
+ case K_PGDN:
+ return K_KP_PGDN;
+ case K_INS:
+ return K_KP_INS;
+ case K_DEL:
+ return K_KP_DEL;
+ default:
+ return result;
+ }
+ }
+ else
+ {
+ switch ( result )
+ {
+ case 0x0D:
+ return K_KP_ENTER;
+ case 0x2F:
+ return K_KP_SLASH;
+ case 0xAF:
+ return K_KP_PLUS;
+ }
+ return result;
+ }
}
/*
*/
void ClearAllStates (void)
{
- int i;
-
-// send an up event for each key, to make sure the server clears them all
- for (i=0 ; i<256 ; i++)
- {
- Key_Event (i, false);
- }
-
Key_ClearStates ();
IN_ClearStates ();
}
-void VID_RestoreGameGamma(void);
extern qboolean host_loopactive;
void AppActivate(BOOL fActive, BOOL minimize)
// LordHavoc: from dabb, fix for alt-tab bug in NVidia drivers
MoveWindow(mainwindow,0,0,gdevmode.dmPelsWidth,gdevmode.dmPelsHeight,false);
}
- if (host_loopactive)
- VID_RestoreGameGamma();
}
if (!fActive)
}
}
+//TODO: move it around in vid_wgl.c since I dont think this is the right position
+void Sys_SendKeyEvents (void)
+{
+ MSG msg;
+
+ while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+ {
+ // we always update if there are any event, even if we're paused
+ scr_skipupdate = 0;
+
+ if (!GetMessage (&msg, NULL, 0, 0))
+ Sys_Quit ();
+
+ TranslateMessage (&msg);
+ DispatchMessage (&msg);
+ }
+}
+
LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* main window procedure */
{
LONG lRet = 1;
int fActive, fMinimized, temp;
+ char state[256];
+ char asciichar[4];
+ int vkey;
+ qboolean down = false;
+
extern unsigned int uiWheelMessage;
if ( uMsg == uiWheelMessage )
window_y = (int) HIWORD(lParam);
VID_UpdateWindowStatus ();
break;
-
+
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
- Key_Event (MapKey(lParam, wParam), true);
- break;
-
+ down = true;
case WM_KEYUP:
case WM_SYSKEYUP:
- Key_Event (MapKey(lParam, wParam), false);
+ vkey = MapKey(lParam, wParam);
+ GetKeyboardState (state);
+ // alt/ctrl/shift tend to produce funky ToAscii values,
+ // and if it's not a single character we don't know care about it
+ if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || ToAscii (wParam, lParam >> 16, state, (unsigned short *)asciichar, 0) != 1)
+ asciichar[0] = 0;
+ Key_Event (vkey, asciichar[0], down);
break;
case WM_SYSCHAR:
case WM_RBUTTONUP:
case WM_MBUTTONDOWN:
case WM_MBUTTONUP:
+ case WM_XBUTTONDOWN: // backslash :: imouse explorer buttons
+ case WM_XBUTTONUP: // backslash :: imouse explorer buttons
case WM_MOUSEMOVE:
temp = 0;
if (wParam & MK_MBUTTON)
temp |= 4;
+ /* backslash :: imouse explorer buttons */
+ if (wParam & MK_XBUTTON1)
+ temp |= 8;
+
+ if (wParam & MK_XBUTTON2)
+ temp |= 16;
+ /* :: backslash */
+
+ // LordHavoc: lets hope this allows more buttons in the future...
+ if (wParam & MK_XBUTTON3)
+ temp |= 32;
+ if (wParam & MK_XBUTTON4)
+ temp |= 64;
+ if (wParam & MK_XBUTTON5)
+ temp |= 128;
+ if (wParam & MK_XBUTTON6)
+ temp |= 256;
+ if (wParam & MK_XBUTTON7)
+ temp |= 512;
+
IN_MouseEvent (temp);
break;
// Event.
case WM_MOUSEWHEEL:
if ((short) HIWORD(wParam) > 0) {
- Key_Event(K_MWHEELUP, true);
- Key_Event(K_MWHEELUP, false);
+ Key_Event(K_MWHEELUP, 0, true);
+ Key_Event(K_MWHEELUP, 0, false);
} else {
- Key_Event(K_MWHEELDOWN, true);
- Key_Event(K_MWHEELDOWN, false);
+ Key_Event(K_MWHEELDOWN, 0, true);
+ Key_Event(K_MWHEELDOWN, 0, false);
}
break;
return lRet;
}
-
-//static int grabsysgamma = true;
-WORD systemgammaramps[3][256], currentgammaramps[3][256];
-
-int VID_SetGamma(float prescale, float gamma, float scale, float base)
+int VID_SetGamma(unsigned short *ramps)
{
- int i;
- HDC hdc;
- hdc = GetDC (NULL);
-
- BuildGammaTable16(prescale, gamma, scale, base, ¤tgammaramps[0][0]);
- for (i = 0;i < 256;i++)
- currentgammaramps[1][i] = currentgammaramps[2][i] = currentgammaramps[0][i];
-
- i = SetDeviceGammaRamp(hdc, ¤tgammaramps[0][0]);
-
+ HDC hdc = GetDC (NULL);
+ int i = SetDeviceGammaRamp(hdc, ramps);
ReleaseDC (NULL, hdc);
return i; // return success or failure
}
-void VID_RestoreGameGamma(void)
-{
- VID_UpdateGamma(true);
-}
-
-void VID_GetSystemGamma(void)
-{
- HDC hdc;
- hdc = GetDC (NULL);
-
- GetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
-
- ReleaseDC (NULL, hdc);
-}
-
-void VID_RestoreSystemGamma(void)
+int VID_GetGamma(unsigned short *ramps)
{
- HDC hdc;
- hdc = GetDC (NULL);
-
- SetDeviceGammaRamp(hdc, &systemgammaramps[0][0]);
-
+ HDC hdc = GetDC (NULL);
+ int i = GetDeviceGammaRamp(hdc, ramps);
ReleaseDC (NULL, hdc);
+ return i; // return success or failure
}
-
static HINSTANCE gldll;
int GL_OpenLibrary(const char *name)
{
- Con_Printf("Loading GL driver %s\n", name);
+ Con_Printf("Loading OpenGL driver %s\n", name);
GL_CloseLibrary();
if (!(gldll = LoadLibrary(name)))
{
WNDCLASS wc;
InitCommonControls();
- hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
+ hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
// Register the frame class
wc.style = 0;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = global_hInstance;
- wc.hIcon = 0;
+ wc.hIcon = hIcon;
wc.hCursor = LoadCursor (NULL,IDC_ARROW);
wc.hbrBackground = NULL;
wc.lpszMenuName = 0;
IN_Init();
}
-int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil)
+int VID_InitMode (int fullscreen, int width, int height, int bpp)
{
int i;
HDC hdc;
};
int pixelformat;
DWORD WindowStyle, ExWindowStyle;
- HGLRC baseRC;
int CenterX, CenterY;
const char *gldrivername;
+ int depth;
if (vid_initialized)
Sys_Error("VID_InitMode called when video is already initialised\n");
// if stencil is enabled, ask for alpha too
- if (stencil)
+ if (bpp >= 32)
{
pfd.cStencilBits = 8;
pfd.cAlphaBits = 8;
}
gldrivername = "opengl32.dll";
+// COMMANDLINEOPTION: Windows WGL: -gl_driver <drivername> selects a GL driver library, default is opengl32.dll, useful only for 3dfxogl.dll or 3dfxvgl.dll, if you don't know what this is for, you don't need it
i = COM_CheckParm("-gl_driver");
if (i && i < com_argc - 1)
gldrivername = com_argv[i + 1];
memset(&gdevmode, 0, sizeof(gdevmode));
- VID_GetSystemGamma();
-
vid_isfullscreen = false;
if (fullscreen)
{
vid_isfullscreen = true;
WindowStyle = WS_POPUP;
- ExWindowStyle = 0;
+ ExWindowStyle = WS_EX_TOPMOST;
}
else
{
hdc = GetDC (NULL);
i = GetDeviceCaps(hdc, RASTERCAPS);
+ depth = GetDeviceCaps(hdc, PLANES) * GetDeviceCaps(hdc, BITSPIXEL);
ReleaseDC (NULL, hdc);
if (i & RC_PALETTE)
{
VID_Shutdown();
- Con_Printf ("Can't run in non-RGB mode\n");
+ Con_Print("Can't run in non-RGB mode\n");
+ return false;
+ }
+ if (bpp > depth)
+ {
+ VID_Shutdown();
+ Con_Print("A higher desktop depth is required to run this video mode\n");
return false;
}
ShowWindow (mainwindow, SW_SHOWDEFAULT);
UpdateWindow (mainwindow);
- SendMessage (mainwindow, WM_SETICON, (WPARAM)true, (LPARAM)hIcon);
- SendMessage (mainwindow, WM_SETICON, (WPARAM)false, (LPARAM)hIcon);
-
- VID_UpdateWindowStatus ();
+ VID_UpdateWindowStatus ();
// now we try to make sure we get the focus on the mode switch, because
// sometimes in some systems we don't. We grab the foreground, then
// fix the leftover Alt from any Alt-Tab or the like that switched us away
ClearAllStates ();
-
- hdc = GetDC(mainwindow);
- if ((pixelformat = ChoosePixelFormat(hdc, &pfd)) == 0)
+ baseDC = GetDC(mainwindow);
+
+ 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;
}
if (!GL_CheckExtension("wgl", wglfuncs, NULL, false))
{
VID_Shutdown();
- Con_Printf("wgl functions not found\n");
+ Con_Print("wgl functions not found\n");
return false;
}
- baseRC = qwglCreateContext(hdc);
+ baseRC = qwglCreateContext(baseDC);
if (!baseRC)
{
VID_Shutdown();
- Con_Printf("Could not initialize GL (wglCreateContext failed).\n\nMake sure you are in 65536 color mode, and try running -window.\n");
+ 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;
}
if (qglGetString == NULL)
{
VID_Shutdown();
- Con_Printf("glGetString not found\n");
+ Con_Print("glGetString not found\n");
return false;
}
gl_renderer = qglGetString(GL_RENDERER);
gl_platform = "WGL";
gl_platformextensions = "";
+ gl_videosyncavailable = false;
+
if (qwglGetExtensionsStringARB)
- gl_platformextensions = qwglGetExtensionsStringARB(hdc);
+ gl_platformextensions = qwglGetExtensionsStringARB(baseDC);
- gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, NULL, false);
- ReleaseDC(mainwindow, hdc);
+// COMMANDLINEOPTION: Windows WGL: -novideosync disables WGL_EXT_swap_control
+ gl_videosyncavailable = GL_CheckExtension("WGL_EXT_swap_control", wglswapintervalfuncs, "-novideosync", false);
+ //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_RestoreSystemGamma();
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 (vid_isfullscreen)
- ChangeDisplaySettings (NULL, 0);
- vid_isfullscreen = false;
+ if (baseDC && mainwindow)
+ ReleaseDC(mainwindow, baseDC);
AppActivate(false, false);
- VID_RestoreSystemGamma();
if (mainwindow)
DestroyWindow(mainwindow);
mainwindow = 0;
+ if (vid_isfullscreen)
+ ChangeDisplaySettings (NULL, 0);
+ vid_isfullscreen = false;
}
if (!hInstDI)
{
hInstDI = LoadLibrary("dinput.dll");
-
+
if (hInstDI == NULL)
{
- Con_SafePrintf ("Couldn't load dinput.dll\n");
+ Con_SafePrint("Couldn't load dinput.dll\n");
return false;
}
}
if (!pDirectInputCreate)
{
- Con_SafePrintf ("Couldn't get DI proc addr\n");
+ Con_SafePrint("Couldn't get DI proc addr\n");
return false;
}
}
if (FAILED(hr))
{
- Con_SafePrintf ("Couldn't open DI mouse device\n");
+ Con_SafePrint("Couldn't open DI mouse device\n");
return false;
}
if (FAILED(hr))
{
- Con_SafePrintf ("Couldn't set DI mouse format\n");
+ Con_SafePrint("Couldn't set DI mouse format\n");
return false;
}
if (FAILED(hr))
{
- Con_SafePrintf ("Couldn't set DI coop level\n");
+ Con_SafePrint("Couldn't set DI coop level\n");
return false;
}
if (FAILED(hr))
{
- Con_SafePrintf ("Couldn't set DI buffersize\n");
+ Con_SafePrint("Couldn't set DI buffersize\n");
return false;
}
*/
void IN_StartupMouse (void)
{
- if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
+ if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
return;
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"))
{
dinput = IN_InitDInput ();
if (dinput)
{
- Con_SafePrintf ("DirectInput initialized\n");
+ Con_SafePrint("DirectInput initialized\n");
}
else
{
- Con_SafePrintf ("DirectInput not initialized\n");
+ Con_SafePrint("DirectInput not initialized\n");
}
}
if (mouseparmsvalid)
{
- if ( COM_CheckParm ("-noforcemspd") )
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (ignored with -dinput, windows only)
+ if ( COM_CheckParm ("-noforcemspd") )
newmouseparms[2] = originalmouseparms[2];
- if ( COM_CheckParm ("-noforcemaccel") )
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (ignored with -dinput, windows only)
+ if ( COM_CheckParm ("-noforcemaccel") )
{
newmouseparms[0] = originalmouseparms[0];
newmouseparms[1] = originalmouseparms[1];
}
- if ( COM_CheckParm ("-noforcemparms") )
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (ignored with -dinput, windows only)
+ if ( COM_CheckParm ("-noforcemparms") )
{
newmouseparms[0] = originalmouseparms[0];
newmouseparms[1] = originalmouseparms[1];
}
}
- mouse_buttons = 3;
+ mouse_buttons = 10;
// if a fullscreen video mode was set before the mouse was initialized,
// set the mouse state appropriately
if ( (mstate & (1<<i)) &&
!(mouse_oldbuttonstate & (1<<i)) )
{
- Key_Event (K_MOUSE1 + i, true);
+ Key_Event (K_MOUSE1 + i, 0, true);
}
if ( !(mstate & (1<<i)) &&
(mouse_oldbuttonstate & (1<<i)) )
{
- Key_Event (K_MOUSE1 + i, false);
+ Key_Event (K_MOUSE1 + i, 0, false);
}
- }
-
+ }
+
mouse_oldbuttonstate = mstate;
}
}
if (!mouseactive)
{
GetCursorPos (¤t_pos);
- ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+ //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+ IN_Mouse( cmd, 0, 0 );
return;
}
if ( (mstate_di & (1<<i)) &&
!(mouse_oldbuttonstate & (1<<i)) )
{
- Key_Event (K_MOUSE1 + i, true);
+ Key_Event (K_MOUSE1 + i, 0, true);
}
if ( !(mstate_di & (1<<i)) &&
(mouse_oldbuttonstate & (1<<i)) )
{
- Key_Event (K_MOUSE1 + i, false);
+ Key_Event (K_MOUSE1 + i, 0, false);
}
}
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;
- }
}
-/*
-===============
-IN_StartupJoystick
+/*
===============
-*/
-void IN_StartupJoystick (void)
+IN_StartupJoystick
+===============
+*/
+void IN_StartupJoystick (void)
{
int numdevs;
JOYCAPS jc;
MMRESULT mmr;
mmr = 0;
-
+
// assume no joystick
- joy_avail = false;
+ joy_avail = false;
// abort startup if user requests no joystick
- if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe"))
- return;
-
+// COMMANDLINEOPTION: Windows Input: -nojoy disables joystick support, may be a small speed increase
+ if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe"))
+ return;
+
// verify joystick driver is present
if ((numdevs = joyGetNumDevs ()) == 0)
{
- Con_Printf ("\njoystick not found -- driver not present\n\n");
+ Con_Print("\njoystick not found -- driver not present\n\n");
return;
}
if ((mmr = joyGetPosEx (joy_id, &ji)) == JOYERR_NOERROR)
break;
- }
+ }
// abort startup if we didn't find a valid joystick
if (mmr != JOYERR_NOERROR)
{
- Con_Printf ("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
+ Con_Printf("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
return;
}
memset (&jc, 0, sizeof(jc));
if ((mmr = joyGetDevCaps (joy_id, &jc, sizeof(jc))) != JOYERR_NOERROR)
{
- Con_Printf ("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
+ Con_Printf("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr);
return;
}
// mark the joystick as available and advanced initialization not completed
// this is needed as cvars are not available during initialization
- joy_avail = true;
+ joy_avail = true;
joy_advancedinit = false;
- Con_Printf ("\njoystick detected\n\n");
+ Con_Print("\njoystick detected\n\n");
}
if (strcmp (joy_name.string, "joystick") != 0)
{
// notify user of advanced controller
- Con_Printf ("\n%s configured\n\n", joy_name.string);
+ Con_Printf("\n%s configured\n\n", joy_name.string);
}
// advanced initialization here
}
}
-
/*
===========
IN_Commands
{
if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
{
- key_index = (i < 4) ? K_JOY1 : K_AUX1;
- Key_Event (key_index + i, true);
+ key_index = (i < 16) ? K_JOY1 : K_AUX1;
+ Key_Event (key_index + i, 0, true);
}
if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
{
- key_index = (i < 4) ? K_JOY1 : K_AUX1;
- Key_Event (key_index + i, false);
+ key_index = (i < 16) ? K_JOY1 : K_AUX1;
+ Key_Event (key_index + i, 0, false);
}
}
joy_oldbuttonstate = buttonstate;
{
if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
{
- Key_Event (K_AUX29 + i, true);
+ Key_Event (K_AUX29 + i, 0, true);
}
if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
{
- Key_Event (K_AUX29 + i, false);
+ Key_Event (K_AUX29 + i, 0, false);
}
}
joy_oldpovstate = povstate;
}
-/*
-===============
+/*
+===============
IN_ReadJoystick
-===============
-*/
+===============
+*/
qboolean IN_ReadJoystick (void)
{
// verify joystick is available and that the user wants to use it
if (!joy_avail || !in_joystick.integer)
{
- return;
+ return;
}
// collect the joystick data, if possible
}
}
- // convert range from -32768..32767 to -1..1
+ // convert range from -32768..32767 to -1..1
fAxisValue /= 32768.0;
switch (dwAxisMap[i])
{
// user wants forward control to become look control
if (fabs(fAxisValue) > joy_pitchthreshold.value)
- {
+ {
// if mouse invert is on, invert the joystick pitch value
// only absolute control support here (joy_advanced is false)
if (m_pitch.value < 0.0)
projects / xonotic / darkplaces.git / blobdiff