LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

SDL click count functionality was added in 2.0.2, not 2.0.4. So we can get rid of some useless code since we require 2.0.2+ in love 0.11...

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-09-27 22:53:48 -03:00
parent b38e567e74
commit aba4386807
2 changed files with 31 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/event/sdl/Event.cpp
+28 -66
View File
@@ -147,7 +147,7 @@ void Event::clear()
love::event::Event::clear(); love::event::Event::clear();
} }
Message *Event::convert(const SDL_Event &e) Message *Event::convert(const SDL_Event &e) const
{ {
Message *msg = nullptr; Message *msg = nullptr;
@@ -244,7 +244,31 @@ Message *Event::convert(const SDL_Event &e)
break; break;
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
msg = convertMouseButtonEvent(e); {
// SDL uses button 3 for the right mouse button, but we use button 2
int button = e.button.button;
switch (button)
{
case SDL_BUTTON_RIGHT:
button = 2;
break;
case SDL_BUTTON_MIDDLE:
button = 3;
break;
}
double px = (double) e.button.x;
double py = (double) e.button.y;
windowToPixelCoords(&px, &py);
vargs.emplace_back(px);
vargs.emplace_back(py);
vargs.emplace_back((double) button);
vargs.emplace_back(e.button.which == SDL_TOUCH_MOUSEID);
vargs.emplace_back((double) e.button.clicks);
bool down = e.type == SDL_MOUSEBUTTONDOWN;
msg = new Message(down ? "mousepressed" : "mousereleased", vargs);
}
break; break;
case SDL_MOUSEWHEEL: case SDL_MOUSEWHEEL:
vargs.emplace_back((double) e.wheel.x); vargs.emplace_back((double) e.wheel.x);
@@ -362,69 +386,7 @@ Message *Event::convert(const SDL_Event &e)
return msg; return msg;
} }
Message *Event::convertMouseButtonEvent(const SDL_Event &e) Message *Event::convertJoystickEvent(const SDL_Event &e) const
{
bool down = e.type == SDL_MOUSEBUTTONDOWN;
std::vector<Variant> vargs;
vargs.reserve(5);
// SDL uses button index 3 for the right mouse button, but we use index 2.
int button = e.button.button;
switch (button)
{
case SDL_BUTTON_RIGHT:
button = 2;
break;
case SDL_BUTTON_MIDDLE:
button = 3;
break;
}
double px = (double) e.button.x;
double py = (double) e.button.y;
windowToPixelCoords(&px, &py);
vargs.emplace_back(px);
vargs.emplace_back(py);
vargs.emplace_back((double) button);
vargs.emplace_back(e.button.which == SDL_TOUCH_MOUSEID);
#if SDL_VERSION_ATLEAST(2,0,4)
SDL_version version;
SDL_GetVersion(&version);
if (version.major >= 2 && (version.minor > 0 || version.patch >= 4))
vargs.emplace_back((double) e.button.clicks);
else
#endif
{
ClickState state = clickCounts[e.button.which];
// Matches the behaviour of SDL 2.0.4's click count tracking code when
// it doesn't know any OS-specific information.
if (down)
{
double now = timer::Timer::getTime();
int diffX = abs(e.button.x - state.lastX);
int diffY = abs(e.button.y - state.lastY);
if ((now - state.time) >= 0.5 || diffX > 1 || diffY > 1)
state.count = 0;
state.count++;
state.lastX = e.button.x;
state.lastY = e.button.y;
state.time = now;
clickCounts[e.button.which] = state;
}
vargs.emplace_back((double) state.count);
}
return new Message(down ? "mousepressed" : "mousereleased", vargs);
}
Message *Event::convertJoystickEvent(const SDL_Event &e)
{ {
auto joymodule = Module::getInstance<joystick::JoystickModule>(Module::M_JOYSTICK); auto joymodule = Module::getInstance<joystick::JoystickModule>(Module::M_JOYSTICK);
if (!joymodule) if (!joymodule)
@@ -549,7 +511,7 @@ Message *Event::convertJoystickEvent(const SDL_Event &e)
return msg; return msg;
} }
Message *Event::convertWindowEvent(const SDL_Event &e) Message *Event::convertWindowEvent(const SDL_Event &e) const
{ {
Message *msg = nullptr; Message *msg = nullptr;
src/modules/event/sdl/Event.h
+3 -14
View File
@@ -68,20 +68,9 @@ public:
private: private:
struct ClickState Message *convert(const SDL_Event &e) const;
{ Message *convertJoystickEvent(const SDL_Event &e) const;
int count; Message *convertWindowEvent(const SDL_Event &e) const;
int lastX;
int lastY;
double time;
};
Message *convert(const SDL_Event &e);
Message *convertMouseButtonEvent(const SDL_Event &e);
Message *convertJoystickEvent(const SDL_Event &e);
Message *convertWindowEvent(const SDL_Event &e);
std::map<int, ClickState> clickCounts;
static std::map<SDL_Keycode, love::keyboard::Keyboard::Key> createKeyMap(); static std::map<SDL_Keycode, love::keyboard::Keyboard::Key> createKeyMap();
static std::map<SDL_Keycode, love::keyboard::Keyboard::Key> keys; static std::map<SDL_Keycode, love::keyboard::Keyboard::Key> keys;