summaryrefslogtreecommitdiff
path: root/src/gui/sdlinput.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-23 22:01:44 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-23 22:01:44 +0300
commit3c404128c4669a1f4f190e20a89553677717fc50 (patch)
tree2db4e5031089c800c4e00fd6244e578f44a7c910 /src/gui/sdlinput.cpp
parent89b267d6d73bbc59f7c313b8a22b97fbb27f99a8 (diff)
downloadmanaplus-3c404128c4669a1f4f190e20a89553677717fc50.tar.gz
manaplus-3c404128c4669a1f4f190e20a89553677717fc50.tar.bz2
manaplus-3c404128c4669a1f4f190e20a89553677717fc50.tar.xz
manaplus-3c404128c4669a1f4f190e20a89553677717fc50.zip
Add missing comments into defines.
Diffstat (limited to 'src/gui/sdlinput.cpp')
-rw-r--r--src/gui/sdlinput.cpp53
1 files changed, 32 insertions, 21 deletions
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 7ec7b7027..3ca69c820 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -165,7 +165,8 @@ void SDLInput::pushInput(const SDL_Event &event)
mouseInput.setY(gui->getLastMouseY());
#ifdef ANDROID
mouseInput.setReal(0, 0);
-#endif
+#endif // ANDROID
+
mouseInput.setButton(MouseButton::WHEEL);
if (y > 0)
mouseInput.setType(MouseEventType::WHEEL_MOVED_UP);
@@ -177,14 +178,14 @@ void SDLInput::pushInput(const SDL_Event &event)
break;
}
-#endif
+#endif // USE_SDL2
#ifdef ANDROID
#ifndef USE_SDL2
case SDL_ACCELEROMETER:
break;
-#endif
-#endif
+#endif // USE_SDL2
+#endif // ANDROID
case SDL_MOUSEBUTTONDOWN:
{
@@ -197,11 +198,13 @@ void SDLInput::pushInput(const SDL_Event &event)
#ifdef ANDROID
#ifdef USE_SDL2
mouseInput.setReal(x, y);
-#else
+#else // USE_SDL2
+
mouseInput.setReal(event.button.realx / scale,
event.button.realy / scale);
-#endif
-#endif
+#endif // USE_SDL2
+#endif // ANDROID
+
mouseInput.setButton(convertMouseButton(event.button.button));
#ifndef USE_SDL2
@@ -210,7 +213,7 @@ void SDLInput::pushInput(const SDL_Event &event)
else if (event.button.button == SDL_BUTTON_WHEELUP)
mouseInput.setType(MouseEventType::WHEEL_MOVED_UP);
else
-#endif
+#endif // USE_SDL2
mouseInput.setType(MouseEventType::PRESSED);
mouseInput.setTimeStamp(SDL_GetTicks());
mMouseInputQueue.push(mouseInput);
@@ -227,11 +230,13 @@ void SDLInput::pushInput(const SDL_Event &event)
#ifdef ANDROID
#ifdef USE_SDL2
mouseInput.setReal(x, y);
-#else
+#else // USE_SDL2
+
mouseInput.setReal(event.button.realx / scale,
event.button.realy / scale);
-#endif
-#endif
+#endif // USE_SDL2
+#endif // ANDROID
+
mouseInput.setButton(convertMouseButton(event.button.button));
mouseInput.setType(MouseEventType::RELEASED);
mouseInput.setTimeStamp(SDL_GetTicks());
@@ -248,11 +253,13 @@ void SDLInput::pushInput(const SDL_Event &event)
#ifdef ANDROID
#ifdef USE_SDL2
mouseInput.setReal(x, y);
-#else
+#else // USE_SDL2
+
mouseInput.setReal(event.motion.realx / scale,
event.motion.realy / scale);
-#endif
-#endif
+#endif // USE_SDL2
+#endif // ANDROID
+
mouseInput.setButton(MouseButton::EMPTY);
mouseInput.setType(MouseEventType::MOVED);
mouseInput.setTimeStamp(SDL_GetTicks());
@@ -282,7 +289,8 @@ void SDLInput::pushInput(const SDL_Event &event)
if ((event.active.state & SDL_APPMOUSEFOCUS) && event.active.gain)
mMouseInWindow = true;
break;
-#endif
+#endif // USE_SDL2
+
default:
break;
} // end switch
@@ -311,7 +319,8 @@ MouseButtonT SDLInput::convertMouseButton(const int button)
case SDL_BUTTON_WHEELUP:
case SDL_BUTTON_WHEELDOWN:
return MouseButton::EMPTY;
-#endif
+#endif // USE_SDL2
+
default:
// We have an unknown mouse type which is ignored.
logger->log("unknown button type: %d", button);
@@ -324,9 +333,10 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
const SDL_keysym keysym = event.key.keysym;
#ifdef USE_SDL2
int value = keysym.scancode;
-#else
+#else // USE_SDL2
+
int value = keysym.unicode;
-#endif
+#endif // USE_SDL2
PRAGMA45(GCC diagnostic push)
PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
@@ -366,7 +376,7 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
// is only valid on key down events in SDL.
#ifndef USE_SDL2
if (event.type == SDL_KEYUP || keysym.unicode == ' ')
-#endif
+#endif // USE_SDL2
{
value = KeyValue::SPACE;
}
@@ -374,7 +384,7 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
case SDLK_ESCAPE:
#ifdef USE_SDL2
case SDLK_AC_BACK:
-#endif
+#endif // USE_SDL2
value = KeyValue::ESCAPE;
break;
case SDLK_DELETE:
@@ -465,7 +475,8 @@ int SDLInput::convertKeyCharacter(const SDL_Event &event)
case SDLK_RSUPER:
value = KeyValue::RIGHT_SUPER;
break;
-#endif
+#endif // USE_SDL2
+
case SDLK_MODE:
value = KeyValue::ALT_GR;
break;