Cleanup.

examples/component/print_key_press.cpp

@@ -8,6 +8,7 @@
 #include <string>  // for char_traits, operator+, string, basic_string, to_string
 #include <utility>  // for move
 #include <vector>   // for vector
+#include <map>     // for map
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
 #include "ftxui/component/component.hpp"       // for CatchEvent, Renderer
@@ -18,13 +19,50 @@
 
 using namespace ftxui;
 
+std::map<Event, std::string> event_to_string = {
+  {Event::ArrowLeft, "Event::ArrowLeft"},
+  {Event::ArrowRight, "Event::ArrowRight"},
+  {Event::ArrowUp, "Event::ArrowUp"},
+  {Event::ArrowDown, "Event::ArrowDown"},
+  {Event::ArrowLeftCtrl, "Event::ArrowLeftCtrl"},
+  {Event::ArrowRightCtrl, "Event::ArrowRightCtrl"},
+  {Event::ArrowUpCtrl, "Event::ArrowUpCtrl"},
+  {Event::ArrowDownCtrl, "Event::ArrowDownCtrl"},
+  {Event::Backspace, "Event::Backspace"},
+  {Event::Delete, "Event::Delete"},
+  {Event::Escape, "Event::Escape"},
+  {Event::Return, "Event::Return"},
+  {Event::Tab, "Event::Tab"},
+  {Event::TabReverse, "Event::TabReverse"},
+  {Event::F1, "Event::F1"},
+  {Event::F2, "Event::F2"},
+  {Event::F3, "Event::F3"},
+  {Event::F4, "Event::F4"},
+  {Event::F5, "Event::F5"},
+  {Event::F6, "Event::F6"},
+  {Event::F7, "Event::F7"},
+  {Event::F8, "Event::F8"},
+  {Event::F9, "Event::F9"},
+  {Event::F10, "Event::F10"},
+  {Event::F11, "Event::F11"},
+  {Event::F12, "Event::F12"},
+  {Event::Home, "Event::Home"},
+  {Event::End, "Event::End"},
+  {Event::PageUp, "Event::PageUp"},
+  {Event::PageDown, "Event::PageDown"},
+  {Event::Custom, "Custom"},
+};
+
 std::string Stringify(Event event) {
   std::string out;
   for (auto& it : event.input())
     out += " " + std::to_string((unsigned int)it);
 
   out = "(" + out + " ) -> ";
-  if (event.is_character()) {
+
+  if (event_to_string.count(event)) {
+    out += event_to_string[event];
+  } else if (event.is_character()) {
     out += "Event::Character(\"" + event.character() + "\")";
   } else if (event.is_mouse()) {
     out += "mouse";
@@ -67,70 +105,8 @@ std::string Stringify(Event event) {
       out += "_meta";
 
     out += "(" +  //
-           std::to_string(event.mouse().x) + "," +
-           std::to_string(event.mouse().y) + ")";
-  } else if (event == Event::ArrowLeft) {
-    out += "Event::ArrowLeft";
-  } else if (event == Event::ArrowRight) {
-    out += "Event::ArrowRight";
-  } else if (event == Event::ArrowUp) {
-    out += "Event::ArrowUp";
-  } else if (event == Event::ArrowDown) {
-    out += "Event::ArrowDown";
-  } else if (event == Event::ArrowLeftCtrl) {
-    out += "Event::ArrowLeftCtrl";
-  } else if (event == Event ::ArrowRightCtrl) {
-    out += "Event::ArrowRightCtrl";
-  } else if (event == Event::ArrowUpCtrl) {
-    out += "Event::ArrowUpCtrl";
-  } else if (event == Event::ArrowDownCtrl) {
-    out += "Event::ArrowDownCtrl";
-  } else if (event == Event::Backspace) {
-    out += "Event::Backspace";
-  } else if (event == Event::Delete) {
-    out += "Event::Delete";
-  } else if (event == Event::Escape) {
-    out += "Event::Escape";
-  } else if (event == Event::Return) {
-    out += "Event::Return";
-  } else if (event == Event::Tab) {
-    out += "Event::Tab";
-  } else if (event == Event::TabReverse) {
-    out += "Event::TabReverse";
-  } else if (event == Event::F1) {
-    out += "Event::F1";
-  } else if (event == Event::F2) {
-    out += "Event::F2";
-  } else if (event == Event::F3) {
-    out += "Event::F3";
-  } else if (event == Event::F4) {
-    out += "Event::F4";
-  } else if (event == Event::F5) {
-    out += "Event::F5";
-  } else if (event == Event::F6) {
-    out += "Event::F6";
-  } else if (event == Event::F7) {
-    out += "Event::F7";
-  } else if (event == Event::F8) {
-    out += "Event::F8";
-  } else if (event == Event::F9) {
-    out += "Event::F9";
-  } else if (event == Event::F10) {
-    out += "Event::F10";
-  } else if (event == Event::F11) {
-    out += "Event::F11";
-  } else if (event == Event::F12) {
-    out += "Event::F12";
-  } else if (event == Event::Home) {
-    out += "Event::Home";
-  } else if (event == Event::End) {
-    out += "Event::End";
-  } else if (event == Event::PageUp) {
-    out += "Event::PageUp";
-  } else if (event == Event::PageDown) {
-    out += "Event::PageDown";
-  } else if (event == Event::Custom) {
-    out += "Custom";
+      std::to_string(event.mouse().x) + "," +
+      std::to_string(event.mouse().y) + ")";
   } else {
     out += "(special)";
   }

include/ftxui/component/event.hpp

@@ -79,6 +79,7 @@ struct Event {
   //--- Method section ---------------------------------------------------------
   bool operator==(const Event& other) const { return input_ == other.input_; }
   bool operator!=(const Event& other) const { return !operator==(other); }
+  bool operator<(const Event& other) const { return input_ < other.input_; }
 
   const std::string& input() const { return input_; }
 

src/ftxui/component/screen_interactive.cpp

@@ -736,8 +736,10 @@ void ScreenInteractive::HandleTask(Component component, Task& task) {
 
       arg.screen_ = this;
 
-      if (!component->OnEvent(arg) && (arg == Event::CtrlC)) {
-        ExitNow();
+      const bool handled = component->OnEvent(arg);
+
+      if (!handled && (arg == Event::CtrlC)) {
+        Exit();
       }
 
       frame_valid_ = false;