diff --git a/src/window/detail/SDLInput.cpp b/src/window/detail/SDLInput.cpp index c42ead4b1..bfda70b04 100644 --- a/src/window/detail/SDLInput.cpp +++ b/src/window/detail/SDLInput.cpp @@ -119,13 +119,13 @@ Mousecode input_util::mousecode_from(const std::string& name) { return static_cast(found->second); } -input_sdl::input_sdl(SDLWindow& window) : window(window) { +SDLInput::SDLInput(SDLWindow& window) : window(window) { input_util::initialize(); // We should always get char stream (maybe) SDL_StartTextInput(window.getSdlWindow()); } -void input_sdl::pollEvents() { +void SDLInput::pollEvents() { delta.x = 0.0f; delta.y = 0.0f; scroll = 0; @@ -226,70 +226,70 @@ void input_sdl::pollEvents() { } } -const char* input_sdl::getClipboardText() const { +const char* SDLInput::getClipboardText() const { return SDL_GetClipboardText(); } -void input_sdl::setClipboardText(const char* text) { +void SDLInput::setClipboardText(const char* text) { SDL_SetClipboardText(text); } -int input_sdl::getScroll() { +int SDLInput::getScroll() { return scroll; } -bool input_sdl::pressed(Keycode key) const { +bool SDLInput::pressed(Keycode key) const { int keycode = static_cast(key); if (keycode < 0 || keycode >= keys_buffer_size) { return false; } return keys[keycode]; } -bool input_sdl::jpressed(Keycode keycode) const { +bool SDLInput::jpressed(Keycode keycode) const { return pressed(keycode) && frames[static_cast(keycode)] == currentFrame; } -bool input_sdl::clicked(Mousecode code) const { +bool SDLInput::clicked(Mousecode code) const { return pressed( static_cast(mouse_keys_offset + static_cast(code)) ); } -bool input_sdl::jclicked(Mousecode code) const { +bool SDLInput::jclicked(Mousecode code) const { return clicked(code) && frames[static_cast(code) + mouse_keys_offset] == currentFrame; } -CursorState input_sdl::getCursor() const { +CursorState SDLInput::getCursor() const { return {isCursorLocked(), cursor, delta}; } -bool input_sdl::isCursorLocked() const { +bool SDLInput::isCursorLocked() const { return cursorLocked; } -void input_sdl::toggleCursor() { +void SDLInput::toggleCursor() { cursorDrag = false; cursorLocked = !cursorLocked; SDL_SetWindowRelativeMouseMode(window.getSdlWindow(), cursorLocked); } -Bindings& input_sdl::getBindings() { +Bindings& SDLInput::getBindings() { return bindings; } -const Bindings& input_sdl::getBindings() const { +const Bindings& SDLInput::getBindings() const { return bindings; } -ObserverHandler input_sdl::addKeyCallback(Keycode key, KeyCallback callback) { +ObserverHandler SDLInput::addKeyCallback(Keycode key, KeyCallback callback) { return keyCallbacks[key].add(std::move(callback)); } -const std::vector& input_sdl::getPressedKeys() const { +const std::vector& SDLInput::getPressedKeys() const { return pressedKeys; } -const std::vector& input_sdl::getCodepoints() const { +const std::vector& SDLInput::getCodepoints() const { return codepoints; } diff --git a/src/window/detail/SDLInput.hpp b/src/window/detail/SDLInput.hpp index 8bdfe3159..e94820318 100644 --- a/src/window/detail/SDLInput.hpp +++ b/src/window/detail/SDLInput.hpp @@ -5,13 +5,13 @@ class SDLWindow; -class input_sdl final : public Input { +class SDLInput final : public Input { public: inline static constexpr short mouse_keys_offset = 512; inline static constexpr short keys_buffer_size = mouse_keys_offset + sizeof(mousecodes_all) / sizeof(mousecodes_all[0]); - input_sdl(SDLWindow& window); + SDLInput(SDLWindow& window); void pollEvents() override; diff --git a/src/window/detail/SDLWindow.cpp b/src/window/detail/SDLWindow.cpp index ebc3f6a0a..86d66f56e 100644 --- a/src/window/detail/SDLWindow.cpp +++ b/src/window/detail/SDLWindow.cpp @@ -455,7 +455,7 @@ std::tuple, std::unique_ptr> Window::initialize( if (!window->isValid()) { return {nullptr, nullptr}; } - auto input = std::make_unique(*window); + auto input = std::make_unique(*window); return {std::move(window), std::move(input)}; }