euporie 2.8.5__py3-none-any.whl → 2.8.7__py3-none-any.whl

euporie/core/key_binding/bindings/basic.py

@@ -13,6 +13,7 @@ from prompt_toolkit.filters import (
 from euporie.core.commands import add_cmd
 from euporie.core.filters import (
     char_after_cursor,
+    cursor_at_end_of_line,
     has_matching_bracket,
     insert_mode,
     replace_mode,
@@ -83,14 +84,16 @@ def _complete_bracket(right: str, event: KeyPressEvent) -> None:
     event.key_processor.feed(event.key_sequence[0], first=True)
 
 
-def _close_bracket(right: str, event: KeyPressEvent) -> None:
+def _skip_close_bracket(right: str, event: KeyPressEvent) -> None:
     event.current_buffer.cursor_position += 1
 
 
 for left, right in [("(", ")"), ("[", "]"), ("{", "}")]:
     add_cmd(
         name=f"complete-bracket-{left}{right}",
-        filter=buffer_has_focus & insert_mode & ~char_after_cursor(right),
+        filter=buffer_has_focus
+        & insert_mode
+        & (char_after_cursor(" ") | cursor_at_end_of_line),
         save_before=if_no_repeat,
         hidden=True,
     )(partial(_complete_bracket, right))
@@ -102,4 +105,4 @@ for left, right in [("(", ")"), ("[", "]"), ("{", "}")]:
         & has_matching_bracket,
         save_before=if_no_repeat,
         hidden=True,
-    )(partial(_close_bracket, right))
+    )(partial(_skip_close_bracket, right))

euporie/core/keys.py

@@ -21,7 +21,8 @@ class MoreKeys(str, Enum):
     SgrPixelStatusResponse = "<sgr-pixel-status-response>"
     ClipboardDataResponse = "<clipboard-data-response>"
 
-    # Regular keys
+    # Regular key-presses
+
     AltTab = "A-tab"
     AltEnter = "A-enter"
     AltEscape = "A-escape"
@@ -124,15 +125,15 @@ class MoreKeys(str, Enum):
     Escape = "escape"
     Insert = "insert"
     Delete = "delete"
-    Pageup = "pageUp"
-    Pagedown = "pageDown"
+    Pageup = "pageup"
+    Pagedown = "pagedown"
     Up = "up"
     Down = "down"
     Right = "right"
     Left = "left"
     Home = "home"
     End = "end"
-    Printscreen = "printScreen"
+    Printscreen = "printscreen"
     Pause = "pause"
     Menu = "menu"
     F1 = "f1"
@@ -251,15 +252,15 @@ class MoreKeys(str, Enum):
     ShiftBackspace = "s-backspace"
     ShiftInsert = "s-insert"
     ShiftDelete = "s-delete"
-    ShiftPageup = "s-pageUp"
-    ShiftPagedown = "s-pageDown"
+    ShiftPageup = "s-pageup"
+    ShiftPagedown = "s-pagedown"
     ShiftUp = "s-up"
     ShiftDown = "s-down"
     ShiftRight = "s-right"
     ShiftLeft = "s-left"
     ShiftHome = "s-home"
     ShiftEnd = "s-end"
-    ShiftPrintscreen = "s-printScreen"
+    ShiftPrintscreen = "s-printscreen"
     ShiftPause = "s-pause"
     ShiftMenu = "s-menu"
     ShiftF1 = "s-f1"
@@ -276,15 +277,15 @@ class MoreKeys(str, Enum):
     ShiftF12 = "s-f12"
     AltInsert = "A-insert"
     AltDelete = "A-delete"
-    AltPageup = "A-pageUp"
-    AltPagedown = "A-pageDown"
+    AltPageup = "A-pageup"
+    AltPagedown = "A-pagedown"
     AltUp = "A-up"
     AltDown = "A-down"
     AltRight = "A-right"
     AltLeft = "A-left"
     AltHome = "A-home"
     AltEnd = "A-end"
-    AltPrintscreen = "A-printScreen"
+    AltPrintscreen = "A-printscreen"
     AltPause = "A-pause"
     AltMenu = "A-menu"
     AltF1 = "A-f1"
@@ -400,15 +401,15 @@ class MoreKeys(str, Enum):
     ControlBackspace = "c-backspace"
     ControlInsert = "c-insert"
     ControlDelete = "c-delete"
-    ControlPageup = "c-pageUp"
-    ControlPagedown = "c-pageDown"
+    ControlPageup = "c-pageup"
+    ControlPagedown = "c-pagedown"
     ControlUp = "c-up"
     ControlDown = "c-down"
     ControlRight = "c-right"
     ControlLeft = "c-left"
     ControlHome = "c-home"
     ControlEnd = "c-end"
-    ControlPrintscreen = "c-printScreen"
+    ControlPrintscreen = "c-printscreen"
     ControlPause = "c-pause"
     ControlMenu = "c-menu"
     ControlF1 = "c-f1"
@@ -524,15 +525,15 @@ class MoreKeys(str, Enum):
     AltShiftBackspace = "A-s-backspace"
     AltShiftInsert = "A-s-insert"
     AltShiftDelete = "A-s-delete"
-    AltShiftPageup = "A-s-pageUp"
-    AltShiftPagedown = "A-s-pageDown"
+    AltShiftPageup = "A-s-pageup"
+    AltShiftPagedown = "A-s-pagedown"
     AltShiftUp = "A-s-up"
     AltShiftDown = "A-s-down"
     AltShiftRight = "A-s-right"
     AltShiftLeft = "A-s-left"
     AltShiftHome = "A-s-home"
     AltShiftEnd = "A-s-end"
-    AltShiftPrintscreen = "A-s-printScreen"
+    AltShiftPrintscreen = "A-s-printscreen"
     AltShiftPause = "A-s-pause"
     AltShiftMenu = "A-s-menu"
     AltShiftF1 = "A-s-f1"
@@ -648,15 +649,15 @@ class MoreKeys(str, Enum):
     ControlShiftBackspace = "c-s-backspace"
     ControlShiftInsert = "c-s-insert"
     ControlShiftDelete = "c-s-delete"
-    ControlShiftPageup = "c-s-pageUp"
-    ControlShiftPagedown = "c-s-pageDown"
+    ControlShiftPageup = "c-s-pageup"
+    ControlShiftPagedown = "c-s-pagedown"
     ControlShiftUp = "c-s-up"
     ControlShiftDown = "c-s-down"
     ControlShiftRight = "c-s-right"
     ControlShiftLeft = "c-s-left"
     ControlShiftHome = "c-s-home"
     ControlShiftEnd = "c-s-end"
-    ControlShiftPrintscreen = "c-s-printScreen"
+    ControlShiftPrintscreen = "c-s-printscreen"
     ControlShiftPause = "c-s-pause"
     ControlShiftMenu = "c-s-menu"
     ControlShiftF1 = "c-s-f1"
@@ -772,15 +773,15 @@ class MoreKeys(str, Enum):
     ControlAltBackspace = "c-A-backspace"
     ControlAltInsert = "c-A-insert"
     ControlAltDelete = "c-A-delete"
-    ControlAltPageup = "c-A-pageUp"
-    ControlAltPagedown = "c-A-pageDown"
+    ControlAltPageup = "c-A-pageup"
+    ControlAltPagedown = "c-A-pagedown"
     ControlAltUp = "c-A-up"
     ControlAltDown = "c-A-down"
     ControlAltRight = "c-A-right"
     ControlAltLeft = "c-A-left"
     ControlAltHome = "c-A-home"
     ControlAltEnd = "c-A-end"
-    ControlAltPrintscreen = "c-A-printScreen"
+    ControlAltPrintscreen = "c-A-printscreen"
     ControlAltPause = "c-A-pause"
     ControlAltMenu = "c-A-menu"
     ControlAltF1 = "c-A-f1"
@@ -896,15 +897,15 @@ class MoreKeys(str, Enum):
     ControlAltShiftBackspace = "c-A-s-backspace"
     ControlAltShiftInsert = "c-A-s-insert"
     ControlAltShiftDelete = "c-A-s-delete"
-    ControlAltShiftPageup = "c-A-s-pageUp"
-    ControlAltShiftPagedown = "c-A-s-pageDown"
+    ControlAltShiftPageup = "c-A-s-pageup"
+    ControlAltShiftPagedown = "c-A-s-pagedown"
     ControlAltShiftUp = "c-A-s-up"
     ControlAltShiftDown = "c-A-s-down"
     ControlAltShiftRight = "c-A-s-right"
     ControlAltShiftLeft = "c-A-s-left"
     ControlAltShiftHome = "c-A-s-home"
     ControlAltShiftEnd = "c-A-s-end"
-    ControlAltShiftPrintscreen = "c-A-s-printScreen"
+    ControlAltShiftPrintscreen = "c-A-s-printscreen"
     ControlAltShiftPause = "c-A-s-pause"
     ControlAltShiftMenu = "c-A-s-menu"
     ControlAltShiftF1 = "c-A-s-f1"

euporie/core/layout/cache.py

@@ -6,6 +6,7 @@ import logging
 from functools import cache
 from typing import TYPE_CHECKING
 
+from prompt_toolkit.cache import FastDictCache
 from prompt_toolkit.data_structures import Point
 from prompt_toolkit.layout.containers import (
     Container,
@@ -56,11 +57,26 @@ class CachedContainer(Container):
         self._invalid = True
         self._invalidate_events: set[Event[object]] = set()
         self._layout_hash = 0
+        self.render_counter = 0
         self.height = 0
         self.width = 0
         self._rendered_lines: set[int] = set()
         self._rowcols_to_yx: dict[Window, dict[tuple[int, int], tuple[int, int]]] = {}
 
+        self._width_cache: FastDictCache[tuple[int, int], Dimension] = FastDictCache(
+            get_value=lambda _render_count,
+            max_available_width: self.container.preferred_width(max_available_width)
+        )
+        self._height_cache: FastDictCache[tuple[int, int, int], Dimension] = (
+            FastDictCache(
+                get_value=lambda _render_count,
+                width,
+                max_available_height: self.container.preferred_height(
+                    width, max_available_height
+                )
+            )
+        )
+
     @property
     def layout_hash(self) -> int:
         """Return a hash of the child's current layout."""
@@ -80,11 +96,11 @@ class CachedContainer(Container):
 
     def preferred_width(self, max_available_width: int) -> Dimension:
         """Return the desired width for this container."""
-        return self.container.preferred_width(max_available_width)
+        return self._width_cache[self.render_counter, max_available_width]
 
     def preferred_height(self, width: int, max_available_height: int) -> Dimension:
         """Return the desired height for this container."""
-        return self.container.preferred_height(width, max_available_height)
+        return self._height_cache[self.render_counter, width, max_available_height]
 
     def render(
         self,
@@ -115,6 +131,7 @@ class CachedContainer(Container):
             self._rendered_lines.clear()
             self.mouse_handlers.mouse_handlers.clear()
             self.screen = Screen()
+            self.render_counter += 1
 
             # Recalculate child height if this child has been invalidated
             height = self.height = self.container.preferred_height(
@@ -278,10 +295,16 @@ class CachedContainer(Container):
             # Modify render info
             info = win.render_info
             if info is not None:
+                xpos = new_wp.xpos + info._x_offset
+                y_start = new_wp.ypos + info._y_offset
+                # Only include visible lines according to the bounding box
                 visible_line_to_row_col = {
-                    line: (y + info._y_offset, new_wp.xpos + info._x_offset)
-                    for line, y in enumerate(
-                        range(new_wp.ypos, new_wp.ypos + new_wp.height)
+                    i: (y, xpos)
+                    for i, y in enumerate(
+                        range(
+                            y_start + new_wp.bbox.top,
+                            y_start + new_wp.height - new_wp.bbox.bottom,
+                        )
                     )
                 }
                 win.render_info = WindowRenderInfo(
@@ -295,8 +318,8 @@ class CachedContainer(Container):
                     visible_line_to_row_col=visible_line_to_row_col,
                     # The following is needed to calculate absolute cursor positions
                     rowcol_to_yx={
-                        (row, col): (y + top, x + left)
-                        for (row, col), (y, x) in info._rowcol_to_yx.items()
+                        k: (y + top, x + left)
+                        for k, (y, x) in info._rowcol_to_yx.items()
                     },
                     x_offset=info._x_offset + left,
                     y_offset=info._y_offset + top,
@@ -342,6 +365,7 @@ class CachedContainer(Container):
 
         rows_range = range(max(0, rows.start), rows.stop)
         cols_range = range(max(0, cols.start), cols.stop)
+
         for y in rows_range:
             input_db_row = input_db[y]
             input_zwes_row = input_zwes[y]

euporie/core/layout/containers.py

@@ -4,10 +4,9 @@ from __future__ import annotations
 
 import logging
 from functools import lru_cache, partial
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, NamedTuple
 
 from prompt_toolkit.application.current import get_app
-from prompt_toolkit.cache import FastDictCache
 from prompt_toolkit.data_structures import Point
 from prompt_toolkit.layout import containers as ptk_containers
 from prompt_toolkit.layout.containers import (
@@ -28,7 +27,7 @@ from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.layout.screen import _CHAR_CACHE
 from prompt_toolkit.layout.utils import explode_text_fragments
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
-from prompt_toolkit.utils import get_cwidth, to_str
+from prompt_toolkit.utils import get_cwidth, take_using_weights, to_str
 
 from euporie.core.data_structures import DiInt
 from euporie.core.layout.controls import DummyControl
@@ -56,6 +55,67 @@ if TYPE_CHECKING:
 log = logging.getLogger(__name__)
 
 
+class DimensionTuple(NamedTuple):
+    """A hashable representation of a PTK :py:class:`Dimension`."""
+
+    min: int
+    max: int
+    preferred: int
+    weight: int = 1
+
+
+@lru_cache
+def distribute_dimensions(
+    size: int, dimensions: tuple[DimensionTuple, ...]
+) -> list[int] | None:
+    """Return the heights for all rows, or None when there is not enough space."""
+    if not dimensions:
+        return []
+
+    # Sum dimensions
+    sum_dimensions = DimensionTuple(
+        min=sum(d.min for d in dimensions),
+        max=sum(d.max for d in dimensions),
+        preferred=sum(d.preferred for d in dimensions),
+    )
+
+    # If there is not enough space for both.
+    # Don't do anything.
+    if sum_dimensions.min > size:
+        return None
+
+    # Find optimal sizes. (Start with minimal size, increase until we cover
+    # the whole size.)
+    sizes = [d.min for d in dimensions]
+
+    child_generator = take_using_weights(
+        items=list(range(len(dimensions))), weights=[d.weight for d in dimensions]
+    )
+
+    i = next(child_generator)
+
+    # Increase until we meet at least the 'preferred' size.
+    preferred_stop = min(size, sum_dimensions.preferred)
+    preferred_dimensions = [d.preferred for d in dimensions]
+
+    while sum(sizes) < preferred_stop:
+        if sizes[i] < preferred_dimensions[i]:
+            sizes[i] += 1
+        i = next(child_generator)
+
+    # Increase until we use all the available space. (or until "max")
+    if not get_app().is_done:
+        max_stop = min(size, sum_dimensions.max)
+        max_dimensions = [d.max for d in dimensions]
+
+        while sum(sizes) < max_stop:
+            if sizes[i] < max_dimensions[i]:
+                sizes[i] += 1
+            i = next(child_generator)
+
+    return sizes
+
+
 @lru_cache(maxsize=None)
 class DummyContainer(Container):
     """Base class for user interface layout."""
@@ -129,13 +189,22 @@ class HSplit(ptk_containers.HSplit):
             key_bindings=key_bindings,
             style=style,
         )
-        _split_cache_getter = super()._divide_heights
-        self._split_cache: FastDictCache[
-            tuple[int, WritePosition], list[int] | None
-        ] = FastDictCache(lambda rc, wp: _split_cache_getter(wp), size=100)
 
     def _divide_heights(self, write_position: WritePosition) -> list[int] | None:
-        return self._split_cache[get_app().render_counter, write_position]
+        """Calculate and cache heights for all rows."""
+        width = write_position.width
+        height = write_position.height
+        dimensions = [c.preferred_height(width, height) for c in self._all_children]
+        result = distribute_dimensions(
+            height,
+            tuple(
+                DimensionTuple(
+                    min=d.min, max=d.max, preferred=d.preferred, weight=d.weight
+                )
+                for d in dimensions
+            ),
+        )
+        return result
 
     def write_to_screen(
         self,
@@ -299,14 +368,20 @@ class VSplit(ptk_containers.VSplit):
             key_bindings=key_bindings,
             style=style,
         )
-        _split_cache_getter = super()._divide_widths
-        self._split_cache: FastDictCache[tuple[int, int], list[int] | None] = (
-            FastDictCache(lambda rc, w: _split_cache_getter(w), size=100)
-        )
 
     def _divide_widths(self, width: int) -> list[int] | None:
         """Calculate and cache widths for all columns."""
-        return self._split_cache[get_app().render_counter, width]
+        dimensions = [c.preferred_width(width) for c in self._all_children]
+        result = distribute_dimensions(
+            width,
+            tuple(
+                DimensionTuple(
+                    min=d.min, max=d.max, preferred=d.preferred, weight=d.weight
+                )
+                for d in dimensions
+            ),
+        )
+        return result
 
     def write_to_screen(
         self,