New implementation for BaseTextBox.get_input, reindent some code.

Author: Tim-ats-d

visualdialog/box.py

@@ -111,8 +111,10 @@ def __init__(
         self.downtime_chars = downtime_chars
         self.downtime_chars_delay = downtime_chars_delay
 
-        #: Keystroke acquisition mode for the TextBox.get_input method.
-        self.key_detection_mode: Literal["key", "code"] = "key"
+        #: Keystroke acquisition curses method for BaseTextBox.get_input.
+        self.key_detection: Literal["getkey",
+                                    "getch",
+                                    "get_wch"] = "getkey"
 
         #: List of accepted key to skip dialog.
         #: This defaults to a list contains " ".
@@ -200,10 +202,7 @@ def get_input(self, win: CursesWindow):
         curses.flushinp()
 
         while 1:
-            key = win.getch()
-
-            if self.key_detection_mode == "key":
-                key = chr(key)
+            key = getattr(win, self.key_detection)()
 
             if key in self.confirm_keys:
                 break

visualdialog/dialog.py

@@ -71,11 +71,11 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         pass
 
-    def _display_end_indicator(
-            self,
-            win: CursesWindow,
-            text_attr: CursesTextAttributes= (curses.A_BOLD,
-                                              curses.A_BLINK)):
+    def _display_end_indicator(self,
+                               win: CursesWindow,
+                               text_attr: CursesTextAttributes = (
+                                   curses.A_BOLD,
+                                   curses.A_BLINK)):
         """Displays an end indicator in the lower right corner of
         textbox.
 
@@ -202,22 +202,21 @@ def _one_by_one(self,
             self._display_end_indicator(win)
             self.get_input(win)
 
-    def char_by_char(
-            self,
-            win: CursesWindow,
-            text: str,
-            colors_pair_nb: int = 0,
-            text_attr: Union[CursesTextAttribute,
-                             CursesTextAttributes] = (),
-            words_attr: Mapping[Sequence[str],
-                                Union[CursesTextAttribute,
-                                      CursesTextAttributes]] = {},
-            word_delimiter: str = " ",
-            flash_screen: bool = False,
-            delay: int = 40,
-            random_delay: Sequence[int] = (0, 0),
-            callback: Callable = lambda: None,
-            cargs: Sequence = ()):
+    def char_by_char(self,
+                     win: CursesWindow,
+                     text: str,
+                     colors_pair_nb: int = 0,
+                     text_attr: Union[CursesTextAttribute,
+                                      CursesTextAttributes] = (),
+                     words_attr: Mapping[Sequence[str],
+                                         Union[CursesTextAttribute,
+                                         CursesTextAttributes]] = {},
+                     word_delimiter: str = " ",
+                     flash_screen: bool = False,
+                     delay: int = 40,
+                     random_delay: Sequence[int] = (0, 0),
+                     callback: Callable = lambda: None,
+                     cargs: Sequence = ()):
         """Write the given text character by character.
 
         :param win: ``curses`` window object on which the method will
@@ -304,22 +303,21 @@ def char_by_char(
                          callback,
                          cargs)
 
-    def word_by_word(
-            self,
-            win: CursesWindow,
-            text: str,
-            colors_pair_nb: int = 0,
-            text_attr: Union[CursesTextAttribute,
-                             CursesTextAttributes] = (),
-            words_attr: Mapping[Sequence[str],
-                                Union[CursesTextAttribute,
-                                      CursesTextAttributes]] = {},
-            word_delimiter: str = " ",
-            flash_screen: bool = False,
-            delay: int = 150,
-            random_delay: Sequence[int] = (0, 0),
-            callback: Callable = lambda: None,
-            cargs: Sequence = ()):
+    def word_by_word(self,
+                     win: CursesWindow,
+                     text: str,
+                     colors_pair_nb: int = 0,
+                     text_attr: Union[CursesTextAttribute,
+                                      CursesTextAttributes] = (),
+                     words_attr: Mapping[Sequence[str],
+                                         Union[CursesTextAttribute,
+                                               CursesTextAttributes]] = {},
+                     word_delimiter: str = " ",
+                     flash_screen: bool = False,
+                     delay: int = 150,
+                     random_delay: Sequence[int] = (0, 0),
+                     callback: Callable = lambda: None,
+                     cargs: Sequence = ()):
         """Write the given text word by word.
 
         :param win: ``curses`` window object on which the method will