Refactor get_char() -> get_event() adding new Event and Key types

Instead of using raw ncurses codes now we have our own scancodes.
dacap · Mar 24, 2024 · 84f3743 · 84f3743
1 parent 2ed3f5d
commit 84f3743
Show file tree

Hide file tree

Showing 18 changed files with 674 additions and 193 deletions.
diff --git a/app/alert_view.cpp b/app/alert_view.cpp
@@ -1,5 +1,5 @@
 // handy text editor
-// Copyright (c) 2016-2018 David Capello
+// Copyright (c) 2016-2024 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -8,11 +8,6 @@
 
 AlertView::AlertView(const char* msg) {
   m_msg = msg;
-  m_result = 0;
-}
-
-int AlertView::result() const {
-  return m_result;
 }
 
 std::string AlertView::get_status_text() const {
@@ -25,9 +20,9 @@ void AlertView::show(Ctx* ctx) {
   ctx->status()->update();
 }
 
-bool AlertView::on_key(Ctx* ctx, int ch) {
-  View::on_key(ctx, ch);
-  m_result = ch;
+bool AlertView::on_key(Ctx* ctx, const Key& key) {
+  View::on_key(ctx, key);
+  m_result = key;
   ctx->back_view();
   return true;
 }
diff --git a/app/alert_view.h b/app/alert_view.h
@@ -1,5 +1,5 @@
 // handy text editor
-// Copyright (c) 2016-2018 David Capello
+// Copyright (c) 2016-2024 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -13,13 +13,13 @@
 class AlertView : public View {
 public:
   AlertView(const char* msg);
-  int result() const;
+  const Key& result() const { return m_result; }
 
   std::string get_status_text() const override;
   void show(Ctx* ctx) override;
-  bool on_key(Ctx* ctx, int ch) override;
+  bool on_key(Ctx* ctx, const Key& key) override;
 
 private:
   std::string m_msg;
-  int m_result;
+  Key m_result;
 };
diff --git a/app/app.cpp b/app/app.cpp
@@ -12,6 +12,7 @@
 #include "base/fs.h"
 #include "ctx.h"
 #include "doc_view.h"
+#include "event.h"
 #include "lua.h"
 #include "view.h"
 
@@ -87,7 +88,7 @@ void App::back_view() {
   view()->set_panel(panel);
 }
 
-int App::alert(const char* msg) {
+Key App::alert(const char* msg) {
   auto alert_view = std::make_shared<AlertView>(msg);
   set_view(alert_view);
   while (is_running() && view() == alert_view)
@@ -103,9 +104,10 @@ void App::loop() {
   ViewPtr view = this->view();
   view->show(this);
 
-  int ch = view->panel()->get_char();
+  Event ev = view->panel()->get_event();
 
-  view->on_key(this, ch);
+  if (ev.type() == Event::Type::Key)
+    view->on_key(this, ev.key());
 }
 
 void App::open_file(const char* fn) {

diff --git a/app/app.h b/app/app.h
@@ -1,5 +1,5 @@
 // handy text editor
-// Copyright (c) 2016-2021 David Capello
+// Copyright (c) 2016-2024 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -30,7 +30,7 @@ class App : public Ctx {
   ViewPtr view() override;
   void set_view(const ViewPtr& v) override;
   void back_view() override;
-  int alert(const char* msg) override;
+  Key alert(const char* msg) override;
   bool is_running() const;
   void loop();
   void open_file(const char* fn) override;

diff --git a/app/ctx.h b/app/ctx.h
@@ -1,12 +1,13 @@
 // handy text editor
-// Copyright (c) 2016-2017 David Capello
+// Copyright (c) 2016-2024 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
 
 #pragma once
 
 #include "base.h"
+#include "keys.h"
 
 class Ctx {
 public:
@@ -16,6 +17,6 @@ class Ctx {
   virtual ViewPtr view() = 0;
   virtual void set_view(const ViewPtr& view) = 0;
   virtual void back_view() = 0;
-  virtual int alert(const char* msg) = 0;
+  virtual Key alert(const char* msg) = 0;
   virtual void open_file(const char* fn) = 0;
 };