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

euporie/core/margins.py

@@ -9,13 +9,15 @@ from typing import TYPE_CHECKING, cast
 
 from prompt_toolkit.data_structures import Point
 from prompt_toolkit.filters import FilterOrBool, to_filter
+from prompt_toolkit.layout.containers import ScrollOffsets, WindowRenderInfo
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.layout.margins import Margin
+from prompt_toolkit.layout.screen import WritePosition
 from prompt_toolkit.mouse_events import MouseButton, MouseEventType
 from prompt_toolkit.mouse_events import MouseEvent as PtkMouseEvent
 
-from euporie.core.current import get_app
+from euporie.core.app.current import get_app
 from euporie.core.key_binding.bindings.mouse import MouseEvent, RelativePosition
 from euporie.core.layout.containers import Window
 
@@ -27,10 +29,10 @@ if TYPE_CHECKING:
         KeyBindingsBase,
         NotImplementedOrNone,
     )
-    from prompt_toolkit.layout.containers import Container, WindowRenderInfo
+    from prompt_toolkit.layout.containers import Container
     from prompt_toolkit.layout.controls import UIContent
     from prompt_toolkit.layout.mouse_handlers import MouseHandlers
-    from prompt_toolkit.layout.screen import Screen, WritePosition
+    from prompt_toolkit.layout.screen import Screen
 
     from euporie.core.diagnostics import Report
 
@@ -49,9 +51,9 @@ class ClickableMargin(Margin, metaclass=ABCMeta):
 
     write_position: WritePosition | None
 
-    def set_write_position(self, write_position: WritePosition) -> None:
+    def set_margin_window(self, margin_window: Window) -> None:
         """Set the write position of the menu."""
-        self.write_position = write_position
+        self.margin_window = margin_window
 
 
 class MarginContainer(Window):
@@ -65,6 +67,9 @@ class MarginContainer(Window):
         self.content = FormattedTextControl(self.create_fragments)
         self.always_hide_cursor = to_filter(True)
 
+        if isinstance(self.margin, ClickableMargin):
+            self.margin.set_margin_window(self)
+
     def create_fragments(self) -> StyleAndTextTuples:
         """Generate text fragments to display."""
         return self.margin.create_margin(
@@ -102,8 +107,6 @@ class MarginContainer(Window):
     ) -> None:
         """Write the actual content to the screen."""
         self.write_position = write_position
-        if isinstance(self.margin, ClickableMargin):
-            self.margin.set_write_position(write_position)
 
         margin_content: UIContent = self.content.create_content(
             write_position.width + 1, write_position.height
@@ -112,6 +115,21 @@ class MarginContainer(Window):
             margin_content, screen, write_position, 0, write_position.width
         )
 
+        self.render_info = WindowRenderInfo(
+            window=self,
+            ui_content=margin_content,
+            horizontal_scroll=0,
+            vertical_scroll=0,
+            window_width=write_position.width,
+            window_height=write_position.height,
+            configured_scroll_offsets=ScrollOffsets(),
+            visible_line_to_row_col=visible_line_to_row_col,
+            rowcol_to_yx=rowcol_to_yx,
+            x_offset=write_position.xpos,
+            y_offset=write_position.ypos,
+            wrap_lines=False,
+        )
+
         # Set mouse handlers.
         def mouse_handler(mouse_event: PtkMouseEvent) -> NotImplementedOrNone:
             """Turn screen coordinates into line coordinates."""
@@ -164,6 +182,8 @@ class MarginContainer(Window):
             handler=mouse_handler,
         )
 
+        screen.visible_windows_to_write_positions[self] = write_position
+
     def is_modal(self) -> bool:
         """When this container is modal."""
         return False
@@ -214,8 +234,7 @@ class ScrollbarMargin(ClickableMargin):
         self.thumb_top = 0.0
         self.thumb_size = 0.0
 
-        self.window_render_info: WindowRenderInfo | None = None
-        self.write_position: WritePosition | None = None
+        self.target_render_info: WindowRenderInfo | None = None
 
     def get_width(self, get_ui_content: Callable[[], UIContent]) -> int:
         """Return the scrollbar width: always 1."""
@@ -226,13 +245,11 @@ class ScrollbarMargin(ClickableMargin):
         window_render_info: WindowRenderInfo | None,
         width: int,
         height: int,
-        margin_render_info: WindowRenderInfo | None = None,
     ) -> StyleAndTextTuples:
         """Create the margin's formatted text."""
         result: StyleAndTextTuples = []
 
-        self.window_render_info = window_render_info
-        self.margin_render_info = margin_render_info
+        self.target_render_info = window_render_info
 
         # If this is the first time the target is being drawn, it may not yet have a
         # render_info yet. Thus, invalidate the app so we can immediately redraw the
@@ -400,11 +417,11 @@ class ScrollbarMargin(ClickableMargin):
             :py:const:`None` is returned when the mouse event is handled successfully
 
         """
-        render_info = self.window_render_info
-        if render_info is None:
+        target_render_info = self.target_render_info
+        if target_render_info is None:
             return NotImplemented
 
-        content_height = render_info.content_height
+        content_height = target_render_info.content_height
         if isinstance(mouse_event, MouseEvent):
             cell_position = mouse_event.cell_position
         else:
@@ -413,9 +430,9 @@ class ScrollbarMargin(ClickableMargin):
 
         # Handle scroll events on the scrollbar
         if mouse_event.event_type == MouseEventType.SCROLL_UP:
-            render_info.window._scroll_up()
+            target_render_info.window._scroll_up()
         elif mouse_event.event_type == MouseEventType.SCROLL_DOWN:
-            render_info.window._scroll_down()
+            target_render_info.window._scroll_down()
 
         # Mouse drag events
         elif self.dragging and mouse_event.event_type == MouseEventType.MOUSE_MOVE:
@@ -425,8 +442,8 @@ class ScrollbarMargin(ClickableMargin):
                 + 0.5
             )
             # Use the window's current vertical scroll as it may have changed since the
-            # window_render_info was generated
-            window = render_info.window
+            # target_render_info was generated
+            window = target_render_info.window
             delta = window.vertical_scroll - target_scroll
 
             if isinstance(window, Window):
@@ -435,7 +452,7 @@ class ScrollbarMargin(ClickableMargin):
                     func()
             # Hack to speed up scrolling on the :py:`ScrollingContainer`
             elif hasattr(window, "scrolling"):
-                setattr(render_info.window, "scrolling", delta)  # noqa: B010
+                setattr(target_render_info.window, "scrolling", delta)  # noqa: B010
 
         # Mouse down events
         elif mouse_event.event_type == MouseEventType.MOUSE_DOWN:
@@ -443,20 +460,30 @@ class ScrollbarMargin(ClickableMargin):
             arrows = self.display_arrows()
             if arrows and int(row) == 0:
                 offset = -1
-            elif arrows and int(row) == render_info.window_height - 1:
+            elif arrows and int(row) == target_render_info.window_height - 1:
                 offset = 1
             # Scroll up or down one page if clicking on the background
             elif row < self.thumb_top + 1 or self.thumb_top + 1 + self.thumb_size < row:
                 direction = (row < (self.thumb_top + self.thumb_size // 2)) * -2 + 1
-                offset = direction * render_info.window_height
+                offset = direction * target_render_info.window_height
             # We are on the scroll button - start a drag event if this is not a
             # repeated mouse event
             elif not repeated:
-                self.dragging = True
-                self.drag_start_scroll = render_info.vertical_scroll
-                self.drag_start_offset = row - self.thumb_top
-                # Restrict mouse events to this area
-                get_app().mouse_limits = self.write_position
+                # Restrict mouse events to the scrollbar's area. Recalculate the area
+                # based on the margin's window's render_info, in case this is not the
+                # main screen
+                if margin_render_info := self.margin_window.render_info:
+                    y_min, x_min = min(margin_render_info._rowcol_to_yx.values())
+                    y_max, x_max = max(margin_render_info._rowcol_to_yx.values())
+                    get_app().mouse_limits = WritePosition(
+                        xpos=x_min,
+                        ypos=y_min,
+                        width=x_max - x_min + 1,
+                        height=y_max - y_min + 1,
+                    )
+                    self.dragging = True
+                    self.drag_start_scroll = target_render_info.vertical_scroll
+                    self.drag_start_offset = row - self.thumb_top
                 return None
             # Otherwise this is a click on the centre scroll button - do nothing
             else:
@@ -465,9 +492,9 @@ class ScrollbarMargin(ClickableMargin):
             if mouse_event.button == MouseButton.LEFT:
                 func = None
                 if offset < 0:
-                    func = render_info.window._scroll_up
+                    func = target_render_info.window._scroll_up
                 elif offset > 0:
-                    func = render_info.window._scroll_down
+                    func = target_render_info.window._scroll_down
                 if func is not None:
                     # Scroll the window multiple times to scroll by the offset
                     for _ in range(abs(int(offset))):
@@ -517,7 +544,7 @@ class NumberedMargin(Margin):
     def get_width(self, get_ui_content: Callable[[], UIContent]) -> int:
         """Return the width of the margin."""
         line_count = get_ui_content().line_count
-        return len("%s" % line_count) + 2
+        return len(f"{line_count}") + 2
 
     def create_margin(
         self, window_render_info: WindowRenderInfo, width: int, height: int
@@ -561,8 +588,10 @@ class NumberedMargin(Margin):
                 style = f"{self_style} class:line-number.current"
             else:
                 style = self_style
+            if last_lineno is None and lineno == 0 and not multiline:
+                linestr = ">"
             # Only display line number if this line is not a continuation of the previous line.
-            if lineno != last_lineno:
+            elif lineno != last_lineno:
                 linestr = str(lineno + 1).rjust(width - 2)
             else:
                 linestr = " " * (width - 2)

euporie/core/path.py

@@ -13,8 +13,9 @@ from fsspec.registry import register_implementation as fs_register_implementatio
 from upath import UPath
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
     from os import PathLike
-    from typing import Any, Mapping
+    from typing import Any
 
 
 log = logging.getLogger(__name__)

euporie/core/renderer.py

@@ -3,11 +3,13 @@
 from __future__ import annotations
 
 import logging
+from hashlib import md5
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.data_structures import Point, Size
 from prompt_toolkit.filters import to_filter
 from prompt_toolkit.layout.mouse_handlers import MouseHandlers
+from prompt_toolkit.layout.screen import Char
 from prompt_toolkit.renderer import Renderer as PtkRenderer
 from prompt_toolkit.renderer import _StyleStringHasStyleCache, _StyleStringToAttrsCache
 
@@ -25,7 +27,6 @@ if TYPE_CHECKING:
     from prompt_toolkit.output import ColorDepth, Output
     from prompt_toolkit.styles import BaseStyle
 
-
 __all__ = ["Renderer"]
 
 log = logging.getLogger(__name__)
@@ -117,19 +118,27 @@ def _output_screen_diff(
             write(char.char)
             last_style = char.style
 
+    def hash_screen_row(row: dict[int, Char], zwe_row: dict[int, str]) -> str:
+        """Generate a hash for a screen row to quickly detect changes."""
+        hasher = md5(usedforsecurity=False)
+        # Hash the character data
+        for idx in sorted(row.keys()):
+            cell = row[idx]
+            hasher.update(f"{idx}:{cell.char}:{cell.style}".encode())
+        # Hash the zero-width escapes
+        for idx in sorted(zwe_row.keys()):
+            hasher.update(f"{idx}:{zwe_row[idx]}".encode())
+        return hasher.hexdigest()
+
     def get_max_column_index(row: dict[int, Char], zwe_row: dict[int, str]) -> int:
         """Return max used column index, ignoring trailing unstyled whitespace."""
-        return max(
-            {
-                index
-                for index, cell in row.items()
-                if cell.char != " " or style_string_has_style[cell.style]
-            }
-            # Lag ZWE indices by one, as one could exist after the last line character
-            # but we don't want that to count towards the line width
-            | {x - 1 for x in zwe_row}
-            | {0}
-        )
+        max_idx = 0
+        for idx, cell in row.items():
+            if cell.char != " " or style_string_has_style[cell.style]:
+                max_idx = max(max_idx, idx)
+        for idx in zwe_row:
+            max_idx = max(max_idx, idx - 1)
+        return max_idx
 
     # Render for the first time: reset styling.
     if not previous_screen:
@@ -169,6 +178,14 @@ def _output_screen_diff(
         zwe_row = screen.zero_width_escapes[y]
         previous_zwe_row = previous_screen.zero_width_escapes[y]
 
+        # Quick comparison using row hashes
+        new_hash = hash_screen_row(new_row, zwe_row)
+        prev_hash = hash_screen_row(previous_row, previous_zwe_row)
+
+        if new_hash == prev_hash:
+            # Rows are identical, skip to next row
+            continue
+
         new_max_line_len = min(width - 1, get_max_column_index(new_row, zwe_row))
         previous_max_line_len = min(
             width - 1, get_max_column_index(previous_row, previous_zwe_row)
@@ -275,26 +292,34 @@ class Renderer(PtkRenderer):
         )
         self._extended_keys_enabled = False
         self._private_sixel_colors_enabled = False
+        self._sgr_pixel_enabled = False
         self.extend_height = to_filter(extend_height)
         self.extend_width = to_filter(extend_width)
 
     def reset(self, _scroll: bool = False, leave_alternate_screen: bool = True) -> None:
         """Reset the output."""
-        if isinstance(self.output, Vt100_Output):
+        output = self.output
+        if isinstance(output, Vt100_Output):
             # Disable extended keys before resetting the output
-            self.output.disable_extended_keys()
+            output.disable_extended_keys()
             self._extended_keys_enabled = False
 
             # Disable private sixel colors before resetting the output
-            self.output.disable_private_sixel_colors()
+            output.disable_private_sixel_colors()
             self._private_sixel_colors_enabled = False
 
+            # Disable sgr pixel mode
+            output.disable_sgr_pixel()
+            self._sgr_pixel_enabled = False
+
         super().reset(_scroll, leave_alternate_screen)
 
     def render(
         self, app: Application[Any], layout: Layout, is_done: bool = False
     ) -> None:
         """Render the current interface to the output."""
+        from euporie.core.app.app import BaseApp
+
         output = self.output
         self.app = app
 
@@ -320,13 +345,29 @@ class Renderer(PtkRenderer):
             output.enable_mouse_support()
             self._mouse_support_enabled = True
 
+            if (
+                isinstance(output, Vt100_Output)
+                and isinstance(app, BaseApp)
+                and app.term_sgr_pixel
+            ):
+                output.enable_sgr_pixel()
+                self._sgr_pixel_enabled = True
+
         elif not needs_mouse_support and self._mouse_support_enabled:
             output.disable_mouse_support()
             self._mouse_support_enabled = False
 
+            if (
+                isinstance(output, Vt100_Output)
+                and isinstance(app, BaseApp)
+                and (app.term_sgr_pixel or self._sgr_pixel_enabled)
+            ):
+                output.disable_sgr_pixel()
+                self._sgr_pixel_enabled = False
+
         # Ensable extended keys
-        if not self._extended_keys_enabled and isinstance(self.output, Vt100_Output):
-            self.output.enable_extended_keys()
+        if not self._extended_keys_enabled and isinstance(output, Vt100_Output):
+            output.enable_extended_keys()
             self._extended_keys_enabled = True
 
         # Ensable private sixel graphic color registers

euporie/core/style.py

@@ -4,16 +4,19 @@ from __future__ import annotations
 
 import logging
 from colorsys import hls_to_rgb, rgb_to_hls
-from functools import partial
+from functools import cache, partial
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.cache import SimpleCache
 from prompt_toolkit.styles.defaults import default_ui_style
 from prompt_toolkit.styles.style import Style
+from pygments.styles import get_style_by_name as pyg_get_style_by_name
 
 if TYPE_CHECKING:
     from typing import Any
 
+    from pygments.style import Style as PygmentsStyle
+
 
 log = logging.getLogger(__name__)
 
@@ -207,9 +210,9 @@ IPYWIDGET_STYLE = [
 class ColorPaletteColor:
     """A representation of a color with adjustment methods."""
 
-    _cache: SimpleCache[
-        tuple[str, float, float, float, bool], ColorPaletteColor
-    ] = SimpleCache()
+    _cache: SimpleCache[tuple[str, float, float, float, bool], ColorPaletteColor] = (
+        SimpleCache()
+    )
 
     def __init__(self, base: str, _base_override: str = "") -> None:
         """Create a new color.
@@ -440,8 +443,8 @@ def build_style(
         # Statusbar
         # "status": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.less(0.15)}",
         "status": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
-        "status-field": f"fg:{cp.fg.more(0.1)} bg:{cp.bg.more(0.1)}",
-        "status-sep": f"fg:{cp.bg.more(0.05)} bg:{cp.bg.more(0.1)}",
+        "status-field": f"bg:{cp.fg.more(0.1)} fg:{cp.bg.more(0.1)} reverse",
+        "status-sep": f"bg:{cp.bg.more(0.05)} fg:{cp.bg.more(0.1)} reverse",
         # Menus & Menu bar
         "menu": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
         "menu bar": f"bg:{cp.bg.less(0.15)}",
@@ -450,11 +453,11 @@ def build_style(
         "menu shortcut disabled": f"fg:{cp.fg.more(0.4).towards(cp.bg, 0.5)}",
         "menu prefix": f"fg:{cp.fg.more(0.2)}",
         "menu prefix disabled": f"fg:{cp.fg.more(0.2).towards(cp.bg, 0.5)}",
-        "menu selection": f"fg:{cp.hl.more(1)} bg:{cp.hl}",
-        "menu selection shortcut": f"fg:{cp.hl.more(1).more(0.05)} bg:{cp.hl}",
-        "menu selection prefix": f"fg:{cp.hl.more(1).more(0.05)} bg:{cp.hl}",
+        "menu selection": f"bg:{cp.hl.more(1)} fg:{cp.hl} reverse",
+        "menu selection shortcut": f"bg:{cp.hl.more(1).more(0.05)} fg:{cp.hl} reverse",
+        "menu selection prefix": f"bg:{cp.hl.more(1).more(0.05)} fg:{cp.hl} reverse",
         "menu border": f"fg:{cp.bg.more(0.15)} bg:{cp.bg.more(0.05)}",
-        "menu border selection": f"bg:{cp.hl}",
+        "menu border selection": f"fg:{cp.bg.more(0.15)} bg:{cp.hl} noreverse",
         # Tab bar
         "app-tab-bar": f"bg:{cp.bg.less(0.15)}",
         "app-tab-bar border": f"fg:{cp.bg.more(0.1)}",
@@ -466,10 +469,10 @@ def build_style(
         # Tabs
         "loading": "fg:#888888",
         # Buffer
-        "line-number": f"fg:{cp.fg.more(0.5)} bg:{cp.bg.more(0.05)}",
-        "line-number.current": f"bold orange bg:{cp.bg.more(0.1)}",
-        "line-number edge": f"fg:{cp.bg.darker(0.1)}",
-        "line-number.current edge": f"fg:{cp.bg.darker(0.1)}",
+        "line-number": f"bg:{cp.fg.more(0.5)} fg:{cp.bg.more(0.05)} reverse",
+        "line-number.current": f"bg:orange fg:{cp.bg.more(0.1)} bold",
+        "line-number edge": f"bg:{cp.bg.darker(0.1)}",
+        "line-number.current edge": f"bg:{cp.bg.darker(0.1)}",
         "cursor-line": f"bg:{cp.bg.more(0.05)}",
         "cursor-line search": f"bg:{cp.bg.more(0.02)}",
         "cursor-line search.current": f"bg:{cp.bg.more(0.02)}",
@@ -479,13 +482,11 @@ def build_style(
         "matching-bracket.other": "fg:yellow bold",
         "trailing-whitespace": f"fg:{cp.fg.more(0.66)}",
         "tab": f"fg:{cp.fg.more(0.66)}",
-        # Search
+        # Search results
         "search": f"bg:{cp.bg.more(0.05)}",
         "search.current": f"bg:{cp.bg.more(0.05)}",
         "incsearch": "bg:ansibrightyellow",
         "incsearch.current": "bg:ansibrightgreen",
-        "search-toolbar": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
-        "search-toolbar.title": f"fg:{cp.fg.more(0.1)} bg:{cp.bg.more(0.1)}",
         # Inputs
         "kernel-input": f"fg:default bg:{cp.bg.more(0.02)}",
         # Cells
@@ -496,20 +497,22 @@ def build_style(
         "cell border edit": f"fg:{cp.hl.adjust(hue=-0.3333, rel=False)}",
         "cell input prompt": "fg:blue",
         "cell output prompt": "fg:red",
-        "cell show outputs": "bg:#888",
-        "cell show inputs": "bg:#888",
+        "cell show outputs": f"bg:{cp.fg.more(0.5)} fg:{cp.bg.more(0.05)} reverse",
+        "cell show inputs": f"bg:{cp.fg.more(0.5)} fg:{cp.bg.more(0.05)} reverse",
+        "cell show inputs border": f"bg:{cp.bg.darker(0.1)} fg:{cp.bg.more(0.05)} reverse",
+        "cell show outputs border": f"bg:{cp.bg.darker(0.1)} fg:{cp.bg.more(0.05)} reverse",
         # Scrollbars
         "scrollbar": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.15)}",
         "scrollbar.background": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.15)}",
-        "scrollbar.arrow": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.20)}",
+        "scrollbar.arrow": f"bg:{cp.bg.more(0.75)} fg:{cp.bg.more(0.20)} reverse",
         "scrollbar.start": "",
         # "scrollbar.start": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.25)}",
-        "scrollbar.button": f"fg:{cp.bg.more(0.75)} bg:{cp.bg.more(0.75)}",
-        "scrollbar.end": f"fg:{cp.bg.more(0.15)} bg:{cp.bg.more(0.75)}",
+        "scrollbar.button": f"bg:{cp.bg.more(0.75)} fg:{cp.bg.more(0.75)} reverse",
+        "scrollbar.end": f"bg:{cp.bg.more(0.15)} fg:{cp.bg.more(0.75)} reverse",
         # Overflow margin
         "overflow": f"fg:{cp.fg.more(0.5)}",
         # Dialogs
-        "dialog dialog-title": f"fg:white bg:{cp.hl.darker(0.25)} bold",
+        "dialog dialog-title": f"bg:white fg:{cp.hl.darker(0.25)} bold reverse",
         "dialog": f"fg:{cp.fg.base} bg:{cp.bg.darker(0.1)}",
         "dialog text-area": f"bg:{cp.bg.lighter(0.05)}",
         "dialog input text text-area": f"fg:default bg:{cp.bg.less(0.1)}",
@@ -517,6 +520,17 @@ def build_style(
         "dialog border": f"fg:{cp.bg.darker(0.1).more(0.1)}",
         # Horizontals rule
         "hr": "fg:ansired",
+        # Toolbars
+        "toolbar": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
+        "toolbar.title": f"fg:{cp.fg.more(0.1)} bg:{cp.bg.more(0.1)}",
+        # Search bar
+        "search-toolbar": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
+        # Command bar
+        "toolbar menu": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
+        "toolbar menu completion": f"fg:{cp.fg.more(0.1)} bg:{cp.bg.more(0.1)}",
+        "toolbar menu completion current": f"fg:{cp.hl} bg:{cp.fg} reverse",
+        "toolbar menu overflow": f"fg:{cp.fg.more(0.5)}",
+        "toolbar menu meta": f"bg:{cp.bg.more(0.25)} bold",
         # Completions menu
         "menu completion-keyword": "fg:#d700af",
         "menu completion-function": "fg:#005faf",
@@ -528,28 +542,28 @@ def build_style(
         "menu completion-path": "fg:#aa8800",
         "menu completion-dict-key": "fg:#ddbb00",
         "menu selection completion-keyword": (
-            f"fg:{ColorPaletteColor('#d700af').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#d700af').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-function": (
-            f"fg:{ColorPaletteColor('#005faf').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#005faf').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-class": (
-            f"fg:{ColorPaletteColor('#008700').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#008700').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-statement": (
-            f"fg:{ColorPaletteColor('#5f0000').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#5f0000').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-instance": (
-            f"fg:{ColorPaletteColor('#d75f00').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#d75f00').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-module": (
-            f"fg:{ColorPaletteColor('#d70000').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#d70000').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-magic": (
-            f"fg:{ColorPaletteColor('#888888').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#888888').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         "menu selection completion-path": (
-            f"fg:{ColorPaletteColor('#aa8800').lighter(0.75)}"
+            f"bg:{ColorPaletteColor('#aa8800').lighter(0.75)} fg:{cp.hl} reverse"
         ),
         # Log
         "log.level.nonset": "fg:grey",
@@ -565,7 +579,7 @@ def build_style(
         "file-browser face": f"bg:{cp.bg.lighter(0.1)}",
         "file-browser face row alt-row": f"bg:{cp.bg.lighter(0.1).more(0.01)}",
         "file-browser face row hovered": f"bg:{cp.bg.more(0.2)}",
-        "file-browser face row selection": f"bg:{cp.hl}",
+        "file-browser face row selection": f"bg:{cp.fg} fg:{cp.hl} reverse",
         # Shortcuts
         "shortcuts.group": f"bg:{cp.bg.more(0.4)} bold underline",
         # "shortcuts.row": f"bg:{cp.bg.base} nobold",
@@ -574,7 +588,7 @@ def build_style(
         # Palette
         "palette.item": f"fg:{cp.fg.more(0.05)} bg:{cp.bg.more(0.05)}",
         "palette.item.alt": f"bg:{cp.bg.more(0.15)}",
-        "palette.item.selected": f"fg:{cp.hl.more(1)} bg:{cp.hl}",
+        "palette.item.selected": f"bg:{cp.hl.more(1)} fg:{cp.hl} reverse",
         # Pager
         "pager": f"bg:{cp.bg.more(0.05)}",
         "pager.border": f"fg:{cp.bg.towards(cp.ansiblack, 0.15)} reverse",
@@ -594,13 +608,13 @@ def build_style(
         "side_bar border outer": f"bg:{cp.bg}",
         "side_bar buttons": f"bg:{cp.bg.less(0.15)}",
         "side_bar buttons hovered": f"fg:{cp.hl}",
-        "side_bar buttons selection": f"fg:{cp.fg} bg:{cp.hl}",
-        "side_bar buttons separator": f"fg:{cp.bg.less(0.15)} bg:{cp.bg.less(0.15)}",
+        "side_bar buttons separator": f"bg:{cp.bg.less(0.15)} fg:{cp.bg.less(0.15)}",
+        "side_bar buttons selection": f"bg:{cp.fg} fg:{cp.hl} reverse",
         "side_bar buttons separator selection before": (
-            f"fg:{cp.bg.less(0.15)} bg:{cp.hl}"
+            f"bg:{cp.bg.less(0.15)} fg:{cp.hl} reverse"
         ),
         "side_bar buttons separator selection after": (
-            f"fg:{cp.hl} bg:{cp.bg.less(0.15)}"
+            f"fg:{cp.hl} bg:{cp.bg.less(0.15)} noreverse"
         ),
         # Tabbed split
         "tabbed-split border": f"fg:{cp.bg.more(0.2)}",
@@ -675,9 +689,9 @@ def build_style(
         "text-area focused selected": "reverse",
         # Buttons
         "input button face": f"fg:default bg:{cp.bg.more(0.05)}",
-        "input button face hovered": f"fg:default bg:{cp.bg.more(0.2)}",
-        "input button face selection": f"bg:{cp.bg.more(0.05)}",
-        "input button face focused": f"fg:default bg:{cp.bg.towards(cp.hl, 0.1)}",
+        "input button face hovered": f"fg:{cp.fg} bg:{cp.bg.more(0.2)}",
+        "input button face selection": f"bg:{cp.fg} fg:{cp.bg.more(0.05)} reverse",
+        "input button face focused": f"bg:{cp.fg} fg:{cp.bg.towards(cp.hl, 0.1)} reverse",
         # Input widgets
         "input border top": f"fg:{cp.bg.lighter(0.5)}",
         "input border left": f"fg:{cp.bg.lighter(0.5)}",
@@ -751,3 +765,9 @@ def build_style(
     }
 
     return Style.from_dict(style_dict)
+
+
+@cache
+def get_style_by_name(name: str) -> type[PygmentsStyle]:
+    """Get Pygments style, caching the result."""
+    return pyg_get_style_by_name(name)