Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: components can't distinguish custom events #677

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion include/ftxui/component/event.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct Event {
static Event Special(std::string);
static Event Mouse(std::string, Mouse mouse);
static Event CursorReporting(std::string, int x, int y);
static Event CustomTagged(int tag);

// --- Arrow ---
static const Event ArrowLeft;
Expand Down Expand Up @@ -74,9 +75,14 @@ struct Event {

const std::string& input() const { return input_; }

bool operator==(const Event& other) const { return input_ == other.input_; }
bool operator==(const Event& other) const {
return type_ == Type::Custom && other.type_ == Type::Custom ? data_.custom_tag == other.data_.custom_tag : input_ == other.input_;
}
bool operator!=(const Event& other) const { return !operator==(other); }

int is_custom(int tag) const { return type_ == Type::Custom && data_.custom_tag == tag; }
int is_custom() const { return type_ == Type::Custom; }

//--- State section ----------------------------------------------------------
ScreenInteractive* screen_ = nullptr;

Expand All @@ -88,6 +94,7 @@ struct Event {
Character,
Mouse,
CursorReporting,
Custom,
};
Type type_ = Type::Unknown;

Expand All @@ -99,6 +106,7 @@ struct Event {
union {
struct Mouse mouse;
struct Cursor cursor;
int custom_tag;
} data_ = {};

std::string input_;
Expand Down
9 changes: 9 additions & 0 deletions src/ftxui/component/event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ Event Event::CursorReporting(std::string input, int x, int y) {
return event;
}

// static
Event Event::CustomTagged(int tag) {
Event event;
event.type_ = Type::Custom;
event.data_.custom_tag = tag;
return event;
}


// --- Arrow ---
const Event Event::ArrowLeft = Event::Special("\x1B[D"); // NOLINT
const Event Event::ArrowRight = Event::Special("\x1B[C"); // NOLINT
Expand Down