1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
use ratatui::{layout::Rect, Frame};
use super::panes::{compute_pane_infos, render_panes, resize_tab_panes};
use crate::app::AppState;
use crate::layout::{PaneInfo, SplitBorder};
use crate::protocol::CursorState;
use crate::terminal::TerminalRuntimeRegistry;
pub(crate) struct TabSurfaceLayout {
pub(crate) pane_infos: Vec<PaneInfo>,
pub(crate) split_borders: Vec<SplitBorder>,
}
#[derive(Clone, Copy)]
pub(crate) struct TabSurfaceView<'a> {
pub(crate) pane_infos: &'a [PaneInfo],
pub(crate) split_borders: &'a [SplitBorder],
}
pub(crate) fn compute_tab_surface(
app: &AppState,
terminal_runtimes: &TerminalRuntimeRegistry,
area: Rect,
resize_panes: bool,
cell_size: crate::kitty_graphics::HostCellSize,
) -> TabSurfaceLayout {
let split_borders = app
.active
.and_then(|i| app.workspaces.get(i))
.map(|ws| {
if ws.zoomed {
Vec::new()
} else {
ws.layout.splits(area)
}
})
.unwrap_or_default();
let pane_infos = compute_pane_infos(app, terminal_runtimes, area, resize_panes, cell_size);
TabSurfaceLayout {
pane_infos,
split_borders,
}
}
pub(crate) fn resize_tab_surface(
app: &AppState,
terminal_runtimes: &TerminalRuntimeRegistry,
tab: &crate::workspace::Tab,
area: Rect,
cell_size: crate::kitty_graphics::HostCellSize,
) {
resize_tab_panes(app, terminal_runtimes, tab, area, cell_size);
}
pub(crate) fn render_tab_surface(
app: &AppState,
terminal_runtimes: &TerminalRuntimeRegistry,
surface: TabSurfaceView<'_>,
frame: &mut Frame,
) {
render_panes(
app,
terminal_runtimes,
frame,
surface.pane_infos,
surface.split_borders,
);
}
pub(crate) fn tab_surface_hyperlinks(
app: &AppState,
terminal_runtimes: &TerminalRuntimeRegistry,
surface: TabSurfaceView<'_>,
) -> Vec<((u16, u16), String, String)> {
let Some(ws_idx) = app.active else {
return Vec::new();
};
if app.workspaces.get(ws_idx).is_none() {
return Vec::new();
}
let mut links = Vec::new();
for info in surface.pane_infos {
if let Some(runtime) = app.runtime_for_pane_in_workspace(terminal_runtimes, ws_idx, info.id)
{
links.extend(runtime.visible_hyperlinks(info.inner_rect));
}
}
links
}
pub(crate) fn tab_surface_cursor(
app: &AppState,
terminal_runtimes: &TerminalRuntimeRegistry,
surface: TabSurfaceView<'_>,
) -> Option<CursorState> {
let ws_idx = app.active?;
let info = surface.pane_infos.iter().find(|info| info.is_focused)?;
if !app.pane_exposes_host_cursor(ws_idx, info.id) {
return None;
}
let runtime = app.runtime_for_pane_in_workspace(terminal_runtimes, ws_idx, info.id)?;
if runtime.synchronized_output_active() {
return None;
}
let scrolled_back = super::panes::pane_is_scrolled_back(runtime);
let reveal = app.reveal_hidden_cursor_for_cjk_ime
&& (!app.cjk_ime_agent_filter_configured || {
let detected = app
.workspaces
.get(ws_idx)
.and_then(|ws| ws.terminal_id(info.id))
.and_then(|terminal_id| app.terminals.get(terminal_id))
.and_then(|terminal| terminal.detected_agent);
detected.is_some_and(|agent| app.cjk_ime_agents.contains(&agent))
});
if let Some(cursor) = runtime.cursor_state(info.inner_rect, true) {
let visible = if reveal {
!scrolled_back
} else {
cursor.visible && !scrolled_back
};
Some(CursorState {
x: cursor.x,
y: cursor.y,
visible,
shape: if reveal && visible {
app.cjk_ime_cursor_shape
} else {
cursor.shape
},
})
} else if reveal && !scrolled_back {
Some(CursorState {
x: info.inner_rect.x,
y: info.inner_rect.y,
visible: true,
shape: app.cjk_ime_cursor_shape,
})
} else {
None
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::workspace::Workspace;
use ratatui::backend::TestBackend;
use ratatui::layout::Direction;
use ratatui::Terminal;
#[tokio::test]
async fn explicit_surface_layout_drives_render_cursor_and_hyperlinks() {
let uri = "https://example.com/surface";
let mut workspace = Workspace::test_new("shell-workspace");
let left = workspace.tabs[0].root_pane;
let right = workspace.test_split(Direction::Horizontal);
workspace.insert_test_runtime(
left,
crate::terminal::TerminalRuntime::test_with_screen_bytes(
20,
8,
format!("\x1b]8;;{uri}\x1b\\LEFT\x1b]8;;\x1b\\").as_bytes(),
),
);
workspace.insert_test_runtime(
right,
crate::terminal::TerminalRuntime::test_with_screen_bytes(20, 8, b"RIGHT"),
);
let mut app = AppState::test_new();
app.workspaces = vec![workspace];
app.active = Some(0);
app.selected = 0;
let full_area = Rect::new(0, 0, 106, 20);
let area = full_area;
let surface = compute_tab_surface(
&app,
&TerminalRuntimeRegistry::new(),
area,
false,
crate::kitty_graphics::HostCellSize::default(),
);
assert_eq!(surface.pane_infos.len(), 2);
assert!(!surface.split_borders.is_empty());
app.view.terminal_area = Rect::new(9, 8, 7, 6);
app.view.pane_infos.clear();
let surface_view = TabSurfaceView {
pane_infos: &surface.pane_infos,
split_borders: &surface.split_borders,
};
let mut terminal =
Terminal::new(TestBackend::new(full_area.width, full_area.height)).unwrap();
terminal
.draw(|frame| {
render_tab_surface(&app, &TerminalRuntimeRegistry::new(), surface_view, frame)
})
.unwrap();
let rendered = terminal
.backend()
.buffer()
.content()
.iter()
.map(|cell| cell.symbol())
.collect::<String>();
assert!(rendered.contains("LEFT"), "surface: {rendered:?}");
assert!(rendered.contains("RIGHT"), "surface: {rendered:?}");
assert!(!rendered.contains("shell-workspace"));
let links = tab_surface_hyperlinks(&app, &TerminalRuntimeRegistry::new(), surface_view);
assert!(links
.iter()
.any(|(_, symbol, link)| { symbol == "L" && link == uri }));
assert!(tab_surface_cursor(&app, &TerminalRuntimeRegistry::new(), surface_view,).is_some());
}
}
|
