listpick 0.1.14.8__py3-none-any.whl → 0.1.14.10__py3-none-any.whl

listpick/listpick_app.py

@@ -40,6 +40,7 @@ from listpick.utils.dump import dump_state, load_state, dump_data
 from listpick.ui.build_help import build_help_rows
 from listpick.ui.footer import StandardFooter, CompactFooter, NoFooter
 from listpick.utils.picker_log import setup_logger
+from listpick.utils.user_input import get_char, open_tty
 
 
 try:
@@ -187,6 +188,8 @@ class Picker:
         sheet_index = 0,
         sheet_states = [{}],
 
+        redraw_screen_accessory: Callable = lambda : None,
+
     ):
         self.stdscr = stdscr
         self.items = items
@@ -335,6 +338,7 @@ class Picker:
         self.sheet_states = sheet_states
         self.sheets = sheets
 
+        self.redraw_screen_accessory = redraw_screen_accessory
         self.initialise_picker_state(reset_colours=self.reset_colours)
 
         # Note: We have to set the footer after initialising the picker state so that the footer can use the get_function_data method
@@ -747,6 +751,8 @@ class Picker:
 
     def draw_screen_(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Draw Picker screen. """
+
+        self.redraw_screen_accessory()
         self.logger.debug("Draw screen.")
 
         if clear:
@@ -1236,6 +1242,7 @@ class Picker:
             "sheets":                           self.sheets,
             "sheet_name":                       self.sheet_name,
             "sheet_states":                     self.sheet_states,
+            "redraw_screen_accessory":          self.redraw_screen_accessory,
         }
         return function_data
 
@@ -1270,6 +1277,7 @@ class Picker:
             "centre_in_terminal_vertical",
             "centre_in_cols",
             "centre_in_terminal",
+            "redraw_screen_accessory",
         ]
 
         for var in variables:
@@ -1362,7 +1370,6 @@ class Picker:
             "cancel_is_back": True,
             "number_columns": False,
             "reset_colours": False,
-            "cell_cursor": False,
         }
         while True:
             h, w = stdscr.getmaxyx()
@@ -1382,7 +1389,7 @@ class Picker:
             if s:
                 return {x: options[x] for x in s}, o, f
             return {}, "", f
-
+            
 
 
     def notification(self, stdscr: curses.window, message: str="", title:str="Notification", colours_end: int=0, duration:int=4) -> None:
@@ -1393,12 +1400,7 @@ class Picker:
         message_width = notification_width-5
 
         if not message: message = "!!"
-        if type(message) == type(""):
-            mw = message_width
-            submenu_items = [[message[i*mw:(i+1)*mw]] for i in range(len(message)//mw+1)]
-        elif type(message) != type([]):
-            submenu_items = [["  !!"]]
-
+        submenu_items = ["  "+message[i*message_width:(i+1)*message_width] for i in range(len(message)//message_width+1)]
 
         notification_remap_keys = { 
             curses.KEY_RESIZE: curses.KEY_F5,
@@ -1408,7 +1410,6 @@ class Picker:
             h, w = stdscr.getmaxyx()
 
             submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
-            # submenu_win = self.stdscr.subwin(notification_height, notification_width, 3, w - (notification_width+4))
             notification_data = {
                 "items": submenu_items,
                 "title": title,
@@ -1425,11 +1426,6 @@ class Picker:
                 "cancel_is_back": True,
                 "reset_colours": False,
 
-                "loaded_files": [],
-                "loaded_file_states": [],
-                "loaded_file": "",
-                "loaded_file_index": 0,
-                "cell_cursor": False,
             }
             OptionPicker = Picker(submenu_win, **notification_data)
             s, o, f = OptionPicker.run()
@@ -2229,6 +2225,13 @@ class Picker:
         # Open tty to accept input
         tty_fd = open_tty()
 
+        h, w = self.stdscr.getmaxyx()
+        def terminal_resized(old_w, old_h) -> bool:
+            w, h = os.get_terminal_size()
+            if old_h != h or old_w != w: return True
+            else: return False
+
+        COLS, LINES = os.get_terminal_size()
         # Main loop
         while True:
             # key = self.stdscr.getch()
@@ -2236,7 +2239,14 @@ class Picker:
             key = get_char(tty_fd, timeout=0.2)
             if key != -1:
                 self.logger.info(f"key={key}")
+
+            self.term_resize_event = terminal_resized(COLS, LINES)
+            COLS, LINES = os.get_terminal_size()
+            if self.term_resize_event: 
+                key = curses.KEY_RESIZE
+
             h, w = self.stdscr.getmaxyx()
+
             if key in self.disabled_keys: continue
             clear_screen=True
 
@@ -3091,7 +3101,7 @@ class Picker:
                 self.logger.info(f"key_function opts_select")
                 s, o, f = self.choose_option(self.stdscr, self.options_list)
                 if self.user_opts.strip(): self.user_opts += " "
-                self.user_opts += " ".join([x for x in s.values()])
+                self.user_opts += " ".join([x[0] for x in s.values()])
             elif self.check_key("notification_toggle", key, self.keys_dict):
                 self.logger.info(f"key_function notification_toggle")
                 self.notification(self.stdscr, colours_end=self.colours_end)
@@ -3580,50 +3590,6 @@ def unrestrict_curses(stdscr: curses.window) -> None:
     curses.curs_set(False)
 
 
-def open_tty():
-    """ Return a file descriptor for the tty that we are opening"""
-    tty_fd = os.open('/dev/tty', os.O_RDONLY)
-    tty.setraw(tty_fd)
-    return tty_fd
-
-def get_char(tty_fd, timeout: float = 0.2, secondary: bool = False) -> int:
-    """ Get character from a tty_fd with a timeout. """
-    rlist, _, _ = select.select([tty_fd], [], [], timeout)
-    if rlist:
-        # key = ord(tty_fd.read(1))
-        key = ord(os.read(tty_fd, 1))
-        if not secondary:
-            if key == 27:
-                key2 = get_char(tty_fd, timeout=0.01, secondary=True)
-                key3 = get_char(tty_fd, timeout=0.01, secondary=True)
-                key4 = get_char(tty_fd, timeout=0.01, secondary=True)
-                key5 = get_char(tty_fd, timeout=0.01, secondary=True)
-                if key2 == ord('O') and key3 == ord('B'):
-                    key = curses.KEY_DOWN
-                elif key2 == ord('O') and key3 == ord('A'):
-                    key = curses.KEY_UP
-                elif key2 == ord('O') and key3 == ord('D'):
-                    key = curses.KEY_LEFT
-                elif key2 == ord('O') and key3 == ord('C'):
-                    key = curses.KEY_RIGHT
-                elif key2 == ord('[') and key3 == ord('Z'):
-                    key = 353
-                elif key2 == ord('O') and key3 == ord('F'):
-                    key = curses.KEY_END
-                elif key2 == ord('O') and key3 == ord('H'):
-                    key = curses.KEY_HOME
-                elif key2 == ord('[') and key3 == ord('3') and key4 == ord('~'):
-                    key = curses.KEY_DC
-                elif key2 == ord('[') and key3 == ord('3') and key4 == ord('~'):
-                    key = curses.KEY_DC
-                elif key2 == ord('O') and key3 == ord('P'):
-                    key = curses.KEY_F1
-                elif key2 == ord('[') and key3 == ord('1') and key4 == ord('5') and key5 == ord('~'):
-                    key = curses.KEY_F5
-
-    else:
-        key = -1
-    return key
 
 def main() -> None:
     """ Main function when listpick is executed. Deals with command line arguments and starts a Picker. """

listpick/ui/input_field.py

@@ -18,22 +18,24 @@ import logging
 logger = logging.getLogger('picker_log')
 import select
 import tty
-
-def open_tty():
-    """ Return a file descriptor for the tty that we are opening"""
-    tty_fd = os.open('/dev/tty', os.O_RDONLY)
-    tty.setraw(tty_fd)
-    return tty_fd
-
-def get_char(tty_fd, timeout: float = 0.2) -> int:
-    """ Get character from a tty_fd with a timeout. """
-    rlist, _, _ = select.select([tty_fd], [], [], timeout)
-    if rlist:
-        # key = ord(tty_fd.read(1))
-        key = ord(os.read(tty_fd, 1))
-    else:
-        key = -1
-    return key
+from listpick.utils.user_input import get_char, open_tty
+from listpick.utils import keycodes
+
+# def open_tty():
+#     """ Return a file descriptor for the tty that we are opening"""
+#     tty_fd = os.open('/dev/tty', os.O_RDONLY)
+#     tty.setraw(tty_fd)
+#     return tty_fd
+#
+# def get_char(tty_fd, timeout: float = 0.2) -> int:
+#     """ Get character from a tty_fd with a timeout. """
+#     rlist, _, _ = select.select([tty_fd], [], [], timeout)
+#     if rlist:
+#         # key = ord(tty_fd.read(1))
+#         key = ord(os.read(tty_fd, 1))
+#     else:
+#         key = -1
+#     return key
     
 def input_field(
     stdscr: curses.window,
@@ -230,100 +232,94 @@ def input_field(
         key = get_char(tty_fd, timeout=0.5)
         # key = stdscr.getch()
 
-        if key in [27, 7]:                                                           # ESC/ALT key or Ctrl+g
-            # For Alt-key combinations: set nodelay and get the second key
-            # stdscr.nodelay(True)
-            # key2 = stdscr.getch()
-            key2 = get_char(tty_fd, timeout=0.05)
-
-            if key2 == -1:                  # ESCAPE key (no key-combination)
-                stdscr.nodelay(False)
-                return "", False
-            elif key2 == curses.KEY_BACKSPACE:
-                # Delete to backslash or space (word_separator_chars)
-                search_txt = usrtxt[:-cursor] if cursor > 0 else usrtxt
-                index = -1
-                for word_separator_char in word_separator_chars:
-                    tmp_index = search_txt[::-1].find(word_separator_char)
-                    if tmp_index > -1:
-                        if index == -1:
-                            index = tmp_index
-                        else:
-                            index = min(index, tmp_index)
-
-                if index == -1:
-                    if cursor == 0:
-                        kill_ring.append(usrtxt)
-                        usrtxt = ""
-                    else:
-                        kill_ring.append(usrtxt[:-(cursor+1)])
-                        usrtxt = usrtxt[-(cursor+1):]
-                    cursor = len(usrtxt)
-                else:
-                    if index == 0:
-                        kill_ring.append(search_txt[-1:])
-                        usrtxt = search_txt[:-1] + usrtxt[len(search_txt):]
+
+        if key in [27, 7]:                                                  # ESC/ALT key or Ctrl+g
+            return "", False
+
+        elif key == keycodes.META_BS:
+            # Delete to backslash or space (word_separator_chars)
+            search_txt = usrtxt[:-cursor] if cursor > 0 else usrtxt
+            index = -1
+            for word_separator_char in word_separator_chars:
+                tmp_index = search_txt[::-1].find(word_separator_char)
+                if tmp_index > -1:
+                    if index == -1:
+                        index = tmp_index
                     else:
-                        kill_ring.append(search_txt[-index:])
-                        usrtxt = search_txt[:-index] + usrtxt[len(search_txt):]
+                        index = min(index, tmp_index)
 
-                potential_path = usrtxt
-                kill_ring_active = False
-
-            elif key2 == ord('f'):
-                # Forward word
-                search_txt = usrtxt[-cursor:]
-                index = -1
-                for word_separator_char in word_separator_chars:
-                    tmp_index = search_txt.find(word_separator_char)
-
-                    if tmp_index > -1:
-                        if index == -1:
-                            index = tmp_index
-                        else:
-                            index = min(index, tmp_index)
-
-                if index == -1:
-                    cursor = 0
+            if index == -1:
+                if cursor == 0:
+                    kill_ring.append(usrtxt)
+                    usrtxt = ""
                 else:
-                    cursor -= index + 1
-                    cursor = max(cursor, 0)
-                kill_ring_active = False
-
-            elif key2 == ord('b'):
-                # Backwards word
-                search_txt = usrtxt[:-cursor] if cursor > 0 else usrtxt
-                index = -1
-                for word_separator_char in word_separator_chars:
-                    tmp_index = search_txt[::-1].find(word_separator_char)
-
-                    if tmp_index == 0:
-                        tmp_index = search_txt[:-1][::-1].find(word_separator_char)
-
-                    if tmp_index > -1:
-                        if index == -1:
-                            index = tmp_index
-                        else:
-                            index = min(index, tmp_index)
-
-                if index == -1:
-                    cursor = len(usrtxt)
+                    kill_ring.append(usrtxt[:-(cursor+1)])
+                    usrtxt = usrtxt[-(cursor+1):]
+                cursor = len(usrtxt)
+            else:
+                if index == 0:
+                    kill_ring.append(search_txt[-1:])
+                    usrtxt = search_txt[:-1] + usrtxt[len(search_txt):]
                 else:
-                    cursor += index + 1
-                kill_ring_active = False
-
-            elif key2 == ord('y'):
-                prev_kill_ring_index = kill_ring_index
-                kill_ring_index = (kill_ring_index + 1)%len(kill_ring)
-                if kill_ring_active and len(kill_ring):
-                    if cursor == 0:
-                        usrtxt = usrtxt[:-len(kill_ring[prev_kill_ring_index])]
-                        usrtxt += kill_ring[kill_ring_index]
+                    kill_ring.append(search_txt[-index:])
+                    usrtxt = search_txt[:-index] + usrtxt[len(search_txt):]
+
+            potential_path = usrtxt
+            kill_ring_active = False
+
+        elif key == keycodes.META_f:
+            # Forward word
+            search_txt = usrtxt[-cursor:]
+            index = -1
+            for word_separator_char in word_separator_chars:
+                tmp_index = search_txt.find(word_separator_char)
+
+                if tmp_index > -1:
+                    if index == -1:
+                        index = tmp_index
+                    else:
+                        index = min(index, tmp_index)
+
+            if index == -1:
+                cursor = 0
+            else:
+                cursor -= index + 1
+                cursor = max(cursor, 0)
+            kill_ring_active = False
+
+        elif key == keycodes.META_b:
+            # Backwards word
+            search_txt = usrtxt[:-cursor] if cursor > 0 else usrtxt
+            index = -1
+            for word_separator_char in word_separator_chars:
+                tmp_index = search_txt[::-1].find(word_separator_char)
+
+                if tmp_index == 0:
+                    tmp_index = search_txt[:-1][::-1].find(word_separator_char)
+
+                if tmp_index > -1:
+                    if index == -1:
+                        index = tmp_index
                     else:
-                        usrtxt = usrtxt[-cursor:-(cursor+len(kill_ring[prev_kill_ring_index]))]
-                        usrtxt = usrtxt[:-cursor] + kill_ring[kill_ring_index] + usrtxt[-cursor:]
-            # Return to delayed getch
-            stdscr.nodelay(False)
+                        index = min(index, tmp_index)
+
+            if index == -1:
+                cursor = len(usrtxt)
+            else:
+                cursor += index + 1
+            kill_ring_active = False
+
+        elif key == keycodes.META_y:
+            # Kill ring
+            prev_kill_ring_index = kill_ring_index
+            kill_ring_index = (kill_ring_index + 1)%len(kill_ring)
+            if kill_ring_active and len(kill_ring):
+                if cursor == 0:
+                    usrtxt = usrtxt[:-len(kill_ring[prev_kill_ring_index])]
+                    usrtxt += kill_ring[kill_ring_index]
+                else:
+                    usrtxt = usrtxt[-cursor:-(cursor+len(kill_ring[prev_kill_ring_index]))]
+                    usrtxt = usrtxt[:-cursor] + kill_ring[kill_ring_index] + usrtxt[-cursor:]
 
         elif key == 3:                                                           # ctrl+c
             # Immediate exit

listpick/ui/keys.py

@@ -9,6 +9,7 @@ License: MIT
 """
 
 import curses
+from listpick.utils import keycodes
 
 picker_keys = {
     "refresh":                          [curses.KEY_F5],
@@ -25,8 +26,8 @@ picker_keys = {
     "page_down":                        [curses.KEY_NPAGE, 6], # Ctrl+f
     "cursor_bottom":                    [ord('G'), curses.KEY_END],
     "cursor_top":                       [ord('g'), curses.KEY_HOME],
-    "five_up":                          [ord('K')],
-    "five_down":                        [ord('J')],
+    "five_up":                          [ord('K'), keycodes.META_k],
+    "five_down":                        [ord('J'), keycodes.META_j],
     "toggle_select":                    [ord(' ')],
     "select_all":                       [ord('m'), 1], # Ctrl-a
     "select_none":                      [ord('M'), 18],   # Ctrl-r
@@ -135,6 +136,7 @@ notification_keys = {
     "five_up":                          [ord('K')],
     "five_down":                        [ord('J')],
     "redraw_screen":                    [12], # Ctrl-l
+    "refresh":                          [curses.KEY_F5, curses.KEY_RESIZE],
 }
 
 

listpick/utils/keycodes.py

@@ -0,0 +1,88 @@
+# Set a base value to ensure that we have no collisions with any unicode characters
+BASE_VALUE = 2**32
+
+# Define constants for alt+a to alt+z
+META_A = BASE_VALUE + 1000
+META_B = BASE_VALUE + 1001
+META_C = BASE_VALUE + 1002
+META_D = BASE_VALUE + 1003
+META_E = BASE_VALUE + 1004
+META_F = BASE_VALUE + 1005
+META_G = BASE_VALUE + 1006
+META_H = BASE_VALUE + 1007
+META_I = BASE_VALUE + 1008
+META_J = BASE_VALUE + 1009
+META_K = BASE_VALUE + 1010
+META_L = BASE_VALUE + 1011
+META_M = BASE_VALUE + 1012
+META_N = BASE_VALUE + 1013
+META_O = BASE_VALUE + 1014
+META_P = BASE_VALUE + 1015
+META_Q = BASE_VALUE + 1016
+META_R = BASE_VALUE + 1017
+META_S = BASE_VALUE + 1018
+META_T = BASE_VALUE + 1019
+META_U = BASE_VALUE + 1020
+META_V = BASE_VALUE + 1021
+META_W = BASE_VALUE + 1022
+META_X = BASE_VALUE + 1023
+META_Y = BASE_VALUE + 1024
+META_Z = BASE_VALUE + 1025
+
+# Define constants for alt+A to alt+Z (using uppercase)
+META_a = BASE_VALUE + 1050
+META_b = BASE_VALUE + 1051
+META_c = BASE_VALUE + 1052
+META_d = BASE_VALUE + 1053
+META_e = BASE_VALUE + 1054
+META_f = BASE_VALUE + 1055
+META_g = BASE_VALUE + 1056
+META_h = BASE_VALUE + 1057
+META_i = BASE_VALUE + 1058
+META_j = BASE_VALUE + 1059
+META_k = BASE_VALUE + 1060
+META_l = BASE_VALUE + 1061
+META_m = BASE_VALUE + 1062
+META_n = BASE_VALUE + 1063
+META_o = BASE_VALUE + 1064
+META_p = BASE_VALUE + 1065
+META_q = BASE_VALUE + 1066
+META_r = BASE_VALUE + 1067
+META_s = BASE_VALUE + 1068
+META_t = BASE_VALUE + 1069
+META_u = BASE_VALUE + 1070
+META_v = BASE_VALUE + 1071
+META_w = BASE_VALUE + 1072
+META_x = BASE_VALUE + 1073
+META_y = BASE_VALUE + 1074
+META_z = BASE_VALUE + 1075
+
+
+META_0 = BASE_VALUE + 1090
+META_1 = BASE_VALUE + 1091
+META_2 = BASE_VALUE + 1092
+META_3 = BASE_VALUE + 1093
+META_4 = BASE_VALUE + 1094
+META_5 = BASE_VALUE + 1095
+META_6 = BASE_VALUE + 1096
+META_7 = BASE_VALUE + 1097
+META_8 = BASE_VALUE + 1098
+META_9 = BASE_VALUE + 1099
+
+
+META_BS = BASE_VALUE + 1100
+
+# Dictionary to map character to its constant value
+META_KEY_MAP = {
+    'a': META_a, 'b': META_b, 'c': META_c, 'd': META_d, 'e': META_e,
+    'f': META_f, 'g': META_g, 'h': META_h, 'i': META_i, 'j': META_j,
+    'k': META_k, 'l': META_l, 'm': META_m, 'n': META_n, 'o': META_o,
+    'p': META_p, 'q': META_q, 'r': META_r, 's': META_s, 't': META_t,
+    'u': META_u, 'v': META_v, 'w': META_w, 'x': META_x, 'y': META_y,
+    'z': META_z, 'A': META_A, 'B': META_B, 'C': META_C, 'D': META_D,
+    'E': META_E, 'F': META_F, 'G': META_G, 'H': META_H, 'I': META_I,
+    'J': META_J, 'K': META_K, 'L': META_L, 'M': META_M, 'N': META_N,
+    'O': META_O, 'P': META_P, 'Q': META_Q, 'R': META_R, 'S': META_S,
+    'T': META_T, 'U': META_U, 'V': META_V, 'W': META_W, 'X': META_X,
+    'Y': META_Y, 'Z': META_Z
+}

listpick/utils/user_input.py

@@ -0,0 +1,104 @@
+from listpick.utils import keycodes
+import os, tty, select, curses
+
+def open_tty():
+    """ Return a file descriptor for the tty that we are opening"""
+    tty_fd = os.open('/dev/tty', os.O_RDONLY)
+    tty.setraw(tty_fd)
+    return tty_fd
+
+def get_char(tty_fd, timeout: float = 0.2, secondary: bool = False) -> int:
+    """ Get character from a tty_fd with a timeout. """
+    rlist, _, _ = select.select([tty_fd], [], [], timeout)
+    if rlist:
+        # key = ord(tty_fd.read(1))
+        key = ord(os.read(tty_fd, 1))
+        if not secondary:
+            if key == 27:
+                key2 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key3 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key4 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key5 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key6 = get_char(tty_fd, timeout=0.01, secondary=True)
+
+                keys = [key2, key3, key4, key5, key6]
+
+                key_str = "".join([chr(k) for k in keys if k != -1])
+
+                ## Arrow Keys
+                if key2 == ord('O') and key3 == ord('B'):
+                    key = curses.KEY_DOWN
+                elif key2 == ord('O') and key3 == ord('A'):
+                    key = curses.KEY_UP
+                elif key2 == ord('O') and key3 == ord('D'):
+                    key = curses.KEY_LEFT
+                elif key2 == ord('O') and key3 == ord('C'):
+                    key = curses.KEY_RIGHT
+
+                ## Shift+ Tab
+                elif key2 == ord('[') and key3 == ord('Z'):
+                    key = 353
+
+                ## Home, End, Pgup, Pgdn
+                elif key2 == ord('O') and key3 == ord('F'):
+                    key = curses.KEY_END
+                elif key2 == ord('O') and key3 == ord('H'):
+                    key = curses.KEY_HOME
+                elif key2 == ord('[') and key3 == ord('6') and key4 == ord("~"):
+                    key = curses.KEY_NPAGE
+                elif key2 == ord('[') and key3 == ord('5') and key4 == ord("~"):
+                    key = curses.KEY_PPAGE
+
+
+                # Delete key
+                elif key_str == "[3~":    ## Delete
+                    key = curses.KEY_DC
+                elif key_str == "[3;2~":                                            ## Shift+Delete
+                    key = 383
+
+                ## Function Keys
+                elif key2 == ord('O') and key3 == ord('P'):
+                    key = curses.KEY_F1
+                elif key_str == "OQ":
+                    key = curses.KEY_F2
+                elif key_str == "OR":
+                    key = curses.KEY_F3
+                elif key_str == "OS":
+                    key = curses.KEY_F4
+                elif key_str == "[15~":
+                    key = curses.KEY_F5
+                elif key_str == "[17~":
+                    key = curses.KEY_F6
+                elif key_str == "[17~":
+                    key = curses.KEY_F7
+                elif key_str == "[19~":
+                    key = curses.KEY_F8
+                elif key_str == "[20~":
+                    key = curses.KEY_F9
+                elif key_str == "[21~":
+                    key = curses.KEY_F10
+                elif key_str == "[23~":
+                    key = curses.KEY_F11
+                elif key_str == "[24~":
+                    key = curses.KEY_F12
+
+                ## Alt+KEY
+                elif key2 >= ord('a') and key2 <= ord('z') and key3 == -1:      ## Alt+[a-zA-Z]
+                    key = keycodes.META_a + (key2 - ord('a'))
+                elif key2 >= ord('A') and key2 <= ord('Z') and key3 == -1:      ## Alt+[a-zA-Z]
+                    key = keycodes.META_A + (key2 - ord('A'))
+                elif key2 == ord('0') and key3 == -1:                           ## Alt+0
+                    key = keycodes.META_0
+                elif key2 >= ord('1') and key2 <= ord('9') and key3 == -1:      ## Alt+1-9
+                    key = keycodes.META_1 + (key2 - ord('1'))
+                elif key2 == 127:                                               ## Alt+BS
+                    key = keycodes.META_BS
+
+                # If it is an unknown key with an escape sequence then return -1.
+                elif key2 != -1:
+                    key = -1
+        
+
+    else:
+        key = -1
+    return key

{listpick-0.1.14.8.dist-info → listpick-0.1.14.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.8
+Version: 0.1.14.10
 Summary: Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.
 Home-page: https://github.com/grimandgreedy/listpick
 Author: Grim

{listpick-0.1.14.8.dist-info → listpick-0.1.14.10.dist-info}/RECORD

@@ -1,13 +1,12 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=NVIY6VGD-yvZ_Lgwheqg53t2N1cgfmmqfbQslF8AgZo,188936
+listpick/listpick_app.py,sha256=SL9lgTIoTYHi3fcs01HFKBoCnxEUMHPkZHxW_nuCFxI,187280
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=8QtsRosIE2IMagRc_remzmwSWpCurFgLenLL7w1ly94,8949
 listpick/ui/footer.py,sha256=ZM5OWCxOZqy5RG6tFTe1ipvu9PRu6Gh3JCA8KXBR_Wc,15004
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
-listpick/ui/input_field.py,sha256=PrYZICoT9M4e85W755d909TItscOae2LYvYfQsWtiXE,31068
-listpick/ui/keycodes.py,sha256=1UilWAwtjhs801BrP-SndP-qIRS3AQJHl6KYKrWPgus,1614
-listpick/ui/keys.py,sha256=C9wG_VPhaXq_c2bREBGKhd4Tb-AKqqOgub7y4W8xQmI,13182
+listpick/ui/input_field.py,sha256=ylf3fiLXdAD4pueHWfzIrlwaRb9f5zm8f1UGkEPBxgM,30539
+listpick/ui/keys.py,sha256=7ZhJfsSatpk-jwfXj_FvzgQsQdUoF7JkD5Mniu9XZ0o,13328
 listpick/ui/pane_stuff.py,sha256=7GXa4UnV_7YmBv-baRi5moN51wYcuS4p0odl5C3m0Tc,169
 listpick/ui/picker_colours.py,sha256=FLOzvkq83orrN2bL0Mw-6RugWOZyuwUjQCrUFMUnKGY,11563
 listpick/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,6 +15,7 @@ listpick/utils/config.py,sha256=MEnAZg2Rhfl38XofEIN0uoVAOY7I0ftc79Evk3fOiVw,1654
 listpick/utils/dump.py,sha256=60YVIMNtBoYvWhmzfTJOsNGcetOvcCB3_T7yv-bYTPQ,3838
 listpick/utils/filtering.py,sha256=uS9sW0inmFvq0cIrwRC1BfuP8kjAD5IWWtls4jGB-70,1199
 listpick/utils/generate_data.py,sha256=7sv6JRhk0-Gcj4kOlkzx4qPNBJZ-GFWg9vM77GktzpI,3073
+listpick/utils/keycodes.py,sha256=ZGkw1-4szxPnP81wj80r92L6_neIOlBBjQltEieCwnk,2696
 listpick/utils/options_selectors.py,sha256=Vbv4jRkUsSPs7g-EQAv9Q0nhYy6Z4sFsJqMjUIe1oeQ,2814
 listpick/utils/paste_operations.py,sha256=7wDXLPlxUgA3CA99gwsm47juWGO2YQ9EJghW06yo9vI,1242
 listpick/utils/picker_log.py,sha256=SW6GmjxpI7YrSf72fSr4O8Ux0fY_OzaSXUgTFdz6Xo4,805
@@ -23,10 +23,11 @@ listpick/utils/search_and_filter_utils.py,sha256=XxGfkyDVXO9OAKcftPat8IReMTFIuTH
 listpick/utils/searching.py,sha256=Xk5UIqamNHL2L90z3ACB_Giqdpi9iRKoAJ6pKaqaD7Q,3093
 listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,5329
 listpick/utils/table_to_list_of_lists.py,sha256=XBj7eGBDF15BRME-swnoXyOfZWxXCxrXp0pzsBfcJ5g,12224
+listpick/utils/user_input.py,sha256=oyJZPAwA7UGAclPhdPL44tKnPIVNHWhX-tZEnCdBKC0,4318
 listpick/utils/utils.py,sha256=McOl9uT3jh7l4TIWeSd8ZGjK_e7r0YZF0Gl20yI6fl0,13873
-listpick-0.1.14.8.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.14.8.dist-info/METADATA,sha256=knTrmh3fmbsj_HcTRytEtKHYUQGgejK5YJjlq0BSd74,8090
-listpick-0.1.14.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.14.8.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.14.8.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.14.8.dist-info/RECORD,,
+listpick-0.1.14.10.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.14.10.dist-info/METADATA,sha256=JBhvFd-3BZN7u_19PRPeNos_bXLzEdpAwp5tbUH0_Q8,8091
+listpick-0.1.14.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.14.10.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.14.10.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.14.10.dist-info/RECORD,,

listpick/ui/keycodes.py

@@ -1,70 +0,0 @@
-# Define constants for alt+a to alt+z
-META_A = 1000
-META_B = 1001
-META_C = 1002
-META_D = 1003
-META_E = 1004
-META_F = 1005
-META_G = 1006
-META_H = 1007
-META_I = 1008
-META_J = 1009
-META_K = 1010
-META_L = 1011
-META_M = 1012
-META_N = 1013
-META_O = 1014
-META_P = 1015
-META_Q = 1016
-META_R = 1017
-META_S = 1018
-META_T = 1019
-META_U = 1020
-META_V = 1021
-META_W = 1022
-META_X = 1023
-META_Y = 1024
-META_Z = 1025
-
-# Define constants for alt+A to alt+Z (using uppercase)
-META_a = 1050
-META_b = 1051
-META_c = 1052
-META_d = 1053
-META_e = 1054
-META_f = 1055
-META_g = 1056
-META_h = 1057
-META_i = 1058
-META_j = 1059
-META_k = 1060
-META_l = 1061
-META_m = 1062
-META_n = 1063
-META_o = 1064
-META_p = 1065
-META_q = 1066
-META_r = 1067
-META_s = 1068
-META_t = 1069
-META_u = 1070
-META_v = 1071
-META_w = 1072
-META_x = 1073
-META_y = 1074
-META_z = 1075
-
-# Dictionary to map character to its constant value
-META_KEY_MAP = {
-    'a': META_a, 'b': META_b, 'c': META_c, 'd': META_d, 'e': META_e,
-    'f': META_f, 'g': META_g, 'h': META_h, 'i': META_i, 'j': META_j,
-    'k': META_k, 'l': META_l, 'm': META_m, 'n': META_n, 'o': META_o,
-    'p': META_p, 'q': META_q, 'r': META_r, 's': META_s, 't': META_t,
-    'u': META_u, 'v': META_v, 'w': META_w, 'x': META_x, 'y': META_y,
-    'z': META_z, 'A': META_A, 'B': META_B, 'C': META_C, 'D': META_D,
-    'E': META_E, 'F': META_F, 'G': META_G, 'H': META_H, 'I': META_I,
-    'J': META_J, 'K': META_K, 'L': META_L, 'M': META_M, 'N': META_N,
-    'O': META_O, 'P': META_P, 'Q': META_Q, 'R': META_R, 'S': META_S,
-    'T': META_T, 'U': META_U, 'V': META_V, 'W': META_W, 'X': META_X,
-    'Y': META_Y, 'Z': META_Z
-}