From 93123e97251fc791c1cac193d675cce9a1ac2de6 Mon Sep 17 00:00:00 2001 From: HampusM Date: Thu, 3 Mar 2022 19:41:23 +0100 Subject: feat: add moving cursor --- src/engine/escape.hpp | 5 +++++ src/engine/graphics/scene.cpp | 26 +++---------------------- src/engine/graphics/scene.hpp | 2 -- src/engine/user/cursor.cpp | 43 +++++++++++++++++++++++++++++++++++++++++ src/engine/user/cursor.hpp | 45 +++++++++++++++++++++++++++++++++++++++++++ src/engine/user/cursor.tpp | 31 +++++++++++++++++++++++++++++ 6 files changed, 127 insertions(+), 25 deletions(-) create mode 100644 src/engine/escape.hpp create mode 100644 src/engine/user/cursor.cpp create mode 100644 src/engine/user/cursor.hpp create mode 100644 src/engine/user/cursor.tpp (limited to 'src/engine') diff --git a/src/engine/escape.hpp b/src/engine/escape.hpp new file mode 100644 index 0000000..53a7c98 --- /dev/null +++ b/src/engine/escape.hpp @@ -0,0 +1,5 @@ +#pragma once + +#include + +constexpr fmt::string_view ESC = "\x1B"; diff --git a/src/engine/graphics/scene.cpp b/src/engine/graphics/scene.cpp index 3f63807..a8e7b88 100644 --- a/src/engine/graphics/scene.cpp +++ b/src/engine/graphics/scene.cpp @@ -1,10 +1,12 @@ #include "scene.hpp" +#include "engine/escape.hpp" + #include #include Scene::Scene(IMatrixFactory matrix_factory) - : _is_shown(false), _matrix_factory(std::move(matrix_factory)) + : _is_shown(false), _matrix_factory(matrix_factory) { } @@ -33,25 +35,3 @@ void Scene::leave() _is_shown = false; } - -/* -void do_in_statusbar(const std::function &routine) -{ - const auto prev_pos = Cursor::where(); - - const auto window_size = Window::size(); - - Cursor::hide(); - - Cursor::move_to(Vector2({1, window_size.height()})); - - std::cout << fmt::format(EscapeSequences::ERASE_LINE, fmt::arg("esc", ESC)); - std::cout.flush(); - - routine(); - - Cursor::move_to(prev_pos); - - Cursor::show(); -} -*/ diff --git a/src/engine/graphics/scene.hpp b/src/engine/graphics/scene.hpp index b26ac05..c4c217f 100644 --- a/src/engine/graphics/scene.hpp +++ b/src/engine/graphics/scene.hpp @@ -7,8 +7,6 @@ #include #include -constexpr fmt::string_view ESC = "\x1B"; - constexpr fmt::string_view ENABLE_ALT_BUFFER = "{esc}[?1049h"; constexpr fmt::string_view DISABLE_ALT_BUFFER = "{esc}[?1049l"; diff --git a/src/engine/user/cursor.cpp b/src/engine/user/cursor.cpp new file mode 100644 index 0000000..9d6e28c --- /dev/null +++ b/src/engine/user/cursor.cpp @@ -0,0 +1,43 @@ +#include "cursor.hpp" + +#include "engine/escape.hpp" + +#include +#include + +CursorController::CursorController(IVector2Factory vector2_factory) + : _vector2_factory(vector2_factory) +{ +} + +void CursorController::move_to(const IVector2 &pos) +{ + fmt::print(MOVE_CURSOR_TO, fmt::arg("esc", ESC), fmt::arg("row", pos.y()), + fmt::arg("column", pos.x())); + std::cout.flush(); +} + +std::shared_ptr CursorController::where() +{ + fmt::print(REQUEST_CURSOR_POSITION, fmt::arg("esc", ESC)); + std::cout.flush(); + + IVector2Options vector2_options = {}; + + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg) + scanf("\033[%u;%uR", &vector2_options.y, &vector2_options.x); + + return _vector2_factory(vector2_options); +} + +void CursorController::hide() +{ + fmt::print(CURSOR_INVISIBLE, fmt::arg("esc", ESC)); + std::cout.flush(); +} + +void CursorController::show() +{ + fmt::print(CURSOR_VISIBLE, fmt::arg("esc", ESC)); + std::cout.flush(); +} diff --git a/src/engine/user/cursor.hpp b/src/engine/user/cursor.hpp new file mode 100644 index 0000000..0317dc5 --- /dev/null +++ b/src/engine/user/cursor.hpp @@ -0,0 +1,45 @@ +#pragma once + +#include "DI/auto_wirable.hpp" +#include "interfaces/direction.hpp" +#include "interfaces/vector2.hpp" + +#include "fmt/core.h" +#include +#include +#include + +constexpr std::string_view MOVE_CURSOR_UP = "{esc}[{amount}A"; +constexpr std::string_view MOVE_CURSOR_DOWN = "{esc}[{amount}B"; +constexpr std::string_view MOVE_CURSOR_LEFT = "{esc}[{amount}D"; +constexpr std::string_view MOVE_CURSOR_RIGHT = "{esc}[{amount}C"; + +constexpr fmt::string_view MOVE_CURSOR_TO = "{esc}[{row};{column}H"; + +constexpr fmt::string_view REQUEST_CURSOR_POSITION = "{esc}[6n"; + +constexpr fmt::string_view CURSOR_VISIBLE = "{esc}[?25h"; +constexpr fmt::string_view CURSOR_INVISIBLE = "{esc}[?25l"; + +class CursorController + : public AutoWirable +{ +public: + explicit CursorController(IVector2Factory vector2_factory); + + template + constexpr void move(const unsigned int &amount) const; + + static void move_to(const IVector2 &pos); + + static void hide(); + + static void show(); + + [[nodiscard]] std::shared_ptr where(); + +private: + IVector2Factory _vector2_factory; +}; + +#include "cursor.tpp" diff --git a/src/engine/user/cursor.tpp b/src/engine/user/cursor.tpp new file mode 100644 index 0000000..224418e --- /dev/null +++ b/src/engine/user/cursor.tpp @@ -0,0 +1,31 @@ +#pragma once + +#include "cursor.hpp" + +#include "engine/escape.hpp" + +#include + +constexpr auto get_direction_format_map() +{ + std::array direction_format_map; + + direction_format_map[Direction::UP] = MOVE_CURSOR_UP; + direction_format_map[Direction::DOWN] = MOVE_CURSOR_DOWN; + direction_format_map[Direction::LEFT] = MOVE_CURSOR_LEFT; + direction_format_map[Direction::RIGHT] = MOVE_CURSOR_RIGHT; + + return direction_format_map; +} + +template +constexpr void CursorController::move(const unsigned int &amount) const +{ + constexpr auto direction_format_map = get_direction_format_map(); + + constexpr auto format = direction_format_map[direction]; + + fmt::vprint(format, + fmt::make_format_args(fmt::arg("esc", ESC), fmt::arg("amount", amount))); + std::cout.flush(); +} -- cgit v1.2.3-18-g5258