Real VTE terminal to display task output

ranfdev · ranfdev · commit d9bb1dcc8722 · 2025-12-07T14:47:38.000+01:00
diff --git a/src/application.rs b/src/application.rs
@@ -157,6 +157,13 @@ mod imp {
                     animation: pop-warning 1s;
                     animation-iteration-count: 3;
                 }}
+
+                .task-output-terminal {{
+                    padding: 8px;
+                    /* A larger radius isn't rendered properly in VTE, because the background of therminal is drawn over it */
+                    border-radius: 4px;
+                    border: 2px solid @borders;
+                }}
             "));
             // We give the CssProvided to the default screen so the CSS rules we added
             // can be applied to our window.
diff --git a/src/dialogs/task_manager_dialog.rs b/src/dialogs/task_manager_dialog.rs
@@ -6,8 +6,9 @@ use gtk::glib::clone;
 use crate::gtk_utils::reaction;
 use crate::i18n::gettext;
 use crate::models::{DistroboxTask, RootStore};
+use crate::widgets::TaskOutputTerminal;
 
-use gtk::glib::{Properties, derived_properties};
+use gtk::glib::Properties;
 use std::cell::RefCell;
 
 mod imp {
@@ -32,13 +33,13 @@ mod imp {
         pub selected_task_view: adw::ToolbarView,
     }
 
-    #[derived_properties]
+    #[glib::derived_properties]
     impl ObjectImpl for TaskManagerDialog {
         fn constructed(&self) {
             self.parent_constructed();
             let obj = self.obj();
             obj.set_title(&gettext("Running Tasks"));
-            obj.set_content_width(360);
+            obj.set_content_width(640);
             obj.set_content_height(640);
 
             let header_bar = adw::HeaderBar::new();
@@ -259,25 +260,21 @@ impl TaskManagerDialog {
             update_status_ui(task);
         });
 
-        let text_view = gtk::TextView::builder()
-            .buffer(&task.output())
-            .editable(false)
-            .cursor_visible(false)
-            .wrap_mode(gtk::WrapMode::Word)
-            .css_classes(vec!["output".to_string()])
-            .top_margin(12)
-            .bottom_margin(12)
-            .left_margin(12)
-            .right_margin(12)
-            .build();
+        // Create VTE terminal for output display
+        let vte_terminal = TaskOutputTerminal::new();
+        
+        // Restore historical output from TextBuffer if it exists
+        let output_buffer = task.output();
+        let buffer_text = output_buffer.text(&output_buffer.start_iter(), &output_buffer.end_iter(), false);
+        if !buffer_text.is_empty() {
+            vte_terminal.write_buffer(&buffer_text);
+        }
+        
+        task.set_vte_terminal(Some(vte_terminal.clone()));
 
-        let scrolled_window = gtk::ScrolledWindow::builder()
-            .child(&text_view)
-            .propagate_natural_height(true)
-            .height_request(300)
-            .vexpand(true)
-            .build();
-        content.append(&scrolled_window);
+        
+        
+        content.append(&vte_terminal);
 
         let button_row = gtk::Box::new(gtk::Orientation::Horizontal, 6);
         button_row.set_hexpand(true);
diff --git a/src/gtk_utils/mod.rs b/src/gtk_utils/mod.rs
@@ -5,6 +5,9 @@ use gtk::glib;
 use gtk::prelude::*;
 mod typed_list_store;
 pub use typed_list_store::TypedListStore;
+mod terminal_colors;
+#[allow(unused_imports)]
+pub use terminal_colors::ColorPalette;
 
 pub fn reconcile_properties<T: IsA<glib::Object>>(dest: &T, src: &T, properties: &[&str]) {
     for prop in dest.list_properties() {
diff --git a/src/gtk_utils/terminal_colors.rs b/src/gtk_utils/terminal_colors.rs
@@ -0,0 +1,123 @@
+/// Terminal color scheme utilities for VTE4 with libadwaita theme support
+/// Provides ANSI color palettes that respect the system light/dark theme preference
+use gtk::gdk;
+use adw;
+use vte4::prelude::*;
+
+/// ANSI color palette entry
+#[derive(Clone, Copy)]
+pub struct ColorPalette {
+    /// Foreground text color
+    pub foreground: gdk::RGBA,
+    /// Background color
+    pub background: gdk::RGBA,
+    /// Standard ANSI colors (0-15)
+    pub palette: [gdk::RGBA; 16],
+}
+
+impl ColorPalette {
+    /// Create a color palette from RGB components
+    fn color(r: f32, g: f32, b: f32) -> gdk::RGBA {
+        gdk::RGBA::new(r, g, b, 1.0)
+    }
+
+    /// Get the dark theme color palette (similar to GNOME Terminal/Ptyxis dark)
+    /// This palette respects libadwaita's dark theme colors
+    pub fn dark() -> Self {
+        Self {
+            // Adwaita dark: text on dark background
+            foreground: Self::color(0.92, 0.92, 0.92),       // #ebebeb
+            background: Self::color(0.1, 0.1, 0.1),         // #1a1a1a
+            palette: [
+                // Standard colors (0-7)
+                Self::color(0.2, 0.2, 0.2),                 // 0: black (darker than bg for contrast)
+                Self::color(0.89, 0.35, 0.36),              // 1: red
+                Self::color(0.37, 0.76, 0.36),              // 2: green
+                Self::color(0.87, 0.75, 0.29),              // 3: yellow
+                Self::color(0.36, 0.62, 0.89),              // 4: blue
+                Self::color(0.76, 0.51, 0.85),              // 5: magenta
+                Self::color(0.36, 0.78, 0.85),              // 6: cyan
+                Self::color(0.82, 0.82, 0.82),              // 7: white (lighter)
+                // Bright colors (8-15)
+                Self::color(0.5, 0.5, 0.5),                 // 8: bright black (gray)
+                Self::color(1.0, 0.55, 0.56),               // 9: bright red
+                Self::color(0.56, 0.93, 0.56),              // 10: bright green
+                Self::color(1.0, 0.93, 0.56),               // 11: bright yellow
+                Self::color(0.56, 0.8, 1.0),                // 12: bright blue
+                Self::color(0.94, 0.71, 1.0),               // 13: bright magenta
+                Self::color(0.56, 0.96, 1.0),               // 14: bright cyan
+                Self::color(1.0, 1.0, 1.0),                 // 15: bright white
+            ],
+        }
+    }
+
+    /// Get the light theme color palette (similar to GNOME Terminal/Ptyxis light)
+    /// This palette respects libadwaita's light theme colors
+    pub fn light() -> Self {
+        Self {
+            // Adwaita light: dark text on light background
+            foreground: Self::color(0.2, 0.2, 0.2),         // #333333
+            background: Self::color(0.98, 0.98, 0.98),      // #fafafa (nearly white)
+            palette: [
+                // Standard colors (0-7)
+                Self::color(0.2, 0.2, 0.2),                 // 0: black
+                Self::color(0.8, 0.0, 0.0),                 // 1: red
+                Self::color(0.0, 0.6, 0.0),                 // 2: green
+                Self::color(0.8, 0.62, 0.0),                // 3: yellow
+                Self::color(0.13, 0.34, 0.76),              // 4: blue
+                Self::color(0.76, 0.27, 0.76),              // 5: magenta
+                Self::color(0.0, 0.6, 0.76),                // 6: cyan
+                Self::color(0.7, 0.7, 0.7),                 // 7: white (gray)
+                // Bright colors (8-15)
+                Self::color(0.5, 0.5, 0.5),                 // 8: bright black (gray)
+                Self::color(1.0, 0.0, 0.0),                 // 9: bright red
+                Self::color(0.0, 1.0, 0.0),                 // 10: bright green
+                Self::color(1.0, 1.0, 0.0),                 // 11: bright yellow
+                Self::color(0.0, 0.0, 1.0),                 // 12: bright blue
+                Self::color(1.0, 0.0, 1.0),                 // 13: bright magenta
+                Self::color(0.0, 1.0, 1.0),                 // 14: bright cyan
+                Self::color(0.99, 0.99, 0.99),              // 15: bright white
+            ],
+        }
+    }
+
+    /// Get the appropriate palette based on the current adwaita theme
+    /// Checks the system style manager to determine if dark or light theme is active
+    pub fn current() -> Self {
+        let style_manager = adw::StyleManager::default();
+        if style_manager.is_dark() {
+            Self::dark()
+        } else {
+            Self::light()
+        }
+    }
+
+    /// Apply this color palette to a VTE terminal
+    pub fn apply_to_terminal(&self, terminal: &vte4::Terminal) {
+        let palette_refs: Vec<&gdk::RGBA> = self.palette.iter().collect();
+        terminal.set_colors(
+            Some(&self.foreground),
+            Some(&self.background),
+            &palette_refs,
+        );
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dark_palette() {
+        let palette = ColorPalette::dark();
+        assert_ne!(palette.foreground, palette.background);
+        assert_eq!(palette.palette.len(), 16);
+    }
+
+    #[test]
+    fn test_light_palette() {
+        let palette = ColorPalette::light();
+        assert_ne!(palette.foreground, palette.background);
+        assert_eq!(palette.palette.len(), 16);
+    }
+}
diff --git a/src/models/distrobox_task.rs b/src/models/distrobox_task.rs
@@ -9,6 +9,7 @@ use std::future::Future;
 use tracing::{debug, info, warn};
 
 use crate::fakers::Child;
+use crate::widgets::TaskOutputTerminal;
 
 /// Status of a DistroboxTask
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, glib::Enum)]
@@ -39,6 +40,7 @@ mod imp {
         pub status: RefCell<TaskStatus>,
         pub error: RefCell<Option<anyhow::Error>>, // set only if status is Failed
         pub cancellable: RefCell<Option<gtk::gio::Cancellable>>,
+        pub vte_terminal: RefCell<Option<TaskOutputTerminal>>, // Optional VTE terminal
     }
 
     #[glib::derived_properties]
@@ -114,8 +116,14 @@ impl DistroboxTask {
         let mut err_lines = BufReader::new(stderr).lines();
 
         let insert_line = |line: String| {
+            // Write to TextBuffer
             self.output().insert(&mut self.output().end_iter(), &line);
             self.output().insert(&mut self.output().end_iter(), "\n");
+            
+            // Write to VTE terminal if available
+            if let Some(vte) = self.imp().vte_terminal.borrow().as_ref() {
+                vte.write_line(&line);
+            }
         };
 
         let mut cancel_rx = cancel_rx.fuse();
@@ -191,4 +199,14 @@ impl DistroboxTask {
     pub fn error_message(&self) -> Option<String> {
         self.imp().error.borrow().as_ref().map(|e| e.to_string())
     }
+
+    /// Set the VTE terminal for this task to write output to
+    pub fn set_vte_terminal(&self, terminal: Option<TaskOutputTerminal>) {
+        *self.imp().vte_terminal.borrow_mut() = terminal;
+    }
+
+    /// Get the current VTE terminal if one is attached
+    pub fn vte_terminal(&self) -> Option<TaskOutputTerminal> {
+        self.imp().vte_terminal.borrow().clone()
+    }
 }
diff --git a/src/widgets/integrated_terminal.rs b/src/widgets/integrated_terminal.rs
@@ -7,6 +7,7 @@ use gtk::{
 use vte4::prelude::*;
 
 use crate::i18n::gettext;
+use crate::gtk_utils::ColorPalette;
 use crate::models::Container;
 
 mod imp {
@@ -75,6 +76,14 @@ impl IntegratedTerminal {
         let terminal = &imp.terminal;
         let reload_button = &imp.reload_button;
 
+        // Configure terminal appearance
+        terminal.set_scroll_on_output(true);
+        terminal.set_scroll_on_keystroke(true);
+
+        // Apply the current theme's color palette
+        let palette = ColorPalette::current();
+        palette.apply_to_terminal(terminal);
+
         // Create context menu actions
         let action_group = gio::SimpleActionGroup::new();
 
diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
@@ -4,6 +4,7 @@ mod image_row_item;
 mod integrated_terminal;
 mod sidebar_row;
 mod tasks_button;
+mod task_output_terminal;
 mod terminal_combo_row;
 mod welcome_view;
 mod window;
@@ -14,6 +15,7 @@ pub use image_row_item::ImageRowItem;
 pub use integrated_terminal::IntegratedTerminal;
 pub use sidebar_row::SidebarRow;
 pub use tasks_button::TasksButton;
+pub use task_output_terminal::TaskOutputTerminal;
 pub use terminal_combo_row::TerminalComboRow;
 pub use welcome_view::WelcomeView;
 pub use window::DistroShelfWindow;
diff --git a/src/widgets/task_output_terminal.rs b/src/widgets/task_output_terminal.rs
