From 5bf5454dbedfa5331cb41b6c7947c01f620a1dd9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 4 Sep 2022 22:15:17 +0530
Subject: [PATCH] Nicer fix for #5469

---
 kittens/tui/handler.py | 12 +++++++++++-
 kittens/tui/loop.py    | 10 ++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/kittens/tui/handler.py b/kittens/tui/handler.py
index 8d97c749c..af739174c 100644
--- a/kittens/tui/handler.py
+++ b/kittens/tui/handler.py
@@ -45,7 +45,6 @@ class Handler:
     mouse_tracking = MouseTracking.none
     terminal_io_ended = False
     overlay_ready_report_needed = False
-    perform_default_key_actions = True  # ctrl-c/ctrl-d will call on_interrupt and on_eot
 
     def _initialize(
         self,
@@ -122,11 +121,22 @@ class Handler:
         self._tui_loop.quit(1)
 
     def on_key_event(self, key_event: KeyEventType, in_bracketed_paste: bool = False) -> None:
+        ' Override this method and perform_default_key_action() to handle all key events '
         if key_event.text:
             self.on_text(key_event.text, in_bracketed_paste)
         else:
             self.on_key(key_event)
 
+    def perform_default_key_action(self, key_event: KeyEventType) -> bool:
+        ' Override in sub-class if you want to handle these key events yourself '
+        if key_event.matches('ctrl+c'):
+            self.on_interrupt()
+            return True
+        if key_event.matches('ctrl+d'):
+            self.on_eot()
+            return True
+        return False
+
     def on_text(self, text: str, in_bracketed_paste: bool = False) -> None:
         pass
 
diff --git a/kittens/tui/loop.py b/kittens/tui/loop.py
index 63d7fc003..faac2f33c 100644
--- a/kittens/tui/loop.py
+++ b/kittens/tui/loop.py
@@ -330,14 +330,8 @@ class Loop:
             except Exception:
                 pass
             else:
-                if self.handler.perform_default_key_actions:
-                    if k.matches('ctrl+c'):
-                        self.handler.on_interrupt()
-                        return
-                    if k.matches('ctrl+d'):
-                        self.handler.on_eot()
-                        return
-                self.handler.on_key_event(k)
+                if not self.handler.perform_default_key_action(k):
+                    self.handler.on_key_event(k)
 
     def _on_pm(self, pm: str) -> None:
         pass