qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-16 16:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added Key_Event (whatever, -1, whatever). To use that "Internal mess" until someone has time to do this "right" ;-)

Browse source
This commit is contained in:
Dabb 2000-11-22 07:27:46 +00:00
parent 1697026a62
commit 8ce7084ba1
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/in_win.c
View file

@ -585,13 +585,13 @@ void IN_MouseEvent (int mstate)
if ( (mstate & (1<<i)) &&
!(mouse_oldbuttonstate & (1<<i)) )
{
Key_Event (K_MOUSE1 + i, true);
Key_Event (K_MOUSE1 + i, -1, true);
}
if ( !(mstate & (1<<i)) &&
(mouse_oldbuttonstate & (1<<i)) )
{
Key_Event (K_MOUSE1 + i, false);
Key_Event (K_MOUSE1 + i, -1, false);
}
}
@ -683,13 +683,13 @@ void IN_MouseMove (usercmd_t *cmd)
if ( (mstate_di & (1<<i)) &&
!(mouse_oldbuttonstate & (1<<i)) )
{
Key_Event (K_MOUSE1 + i, true);
Key_Event (K_MOUSE1 + i, -1, true);
}
if ( !(mstate_di & (1<<i)) &&
(mouse_oldbuttonstate & (1<<i)) )
{
Key_Event (K_MOUSE1 + i, false);
Key_Event (K_MOUSE1 + i, -1, false);
}
}
@ -994,13 +994,13 @@ void IN_Commands (void)
if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
{
key_index = (i < 4) ? K_JOY1 : K_AUX1;
Key_Event (key_index + i, true);
Key_Event (key_index + i, -1, true);
}
if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
{
key_index = (i < 4) ? K_JOY1 : K_AUX1;
Key_Event (key_index + i, false);
Key_Event (key_index + i, -1, false);
}
}
joy_oldbuttonstate = buttonstate;
@ -1027,12 +1027,12 @@ void IN_Commands (void)
{
if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
{
Key_Event (K_AUX29 + i, true);
Key_Event (K_AUX29 + i, -1, true);
}
if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
{
Key_Event (K_AUX29 + i, false);
Key_Event (K_AUX29 + i, -1, false);
}
}
joy_oldpovstate = povstate;

12
source/vid_mgl.c
View file

@ -2999,13 +2999,13 @@ LONG WINAPI MainWndProc (
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
if (!in_mode_set)
Key_Event (MapKey(lParam), true);
Key_Event (MapKey(lParam), -1, true);
break;
case WM_KEYUP:
case WM_SYSKEYUP:
if (!in_mode_set)
Key_Event (MapKey(lParam), false);
Key_Event (MapKey(lParam), -1, false);
break;
// this is complicated because Win32 seems to pack multiple mouse events into
@ -3038,11 +3038,11 @@ LONG WINAPI MainWndProc (
// Event.
case WM_MOUSEWHEEL:
if ((short) HIWORD(wParam) > 0) {
Key_Event(K_MWHEELUP, true);
Key_Event(K_MWHEELUP, false);
Key_Event(K_MWHEELUP, -1, true);
Key_Event(K_MWHEELUP, -1, false);
} else {
Key_Event(K_MWHEELDOWN, true);
Key_Event(K_MWHEELDOWN, false);
Key_Event(K_MWHEELDOWN, -1, true);
Key_Event(K_MWHEELDOWN, -1, false);
}
break;
// KJB: Added these new palette functions

12
source/vid_wgl.c
View file

@ -1069,12 +1069,12 @@ LONG WINAPI MainWndProc (
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
Key_Event (MapKey(lParam), true);
Key_Event (MapKey(lParam), -1, true);
break;
case WM_KEYUP:
case WM_SYSKEYUP:
Key_Event (MapKey(lParam), false);
Key_Event (MapKey(lParam), -1, false);
break;
case WM_SYSCHAR:
@ -1110,11 +1110,11 @@ LONG WINAPI MainWndProc (
// Event.
case WM_MOUSEWHEEL:
if ((short) HIWORD(wParam) > 0) {
Key_Event(K_MWHEELUP, true);
Key_Event(K_MWHEELUP, false);
Key_Event(K_MWHEELUP, -1, true);
Key_Event(K_MWHEELUP, -1, false);
} else {
Key_Event(K_MWHEELDOWN, true);
Key_Event(K_MWHEELDOWN, false);
Key_Event(K_MWHEELDOWN, -1, true);
Key_Event(K_MWHEELDOWN, -1, false);
}
break;