Merge branch 'main' into fix/hyperlink-click-pipeline

Author: ZoOtMcNoOt

docs/docs/config.md

@@ -47,6 +47,18 @@ When configured, Rio will automatically switch between the specified light and d
 
 ![Adaptive theme](/assets/features/adaptive-theme.gif)
 
+## force-theme
+
+When using adaptive themes, you can override the system theme by forcing Rio to use a specific theme regardless of the system appearance.
+
+```toml
+force-theme = "dark"
+```
+
+Accepted values: `"dark"` or `"light"`. When not set, Rio follows the system theme.
+
+You can also toggle the appearance theme at runtime using the `ToggleAppearanceTheme` key binding action or through the command palette.
+
 ## colors
 
 Defining colors in the configuration file will not have any effect if you're using a theme.

docs/docs/key-bindings.md

@@ -73,6 +73,7 @@ Execute a predefined action in Rio terminal.
 | CreateWindow     | Create a Rio window instance |
 | Quit             | Exit Rio |
 | ToggleFullscreen | Toggle fullscreen |
+| ToggleAppearanceTheme | Toggle between dark and light appearance theme |
 
 ### [Split Actions](#split-actions)
 

docs/src/pages/changelog.mdx

@@ -26,6 +26,8 @@ language: 'en'
 - **Native Vulkan Support** (Linux/Windows): Hardware-accelerated rendering with Vulkan
 - **New GPU-Rendered Navigation**: Faster, smoother tab interface
 - **Command Palette**: Quick access to terminal functions
+- **Toggle Appearance Theme**: Switch between dark and light themes at runtime via key binding (`ToggleAppearanceTheme`) or command palette (only available when adaptive theme is configured)
+- **Force Theme**: New `force-theme` configuration property to override the system theme when using adaptive themes
 - **Quake Window Mode**: Drop-down terminal from top of screen
 - **macOS Traffic Light Positioning**: Customize position of window control buttons
   - Configure via `macos-traffic-light-position-x` and `macos-traffic-light-position-y`

frontends/rioterm/src/application.rs

@@ -162,7 +162,8 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
             return;
         }
 
-        update_colors_based_on_theme(&mut self.config, event_loop.system_theme());
+        let theme = self.config.force_theme.map(|t| t.to_window_theme()).or(event_loop.system_theme());
+        update_colors_based_on_theme(&mut self.config, theme);
 
         self.router.create_window(
             event_loop,
@@ -385,7 +386,8 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
                     // Apply system theme to ensure colors are consistent
                     if !has_checked_adaptive_colors {
                         let system_theme = route.window.winit_window.theme();
-                        update_colors_based_on_theme(&mut self.config, system_theme);
+                        let theme = self.config.force_theme.map(|t| t.to_window_theme()).or(system_theme);
+                        update_colors_based_on_theme(&mut self.config, theme);
                         has_checked_adaptive_colors = true;
                     }
 
@@ -790,6 +792,34 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
                     }
                 }
             }
+            RioEventType::Rio(RioEvent::ToggleAppearanceTheme) => {
+                if let Some(route) = self.router.routes.get_mut(&window_id) {
+                    use rio_backend::config::theme::AppearanceTheme;
+                    let current = self
+                        .config
+                        .force_theme
+                        .or_else(|| {
+                            route
+                                .window
+                                .winit_window
+                                .theme()
+                                .map(AppearanceTheme::from_window_theme)
+                        })
+                        .unwrap_or(AppearanceTheme::Dark);
+                    let toggled = current.toggled();
+                    self.config.force_theme = Some(toggled);
+                    update_colors_based_on_theme(
+                        &mut self.config,
+                        Some(toggled.to_window_theme()),
+                    );
+                    route.window.screen.update_config(
+                        &self.config,
+                        &self.router.font_library,
+                        false,
+                    );
+                    route.window.configure_window(&self.config);
+                }
+            }
             RioEventType::Rio(RioEvent::ColorChange(route_id, index, color)) => {
                 if let Some(route) = self.router.routes.get_mut(&window_id) {
                     let screen = &mut route.window.screen;
@@ -1569,6 +1599,9 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
             }
 
             WindowEvent::ThemeChanged(new_theme) => {
+                if self.config.force_theme.is_some() {
+                    return;
+                }
                 update_colors_based_on_theme(&mut self.config, Some(new_theme));
                 route.window.screen.update_config(
                     &self.config,

frontends/rioterm/src/bindings/mod.rs

@@ -263,6 +263,7 @@ impl From<String> for Action {
             "movedividerleft" => Some(Action::MoveDividerLeft),
             "movedividerright" => Some(Action::MoveDividerRight),
             "togglevimode" => Some(Action::ToggleViMode),
+            "toggleappearancetheme" => Some(Action::ToggleAppearanceTheme),
             "togglefullscreen" => Some(Action::ToggleFullscreen),
             "none" => Some(Action::None),
             _ => None,
@@ -456,6 +457,9 @@ pub enum Action {
     /// Toggle vi mode.
     ToggleViMode,
 
+    /// Toggle appearance theme (dark/light).
+    ToggleAppearanceTheme,
+
     // Tab selections
     SelectTab(usize),
     SelectLastTab,

frontends/rioterm/src/context/mod.rs

@@ -647,6 +647,12 @@ impl<T: EventListener + Clone + std::marker::Send + 'static> ContextManager<T> {
             .send_event(RioEvent::ToggleFullScreen, self.window_id);
     }
 
+    #[inline]
+    pub fn toggle_appearance_theme(&mut self) {
+        self.event_proxy
+            .send_event(RioEvent::ToggleAppearanceTheme, self.window_id);
+    }
+
     #[inline]
     pub fn minimize(&mut self) {
         self.event_proxy

frontends/rioterm/src/renderer/command_palette.rs

@@ -62,6 +62,7 @@ pub enum PaletteAction {
     ResetFontSize,
     ToggleViMode,
     ToggleFullscreen,
+    ToggleAppearanceTheme,
     Copy,
     Paste,
     SearchForward,
@@ -163,6 +164,11 @@ const COMMANDS: &[Command] = &[
         shortcut: "",
         action: PaletteAction::ToggleFullscreen,
     },
+    Command {
+        title: "Toggle Appearance Theme",
+        shortcut: "",
+        action: PaletteAction::ToggleAppearanceTheme,
+    },
     Command {
         title: "Copy",
         shortcut: "Cmd+C",
@@ -248,6 +254,7 @@ pub struct CommandPalette {
     pub query: String,
     pub selected_index: usize,
     scroll_offset: usize,
+    pub has_adaptive_theme: bool,
     /// Pre-allocated rich text ID for input (lazily initialized)
     input_text_id: Option<usize>,
     /// Pre-allocated rich text IDs for result rows (lazily initialized, fixed pool)
@@ -265,6 +272,7 @@ impl Default for CommandPalette {
             query: String::new(),
             selected_index: 0,
             scroll_offset: 0,
+            has_adaptive_theme: false,
             input_text_id: None,
             result_text_ids: Vec::new(),
             shortcut_text_ids: Vec::new(),
@@ -330,8 +338,15 @@ impl CommandPalette {
     }
 
     fn filtered_commands(&self) -> Vec<(i32, &Command)> {
+        let has_adaptive = self.has_adaptive_theme;
         let mut results: Vec<(i32, &Command)> = COMMANDS
             .iter()
+            .filter(|cmd| {
+                if cmd.action == PaletteAction::ToggleAppearanceTheme {
+                    return has_adaptive;
+                }
+                true
+            })
             .filter_map(|cmd| {
                 let score = fuzzy_score(&self.query, cmd.title)?;
                 Some((score, cmd))
@@ -702,7 +717,8 @@ mod tests {
     fn test_filtered_commands_empty_query() {
         let palette = CommandPalette::new();
         let filtered = palette.filtered_commands();
-        assert_eq!(filtered.len(), COMMANDS.len());
+        // ToggleAppearanceTheme is hidden when has_adaptive_theme is false
+        assert_eq!(filtered.len(), COMMANDS.len() - 1);
     }
 
     #[test]

frontends/rioterm/src/renderer/mod.rs

@@ -127,7 +127,11 @@ impl Renderer {
             navigation: config.navigation.clone(),
             margin: config.margin,
             island,
-            command_palette: command_palette::CommandPalette::new(),
+            command_palette: {
+                let mut palette = command_palette::CommandPalette::new();
+                palette.has_adaptive_theme = config.adaptive_colors.is_some();
+                palette
+            },
             named_colors,
             dynamic_background,
             search: search::SearchOverlay::default(),

frontends/rioterm/src/screen/mod.rs

@@ -1138,6 +1138,9 @@ impl Screen<'_> {
                         self.render();
                     }
                     Act::ToggleFullscreen => self.context_manager.toggle_full_screen(),
+                    Act::ToggleAppearanceTheme => {
+                        self.context_manager.toggle_appearance_theme();
+                    }
                     Act::Minimize => {
                         self.context_manager.minimize();
                     }
@@ -3187,6 +3190,9 @@ impl Screen<'_> {
             PaletteAction::ToggleFullscreen => {
                 self.context_manager.toggle_full_screen();
             }
+            PaletteAction::ToggleAppearanceTheme => {
+                self.context_manager.toggle_appearance_theme();
+            }
             PaletteAction::Copy => {
                 self.copy_selection(ClipboardType::Clipboard);
             }

rio-backend/src/config/mod.rs

@@ -30,7 +30,7 @@ use std::io::Write;
 use std::path::PathBuf;
 use std::{default::Default, fs::File};
 use sugarloaf::font::fonts::SugarloafFonts;
-use theme::{AdaptiveColors, AdaptiveTheme, Theme};
+use theme::{AdaptiveColors, AdaptiveTheme, AppearanceTheme, Theme};
 use tracing::warn;
 
 #[derive(Clone, Debug)]
@@ -130,6 +130,8 @@ pub struct Config {
     pub colors: Colors,
     #[serde(default = "Option::default", skip_serializing)]
     pub adaptive_colors: Option<AdaptiveColors>,
+    #[serde(default = "Option::default", rename = "force-theme")]
+    pub force_theme: Option<AppearanceTheme>,
     #[serde(default = "Developer::default")]
     pub developer: Developer,
     #[serde(default = "Bindings::default")]
@@ -612,6 +614,7 @@ impl Default for Config {
             editor: default_editor(),
             adaptive_theme: None,
             adaptive_colors: None,
+            force_theme: None,
             bindings: Bindings::default(),
             colors: Colors::default(),
             scroll: Scroll::default(),