edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

use info provided by sdl for mouse double clicks

Browse source
This commit is contained in:
oy 2019-01-06 10:23:25 +01:00
parent f41d72ebbb
commit d215c73206
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/engine/client/input.cpp
View file

@ -40,8 +40,7 @@ CInput::CInput()
m_InputCounter = 1;
m_InputGrabbed = 0;
m_LastRelease = 0;
m_ReleaseDelta = -1;
m_MouseDoubleClick = false;
m_NumEvents = 0;
}
@ -96,10 +95,9 @@ void CInput::MouseModeRelative()
int CInput::MouseDoubleClick()
{
if(m_ReleaseDelta >= 0 && m_ReleaseDelta < (time_freq() >> 2))
if(m_MouseDoubleClick)
{
m_LastRelease = 0;
m_ReleaseDelta = -1;
m_MouseDoubleClick = false;
return 1;
}
return 0;
@ -171,12 +169,6 @@ int CInput::Update()
case SDL_MOUSEBUTTONUP:
Action = IInput::FLAG_RELEASE;
if(Event.button.button == 1) // ignore_convention
{
m_ReleaseDelta = time_get() - m_LastRelease;
m_LastRelease = time_get();
}
// fall through
case SDL_MOUSEBUTTONDOWN:
if(Event.button.button == SDL_BUTTON_LEFT) Key = KEY_MOUSE_1; // ignore_convention
@ -188,6 +180,8 @@ int CInput::Update()
if(Event.button.button == 7) Key = KEY_MOUSE_7; // ignore_convention
if(Event.button.button == 8) Key = KEY_MOUSE_8; // ignore_convention
if(Event.button.button == 9) Key = KEY_MOUSE_9; // ignore_convention
if(Event.button.clicks%2 == 0 && Event.button.button == SDL_BUTTON_LEFT)
m_MouseDoubleClick = true;
Scancode = Key;
break;

3
src/engine/client/input.h
View file

@ -10,8 +10,7 @@ class CInput : public IEngineInput
int m_InputGrabbed;
int64 m_LastRelease;
int64 m_ReleaseDelta;
bool m_MouseDoubleClick;
void AddEvent(char *pText, int Key, int Flags);
void Clear();