amass/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2024-11-23 11:17:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix event const correctness (#56)

Browse Source
This commit is contained in:
Mike Wallio 2020-10-24 10:47:03 -04:00 committed by GitHub
parent d969c74341
commit 1cb08fd606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ namespace ftxui {
// https://invisible-island.net/xterm/ctlseqs/ctlseqs.html // https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
// //
struct Event { struct Event {
public:
// --- Constructor section --------------------------------------------------- // --- Constructor section ---------------------------------------------------
static Event Character(char); static Event Character(char);
static Event Character(wchar_t); static Event Character(wchar_t);
@ -27,29 +26,29 @@ struct Event {
static void Convert(Receiver<char>& in, Sender<Event>& out, char c); static void Convert(Receiver<char>& in, Sender<Event>& out, char c);
// --- Arrow --- // --- Arrow ---
static Event ArrowLeft; static const Event ArrowLeft;
static Event ArrowRight; static const Event ArrowRight;
static Event ArrowUp; static const Event ArrowUp;
static Event ArrowDown; static const Event ArrowDown;
// --- Other --- // --- Other ---
static Event Backspace; static const Event Backspace;
static Event Delete; static const Event Delete;
static Event Return; static const Event Return;
static Event Escape; static const Event Escape;
static Event Tab; static const Event Tab;
static Event TabReverse; static const Event TabReverse;
static Event F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12; static const Event F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12;
// --- Custom --- // --- Custom ---
static Event Custom; static Event Custom;
//--- Method section --------------------------------------------------------- //--- Method section ---------------------------------------------------------
bool is_character() { return is_character_; } bool is_character() const { return is_character_; }
wchar_t character() { return character_; } wchar_t character() const { return character_; }
const std::string& input() { return input_; } const std::string& input() const { return input_; }
bool operator==(const Event& other) { return input_ == other.input_; } bool operator==(const Event& other) const { return input_ == other.input_; }
//--- State section ---------------------------------------------------------- //--- State section ----------------------------------------------------------
private: private:
@ -58,6 +57,7 @@ struct Event {
wchar_t character_ = U'?'; wchar_t character_ = U'?';
}; };
} // namespace ftxui } // namespace ftxui
#endif /* end of include guard: FTXUI_COMPONENT_EVENT_HPP */ #endif /* end of include guard: FTXUI_COMPONENT_EVENT_HPP */

46
src/ftxui/component/event.cpp
View File

@ -156,32 +156,32 @@ void Event::Convert(Receiver<char>& in, Sender<Event>& out, char c) {
} }
// --- Arrow --- // --- Arrow ---
Event Event::ArrowLeft = Event::Special("\x1B[D"); const Event Event::ArrowLeft = Event::Special("\x1B[D");
Event Event::ArrowRight = Event::Special("\x1B[C"); const Event Event::ArrowRight = Event::Special("\x1B[C");
Event Event::ArrowUp = Event::Special("\x1B[A"); const Event Event::ArrowUp = Event::Special("\x1B[A");
Event Event::ArrowDown = Event::Special("\x1B[B"); const Event Event::ArrowDown = Event::Special("\x1B[B");
Event Event::Backspace = Event::Special({127}); const Event Event::Backspace = Event::Special({127});
Event Event::Delete = Event::Special("\x1B[3~"); const Event Event::Delete = Event::Special("\x1B[3~");
Event Event::Escape = Event::Special("\x1B"); const Event Event::Escape = Event::Special("\x1B");
#if defined(_WIN32) #if defined(_WIN32)
Event Event::Return = Event::Special({13}); const Event Event::Return = Event::Special({13});
#else #else
Event Event::Return = Event::Special({10}); const Event Event::Return = Event::Special({10});
#endif #endif
Event Event::Tab = Event::Special({9}); const Event Event::Tab = Event::Special({9});
Event Event::TabReverse = Event::Special({27, 91, 90}); const Event Event::TabReverse = Event::Special({27, 91, 90});
Event Event::F1 = Event::Special("\x1B[OP"); const Event Event::F1 = Event::Special("\x1B[OP");
Event Event::F2 = Event::Special("\x1B[OQ"); const Event Event::F2 = Event::Special("\x1B[OQ");
Event Event::F3 = Event::Special("\x1B[OR"); const Event Event::F3 = Event::Special("\x1B[OR");
Event Event::F4 = Event::Special("\x1B[OS"); const Event Event::F4 = Event::Special("\x1B[OS");
Event Event::F5 = Event::Special("\x1B[15~"); const Event Event::F5 = Event::Special("\x1B[15~");
Event Event::F6 = Event::Special("\x1B[17~"); const Event Event::F6 = Event::Special("\x1B[17~");
Event Event::F7 = Event::Special("\x1B[18~"); const Event Event::F7 = Event::Special("\x1B[18~");
Event Event::F8 = Event::Special("\x1B[19~"); const Event Event::F8 = Event::Special("\x1B[19~");
Event Event::F9 = Event::Special("\x1B[20~"); const Event Event::F9 = Event::Special("\x1B[20~");
Event Event::F10 = Event::Special("\x1B[21~"); const Event Event::F10 = Event::Special("\x1B[21~");
Event Event::F11 = Event::Special("\x1B[21~"); // Doesn't exist const Event Event::F11 = Event::Special("\x1B[21~"); // Doesn't exist
Event Event::F12 = Event::Special("\x1B[24~"); const Event Event::F12 = Event::Special("\x1B[24~");
Event Event::Custom = Event::Special({0}); Event Event::Custom = Event::Special({0});
} // namespace ftxui } // namespace ftxui