From ea4826bd3b81ace08b72c7e305aa0b1f89669110 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 20 Mar 2014 01:38:44 +0300 Subject: Improve sdlinput. --- src/gui/sdlinput.cpp | 19 ++----------------- src/gui/sdlinput.h | 6 ++++-- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index c1e02e9b2..0bc23a849 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -98,11 +98,6 @@ SDLInput::SDLInput() : { } -bool SDLInput::isKeyQueueEmpty() const -{ - return mKeyInputQueue.empty(); -} - KeyInput SDLInput::dequeueKeyInput() { if (mKeyInputQueue.empty()) @@ -114,11 +109,6 @@ KeyInput SDLInput::dequeueKeyInput() return keyInput; } -bool SDLInput::isMouseQueueEmpty() const -{ - return mMouseInputQueue.empty(); -} - MouseInput SDLInput::dequeueMouseInput() { MouseInput mouseInput; @@ -165,7 +155,6 @@ void SDLInput::pushInput(const SDL_Event &event) case SDL_MOUSEWHEEL: { -// const int x = event.wheel.x; const int y = event.wheel.y; if (y) { @@ -273,8 +262,7 @@ void SDLInput::pushInput(const SDL_Event &event) * This occurs when the mouse leaves the window and the Gui-chan * application loses its mousefocus. */ - if ((event.active.state & SDL_APPMOUSEFOCUS) - && !event.active.gain) + if ((event.active.state & SDL_APPMOUSEFOCUS) && !event.active.gain) { mMouseInWindow = false; @@ -288,11 +276,8 @@ void SDLInput::pushInput(const SDL_Event &event) } } - if ((event.active.state & SDL_APPMOUSEFOCUS) - && event.active.gain) - { + if ((event.active.state & SDL_APPMOUSEFOCUS) && event.active.gain) mMouseInWindow = true; - } break; #endif default: diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 6102de743..9e7cbccb9 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -111,9 +111,11 @@ public: // Inherited from SDLInput - bool isKeyQueueEmpty() const A_WARN_UNUSED; + bool isKeyQueueEmpty() const A_WARN_UNUSED + { return mKeyInputQueue.empty(); } - bool isMouseQueueEmpty() const A_WARN_UNUSED; + bool isMouseQueueEmpty() const A_WARN_UNUSED + { return mMouseInputQueue.empty(); } MouseInput dequeueMouseInput() A_WARN_UNUSED; -- cgit v1.2.3-70-g09d2