curses-utils2 0.2.0__tar.gz → 0.3.0__tar.gz

{curses_utils2-0.2.0 → curses_utils2-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: curses-utils2
-Version: 0.2.0
+Version: 0.3.0
 Summary: A curses utils
 Project-URL: homepage, https://github.com/shamilbi/curses-utils2
 Author-email: Shamil Bikineyev <shamilbi@gmail.com>

curses_utils2-0.3.0/curses_utils2/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.3.0'

{curses_utils2-0.2.0 → curses_utils2-0.3.0}/curses_utils2/list1.py

@@ -15,7 +15,7 @@ class ListProto(Protocol):
         pass
 
 
-class List:
+class List:  # pylint: disable=attribute-defined-outside-init
     '''
     A projection of an array of records r0...rX to a window lines of string s0...sY
     where si = get_record_str(j) = rj -> str, s(i+1) = get_record_str(j+1), j < records_len()
@@ -24,19 +24,19 @@ class List:
 
     def __init__(
         self,
-        win: curses.window,
         proto: ListProto,
         current_color: int = curses.A_BOLD,
     ):
-        self.win = win
         self.proto = proto
         self.current_color = current_color
 
-        self.win.keypad(True)
-
         self.cur = 0  # cursor y
         self.idx = 0  # source index
 
+    def set_win(self, win: curses.window):
+        self.win = win
+        self.win.keypad(True)
+
     def refresh(self):
         self.win.erase()
         len_ = self.proto.records_len()
@@ -44,6 +44,8 @@ class List:
             rows, _ = self.win.getmaxyx()
             if not self.idx < len_:  # deleted
                 self.idx = len_ - 1
+            if not self.cur < rows:  # new win < old win
+                self.cur = rows - 1
             if (rows - self.cur) > (di := len_ - self.idx):
                 # gap at bottom
                 self.cur = rows - di

{curses_utils2-0.2.0 → curses_utils2-0.3.0}/curses_utils2/list1m.py

@@ -16,11 +16,10 @@ class List1m(List):
 
     def __init__(
         self,
-        win: curses.window,
         proto: ListProto1m,
         current_color: int = curses.A_BOLD,
     ):
-        super().__init__(win, proto, current_color)
+        super().__init__(proto, current_color)
         self.proto: ListProto1m = proto
 
     def move_up(self, i: int):

{curses_utils2-0.2.0 → curses_utils2-0.3.0}/curses_utils2/list3.py

@@ -16,26 +16,26 @@ class ListProto3(Protocol):
         pass
 
 
-class List3:
+class List3:  # pylint: disable=attribute-defined-outside-init
     'List + every record projects to <height> window lines'
 
     def __init__(
         self,
-        win: curses.window,
         proto: ListProto3,
         height: int = 1,
         current_color: int = curses.A_BOLD,
     ):
-        self.win = win
         self.height = height
         self.proto = proto
         self.current_color = current_color
 
-        self.win.keypad(True)
-
         self.cur = 0  # cursor y, = 0..(maxy // height), real cursor = cur * height
         self.idx = 0  # source index
 
+    def set_win(self, win: curses.window):
+        self.win = win
+        self.win.keypad(True)
+
     def addstr(self, i: int, g: Generator[str], attr: int = 0):
         i2 = i * self.height
         j = -1
@@ -62,6 +62,8 @@ class List3:
             rows //= self.height
             if not self.idx < len_:  # deleted
                 self.idx = len_ - 1
+            if not self.cur < rows:  # new win < old win
+                self.cur = rows - 1
             if (rows - self.cur) > (di := len_ - self.idx):
                 # gap at bottom
                 self.cur = rows - di

curses_utils2-0.2.0/curses_utils2/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.2.0'

curses_utils2-0.2.0/curses_utils2/list2.py

@@ -1,174 +0,0 @@
-import curses
-from typing import Protocol
-
-from .win import win_addstr
-
-
-class ListProto2(Protocol):
-    def get_record_str(self, i: int) -> tuple[str, str]:
-        pass
-
-    def records_len(self) -> int:
-        pass
-
-    def refresh_win_deps(self):
-        pass
-
-
-class List2:
-    'List + every record projects to 2 window lines'
-
-    def __init__(
-        self,
-        win: curses.window,
-        proto: ListProto2,
-        current_color: int = curses.A_BOLD,
-    ):
-        self.win = win
-        self.proto = proto
-        self.current_color = current_color
-
-        self.win.keypad(True)
-
-        self.cur = 0  # cursor y, = 0..(maxy // 2), real cursor = cur * 2
-        self.idx = 0  # source index
-
-    def addstr(self, i: int, t: tuple[str, str], attr: int = 0):
-        i2 = i * 2
-        if attr:
-            win_addstr(self.win, i2, 0, t[0], attr=attr | curses.A_BOLD)
-            win_addstr(self.win, i2 + 1, 0, t[1], attr=attr | curses.A_DIM)
-        else:
-            # win_addstr(self.win, i2, 0, t[0], attr=curses.A_BOLD)
-            win_addstr(self.win, i2, 0, t[0])
-            win_addstr(self.win, i2 + 1, 0, t[1], attr=curses.A_DIM)
-
-    def refresh(self):
-        self.win.erase()
-        len_ = self.proto.records_len()
-        if len_:
-            rows, _ = self.win.getmaxyx()
-            rows //= 2
-            if not self.idx < len_:  # deleted
-                self.idx = len_ - 1
-            if (rows - self.cur) > (di := len_ - self.idx):
-                # gap at bottom
-                self.cur = rows - di
-            self.cur = min(self.cur, self.idx)
-            for i in range(rows):
-                idx = self.idx - self.cur + i
-                if not idx < len_:
-                    break
-                s = self.proto.get_record_str(idx)
-                if i == self.cur:
-                    self.addstr(i, s, attr=self.current_color)
-                else:
-                    self.addstr(i, s)
-            self.win.move(self.cur * 2, 0)
-        self.win.refresh()
-        self.proto.refresh_win_deps()
-
-    def scroll_top(self):
-        self.idx = self.cur = 0
-        self.refresh()
-
-    def scroll_bottom(self):
-        len_ = self.proto.records_len()
-        if not len_:
-            return
-        rows, _ = self.win.getmaxyx()
-        rows //= 2
-        self.cur = min(rows - 1, len_ - 1)
-        self.idx = len_ - 1
-        self.refresh()
-
-    def scroll_down(self):
-        len_ = self.proto.records_len()
-        if not len_ or not self.idx + 1 < len_:
-            return
-        rows, _ = self.win.getmaxyx()
-        rows //= 2
-        prev_s = self.proto.get_record_str(self.idx)
-        next_s = self.proto.get_record_str(self.idx + 1)
-        self.addstr(self.cur, prev_s)
-        if self.cur + 1 < rows:
-            self.cur += 1
-        else:
-            self.win.move(0, 0)
-            self.win.deleteln()
-            self.win.deleteln()
-            self.cur = rows - 1
-        self.addstr(self.cur, next_s, attr=self.current_color)
-        self.idx += 1
-        self.win.refresh()
-        self.proto.refresh_win_deps()
-
-    def scroll_up(self):
-        len_ = self.proto.records_len()
-        if not len_ or self.idx - 1 < 0:
-            return
-        prev_s = self.proto.get_record_str(self.idx)
-        next_s = self.proto.get_record_str(self.idx - 1)
-        self.addstr(self.cur, prev_s)
-        if self.cur > 0:
-            self.cur -= 1
-        else:
-            self.win.move(0, 0)
-            self.win.insdelln(2)
-        self.addstr(self.cur, next_s, attr=self.current_color)
-        self.idx -= 1
-        self.win.refresh()
-        self.proto.refresh_win_deps()
-
-    def scroll_page_down(self):
-        len_ = self.proto.records_len()
-        if not len_:
-            return
-        rows, _ = self.win.getmaxyx()
-        rows //= 2
-        idx = self.idx + rows
-        if idx < len_:
-            self.idx = idx
-            self.refresh()
-        else:
-            idx = len_ - 1
-            delta = idx - self.idx
-            if not delta:
-                self.scroll_bottom()
-            elif self.cur + delta < rows:
-                self.cur += delta
-                self.idx = idx
-                self.refresh()
-            else:
-                self.scroll_bottom()
-
-    def scroll_page_up(self):
-        len_ = self.proto.records_len()
-        if not len_:
-            return
-        rows, _ = self.win.getmaxyx()
-        rows //= 2
-        idx = self.idx - rows
-        if idx >= 0:
-            self.idx = idx
-            self.refresh()
-        else:
-            self.scroll_top()
-
-    def handle_input(self, ch: int) -> bool:
-        char = chr(ch)
-        if char.upper() == 'J' or ch == curses.KEY_DOWN:  # Down or J
-            self.scroll_down()
-        elif char.upper() == 'K' or ch == curses.KEY_UP:  # Up or K
-            self.scroll_up()
-        elif char == 'g' or ch == curses.KEY_HOME:  # Move to top
-            self.scroll_top()
-        elif char == 'G' or ch == curses.KEY_END:  # Move to last item
-            self.scroll_bottom()
-        elif ch == curses.KEY_NPAGE:  # Page down
-            self.scroll_page_down()
-        elif ch == curses.KEY_PPAGE:  # Page up
-            self.scroll_page_up()
-        else:
-            return False
-        return True