zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-10-31 18:48:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore cursor shape on exit. (#793)

Browse Source 
Fixed: https://github.com/ArthurSonzogni/FTXUI/issues/792
This commit is contained in:
Arthur Sonzogni
2023-12-17 10:24:33 +01:00
committed by ArthurSonzogni
parent 4dd9d4b1d0
commit 6618d099f5
10 changed files with 119 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/ftxui/component/event.hpp
View File

@@ -33,7 +33,8 @@ struct Event {
static Event Character(wchar_t);
static Event Special(std::string);
static Event Mouse(std::string, Mouse mouse);
static Event CursorReporting(std::string, int x, int y);
static Event CursorPosition(std::string, int x, int y); // Internal
static Event CursorShape(std::string, int shape); // Internal
// --- Arrow ---
static const Event ArrowLeft;
@@ -66,20 +67,24 @@ struct Event {
static const Event Custom;
//--- Method section ---------------------------------------------------------
bool operator==(const Event& other) const { return input_ == other.input_; }
bool operator!=(const Event& other) const { return !operator==(other); }
const std::string& input() const { return input_; }
bool is_character() const { return type_ == Type::Character; }
std::string character() const { return input_; }
bool is_mouse() const { return type_ == Type::Mouse; }
struct Mouse& mouse() { return data_.mouse; }
bool is_cursor_reporting() const { return type_ == Type::CursorReporting; }
// --- Internal Method section -----------------------------------------------
bool is_cursor_position() const { return type_ == Type::CursorPosition; }
int cursor_x() const { return data_.cursor.x; }
int cursor_y() const { return data_.cursor.y; }
const std::string& input() const { return input_; }
bool operator==(const Event& other) const { return input_ == other.input_; }
bool operator!=(const Event& other) const { return !operator==(other); }
bool is_cursor_shape() const { return type_ == Type::CursorShape; }
int cursor_shape() const { return data_.cursor_shape; }
//--- State section ----------------------------------------------------------
ScreenInteractive* screen_ = nullptr;
@@ -91,7 +96,8 @@ struct Event {
Unknown,
Character,
Mouse,
CursorReporting,
CursorPosition,
CursorShape,
};
Type type_ = Type::Unknown;
@@ -103,6 +109,7 @@ struct Event {
union {
struct Mouse mouse;
struct Cursor cursor;
int cursor_shape;
} data_ = {};
std::string input_;

3
include/ftxui/component/screen_interactive.hpp
View File

@@ -114,6 +114,9 @@ class ScreenInteractive : public Screen {
bool frame_valid_ = false;
// The style of the cursor to restore on exit.
int cursor_reset_shape_ = 1;
Mouse latest_mouse_event_;
friend class Loop;