Merge branch 'perf-workaround'

Author: raphamorim

docs/src/data/features.js

@@ -47,8 +47,8 @@ const FEATURES = [
     Icon: Image,
     description: (
       <Translate id="home.features.images-in-terminal.description">
-        Display images within the terminal using Sixel and iTerm2
-        image protocol.
+        Display images within the terminal using Kitty and iTerm2
+        image protocols, or using Sixel.
       </Translate>
     ),
   },

frontends/rioterm/src/application.rs

@@ -280,7 +280,7 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
                 }
             }
 
-            RioEventType::Rio(RioEvent::TerminalDamaged { route_id, damage }) => {
+            RioEventType::Rio(RioEvent::TerminalDamaged(route_id)) => {
                 if self.config.renderer.strategy.is_event_based() {
                     if let Some(route) = self.router.routes.get_mut(&window_id) {
                         if self.config.renderer.disable_unfocused_render
@@ -298,12 +298,9 @@ impl ApplicationHandler<EventPayload> for Application<'_> {
                         if let Some(ctx_item) =
                             route.window.screen.ctx_mut().get_by_route_id(route_id)
                         {
-                            // Store damage directly — no need to lock terminal later
-                            ctx_item
-                                .val
-                                .renderable_content
-                                .pending_update
-                                .set_terminal_damage(damage);
+                            // Just mark dirty — damage will be extracted from
+                            // the terminal when the renderer locks it.
+                            ctx_item.val.renderable_content.pending_update.set_dirty();
                             route.schedule_redraw(&mut self.scheduler, route_id);
                         }
                     }

frontends/rioterm/src/context/renderable.rs

@@ -108,6 +108,15 @@ pub struct TerminalSnapshot {
     pub display_offset: usize,
     pub blinking_cursor: bool,
     pub visible_rows: Vec<Row<Square>>,
+    /// Snapshot of the grid's per-cell style intern table. Cloned cheaply
+    /// (the table is just a `Vec<Style>` plus an `FxHashMap`); the renderer
+    /// dereferences cell `style_id`s through this clone instead of reaching
+    /// into the live grid.
+    pub style_set: rio_backend::crosswords::style::StyleSet,
+    /// Snapshot of the grid's extras table (zero-width chars, hyperlinks,
+    /// sixel/iterm graphics). The renderer reads per-cell graphic data
+    /// through this clone.
+    pub extras_table: rio_backend::crosswords::grid::ExtrasTable,
     pub cursor: CursorState,
     pub damage: TerminalDamage,
     // Cache terminal dimensions to avoid repeated calls
@@ -142,7 +151,6 @@ impl PendingUpdate {
     }
 
     /// Mark as needing to check for damage on next render
-    /// This is used by TerminalDamaged events to store damage
     pub fn set_dirty(&mut self) {
         self.dirty = true;
     }
@@ -179,7 +187,7 @@ impl PendingUpdate {
     }
 
     /// Merge two terminal damages into one
-    fn merge_terminal_damages(
+    pub fn merge_terminal_damages(
         existing: TerminalDamage,
         new: TerminalDamage,
     ) -> TerminalDamage {

frontends/rioterm/src/hints.rs

@@ -251,7 +251,13 @@ impl HintState {
         term: &rio_backend::crosswords::Crosswords<T>,
         hint: Rc<Hint>,
     ) {
-        // Scan the visible area for OSC 8 hyperlinks
+        // Walk the visible region looking for OSC 8 hyperlink spans.
+        //
+        // After the cell repack, hyperlinks live in the per-grid
+        // `extras_table`. Each cell carries an `extras_id: u16`; cells
+        // in the same hyperlink span share that id. We compare ids
+        // (cheap u16 compare) to find the start and end of each span,
+        // then look up the URI once via `Crosswords::cell_hyperlink`.
         let grid = &term.grid;
         let display_offset = grid.display_offset();
         let visible_lines = grid.screen_lines();
@@ -262,46 +268,42 @@ impl HintState {
                 continue;
             }
 
-            let mut col = Column(0);
-            while col < grid.columns() {
-                let cell = &grid[line][col];
-
-                if let Some(hyperlink) = cell.hyperlink() {
-                    // Find the extent of this hyperlink
-                    let start_col = col;
-                    let mut end_col = col;
-
-                    // Scan forward to find the end of the hyperlink
-                    while end_col < grid.columns() {
-                        let next_cell = &grid[line][end_col];
-                        if next_cell.hyperlink().as_ref() == Some(&hyperlink) {
-                            end_col += 1;
-                        } else {
-                            break;
-                        }
+            let mut col = 0usize;
+            let cols = grid.columns();
+            while col < cols {
+                let id = match term.cell_hyperlink_id(line, Column(col)) {
+                    Some(id) => id,
+                    None => {
+                        col += 1;
+                        continue;
                     }
+                };
 
-                    let mut uri = hyperlink.uri().to_string();
+                // Found the start of a hyperlink span. Walk forward
+                // until the extras_id changes.
+                let start_col = col;
+                let mut end_col = col;
+                while end_col < cols
+                    && term.cell_hyperlink_id(line, Column(end_col)) == Some(id)
+                {
+                    end_col += 1;
+                }
 
-                    // Apply post-processing if enabled
+                // Look up the URI once for the whole span.
+                if let Some(hyperlink) = term.cell_hyperlink(line, Column(start_col)) {
+                    let mut uri = hyperlink.uri().to_string();
                     if hint.post_processing {
                         uri = post_process_hyperlink_uri(&uri);
                     }
-
-                    let hint_match = HintMatch {
+                    self.matches.push(HintMatch {
                         text: uri,
-                        start: Pos::new(line, start_col),
-                        end: Pos::new(line, end_col - 1),
+                        start: Pos::new(line, Column(start_col)),
+                        end: Pos::new(line, Column(end_col - 1)),
                         hint: hint.clone(),
-                    };
-
-                    self.matches.push(hint_match);
-
-                    // Skip to the end of this hyperlink
-                    col = end_col;
-                } else {
-                    col += 1;
+                    });
                 }
+
+                col = end_col;
             }
         }
     }
@@ -316,7 +318,7 @@ impl HintState {
 
         for col in 0..grid.columns() {
             let cell = &grid[line][Column(col)];
-            text.push(cell.c);
+            text.push(cell.c());
         }
 
         text.trim_end().to_string()