euporie 2.3.2__py3-none-any.whl → 2.4.1__py3-none-any.whl

euporie/core/widgets/display.py

@@ -16,16 +16,15 @@ from prompt_toolkit.filters.base import Condition
 from prompt_toolkit.filters.utils import to_filter
 from prompt_toolkit.formatted_text.base import to_formatted_text
 from prompt_toolkit.formatted_text.utils import fragment_list_width, split_lines
-from prompt_toolkit.layout.containers import Float, Window
+from prompt_toolkit.layout.containers import ConditionalContainer, Float, VSplit, Window
 from prompt_toolkit.layout.controls import GetLinePrefixCallable, UIContent, UIControl
-from prompt_toolkit.layout.margins import ConditionalMargin
 from prompt_toolkit.layout.mouse_handlers import MouseHandlers
 from prompt_toolkit.layout.screen import Char, WritePosition
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.utils import Event
 
 from euporie.core.commands import add_cmd
-from euporie.core.convert.base import convert, find_route
+from euporie.core.convert.core import convert, find_route
 from euporie.core.convert.utils import data_pixel_size, pixels_to_cell_size
 from euporie.core.current import get_app
 from euporie.core.data_structures import DiInt
@@ -40,21 +39,21 @@ from euporie.core.key_binding.registry import (
     load_registered_bindings,
     register_bindings,
 )
-from euporie.core.margins import ScrollbarMargin
+from euporie.core.margins import MarginContainer, ScrollbarMargin
 from euporie.core.terminal import tmuxify
 from euporie.core.widgets.page import BoundedWritePosition
 
 if TYPE_CHECKING:
+    from pathlib import Path
     from typing import Any, Callable, Iterable
 
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text import StyleAndTextTuples
     from prompt_toolkit.key_binding import KeyBindingsBase
     from prompt_toolkit.key_binding.key_bindings import NotImplementedOrNone
-    from prompt_toolkit.layout.containers import AnyContainer, WindowRenderInfo
+    from prompt_toolkit.layout.containers import AnyContainer
     from prompt_toolkit.layout.dimension import AnyDimension
     from prompt_toolkit.layout.screen import Screen
-    from upath import UPath
 
 
 log = logging.getLogger(__name__)
@@ -71,7 +70,7 @@ class DisplayControl(UIControl):
         self,
         data: Any,
         format_: str,
-        path: UPath | None = None,
+        path: Path | None = None,
         fg_color: str | None = None,
         bg_color: str | None = None,
         sizing_func: Callable[[], tuple[int, float]] | None = None,
@@ -102,11 +101,12 @@ class DisplayControl(UIControl):
         self.key_bindings = load_registered_bindings(
             "euporie.core.widgets.display.Display"
         )
+        self._cursor_position = Point(x=0, y=0)
+        self.dy = 0
         self.app = get_app()
 
+        self.on_data_changed = Event(self)
         self.on_cursor_position_changed = Event(self)
-        self._cursor_position = Point(x=0, y=0)
-        self.dy = 0
 
         self.sizing_func = sizing_func or (lambda: (0, 0))
         self._max_cols = 0
@@ -133,6 +133,7 @@ class DisplayControl(UIControl):
         """Set the control's data."""
         self._data = value
         self.reset()
+        self.on_data_changed.fire()
 
     def get_key_bindings(self) -> KeyBindingsBase | None:
         """Return the control's key bindings."""
@@ -276,6 +277,7 @@ class DisplayControl(UIControl):
     def get_invalidate_events(self) -> Iterable[Event[object]]:
         """Return the Window invalidate events."""
         # Whenever the cursor position changes, the UI has to be updated.
+        yield self.on_data_changed
         yield self.on_cursor_position_changed
 
     @property
@@ -293,7 +295,6 @@ class DisplayWindow(Window):
     """A window sub-class which can scroll left and right."""
 
     content: DisplayControl
-    render_info: WindowRenderInfo
     vertical_scroll: int
 
     def _write_to_screen_at_index(
@@ -388,7 +389,7 @@ class GraphicControl(DisplayControl, metaclass=ABCMeta):
         self,
         data: Any,
         format_: str,
-        path: UPath | None = None,
+        path: Path | None = None,
         fg_color: str | None = None,
         bg_color: str | None = None,
         sizing_func: Callable[[], tuple[int, float]] | None = None,
@@ -632,7 +633,7 @@ class KittyGraphicControl(GraphicControl):
         self,
         data: Any,
         format_: str,
-        path: UPath | None = None,
+        path: Path | None = None,
         fg_color: str | None = None,
         bg_color: str | None = None,
         sizing_func: Callable[[], tuple[int, float]] | None = None,
@@ -957,7 +958,7 @@ class GraphicFloat(Float):
         target_window: Window,
         data: Any,
         format_: str,
-        path: UPath | None = None,
+        path: Path | None = None,
         fg_color: str | None = None,
         bg_color: str | None = None,
         sizing_func: Callable[[], tuple[int, float]] | None = None,
@@ -1053,6 +1054,32 @@ class GraphicFloat(Float):
             self.control.data = value
             self.control.reset()
 
+    @property
+    def format_(self) -> str:
+        """Return the graphic's current data format."""
+        if self.control is not None:
+            return self.control.format_
+        return ""
+
+    @format_.setter
+    def format_(self, value: str) -> None:
+        """Set the graphic float's data format."""
+        if self.control is not None:
+            self.control.format_ = value
+
+    @property
+    def path(self) -> Path | None:
+        """Return the graphic's current data path."""
+        if self.control is not None:
+            return self.control.path
+        return None
+
+    @path.setter
+    def path(self, value: Path | None) -> None:
+        """Set the graphic float's data path."""
+        if self.control is not None:
+            self.control.path = value
+
 
 class Display:
     """Rich output displays.
@@ -1065,7 +1092,7 @@ class Display:
         self,
         data: Any,
         format_: str,
-        path: UPath | None = None,
+        path: Path | None = None,
         fg_color: str | None = None,
         bg_color: str | None = None,
         height: AnyDimension = None,
@@ -1138,16 +1165,19 @@ class Display:
             char=" ",
         )
 
-        self.window.right_margins = [
-            ConditionalMargin(
-                ScrollbarMargin(),
-                filter=to_filter(scrollbar)
-                & (
-                    ~to_filter(scrollbar_autohide)
-                    | (to_filter(scrollbar_autohide) & scrollable(self.window))
+        self.container = VSplit(
+            [
+                self.window,
+                ConditionalContainer(
+                    MarginContainer(ScrollbarMargin(), target=self.window),
+                    filter=to_filter(scrollbar)
+                    & (
+                        ~to_filter(scrollbar_autohide)
+                        | (to_filter(scrollbar_autohide) & scrollable(self.window))
+                    ),
                 ),
-            )
-        ]
+            ]
+        )
 
         # Add graphic
         app = get_app()
@@ -1175,6 +1205,28 @@ class Display:
         self.control.data = value
         self.graphic_float.data = value
 
+    @property
+    def format_(self) -> str:
+        """Return the display's current data format."""
+        return self.control.format_
+
+    @format_.setter
+    def format_(self, value: str) -> None:
+        """Set the display container's data format."""
+        self.control.format_ = value
+        self.graphic_float.format_ = value
+
+    @property
+    def path(self) -> Path | None:
+        """Return the display's current data path."""
+        return self.control.path
+
+    @path.setter
+    def path(self, value: Path | None) -> None:
+        """Set the display container's data path."""
+        self.control.path = value
+        self.graphic_float.path = value
+
     def make_sizing_func(
         self, data: Any, format_: str, fg: str | None, bg: str | None
     ) -> Callable[[], tuple[int, float]]:
@@ -1222,7 +1274,7 @@ class Display:
 
     def __pt_container__(self) -> AnyContainer:
         """Return the content of this output."""
-        return self.window
+        return self.container
 
     # ################################### Commands ####################################
 

euporie/core/widgets/file_browser.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.cache import FastDictCache
 from prompt_toolkit.completion import PathCompleter
@@ -20,16 +19,19 @@ from prompt_toolkit.layout.containers import (
     Window,
 )
 from prompt_toolkit.layout.controls import UIContent, UIControl
-from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
+from prompt_toolkit.layout.screen import WritePosition
+from prompt_toolkit.mouse_events import MouseButton, MouseEvent, MouseEventType
 from prompt_toolkit.utils import Event
 from upath import UPath
 
-from euporie.core.border import InnerEigthGrid
-from euporie.core.margins import ScrollbarMargin
+from euporie.core.app import get_app
+from euporie.core.border import InsetGrid
+from euporie.core.margins import MarginContainer, ScrollbarMargin
 from euporie.core.widgets.decor import Border, FocusedStyle
 from euporie.core.widgets.forms import Button, Text
 
 if TYPE_CHECKING:
+    from pathlib import Path
     from typing import Callable
 
     from prompt_toolkit.filters.base import FilterOrBool
@@ -39,6 +41,8 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.dimension import AnyDimension
     from upath.core import PT
 
+    from euporie.core.widgets.status_bar import StatusBarFields
+
 log = logging.getLogger(__name__)
 
 
@@ -349,7 +353,7 @@ FILE_ICONS = {
 }
 
 
-def is_dir(path: str | UPath) -> bool | None:
+def is_dir(path: str | Path) -> bool | None:
     """Check if a path is a directory."""
     test_path = UPath(path)
     try:
@@ -363,22 +367,25 @@ class FileBrowserControl(UIControl):
 
     def __init__(
         self,
-        path: UPath | None = None,
+        path: Path | None = None,
         on_chdir: Callable[[FileBrowserControl], None] | None = None,
         on_select: Callable[[FileBrowserControl], None] | None = None,
         on_open: Callable[[FileBrowserControl], None] | None = None,
+        window: Window | None = None,
     ) -> None:
         """Initialize a new file browser instance."""
         self.dir = path or UPath(".")
-        self.hovered: int = 0
+        self.hovered: int | None = None
         self.selected: int | None = None
         self._dir_cache: FastDictCache[
-            tuple[UPath], list[tuple[bool, UPath]]
+            tuple[Path], list[tuple[bool, Path]]
         ] = FastDictCache(get_value=self.load_path, size=1)
         self.on_select = Event(self, on_select)
         self.on_chdir = Event(self, on_chdir)
         self.on_open = Event(self, on_open)
 
+        self.window = window
+
         self.on_chdir.fire()
 
         self.key_bindings = kb = KeyBindings()
@@ -412,12 +419,12 @@ class FileBrowserControl(UIControl):
             return self.open_path()
 
     @property
-    def contents(self) -> list[tuple[bool, UPath]]:
+    def contents(self) -> list[tuple[bool, Path]]:
         """Return the contents of the current folder."""
         return self._dir_cache[(self.dir,)]
 
     @property
-    def dir(self) -> UPath:
+    def dir(self) -> Path:
         """Return the current folder path."""
         return self._dir
 
@@ -435,12 +442,12 @@ class FileBrowserControl(UIControl):
             log.warning("'%s' is not a directory, not changing directory", value)
 
     @property
-    def path(self) -> UPath:
+    def path(self) -> Path:
         """Return the current selected path."""
         return self.contents[self.selected or 0][1]
 
     @staticmethod
-    def load_path(path: UPath) -> list[tuple[bool, UPath]]:
+    def load_path(path: Path) -> list[tuple[bool, Path]]:
         """Return the contents of a folder."""
         paths = [] if path.parent == path else [path / ".."]
         try:
@@ -489,11 +496,42 @@ class FileBrowserControl(UIControl):
     def mouse_handler(self, mouse_event: MouseEvent) -> NotImplementedOrNone:
         """Handle mouse events."""
         row = mouse_event.position.y
-        if mouse_event.event_type == MouseEventType.MOUSE_DOWN:
-            get_app().layout.current_control = self
+        app = get_app()
+        if (
+            mouse_event.button == MouseButton.LEFT
+            and mouse_event.event_type == MouseEventType.MOUSE_DOWN
+        ):
+            app.layout.current_control = self
+            app.mouse_limits = None
+            self.hovered = None
             return self.select(row, open_file=True)
         elif mouse_event.event_type == MouseEventType.MOUSE_MOVE:
-            return self.hover(row)
+            # Mark item as hovered if mouse is over the control
+            if (
+                self.window is not None
+                and (info := self.window.render_info) is not None
+            ):
+                rowcol_to_yx = info._rowcol_to_yx
+                abs_mouse_pos = (
+                    mouse_event.position.x + info._x_offset,
+                    mouse_event.position.y + info._y_offset - info.vertical_scroll,
+                )
+                if abs_mouse_pos == app.mouse_position:
+                    row_col_vals = rowcol_to_yx.values()
+                    y_min, x_min = min(row_col_vals)
+                    y_max, x_max = max(row_col_vals)
+                    app.mouse_limits = WritePosition(
+                        xpos=x_min,
+                        ypos=y_min,
+                        width=x_max - x_min + 1,
+                        height=y_max - y_min + 1,
+                    )
+                    return self.hover(row)
+                else:
+                    # Clear mouse limits if mouse is outside control
+                    app.mouse_limits = None
+                    self.hovered = None
+                    return None
 
         return NotImplemented
 
@@ -509,12 +547,13 @@ class FileBrowserControl(UIControl):
             self.open_path()
         return None
 
-    def hover(self, row: int) -> NotImplementedOrNone:
+    def hover(self, row: int | None) -> NotImplementedOrNone:
         """Hover a file in the browser."""
-        row = min(max(0, row), len(self.contents) - 1)
-        if self.hovered != row:
-            self.hovered = row
-            return None
+        if row is not None:
+            row = min(max(0, row), len(self.contents) - 1)
+            if self.hovered != row:
+                self.hovered = row
+                return None
         return NotImplemented
 
     def open_path(self) -> None:
@@ -555,6 +594,14 @@ class FileBrowserControl(UIControl):
         """Determine that the file_browser is focusable."""
         return True
 
+    def __pt_status__(self) -> StatusBarFields:
+        """Show the selected or hovered path in the statusbar."""
+        if self.hovered is not None:
+            return [[("", str(self.contents[self.hovered][1]))]], []
+        elif self.selected is not None:
+            return [[("", str(self.contents[self.selected][1]))]], []
+        return [], []
+
 
 class FileBrowser:
     """A file browser."""
@@ -563,10 +610,10 @@ class FileBrowser:
 
     def __init__(
         self,
-        path: UPath | None = None,
-        on_select: Callable[[UPath], None] | None = None,
-        on_open: Callable[[UPath], None] | None = None,
-        on_chdir: Callable[[UPath], None] | None = None,
+        path: Path | None = None,
+        on_select: Callable[[Path], None] | None = None,
+        on_open: Callable[[Path], None] | None = None,
+        on_chdir: Callable[[Path], None] | None = None,
         width: AnyDimension = None,
         height: AnyDimension = None,
         style: str = "",
@@ -575,7 +622,7 @@ class FileBrowser:
         """Create a new instance."""
 
         def _accept_path(buffer: Buffer) -> bool:
-            control.dir = UPath(buffer.text)
+            control.dir = Path(buffer.text)
             return True
 
         def _validate_path(path: str) -> bool:
@@ -588,7 +635,6 @@ class FileBrowser:
         )
         self.control = control = FileBrowserControl(
             path=path,
-            on_open=lambda x: log.debug(x.path),
             on_chdir=lambda x: setattr(text, "text", str(x.dir)),
         )
         if on_select is not None:
@@ -622,12 +668,16 @@ class FileBrowser:
                 ),
                 FocusedStyle(
                     Border(
-                        Window(
-                            control,
-                            style="class:face",
-                            right_margins=[ScrollbarMargin()],
+                        VSplit(
+                            [
+                                window := Window(
+                                    control,
+                                    style="class:face",
+                                ),
+                                MarginContainer(ScrollbarMargin(), target=window),
+                            ]
                         ),
-                        border=InnerEigthGrid,
+                        border=InsetGrid,
                         style="class:input,inset,border",
                     ),
                     style_hover="",
@@ -637,7 +687,13 @@ class FileBrowser:
             width=width,
             height=height,
         )
+        # Set control's window so it can determine it's position for mouse-over
+        control.window = window
 
     def __pt_container__(self) -> AnyContainer:
         """Return the tree-view container's content."""
         return self.container
+
+    def __pt_status__(self) -> StatusBarFields:
+        """Show the selected or hovered path in the statusbar."""
+        return self.control.__pt_status__()

euporie/core/widgets/formatted_text_area.py

@@ -15,7 +15,7 @@ from prompt_toolkit.layout.margins import ConditionalMargin
 from prompt_toolkit.layout.processors import DynamicProcessor, Processor, Transformation
 from prompt_toolkit.widgets import TextArea
 
-from euporie.core.margins import NumberedDiffMargin, ScrollbarMargin
+from euporie.core.margins import NumberedDiffMargin
 
 if TYPE_CHECKING:
     from typing import Any
@@ -98,8 +98,6 @@ class FormattedTextArea(TextArea):
                 self.line_numbers,
             )
         ]
-        # Add auto scrollbar
-        self.window.right_margins = [ScrollbarMargin(display_arrows=False)]
         # Set the formatted text to display
         self._set_formatted_text(formatted_text)