aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2026-02-04 11:59:21 +0100
committerGitHub <noreply@github.com>2026-02-04 11:59:21 +0100
commit690a1e4506854c1e7637cf4c27f75e39b923972d (patch)
treeecedd56de5971abe1db82d83402815e52e9df3b2
parentfix(layout): Correctly handle relative layout paths from CLI (#4664) (diff)
downloadsl0ppij-690a1e4506854c1e7637cf4c27f75e39b923972d.tar.gz
sl0ppij-690a1e4506854c1e7637cf4c27f75e39b923972d.tar.xz
sl0ppij-690a1e4506854c1e7637cf4c27f75e39b923972d.zip
Allow resizing panes with the mouse (#4678)
* initial implementation * improve edge detection * fix up/down resize increment bug * temporarily disable alt-mouse grouping * fix inverting strategies and simplify edge detection * resize of floating -> ctrl click, resize of tiled -> (ctrl)click * fix old functionality and tests * refactor and fixes * refactor mouse click handling * move mouse click handling to separate module * resize scroll up/down with scroll wheel * tests for scroll resize * implement hover help * fix occlusion bug * allow disabling with config * fix focus pinned pane on frame * use strategy invert resize directly rather than function parameter * remove annoying log message * cleanups and formatting * add pr
-rw-r--r--CHANGELOG.md1
-rw-r--r--example/default.kdl5
-rw-r--r--zellij-client/src/os_input_output.rs47
-rw-r--r--zellij-client/src/remote_attach/unit/remote_attach_tests.rs4
-rw-r--r--zellij-client/src/stdin_handler.rs35
-rw-r--r--zellij-client/src/unit/terminal_loop_tests.rs4
-rw-r--r--zellij-client/src/web_client/unit/web_client_tests.rs3
-rw-r--r--zellij-server/src/background_jobs.rs61
-rw-r--r--zellij-server/src/lib.rs13
-rw-r--r--zellij-server/src/output/mod.rs6
-rw-r--r--zellij-server/src/panes/floating_panes/mod.rs80
-rw-r--r--zellij-server/src/panes/tiled_panes/mod.rs44
-rw-r--r--zellij-server/src/screen.rs212
-rw-r--r--zellij-server/src/tab/mod.rs737
-rw-r--r--zellij-server/src/tab/mouse_handler.rs1465
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_click_on_floating_pin_button_toggles_pin.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_corner.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_edge.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_pinned_floating_pane_when_floating_panes_not_shown.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_horizontally.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_vertically.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_unfocused_tiled_pane_vertically.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_floating_pane_size.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_pinned_floating_pane_size_when_floating_panes_hidden.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_active_tiled_pane_decreases_pane_size.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_inactive_tiled_pane_decreases_active_tiled_pane_size.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_floating_pane_size.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_pinned_floating_pane_size_when_floating_panes_hidden.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_active_tiled_pane_increases_pane_size.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_inactive_tiled_pane_increases_active_tiled_pane_size.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__drag_pane_with_mouse.snap22
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_active_pane_unsets_hover.snap5
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_inactive_pane_sets_hover_state.snap5
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_floating_frame_not_on_pin_moves_pane.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_pinned_floating_pane.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_drag_moves_floating_pane.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__resize_tiled_then_move_floating_sequence.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_on_inactive_pane_scrolls_that_pane.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_down_scrolls_pane.snap24
-rw-r--r--zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_up_scrolls_pane.snap24
-rw-r--r--zellij-server/src/tab/unit/tab_integration_tests.rs2249
-rw-r--r--zellij-server/src/tab/unit/tab_tests.rs3
-rw-r--r--zellij-server/src/ui/pane_boundaries_frame.rs97
-rw-r--r--zellij-server/src/ui/pane_contents_and_ui.rs5
-rw-r--r--zellij-server/src/unit/screen_tests.rs60
-rw-r--r--zellij-utils/assets/config/default.kdl5
-rw-r--r--zellij-utils/assets/prost_ipc/client_server_contract.rs2
-rw-r--r--zellij-utils/src/client_server_contract/common_types.proto1
-rw-r--r--zellij-utils/src/errors.rs5
-rw-r--r--zellij-utils/src/input/mouse.rs120
-rw-r--r--zellij-utils/src/input/options.rs10
-rw-r--r--zellij-utils/src/ipc/protobuf_conversion.rs2
-rw-r--r--zellij-utils/src/ipc/tests/roundtrip_tests.rs1
-rw-r--r--zellij-utils/src/kdl/mod.rs34
-rw-r--r--zellij-utils/src/kdl/snapshots/zellij_utils__kdl__bare_config_from_default_assets_to_string_with_comments.snap4
-rw-r--r--zellij-utils/src/kdl/snapshots/zellij_utils__kdl__config_options_to_string_with_comments.snap4
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_env_vars_override_config_env_vars.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_keybinds_override_config_keybinds.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_options_override_config_options.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap1
-rw-r--r--zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_ui_config_overrides_config_ui_config.snap1
65 files changed, 4922 insertions, 966 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c1d6fe..981accdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* fix: session creation time (all session created 0s ago bug) on musl targets (https://github.com/zellij-org/zellij/pull/4645)
* feat: allow explicitly saving current session for resurrection (rather than waiting on the resurrection interval) (https://github.com/zellij-org/zellij/pull/4654)
* fix: proper error handling in route (https://github.com/zellij-org/zellij/pull/4655)
+* feat: allow resizing panes with the mouse (https://github.com/zellij-org/zellij/pull/4678)
## [0.43.1] - 2025-08-08
diff --git a/example/default.kdl b/example/default.kdl
index f82030be..59e70eb7 100644
--- a/example/default.kdl
+++ b/example/default.kdl
@@ -514,6 +514,11 @@ load_plugins {
//
// advanced_mouse_actions false
+// Whether to enable mouse hover visual effects (frame highlight and help text)
+// Default: true
+//
+// mouse_hover_effects false
+
// A command to run (will be wrapped with sh -c and provided the RESURRECT_COMMAND env variable)
// after Zellij attempts to discover a command inside a pane when resurrecting sessions, the STDOUT
// of this command will be used instead of the discovered RESURRECT_COMMAND
diff --git a/zellij-client/src/os_input_output.rs b/zellij-client/src/os_input_output.rs
index c6f21d48..a7b4a6e3 100644
--- a/zellij-client/src/os_input_output.rs
+++ b/zellij-client/src/os_input_output.rs
@@ -219,8 +219,6 @@ pub trait ClientOsApi: Send + Sync + std::fmt::Debug {
fn load_palette(&self) -> Palette;
fn enable_mouse(&self) -> Result<()>;
fn disable_mouse(&self) -> Result<()>;
- // Repeatedly send action, until stdin is readable again
- fn stdin_poller(&self) -> StdinPoller;
fn env_variable(&self, _name: &str) -> Option<String> {
None
}
@@ -408,10 +406,6 @@ impl ClientOsApi for ClientOsInputOutput {
Ok(())
}
- fn stdin_poller(&self) -> StdinPoller {
- StdinPoller::default()
- }
-
fn env_variable(&self, name: &str) -> Option<String> {
std::env::var(name).ok()
}
@@ -449,44 +443,3 @@ pub fn get_cli_client_os_input() -> Result<ClientOsInputOutput, nix::Error> {
}
pub const DEFAULT_STDIN_POLL_TIMEOUT_MS: u64 = 10;
-
-pub struct StdinPoller {
- poll: Poll,
- events: Events,
- timeout: time::Duration,
-}
-
-impl StdinPoller {
- // use mio poll to check if stdin is readable without blocking
- pub fn ready(&mut self) -> bool {
- self.poll
- .poll(&mut self.events, Some(self.timeout))
- .expect("could not poll stdin for readiness");
- for event in &self.events {
- if event.token() == Token(0) && event.is_readable() {
- return true;
- }
- }
- false
- }
-}
-
-impl Default for StdinPoller {
- fn default() -> Self {
- let stdin = 0;
- let mut stdin_fd = SourceFd(&stdin);
- let events = Events::with_capacity(128);
- let poll = Poll::new().unwrap();
- poll.registry()
- .register(&mut stdin_fd, Token(0), Interest::READABLE)
- .expect("could not create stdin poll");
-
- let timeout = time::Duration::from_millis(DEFAULT_STDIN_POLL_TIMEOUT_MS);
-
- Self {
- poll,
- events,
- timeout,
- }
- }
-}
diff --git a/zellij-client/src/remote_attach/unit/remote_attach_tests.rs b/zellij-client/src/remote_attach/unit/remote_attach_tests.rs
index 6a6e0cd5..4b906a9c 100644
--- a/zellij-client/src/remote_attach/unit/remote_attach_tests.rs
+++ b/zellij-client/src/remote_attach/unit/remote_attach_tests.rs
@@ -283,10 +283,6 @@ impl crate::os_input_output::ClientOsApi for MockClientOsApi {
fn disable_mouse(&self) -> anyhow::Result<()> {
Ok(())
}
-
- fn stdin_poller(&self) -> crate::os_input_output::StdinPoller {
- crate::os_input_output::StdinPoller::default()
- }
}
// Tests
diff --git a/zellij-client/src/stdin_handler.rs b/zellij-client/src/stdin_handler.rs
index 7ec335f7..a7ddf4e2 100644
--- a/zellij-client/src/stdin_handler.rs
+++ b/zellij-client/src/stdin_handler.rs
@@ -3,7 +3,7 @@ use crate::os_input_output::ClientOsApi;
use crate::stdin_ansi_parser::StdinAnsiParser;
use crate::InputInstruction;
use std::sync::{Arc, Mutex};
-use termwiz::input::{InputEvent, InputParser, MouseButtons};
+use termwiz::input::{InputEvent, InputParser};
use zellij_utils::channels::SenderWithContext;
fn send_done_parsing_after_query_timeout(
@@ -26,7 +26,6 @@ pub(crate) fn stdin_loop(
stdin_ansi_parser: Arc<Mutex<StdinAnsiParser>>,
explicitly_disable_kitty_keyboard_protocol: bool,
) {
- let mut holding_mouse = false;
let mut input_parser = InputParser::new();
let mut current_buffer = vec![];
{
@@ -115,26 +114,7 @@ pub(crate) fn stdin_loop(
maybe_more,
);
- let event_count = events.len();
- for (i, input_event) in events.into_iter().enumerate() {
- if holding_mouse && is_mouse_press_or_hold(&input_event) && i == event_count - 1
- {
- let mut poller = os_input.stdin_poller();
- loop {
- if poller.ready() {
- break;
- }
- send_input_instructions
- .send(InputInstruction::KeyEvent(
- input_event.clone(),
- current_buffer.clone(),
- ))
- .unwrap();
- }
- }
-
- holding_mouse = is_mouse_press_or_hold(&input_event);
-
+ for input_event in events.into_iter() {
send_input_instructions
.send(InputInstruction::KeyEvent(
input_event,
@@ -155,14 +135,3 @@ pub(crate) fn stdin_loop(
}
}
}
-
-fn is_mouse_press_or_hold(input_event: &InputEvent) -> bool {
- if let InputEvent::Mouse(mouse_event) = input_event {
- if mouse_event.mouse_buttons.contains(MouseButtons::LEFT)
- || mouse_event.mouse_buttons.contains(MouseButtons::RIGHT)
- {
- return true;
- }
- }
- false
-}
diff --git a/zellij-client/src/unit/terminal_loop_tests.rs b/zellij-client/src/unit/terminal_loop_tests.rs
index d65b1814..bf773421 100644
--- a/zellij-client/src/unit/terminal_loop_tests.rs
+++ b/zellij-client/src/unit/terminal_loop_tests.rs
@@ -129,10 +129,6 @@ impl ClientOsApi for TestClientOsApi {
Ok(())
}
- fn stdin_poller(&self) -> crate::os_input_output::StdinPoller {
- crate::os_input_output::StdinPoller::default()
- }
-
fn get_async_stdin_reader(&self) -> Box<dyn AsyncStdin> {
Box::new(MockAsyncStdin {
rx: self.stdin_rx.clone(),
diff --git a/zellij-client/src/web_client/unit/web_client_tests.rs b/zellij-client/src/web_client/unit/web_client_tests.rs
index 15a45efa..2eee55eb 100644
--- a/zellij-client/src/web_client/unit/web_client_tests.rs
+++ b/zellij-client/src/web_client/unit/web_client_tests.rs
@@ -1928,7 +1928,4 @@ impl ClientOsApi for MockClientOsApi {
fn disable_mouse(&self) -> anyhow::Result<()> {
Ok(())
}
- fn stdin_poller(&self) -> crate::os_input_output::StdinPoller {
- crate::os_input_output::StdinPoller::default()
- }
}
diff --git a/zellij-server/src/background_jobs.rs b/zellij-server/src/background_jobs.rs
index 371f99b9..fca9f9aa 100644
--- a/zellij-server/src/background_jobs.rs
+++ b/zellij-server/src/background_jobs.rs
@@ -34,7 +34,7 @@ use crate::plugins::{PluginId, PluginInstruction};
use crate::pty::PtyInstruction;
use crate::screen::ScreenInstruction;
use crate::thread_bus::Bus;
-use crate::ClientId;
+use crate::{ClientId, ServerInstruction};
#[derive(Debug, Clone, Eq, PartialEq, Hash)]
pub enum BackgroundJob {
@@ -66,6 +66,9 @@ pub enum BackgroundJob {
HighlightPanesWithMessage(Vec<PaneId>, String),
RenderToClients,
QueryZellijWebServerStatus,
+ ClearHelpText {
+ client_id: ClientId,
+ },
Exit,
}
@@ -92,6 +95,7 @@ impl From<&BackgroundJob> for BackgroundJobContext {
BackgroundJob::QueryZellijWebServerStatus => {
BackgroundJobContext::QueryZellijWebServerStatus
},
+ BackgroundJob::ClearHelpText { .. } => BackgroundJobContext::ClearHelpText,
BackgroundJob::Exit => BackgroundJobContext::Exit,
}
}
@@ -103,6 +107,7 @@ static PLUGIN_ANIMATION_OFFSET_DURATION_MD: u64 = 500;
static SESSION_READ_DURATION: u64 = 1000;
static DEFAULT_SERIALIZATION_INTERVAL: u64 = 60000;
static REPAINT_DELAY_MS: u64 = 10;
+static HELP_TEXT_DEBOUNCE_DURATION: u64 = 5000;
pub(crate) fn background_jobs_main(
bus: Bus<BackgroundJob>,
@@ -122,6 +127,8 @@ pub(crate) fn background_jobs_main(
let serialization_interval = serialization_interval.map(|s| s * 1000); // convert to
// milliseconds
let last_render_request: Arc<Mutex<Option<Instant>>> = Arc::new(Mutex::new(None));
+ let pending_help_text_clear: Arc<Mutex<HashMap<ClientId, Instant>>> =
+ Arc::new(Mutex::new(HashMap::new()));
let http_client = HttpClient::builder()
// TODO: timeout?
@@ -491,6 +498,58 @@ pub(crate) fn background_jobs_main(
}
});
},
+ BackgroundJob::ClearHelpText { client_id } => {
+ let should_spawn = {
+ let mut pending = pending_help_text_clear.lock().unwrap();
+ let current_time = Instant::now();
+ let should_spawn = !pending.contains_key(&client_id);
+ pending.insert(client_id, current_time);
+ should_spawn
+ };
+
+ if should_spawn {
+ task::spawn({
+ let senders = bus.senders.clone();
+ let pending = pending_help_text_clear.clone();
+ let debounce_duration = Duration::from_millis(HELP_TEXT_DEBOUNCE_DURATION);
+ async move {
+ task::sleep(debounce_duration).await;
+ loop {
+ let next_sleep_duration = {
+ let mut pending = pending.lock().unwrap();
+ match pending.get(&client_id) {
+ Some(&last_motion_time) => {
+ let time_since_motion =
+ Instant::now().duration_since(last_motion_time);
+ if time_since_motion >= debounce_duration {
+ pending.remove(&client_id);
+ None
+ } else {
+ let remaining = debounce_duration
+ .saturating_sub(time_since_motion);
+ Some(remaining)
+ }
+ },
+ None => break,
+ }
+ };
+
+ match next_sleep_duration {
+ Some(duration) => {
+ task::sleep(duration).await;
+ },
+ None => {
+ let _ = senders.send_to_server(
+ ServerInstruction::ClearMouseHelpText(client_id),
+ );
+ break;
+ },
+ }
+ }
+ }
+ });
+ }
+ },
BackgroundJob::Exit => {
for loading_plugin in loading_plugins.values() {
loading_plugin.store(false, Ordering::SeqCst);
diff --git a/zellij-server/src/lib.rs b/zellij-server/src/lib.rs
index 2ccb9d24..43657ceb 100644
--- a/zellij-server/src/lib.rs
+++ b/zellij-server/src/lib.rs
@@ -127,6 +127,7 @@ pub enum ServerInstruction {
SendWebClientsForbidden(ClientId),
WebServerStarted(String), // String -> base_url
FailedToStartWebServer(String),
+ ClearMouseHelpText(ClientId),
}
impl From<&ServerInstruction> for ServerContext {
@@ -174,6 +175,7 @@ impl From<&ServerInstruction> for ServerContext {
ServerInstruction::SendWebClientsForbidden(..) => {
ServerContext::SendWebClientsForbidden
},
+ ServerInstruction::ClearMouseHelpText(..) => ServerContext::ClearMouseHelpText,
}
}
}
@@ -393,6 +395,7 @@ impl SessionMetaData {
.options
.advanced_mouse_actions
.unwrap_or(true),
+ mouse_hover_effects: new_config.options.mouse_hover_effects.unwrap_or(true),
})
.unwrap();
self.senders
@@ -1643,6 +1646,16 @@ pub fn start_server(mut os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) {
.send_to_plugin(PluginInstruction::FailedToStartWebServer(error))
.unwrap();
},
+ ServerInstruction::ClearMouseHelpText(client_id) => {
+ session_data
+ .write()
+ .unwrap()
+ .as_ref()
+ .unwrap()
+ .senders
+ .send_to_screen(ScreenInstruction::ClearMouseHelpText(client_id))
+ .unwrap();
+ },
}
}
diff --git a/zellij-server/src/output/mod.rs b/zellij-server/src/output/mod.rs
index 5ca283a7..6d9c2185 100644
--- a/zellij-server/src/output/mod.rs
+++ b/zellij-server/src/output/mod.rs
@@ -717,7 +717,7 @@ impl FloatingPanesStack {
// pane covers chunk completely
drop(c_chunk.terminal_characters.drain(..));
return Ok(None);
- } else if pane_right_edge > c_chunk_left_side
+ } else if pane_right_edge >= c_chunk_left_side
&& pane_right_edge < c_chunk_right_side
&& pane_left_edge <= c_chunk_left_side
{
@@ -726,8 +726,8 @@ impl FloatingPanesStack {
drop(covered_part);
c_chunk.x = pane_right_edge + 1;
return Ok(None);
- } else if pane_left_edge > c_chunk_left_side
- && pane_left_edge < c_chunk_right_side
+ } else if pane_left_edge >= c_chunk_left_side
+ && pane_left_edge >= c_chunk_left_side
&& pane_right_edge >= c_chunk_right_side
{
// pane covers chunk partially to the right
diff --git a/zellij-server/src/panes/floating_panes/mod.rs b/zellij-server/src/panes/floating_panes/mod.rs
index d28e0574..cfe27812 100644
--- a/zellij-server/src/panes/floating_panes/mod.rs
+++ b/zellij-server/src/panes/floating_panes/mod.rs
@@ -48,7 +48,9 @@ pub struct FloatingPanes {
z_indices: Vec<PaneId>,
active_panes: ActivePanes,
show_panes: bool,
- pane_being_moved_with_mouse: Option<(PaneId, Position)>,
+ pane_being_moved_with_mouse: Option<(PaneId, Position, Position)>, // (pane-id,
+ // initial_position,
+ // last_position)
senders: ThreadSenders,
window_title: Option<String>,
}
@@ -380,6 +382,7 @@ impl FloatingPanes {
mouse_hover_pane_id: &HashMap<ClientId, PaneId>,
current_pane_group: HashMap<ClientId, Vec<PaneId>>,
client_id_override: Option<ClientId>,
+ help_text_visible: &HashMap<ClientId, bool>,
) -> Result<()> {
let err_context = || "failed to render output";
let mut connected_clients: HashSet<ClientId> =
@@ -439,6 +442,9 @@ impl FloatingPanes {
{ self.connected_clients_in_app.borrow().len() > 1 };
active_panes.retain(|c_id, _| self.connected_clients.borrow().contains(c_id));
let pane_is_selectable = pane.selectable();
+ let show_help_text = active_panes.iter().any(|(client_id, pane_id)| {
+ pane_id == &pane.pid() && help_text_visible.get(client_id).copied().unwrap_or(false)
+ });
let mut pane_contents_and_ui = PaneContentsAndUi::new(
pane,
output,
@@ -451,6 +457,7 @@ impl FloatingPanes {
true,
mouse_hover_pane_id,
current_pane_group.clone(),
+ show_help_text,
);
for client_id in &connected_clients {
let client_mode = self
@@ -558,6 +565,37 @@ impl FloatingPanes {
Ok(true)
}
+ pub fn resize_pane_with_strategies(
+ &mut self,
+ pane_id: PaneId,
+ strategies: &[ResizeStrategy],
+ change_by: (usize, usize),
+ ) -> Result<()> {
+ let err_context = || format!("Failed to resize pane {:?} with strategies", pane_id);
+ let display_area = *self.display_area.borrow();
+ let viewport = *self.viewport.borrow();
+ let mut floating_pane_grid = FloatingPaneGrid::new(
+ &mut self.panes,
+ &mut self.desired_pane_positions,
+ display_area,
+ viewport,
+ );
+
+ // Apply each strategy
+ for strategy in strategies {
+ floating_pane_grid
+ .change_pane_size(&pane_id, strategy, change_by)
+ .with_context(err_context)?;
+ }
+
+ for pane in self.panes.values_mut() {
+ resize_pty!(pane, os_api, self.senders, self.character_cell_size)
+ .with_context(err_context)?;
+ }
+ self.set_force_render();
+ Ok(())
+ }
+
fn set_pane_active_at(&mut self, pane_id: PaneId) {
if let Some(pane) = self.panes.get_mut(&pane_id) {
pane.set_active_at(Instant::now());
@@ -1023,8 +1061,18 @@ impl FloatingPanes {
.ok()?
.and_then(|pane_id| self.panes.get_mut(&pane_id))
}
- pub fn set_pane_being_moved_with_mouse(&mut self, pane_id: PaneId, position: Position) {
- self.pane_being_moved_with_mouse = Some((pane_id, position));
+ pub fn set_pane_being_moved_with_mouse(&mut self, pane_id: PaneId, last_position: Position) {
+ if let Some((last_pane_id, initial_position)) = self
+ .pane_being_moved_with_mouse
+ .map(|(pane_id, initial_position, _)| (pane_id, initial_position))
+ {
+ if last_pane_id == pane_id {
+ // preserve initial_position
+ self.pane_being_moved_with_mouse = Some((pane_id, initial_position, last_position));
+ return;
+ }
+ }
+ self.pane_being_moved_with_mouse = Some((pane_id, last_position, last_position));
}
pub fn pane_is_being_moved_with_mouse(&self) -> bool {
self.pane_being_moved_with_mouse.is_some()
@@ -1033,8 +1081,9 @@ impl FloatingPanes {
// true => changed position
let display_area = *self.display_area.borrow();
let viewport = *self.viewport.borrow();
- let Some((pane_id, previous_position)) = self.pane_being_moved_with_mouse else {
- log::error!("Pane is not being moved with mousd");
+ let Some((pane_id, _initial_position, previous_position)) =
+ self.pane_being_moved_with_mouse
+ else {
return false;
};
if click_position == &previous_position {
@@ -1066,7 +1115,7 @@ impl FloatingPanes {
}
} else if let Some(pane) = self.get_pane_at_mut(&position, search_selectable) {
let clicked_on_frame = pane.position_is_on_frame(&position);
- if show_panes && clicked_on_frame {
+ if (show_panes || pane.position_and_size().is_pinned) && clicked_on_frame {
let pid = pane.pid();
if self.pane_being_moved_with_mouse.is_none() {
self.set_pane_being_moved_with_mouse(pid, position);
@@ -1078,12 +1127,25 @@ impl FloatingPanes {
};
false
}
- pub fn stop_moving_pane_with_mouse(&mut self, position: Position) {
- if self.pane_being_moved_with_mouse.is_some() {
- self.move_pane_to_position(&position);
+ pub fn stop_moving_pane_with_mouse(&mut self, position: Position) -> bool {
+ // bool -> this
+ // pane was never
+ // moved (initial
+ // position ==
+ // last_position)
+ let mut never_moved = false;
+ if let Some((_pane_id, initial_position, _last_position)) =
+ self.pane_being_moved_with_mouse.take()
+ {
+ if initial_position == position {
+ never_moved = true;
+ } else {
+ self.move_pane_to_position(&position);
+ }
self.set_force_render();
};
self.pane_being_moved_with_mouse = None;
+ never_moved
}
pub fn get_active_pane_id(&self, client_id: ClientId) -> Option<PaneId> {
self.active_panes.get(&client_id).copied()
diff --git a/zellij-server/src/panes/tiled_panes/mod.rs b/zellij-server/src/panes/tiled_panes/mod.rs
index 6bcfe9db..4c8020ac 100644
--- a/zellij-server/src/panes/tiled_panes/mod.rs
+++ b/zellij-server/src/panes/tiled_panes/mod.rs
@@ -1005,6 +1005,7 @@ impl TiledPanes {
mouse_hover_pane_id: &HashMap<ClientId, PaneId>,
current_pane_group: HashMap<ClientId, Vec<PaneId>>,
client_id_override: Option<ClientId>,
+ help_text_visible: &HashMap<ClientId, bool>,
) -> Result<()> {
let err_context = || "failed to render tiled panes";
@@ -1038,6 +1039,7 @@ impl TiledPanes {
.stacked_pane_ids_on_top_and_bottom_of_stacks()
.with_context(err_context)?
};
+ let selectable_pane_count = self.panes.iter().filter(|(_, p)| p.selectable()).count();
for (kind, pane) in self.panes.iter_mut() {
match kind {
PaneId::Terminal(_) => {
@@ -1072,6 +1074,11 @@ impl TiledPanes {
let pane_is_one_liner_in_stack =
pane_is_stacked && pane.current_geom().rows.is_fixed();
let pane_is_selectable = pane.selectable();
+ let show_help_text = active_panes.iter().any(|(client_id, pane_id)| {
+ pane_id == &pane.pid()
+ && help_text_visible.get(client_id).copied().unwrap_or(false)
+ }) && selectable_pane_count > 1
+ && self.fullscreen_is_active.is_none();
let mut pane_contents_and_ui = PaneContentsAndUi::new(
pane,
output,
@@ -1084,6 +1091,7 @@ impl TiledPanes {
should_draw_pane_frames,
&mouse_hover_pane_id,
current_pane_group.clone(),
+ show_help_text,
);
for client_id in &connected_clients {
let client_mode = self
@@ -1319,7 +1327,7 @@ impl TiledPanes {
) -> Result<()> {
if *self.stacked_resize.borrow() && strategy.direction.is_none() {
if let Some(active_pane_id) = self.get_active_pane_id(client_id) {
- self.stacked_resize_pane_with_id(active_pane_id, strategy)?;
+ self.stacked_resize_pane_with_id(active_pane_id, strategy, None)?;
self.reapply_pane_frames();
}
} else {
@@ -1518,12 +1526,14 @@ impl TiledPanes {
self.tombstones_before_increase = None;
self.tombstones_before_decrease = None;
}
- fn stacked_resize_pane_with_id(
+ pub fn stacked_resize_pane_with_id(
&mut self,
pane_id: PaneId,
strategy: &ResizeStrategy,
+ // override as rarely as possible to maintain ux consistency
+ resize_percent_override: Option<(f64, f64)>,
) -> Result<bool> {
- let resize_percent = (30.0, 30.0);
+ let resize_percent = resize_percent_override.unwrap_or((30.0, 30.0));
match strategy.resize {
Resize::Increase => {
match self.tombstones_before_decrease.as_mut() {
@@ -1754,6 +1764,34 @@ impl TiledPanes {
Ok(pane_size_changed)
}
+ pub fn resize_pane_with_strategies(
+ &mut self,
+ pane_id: PaneId,
+ strategies: &[ResizeStrategy],
+ change_by: (f64, f64),
+ ) -> Result<()> {
+ let err_context = || format!("failed to resize pane {:?} with strategies", pane_id);
+
+ let mut pane_grid = TiledPaneGrid::new(
+ &mut self.panes,
+ &self.panes_to_hide,
+ *self.display_area.borrow(),
+ *self.viewport.borrow(),
+ );
+
+ for strategy in strategies {
+ let _ = pane_grid
+ .change_pane_size(&pane_id, strategy, change_by)
+ .with_context(err_context);
+ }
+
+ for pane in self.panes.values_mut() {
+ resize_pty!(pane, self.os_api, self.senders, self.character_cell_size).unwrap();
+ }
+ self.reset_boundaries();
+ Ok(())
+ }
+
pub fn focus_next_pane(&mut self, client_id: ClientId) {
let active_pane_id = self.get_active_pane_id(client_id).unwrap();
let next_active_pane_id = {
diff --git a/zellij-server/src/screen.rs b/zellij-server/src/screen.rs
index 17e83230..20909dc4 100644
--- a/zellij-server/src/screen.rs
+++ b/zellij-server/src/screen.rs
@@ -13,8 +13,9 @@ use crate::route::NotificationEnd;
use log::{debug, warn};
use zellij_utils::data::{
CommandOrPlugin, Direction, FloatingPaneCoordinates, GetFocusedPaneInfoResponse,
- KeyWithModifier, NewPanePlacement, PaneContents, PaneManifest, PaneScrollbackResponse,
- PluginPermission, Resize, ResizeStrategy, SessionInfo, Styling, WebSharing,
+ KeyWithModifier, LayoutInfo, NewPanePlacement, PaneContents, PaneManifest,
+ PaneScrollbackResponse, PluginPermission, Resize, ResizeStrategy, SessionInfo, Styling,
+ WebSharing,
};
use zellij_utils::errors::prelude::*;
use zellij_utils::input::command::RunCommand;
@@ -514,6 +515,7 @@ pub enum ScreenInstruction {
stacked_resize: bool,
default_editor: Option<PathBuf>,
advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
},
RerunCommandPane(u32, Option<NotificationEnd>), // u32 - terminal pane id
ResizePaneWithId(ResizeStrategy, PaneId),
@@ -572,6 +574,7 @@ pub enum ScreenInstruction {
RemoveWatcherClient(ClientId),
SetFollowedClient(ClientId),
WatcherTerminalResize(ClientId, Size),
+ ClearMouseHelpText(ClientId),
}
impl From<&ScreenInstruction> for ScreenContext {
@@ -817,7 +820,8 @@ impl From<&ScreenInstruction> for ScreenContext {
ScreenInstruction::AddWatcherClient(..) => ScreenContext::AddWatcherClient,
ScreenInstruction::RemoveWatcherClient(..) => ScreenContext::RemoveWatcherClient,
ScreenInstruction::SetFollowedClient(..) => ScreenContext::SetFollowedClient,
- ScreenInstruction::WatcherTerminalResize(..) => ScreenContext::WatcherTerminalResize, // NEW
+ ScreenInstruction::WatcherTerminalResize(..) => ScreenContext::WatcherTerminalResize,
+ ScreenInstruction::ClearMouseHelpText(..) => ScreenContext::ClearMouseHelpText,
}
}
}
@@ -991,6 +995,7 @@ pub(crate) struct Screen {
web_sharing: WebSharing,
current_pane_group: Rc<RefCell<PaneGroups>>,
advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
currently_marking_pane_group: Rc<RefCell<HashMap<ClientId, bool>>>,
// the below are the configured values - the ones that will be set if and when the web server
// is brought online
@@ -999,6 +1004,7 @@ pub(crate) struct Screen {
render_blocker: RenderBlocker,
watcher_clients: HashMap<ClientId, WatcherState>,
followed_client_id: Option<ClientId>,
+ cached_layouts: Vec<LayoutInfo>,
}
impl Screen {
@@ -1029,6 +1035,7 @@ impl Screen {
web_clients_allowed: bool,
web_sharing: WebSharing,
advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
web_server_ip: IpAddr,
web_server_port: u16,
) -> Self {
@@ -1082,11 +1089,13 @@ impl Screen {
current_pane_group: Rc::new(RefCell::new(current_pane_group)),
currently_marking_pane_group: Rc::new(RefCell::new(HashMap::new())),
advanced_mouse_actions,
+ mouse_hover_effects,
web_server_ip,
web_server_port,
render_blocker: RenderBlocker::new(100),
watcher_clients: HashMap::new(),
followed_client_id: None,
+ cached_layouts: vec![],
}
}
@@ -1296,7 +1305,7 @@ impl Screen {
.non_fatal();
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)?;
return self.render(None).with_context(err_context);
},
@@ -1449,7 +1458,7 @@ impl Screen {
t.position -= 1;
}
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)?;
self.render(None).with_context(err_context)
}
@@ -1488,7 +1497,7 @@ impl Screen {
.with_context(err_context)?;
tab.set_force_render();
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)?;
self.render(None).with_context(err_context)
} else {
@@ -1822,6 +1831,7 @@ impl Screen {
self.current_pane_group.clone(),
self.currently_marking_pane_group.clone(),
self.advanced_mouse_actions,
+ self.mouse_hover_effects,
self.web_server_ip,
self.web_server_port,
);
@@ -1946,7 +1956,7 @@ impl Screen {
.with_context(err_context)?;
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.and_then(|_| self.render(None))
.with_context(err_context)
}
@@ -2026,7 +2036,7 @@ impl Screen {
self.tab_history.remove(&client_id);
}
self.connected_clients.borrow_mut().remove(&client_id);
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)
}
@@ -2162,21 +2172,28 @@ impl Screen {
Ok(pane_manifest)
}
- fn log_and_report_session_state(&mut self) -> Result<()> {
+ fn log_and_report_session_state(&mut self, skip_querying_layouts: bool) -> Result<()> {
let err_context = || format!("Failed to log and report session state");
self.update_active_pane_ids();
// generate own session info
let pane_manifest = self.generate_and_report_pane_state()?;
let tab_infos = self.generate_and_report_tab_state()?;
+
// in the context of unit/integration tests, we don't need to list available layouts
// because this is mostly about HD access - it does however throw off the timing in the
// tests and causes them to flake, which is why we skip it here
- #[cfg(not(test))]
- let (available_layouts, _layout_errors) =
- Layout::list_available_layouts(self.layout_dir.clone(), &self.default_layout_name);
- #[cfg(test)]
- let available_layouts = vec![];
+ let available_layouts = if skip_querying_layouts {
+ self.cached_layouts.clone()
+ } else {
+ #[cfg(not(test))]
+ let (available_layouts, _layout_errors) =
+ Layout::list_available_layouts(self.layout_dir.clone(), &self.default_layout_name);
+ #[cfg(test)]
+ let available_layouts = vec![];
+ self.cached_layouts = available_layouts.clone();
+ available_layouts
+ };
let session_info = SessionInfo {
name: self.session_name.clone(),
tabs: tab_infos,
@@ -2285,7 +2302,7 @@ impl Screen {
.push_str(&clean_string_from_control_and_linebreak(c));
},
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)
},
Err(err) => {
@@ -2311,7 +2328,7 @@ impl Screen {
Ok(active_tab) => {
if active_tab.name != active_tab.prev_name {
active_tab.name = active_tab.prev_name.clone();
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.context("failed to undo renaming of active tab")?;
}
},
@@ -2343,7 +2360,7 @@ impl Screen {
};
self.switch_tabs(active_tab_pos, left_tab_pos, client_id);
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.context("failed to move tab to left")?;
},
Err(err) => Err::<(), _>(err).with_context(err_context).non_fatal(),
@@ -2428,7 +2445,7 @@ impl Screen {
let right_tab_pos = (active_tab_pos + 1) % self.tabs.len();
self.switch_tabs(active_tab_pos, right_tab_pos, client_id);
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.context("failed to move tab to the right")?;
},
Err(err) => Err::<(), _>(err).with_context(err_context).non_fatal(),
@@ -2545,7 +2562,7 @@ impl Screen {
Err(err) => Err::<(), _>(err).with_context(err_context).non_fatal(),
};
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)?;
Ok(())
}
@@ -2581,7 +2598,7 @@ impl Screen {
Err(err) => Err::<(), _>(err).with_context(err_context).non_fatal(),
};
}
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)?;
Ok(())
}
@@ -2595,7 +2612,7 @@ impl Screen {
.context("failed to toggle tabs")?;
};
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.context("failed to toggle tabs")?;
self.render(None)
}
@@ -2656,7 +2673,7 @@ impl Screen {
.with_context(err_context)?
.focus_pane_with_id(plugin_pane_id, should_float, should_be_in_place, client_id)
.context("failed to focus plugin pane")?;
- self.log_and_report_session_state()
+ self.log_and_report_session_state(false)
.with_context(err_context)?;
Ok(true)
},
@@ -2909,7 +2926,7 @@ impl Screen {
)?;
}
- self.log_and_report_session_state()?;
+ self.log_and_report_session_state(false)?;
} else {
let active_pane_id = {
let active_tab = self.get_active_tab_mut(client_id)?;
@@ -2994,7 +3011,7 @@ impl Screen {
} else {
log::error!("Could not find tab with index: {:?}", tab_index);
}
- self.log_and_report_session_state()?;
+ self.log_and_report_session_state(false)?;
Ok(())
}
pub fn replace_pane(
@@ -3116,7 +3133,7 @@ impl Screen {
);
}
}
- let _ = self.log_and_report_session_state();
+ let _ = self.log_and_report_session_state(false);
}
pub fn reconfigure(
&mut self,
@@ -3135,6 +3152,7 @@ impl Screen {
stacked_resize: bool,
default_editor: Option<PathBuf>,
advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
client_id: ClientId,
) -> Result<()> {
let should_support_arrow_fonts = !simplified_ui;
@@ -3150,6 +3168,7 @@ impl Screen {
self.copy_options.copy_on_select = copy_on_select;
self.draw_pane_frames = pane_frames;
self.advanced_mouse_actions = advanced_mouse_actions;
+ self.mouse_hover_effects = mouse_hover_effects;
self.default_mode_info
.update_arrow_fonts(should_support_arrow_fonts);
self.default_mode_info
@@ -3170,6 +3189,14 @@ impl Screen {
tab.set_pane_frames(pane_frames);
tab.update_arrow_fonts(should_support_arrow_fonts);
tab.update_advanced_mouse_actions(advanced_mouse_actions);
+ tab.update_mouse_hover_effects(mouse_hover_effects);
+ }
+
+ // Clear hover state when disabled
+ if !mouse_hover_effects {
+ for tab in self.tabs.values_mut() {
+ tab.clear_mouse_hover_state();
+ }
}
// client specific configuration
@@ -3328,23 +3355,28 @@ impl Screen {
.and_then(|tab| tab.handle_mouse_event(&event, client_id))
{
Ok(mouse_effect) => {
+ let mut should_render = false;
if let Some(pane_id) = mouse_effect.group_toggle {
if self.advanced_mouse_actions {
self.toggle_pane_id_in_group(pane_id, &client_id);
+ should_render = true;
}
}
if let Some(pane_id) = mouse_effect.group_add {
if self.advanced_mouse_actions {
self.add_pane_id_to_group(pane_id, &client_id);
+ should_render = true;
}
}
if mouse_effect.ungroup {
if self.advanced_mouse_actions {
self.clear_pane_group(&client_id);
+ should_render = true;
}
}
if mouse_effect.state_changed {
- let _ = self.log_and_report_session_state();
+ let _ = self.log_and_report_session_state(true);
+ should_render = true;
}
if !mouse_effect.leave_clipboard_message {
let _ = self
@@ -3355,8 +3387,11 @@ impl Screen {
Some(client_id),
Event::InputReceived,
)]));
+ should_render = true; // TODO: do we need this?
+ }
+ if should_render {
+ self.render(None).non_fatal();
}
- self.render(None).non_fatal();
},
Err(e) => {
log::error!("Failed to process MouseEvent: {}", e);
@@ -3372,7 +3407,7 @@ impl Screen {
.get_active_pane_id(client_id)
.with_context(|| err_context)?;
self.toggle_pane_id_in_group(active_pane_id, &client_id);
- let _ = self.log_and_report_session_state();
+ let _ = self.log_and_report_session_state(false);
Ok(())
}
pub fn toggle_group_marking(&mut self, client_id: ClientId) -> Result<()> {
@@ -3398,7 +3433,7 @@ impl Screen {
for tab in self.tabs.values_mut() {
tab.update_input_modes()?;
}
- let _ = self.log_and_report_session_state();
+ let _ = self.log_and_report_session_state(false);
}
Ok(())
}
@@ -3628,7 +3663,7 @@ impl Screen {
}
}
self.retain_only_existing_panes_in_pane_groups();
- let _ = self.log_and_report_session_state();
+ let _ = self.log_and_report_session_state(false);
}
fn retain_only_existing_panes_in_pane_groups(&mut self) {
let clients_with_empty_group = {
@@ -3797,6 +3832,7 @@ pub(crate) fn screen_thread_main(
.unwrap_or(false);
let web_sharing = config_options.web_sharing.unwrap_or_else(Default::default);
let advanced_mouse_actions = config_options.advanced_mouse_actions.unwrap_or(true);
+ let mouse_hover_effects = config_options.mouse_hover_effects.unwrap_or(true);
let thread_senders = bus.senders.clone();
let mut screen = Screen::new(
@@ -3834,6 +3870,7 @@ pub(crate) fn screen_thread_main(
web_clients_allowed,
web_sharing,
advanced_mouse_actions,
+ mouse_hover_effects,
web_server_ip,
web_server_port,
);
@@ -3995,7 +4032,7 @@ pub(crate) fn screen_thread_main(
}
},
};
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.render(None)?;
},
@@ -4004,7 +4041,7 @@ pub(crate) fn screen_thread_main(
ClientTabIndexOrPaneId::ClientId(client_id) => {
active_tab!(screen, client_id, |tab: &mut Tab| tab
.replace_active_pane_with_editor_pane(pid, client_id), ?);
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ClientTabIndexOrPaneId::TabIndex(_tab_index) => {
log::error!("Cannot OpenInPlaceEditor with a TabIndex");
@@ -4038,13 +4075,13 @@ pub(crate) fn screen_thread_main(
) => {
active_tab_and_connected_client_id!(screen, client_id, |tab: &mut Tab, client_id: ClientId| tab
.toggle_pane_embed_or_floating(client_id), ?);
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.render(None)?;
},
ScreenInstruction::ToggleFloatingPanes(client_id, default_shell, completion_tx) => {
active_tab_and_connected_client_id!(screen, client_id, |tab: &mut Tab, client_id: ClientId| tab
.toggle_floating_panes(Some(client_id), default_shell, completion_tx), ?);
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.render(None)?;
},
@@ -4134,7 +4171,7 @@ pub(crate) fn screen_thread_main(
},
};
if state_changed {
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
}
screen.render(None)?;
},
@@ -4151,7 +4188,7 @@ pub(crate) fn screen_thread_main(
?
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::SwitchFocus(
client_id,
@@ -4164,7 +4201,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.focus_next_pane(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::FocusNextPane(
client_id,
@@ -4189,7 +4226,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.focus_previous_pane(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MoveFocusLeft(
client_id,
@@ -4204,7 +4241,7 @@ pub(crate) fn screen_thread_main(
);
screen.add_active_pane_to_group_if_marking(&client_id);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MoveFocusLeftOrPreviousTab(
client_id,
@@ -4214,7 +4251,7 @@ pub(crate) fn screen_thread_main(
screen.move_focus_left_or_previous_tab(client_id)?;
screen.add_active_pane_to_group_if_marking(&client_id);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MoveFocusDown(
client_id,
@@ -4229,7 +4266,7 @@ pub(crate) fn screen_thread_main(
);
screen.add_active_pane_to_group_if_marking(&client_id);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MoveFocusRight(
client_id,
@@ -4244,7 +4281,7 @@ pub(crate) fn screen_thread_main(
);
screen.add_active_pane_to_group_if_marking(&client_id);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MoveFocusRightOrNextTab(
client_id,
@@ -4254,7 +4291,7 @@ pub(crate) fn screen_thread_main(
screen.move_focus_right_or_next_tab(client_id)?;
screen.add_active_pane_to_group_if_marking(&client_id);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MoveFocusUp(
client_id,
@@ -4269,7 +4306,7 @@ pub(crate) fn screen_thread_main(
);
screen.add_active_pane_to_group_if_marking(&client_id);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::ClearScreen(
client_id,
@@ -4395,7 +4432,7 @@ pub(crate) fn screen_thread_main(
?
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::GetPaneScrollback {
pane_id,
@@ -4453,7 +4490,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.move_active_pane(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MovePaneBackwards(
client_id,
@@ -4466,7 +4503,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.move_active_pane_backwards(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MovePaneDown(
client_id,
@@ -4479,7 +4516,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.move_active_pane_down(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MovePaneUp(
client_id,
@@ -4492,7 +4529,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.move_active_pane_up(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MovePaneRight(
client_id,
@@ -4505,7 +4542,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.move_active_pane_right(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::MovePaneLeft(
client_id,
@@ -4518,7 +4555,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.move_active_pane_left(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::ScrollUpAt(
point,
@@ -4654,7 +4691,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.close_focused_pane(client_id, completion_tx), ?
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::SetSelectable(pid, selectable) => {
let all_tabs = screen.get_tabs_mut();
@@ -4671,7 +4708,7 @@ pub(crate) fn screen_thread_main(
.push(ScreenInstruction::SetSelectable(pid, selectable));
}
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::ShowPluginCursor(pid, client_id, cursor_position) => {
let all_tabs = screen.get_tabs_mut();
@@ -4691,7 +4728,7 @@ pub(crate) fn screen_thread_main(
));
}
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::SetMouseSelectionSupport(pid, selection_support) => {
let all_tabs = screen.get_tabs_mut();
@@ -4709,7 +4746,7 @@ pub(crate) fn screen_thread_main(
);
}
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::ClosePane(
id,
@@ -4736,7 +4773,7 @@ pub(crate) fn screen_thread_main(
},
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.retain_only_existing_panes_in_pane_groups();
},
ScreenInstruction::HoldPane(id, exit_status, run_command) => {
@@ -4747,7 +4784,7 @@ pub(crate) fn screen_thread_main(
break;
}
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::UpdatePaneName(
c,
@@ -4761,7 +4798,7 @@ pub(crate) fn screen_thread_main(
|tab: &mut Tab, client_id: ClientId| tab.update_active_pane_name(c, client_id), ?
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::UndoRenamePane(
client_id,
@@ -4787,7 +4824,7 @@ pub(crate) fn screen_thread_main(
.toggle_active_pane_fullscreen(client_id)
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::TogglePaneFrames(
_completion_tx, // the action ends here, dropping this will release anything
@@ -4798,7 +4835,7 @@ pub(crate) fn screen_thread_main(
tab.set_pane_frames(screen.draw_pane_frames);
}
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::SwitchTabNext(
client_id,
@@ -5076,7 +5113,7 @@ pub(crate) fn screen_thread_main(
},
ScreenInstruction::TerminalResize(new_size) => {
screen.resize_to_screen(new_size)?;
- screen.log_and_report_session_state()?; // update tabs so that the ui indication will be send to the plugins
+ screen.log_and_report_session_state(false)?; // update tabs so that the ui indication will be send to the plugins
screen.render(None)?;
},
ScreenInstruction::TerminalPixelDimensions(pixel_dimensions) => {
@@ -5118,7 +5155,7 @@ pub(crate) fn screen_thread_main(
client_id,
|tab: &mut Tab, _client_id: ClientId| tab.toggle_sync_panes_is_active()
);
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.render(None)?;
},
ScreenInstruction::MouseEvent(
@@ -5171,7 +5208,7 @@ pub(crate) fn screen_thread_main(
for event in pending_events_waiting_for_client.drain(..) {
screen.bus.senders.send_to_screen(event).non_fatal();
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
if is_web_client {
// we do this because
@@ -5191,7 +5228,7 @@ pub(crate) fn screen_thread_main(
},
ScreenInstruction::RemoveClient(client_id) => {
screen.remove_client(client_id)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.render(None)?;
},
ScreenInstruction::UpdateSearch(
@@ -5320,7 +5357,7 @@ pub(crate) fn screen_thread_main(
?
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::NextSwapLayout(
client_id,
@@ -5334,7 +5371,7 @@ pub(crate) fn screen_thread_main(
?
);
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::OverrideLayout(
cwd,
@@ -5545,7 +5582,7 @@ pub(crate) fn screen_thread_main(
}
// Single render and log after all tabs are updated (performance optimization)
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
let _ = screen.render(None);
drop(completion_tx); // action ends here, notify the action initiator
},
@@ -5809,7 +5846,7 @@ pub(crate) fn screen_thread_main(
screen.update_plugin_loading_stage(plugin_id, loading_indication);
screen.render(None)?;
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::UpdatePluginLoadingStage(pid, loading_indication) => {
let found_plugin =
@@ -5844,7 +5881,7 @@ pub(crate) fn screen_thread_main(
for tab in all_tabs.values_mut() {
tab.update_input_modes()?;
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
screen.render(None)?;
},
ScreenInstruction::LaunchOrFocusPlugin(
@@ -5909,7 +5946,7 @@ pub(crate) fn screen_thread_main(
client_id,
)? {
screen.render(None)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
} else {
screen
.bus
@@ -6023,7 +6060,7 @@ pub(crate) fn screen_thread_main(
break;
}
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::UnsuppressPane(pane_id, should_float_if_hidden) => {
let all_tabs = screen.get_tabs_mut();
@@ -6034,7 +6071,7 @@ pub(crate) fn screen_thread_main(
break;
}
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::UnsuppressOrExpandPane(pane_id, should_float_if_hidden) => {
let all_tabs = screen.get_tabs_mut();
@@ -6045,7 +6082,7 @@ pub(crate) fn screen_thread_main(
break;
}
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::FocusPaneWithId(
pane_id,
@@ -6061,7 +6098,7 @@ pub(crate) fn screen_thread_main(
should_be_in_place_if_hidden,
client_id,
)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::RenamePane(
pane_id,
@@ -6079,7 +6116,7 @@ pub(crate) fn screen_thread_main(
break;
}
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::RenameTab(
tab_index,
@@ -6095,7 +6132,7 @@ pub(crate) fn screen_thread_main(
log::error!("Failed to find tab with index: {:?}", tab_index);
},
}
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::RequestPluginPermissions(plugin_id, plugin_permission) => {
let all_tabs = screen.get_tabs_mut();
@@ -6162,7 +6199,7 @@ pub(crate) fn screen_thread_main(
client_id_tab_index_or_pane_id,
)?;
- screen.log_and_report_session_state()?;
+ screen.log_and_report_session_state(false)?;
},
ScreenInstruction::SerializeLayoutForResurrection => {
if screen.session_serialization {
@@ -6289,7 +6326,7 @@ pub(crate) fn screen_thread_main(
// report
screen
- .log_and_report_session_state()
+ .log_and_report_session_state(false)
.with_context(err_context)?;
// set the env variable
@@ -6323,6 +6360,7 @@ pub(crate) fn screen_thread_main(
stacked_resize,
default_editor,
advanced_mouse_actions,
+ mouse_hover_effects,
} => {
screen
.reconfigure(
@@ -6341,6 +6379,7 @@ pub(crate) fn screen_thread_main(
stacked_resize,
default_editor,
advanced_mouse_actions,
+ mouse_hover_effects,
client_id,
)
.non_fatal();
@@ -6664,7 +6703,7 @@ pub(crate) fn screen_thread_main(
for_all_clients,
client_id,
);
- let _ = screen.log_and_report_session_state();
+ let _ = screen.log_and_report_session_state(false);
},
ScreenInstruction::TogglePaneInGroup(
client_id,
@@ -6690,7 +6729,7 @@ pub(crate) fn screen_thread_main(
for tab in screen.tabs.values_mut() {
tab.update_web_sharing(screen.web_sharing);
}
- let _ = screen.log_and_report_session_state();
+ let _ = screen.log_and_report_session_state(false);
let _ = screen.render(None);
},
ScreenInstruction::HighlightAndUnhighlightPanes(
@@ -6720,7 +6759,7 @@ pub(crate) fn screen_thread_main(
}
screen.render(None)?;
}
- let _ = screen.log_and_report_session_state();
+ let _ = screen.log_and_report_session_state(false);
},
ScreenInstruction::FloatMultiplePanes(pane_ids_to_float, client_id) => {
{
@@ -6751,7 +6790,7 @@ pub(crate) fn screen_thread_main(
);
}
}
- let _ = screen.log_and_report_session_state();
+ let _ = screen.log_and_report_session_state(false);
},
ScreenInstruction::EmbedMultiplePanes(pane_ids_to_float, client_id) => {
{
@@ -6782,7 +6821,7 @@ pub(crate) fn screen_thread_main(
);
}
}
- let _ = screen.log_and_report_session_state();
+ let _ = screen.log_and_report_session_state(false);
},
ScreenInstruction::InterceptKeyPresses(plugin_id, client_id) => {
keybind_intercepts.insert(client_id, plugin_id);
@@ -6815,10 +6854,15 @@ pub(crate) fn screen_thread_main(
.context("failed to set followed client")?;
},
ScreenInstruction::WatcherTerminalResize(client_id, size) => {
- // NEW
screen.set_watcher_size(client_id, size);
screen.render(None)?;
},
+ ScreenInstruction::ClearMouseHelpText(client_id) => {
+ if let Ok(tab) = screen.get_active_tab_mut(client_id) {
+ tab.clear_mouse_help_text(client_id);
+ screen.render(None)?;
+ }
+ },
}
}
Ok(())
diff --git a/zellij-server/src/tab/mod.rs b/zellij-server/src/tab/mod.rs
index 02c26362..a7d216b3 100644
--- a/zellij-server/src/tab/mod.rs
+++ b/zellij-server/src/tab/mod.rs
@@ -4,9 +4,11 @@
mod clipboard;
mod copy_command;
mod layout_applier;
+mod mouse_handler;
mod swap_layouts;
use copy_command::CopyCommand;
+pub use mouse_handler::{MouseEffect, MouseHandler, PaneEdge, PaneResizeState};
use std::env::temp_dir;
use std::net::IpAddr;
use std::path::PathBuf;
@@ -18,7 +20,7 @@ use zellij_utils::data::{
};
use zellij_utils::errors::prelude::*;
use zellij_utils::input::command::RunCommand;
-use zellij_utils::input::mouse::{MouseEvent, MouseEventType};
+use zellij_utils::input::mouse::MouseEvent;
use zellij_utils::position::Position;
use zellij_utils::position::{Column, Line};
use zellij_utils::shared::clean_string_from_control_and_linebreak;
@@ -151,72 +153,6 @@ enum BufferedTabInstruction {
HoldPane(PaneId, Option<i32>, bool, RunCommand), // Option<i32> is the exit status, bool is is_first_run
}
-#[derive(Debug, Default, Copy, Clone)]
-pub struct MouseEffect {
- pub state_changed: bool,
- pub leave_clipboard_message: bool,
- pub group_toggle: Option<PaneId>,
- pub group_add: Option<PaneId>,
- pub ungroup: bool,
-}
-
-impl MouseEffect {
- pub fn state_changed() -> Self {
- MouseEffect {
- state_changed: true,
- leave_clipboard_message: false,
- group_toggle: None,
- group_add: None,
- ungroup: false,
- }
- }
- pub fn leave_clipboard_message() -> Self {
- MouseEffect {
- state_changed: false,
- leave_clipboard_message: true,
- group_toggle: None,
- group_add: None,
- ungroup: false,
- }
- }
- pub fn state_changed_and_leave_clipboard_message() -> Self {
- MouseEffect {
- state_changed: true,
- leave_clipboard_message: true,
- group_toggle: None,
- group_add: None,
- ungroup: false,
- }
- }
- pub fn group_toggle(pane_id: PaneId) -> Self {
- MouseEffect {
- state_changed: true,
- leave_clipboard_message: false,
- group_toggle: Some(pane_id),
- group_add: None,
- ungroup: false,
- }
- }
- pub fn group_add(pane_id: PaneId) -> Self {
- MouseEffect {
- state_changed: true,
- leave_clipboard_message: false,
- group_toggle: None,
- group_add: Some(pane_id),
- ungroup: false,
- }
- }
- pub fn ungroup() -> Self {
- MouseEffect {
- state_changed: true,
- leave_clipboard_message: false,
- group_toggle: None,
- group_add: None,
- ungroup: true,
- }
- }
-}
-
pub(crate) struct Tab {
pub index: usize,
pub position: usize,
@@ -242,6 +178,7 @@ pub(crate) struct Tab {
auto_layout: bool,
pending_vte_events: HashMap<u32, Vec<VteBytes>>,
pub selecting_with_mouse_in_pane: Option<PaneId>, // this is only pub for the tests
+ pane_being_resized_with_mouse: Option<PaneResizeState>,
link_handler: Rc<RefCell<LinkHandler>>,
clipboard_provider: ClipboardProvider,
// TODO: used only to focus the pane when the layout is loaded
@@ -268,8 +205,11 @@ pub(crate) struct Tab {
web_clients_allowed: bool,
web_sharing: WebSharing,
mouse_hover_pane_id: HashMap<ClientId, PaneId>,
+ mouse_help_text_visible: HashMap<ClientId, bool>,
+ last_mouse_activity_time: HashMap<ClientId, Instant>,
current_pane_group: Rc<RefCell<PaneGroups>>,
advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
currently_marking_pane_group: Rc<RefCell<HashMap<ClientId, bool>>>,
connected_clients_in_app: Rc<RefCell<HashMap<ClientId, bool>>>, // bool -> is_web_client
// the below are the configured values - the ones that will be set if and when the web server
@@ -486,6 +426,31 @@ pub trait Pane {
}
false
}
+ fn get_edge_at_position(&self, position: &Position) -> Option<PaneEdge> {
+ if !self.contains(position) {
+ return None;
+ }
+
+ let pos_col = position.column();
+ let pos_line = position.line();
+ let pane_x = self.x();
+ let pane_y = self.y();
+ let pane_cols = self.cols();
+ let pane_rows = self.rows();
+
+ let mid_col = pane_x + pane_cols / 2;
+ let mid_line = pane_y + pane_rows / 2;
+
+ let is_left = pos_col < mid_col;
+ let is_top = (pos_line as usize) < mid_line;
+
+ return Some(match (is_top, is_left) {
+ (true, true) => PaneEdge::TopLeft,
+ (true, false) => PaneEdge::TopRight,
+ (false, true) => PaneEdge::BottomLeft,
+ (false, false) => PaneEdge::BottomRight,
+ });
+ }
// TODO: get rid of this in favor of intercept_mouse_event_on_frame
fn intercept_left_mouse_click(&mut self, _position: &Position, _client_id: ClientId) -> bool {
let intercepted = false;
@@ -693,6 +658,7 @@ impl Tab {
current_pane_group: Rc<RefCell<PaneGroups>>,
currently_marking_pane_group: Rc<RefCell<HashMap<ClientId, bool>>>,
advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
web_server_ip: IpAddr,
web_server_port: u16,
) -> Self {
@@ -772,6 +738,7 @@ impl Tab {
pending_vte_events: HashMap::new(),
connected_clients,
selecting_with_mouse_in_pane: None,
+ pane_being_resized_with_mouse: None,
link_handler: Rc::new(RefCell::new(LinkHandler::new())),
clipboard_provider,
focus_pane_id: None,
@@ -793,9 +760,12 @@ impl Tab {
web_clients_allowed,
web_sharing,
mouse_hover_pane_id: HashMap::new(),
+ mouse_help_text_visible: HashMap::new(),
+ last_mouse_activity_time: HashMap::new(),
current_pane_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ mouse_hover_effects,
connected_clients_in_app,
web_server_ip,
web_server_port,
@@ -1223,6 +1193,8 @@ impl Tab {
.get_mut(&client_id)
.map(|c| c.change_to_default_mode()); // TODO: no races?
self.connected_clients.borrow_mut().remove(&client_id);
+ self.mouse_help_text_visible.remove(&client_id);
+ self.last_mouse_activity_time.remove(&client_id);
self.set_force_render();
}
pub fn drain_connected_clients(
@@ -2628,7 +2600,8 @@ impl Tab {
)
};
- self.clear_search(client_id); // this is an inexpensive operation if empty, if we need more such cleanups we should consider moving this and the rest to some sort of cleanup method
+ self.clear_search(client_id);
+ self.mouse_help_text_visible.clear();
let pane_id = if self.floating_panes.panes_are_visible() {
self.floating_panes
.get_active_pane_id(client_id)
@@ -3010,6 +2983,7 @@ impl Tab {
&self.mouse_hover_pane_id,
current_pane_group.clone(),
client_id_override,
+ &self.mouse_help_text_visible,
)
.with_context(err_context)?;
if (self.floating_panes.panes_are_visible() && self.floating_panes.has_active_panes())
@@ -3021,6 +2995,7 @@ impl Tab {
&self.mouse_hover_pane_id,
current_pane_group,
client_id_override,
+ &self.mouse_help_text_visible,
)
.with_context(err_context)?;
}
@@ -3593,9 +3568,7 @@ impl Tab {
);
}
pub fn set_mouse_selection_support(&mut self, pane_id: PaneId, selection_support: bool) {
- if let Some(pane) = self.get_pane_with_id_mut(pane_id) {
- pane.set_mouse_selection_support(selection_support);
- }
+ MouseHandler::set_mouse_selection_support(self, pane_id, selection_support);
}
pub fn close_pane(
&mut self,
@@ -4121,27 +4094,7 @@ impl Tab {
lines: usize,
client_id: ClientId,
) -> Result<MouseEffect> {
- let err_context = || {
- format!("failed to handle scrollwheel up at position {point:?} for client {client_id}")
- };
-
- if let Some(pane) = self.get_pane_at(point, false).with_context(err_context)? {
- let relative_position = pane.relative_position(point);
- if let Some(mouse_event) = pane.mouse_scroll_up(&relative_position) {
- self.write_to_terminal_at(mouse_event.into_bytes(), point, client_id)
- .with_context(err_context)?;
- } else if pane.is_alternate_mode_active() {
- // faux scrolling, send UP n times
- // do n separate writes to make sure the sequence gets adjusted for cursor keys mode
- for _ in 0..lines {
- self.write_to_terminal_at("\u{1b}[A".as_bytes().to_owned(), point, client_id)
- .with_context(err_context)?;
- }
- } else {
- pane.scroll_up(lines, client_id);
- }
- }
- Ok(MouseEffect::default())
+ MouseHandler::handle_scrollwheel_up(self, point, lines, client_id)
}
pub fn handle_scrollwheel_down(
@@ -4150,35 +4103,7 @@ impl Tab {
lines: usize,
client_id: ClientId,
) -> Result<MouseEffect> {
- let err_context = || {
- format!(
- "failed to handle scrollwheel down at position {point:?} for client {client_id}"
- )
- };
-
- if let Some(pane) = self.get_pane_at(point, false).with_context(err_context)? {
- let relative_position = pane.relative_position(point);
- if let Some(mouse_event) = pane.mouse_scroll_down(&relative_position) {
- self.write_to_terminal_at(mouse_event.into_bytes(), point, client_id)
- .with_context(err_context)?;
- } else if pane.is_alternate_mode_active() {
- // faux scrolling, send DOWN n times
- // do n separate writes to make sure the sequence gets adjusted for cursor keys mode
- for _ in 0..lines {
- self.write_to_terminal_at("\u{1b}[B".as_bytes().to_owned(), point, client_id)
- .with_context(err_context)?;
- }
- } else {
- pane.scroll_down(lines, client_id);
- if !pane.is_scrolled() {
- if let PaneId::Terminal(pid) = pane.pid() {
- self.process_pending_vte_events(pid)
- .with_context(err_context)?;
- }
- }
- }
- }
- Ok(MouseEffect::default())
+ MouseHandler::handle_scrollwheel_down(self, point, lines, client_id)
}
fn get_pane_at(
@@ -4285,567 +4210,14 @@ impl Tab {
}
}
- // returns true if the mouse event caused some sort of tab/pane state change that needs to be
- // reported to plugins
pub fn handle_mouse_event(
&mut self,
event: &MouseEvent,
client_id: ClientId,
) -> Result<MouseEffect> {
- let err_context =
- || format!("failed to handle mouse event {event:?} for client {client_id}");
-
- let active_pane_id = self
- .get_active_pane_id(client_id)
- .ok_or(anyhow!("Failed to find pane at position"))?;
-
- if event.left {
- // left mouse click
- let pane_id_at_position = self
- .get_pane_at(&event.position, false)
- .with_context(err_context)?
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?
- .pid();
- match event.event_type {
- MouseEventType::Press if event.alt => {
- self.mouse_hover_pane_id.remove(&client_id);
- Ok(MouseEffect::group_toggle(pane_id_at_position))
- },
- MouseEventType::Motion if event.alt => {
- Ok(MouseEffect::group_add(pane_id_at_position))
- },
- MouseEventType::Press => {
- if pane_id_at_position == active_pane_id {
- self.handle_active_pane_left_mouse_press(event, client_id)
- } else {
- self.handle_inactive_pane_left_mouse_press(event, client_id)
- }
- },
- MouseEventType::Motion => self.handle_left_mouse_motion(event, client_id),
- MouseEventType::Release => self.handle_left_mouse_release(event, client_id),
- }
- } else if event.wheel_up {
- self.handle_scrollwheel_up(&event.position, 3, client_id)
- } else if event.wheel_down {
- self.handle_scrollwheel_down(&event.position, 3, client_id)
- } else if event.right && event.alt {
- self.mouse_hover_pane_id.remove(&client_id);
- Ok(MouseEffect::ungroup())
- } else if event.right {
- self.handle_right_click(&event, client_id)
- } else if event.middle {
- self.handle_middle_click(&event, client_id)
- } else {
- self.handle_mouse_no_click(&event, client_id)
- }
- }
- fn write_mouse_event_to_active_pane(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<()> {
- let err_context =
- || format!("failed to handle mouse event {event:?} for client {client_id}");
- let active_pane = self.get_active_pane_or_floating_pane_mut(client_id);
- if let Some(active_pane) = active_pane {
- let relative_position = active_pane.relative_position(&event.position);
- let mut pass_event = *event;
- pass_event.position = relative_position;
- if let Some(mouse_event) = active_pane.mouse_event(&pass_event, client_id) {
- if !active_pane.position_is_on_frame(&event.position) {
- self.write_to_active_terminal(
- &None,
- mouse_event.into_bytes(),
- false,
- client_id,
- )
- .with_context(err_context)?;
- }
- }
- }
- Ok(())
- }
- // returns true if the mouse event caused some sort of tab/pane state change that needs to be
- // reported to plugins
- fn handle_active_pane_left_mouse_press(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context =
- || format!("failed to handle mouse event {event:?} for client {client_id}");
- let floating_panes_are_visible = self.floating_panes.panes_are_visible();
- let pane_at_position = self
- .get_pane_at(&event.position, false)
- .with_context(err_context)?
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
- if pane_at_position.position_is_on_frame(&event.position) {
- // intercept frame click eg. for toggling pinned
- let intercepted = pane_at_position.intercept_mouse_event_on_frame(&event, client_id);
- if intercepted {
- self.set_force_render();
- return Ok(MouseEffect::state_changed());
- } else if floating_panes_are_visible {
- // start moving if floating pane
- let search_selectable = false;
- if self
- .floating_panes
- .move_pane_with_mouse(event.position, search_selectable)
- {
- self.swap_layouts.set_is_floating_damaged();
- self.set_force_render();
- return Ok(MouseEffect::state_changed());
- }
- }
- } else {
- let relative_position = pane_at_position.relative_position(&event.position);
- if let Some(mouse_event) = pane_at_position.mouse_left_click(&relative_position, false)
- {
- // send click to terminal if needed (eg. the program inside
- // requested mouse mode)
- if !pane_at_position.position_is_on_frame(&event.position) {
- self.write_to_active_terminal(
- &None,
- mouse_event.into_bytes(),
- false,
- client_id,
- )
- .with_context(err_context)?;
- }
- } else {
- // start selection for copy/paste
- let mut leave_clipboard_message = false;
- pane_at_position.start_selection(&relative_position, client_id);
- if pane_at_position.get_selected_text(client_id).is_some() {
- leave_clipboard_message = true;
- }
- if pane_at_position.supports_mouse_selection() {
- self.selecting_with_mouse_in_pane = Some(pane_at_position.pid());
- }
- if leave_clipboard_message {
- return Ok(MouseEffect::leave_clipboard_message());
- }
- }
- }
- Ok(MouseEffect::default())
- }
- fn handle_inactive_pane_left_mouse_press(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context =
- || format!("failed to handle mouse event {event:?} for client {client_id}");
- if !self.floating_panes.panes_are_visible() {
- if let Ok(Some(pane_id)) = self
- .floating_panes
- .get_pinned_pane_id_at(&event.position, true)
- {
- // here, the floating panes are not visible, but there is a pinned pane (always
- // visible) that has been clicked on - so we make the entire surface visible and
- // focus it
- self.show_floating_panes();
- self.floating_panes.focus_pane(pane_id, client_id);
- return Ok(MouseEffect::state_changed());
- } else if let Ok(Some(_pane_id)) = self
- .floating_panes
- .get_pinned_pane_id_at(&event.position, false)
- {
- // here, the floating panes are not visible, but there is a pinned pane (always
- // visible) that has been clicked on - this pane however is not selectable
- // (we know this because we passed "false" to get_pinned_pane_id_at)
- // so we don't do anything
- return Ok(MouseEffect::default());
- }
- }
- let active_pane_id_before_click = self
- .get_active_pane_id(client_id)
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
- self.focus_pane_at(&event.position, client_id)
- .with_context(err_context)?;
-
- if let Some(pane_at_position) = self.unselectable_pane_at_position(&event.position) {
- let relative_position = pane_at_position.relative_position(&event.position);
- // we use start_selection here because it has a client_id,
- // ideally we should add client_id to mouse_left_click and others, but this should be
- // dealt with as part of the trait removal refactoring
- pane_at_position.start_selection(&relative_position, client_id);
- }
-
- if self.floating_panes.panes_are_visible() {
- let search_selectable = false;
- // we do this because this might be the beginning of the user dragging a pane
- // that was not focused
- // TODO: rename move_pane_with_mouse to "start_moving_pane_with_mouse"?
- let moved_pane_with_mouse = self
- .floating_panes
- .move_pane_with_mouse(event.position, search_selectable);
- if moved_pane_with_mouse {
- return Ok(MouseEffect::state_changed());
- } else {
- return Ok(MouseEffect::default());
- }
- }
- let active_pane_id_after_click = self
- .get_active_pane_id(client_id)
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
- if active_pane_id_before_click != active_pane_id_after_click {
- // focus changed, need to report it
- Ok(MouseEffect::state_changed())
- } else {
- Ok(MouseEffect::default())
- }
- }
- fn handle_left_mouse_motion(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context =
- || format!("failed to handle mouse event {event:?} for client {client_id}");
- let pane_is_being_moved_with_mouse = self.floating_panes.pane_is_being_moved_with_mouse();
- let active_pane_id = self
- .get_active_pane_id(client_id)
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
- if pane_is_being_moved_with_mouse {
- let search_selectable = false;
- if self
- .floating_panes
- .move_pane_with_mouse(event.position, search_selectable)
- {
- self.swap_layouts.set_is_floating_damaged();
- self.set_force_render();
- return Ok(MouseEffect::state_changed());
- }
- } else if let Some(pane_id_with_selection) = self.selecting_with_mouse_in_pane {
- if let Some(pane_with_selection) = self.get_pane_with_id_mut(pane_id_with_selection) {
- let relative_position = pane_with_selection.relative_position(&event.position);
- pane_with_selection.update_selection(&relative_position, client_id);
- }
- } else {
- let pane_at_position = self
- .get_pane_at(&event.position, false)
- .with_context(err_context)?
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
- if pane_at_position.pid() == active_pane_id {
- self.write_mouse_event_to_active_pane(event, client_id)?;
- }
- }
- Ok(MouseEffect::default())
- }
- fn handle_left_mouse_release(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context =
- || format!("failed to handle mouse event {event:?} for client {client_id}");
- let mut leave_clipboard_message = false;
- let floating_panes_are_visible = self.floating_panes.panes_are_visible();
- let copy_on_release = self.copy_on_select;
-
- if let Some(pane_with_selection) = self
- .selecting_with_mouse_in_pane
- .and_then(|p_id| self.get_pane_with_id_mut(p_id))
- {
- let mut relative_position = pane_with_selection.relative_position(&event.position);
-
- relative_position.change_column(
- (relative_position.column())
- .max(0)
- .min(pane_with_selection.get_content_columns()),
- );
-
- relative_position.change_line(
- (relative_position.line())
- .max(0)
- .min(pane_with_selection.get_content_rows() as isize),
- );
-
- if let Some(mouse_event) =
- pane_with_selection.mouse_left_click_release(&relative_position)
- {
- self.write_to_active_terminal(&None, mouse_event.into_bytes(), false, client_id)
- .with_context(err_context)?;
- } else {
- let relative_position = pane_with_selection.relative_position(&event.position);
- pane_with_selection.end_selection(&relative_position, client_id);
- if pane_with_selection.supports_mouse_selection() {
- if copy_on_release {
- let selected_text = pane_with_selection.get_selected_text(client_id);
-
- if let Some(selected_text) = selected_text {
- leave_clipboard_message = true;
- self.write_selection_to_clipboard(&selected_text)
- .with_context(err_context)?;
- }
- }
- }
-
- self.selecting_with_mouse_in_pane = None;
- }
- } else if floating_panes_are_visible && self.floating_panes.pane_is_being_moved_with_mouse()
- {
- self.floating_panes
- .stop_moving_pane_with_mouse(event.position);
- } else {
- let active_pane_id = self
- .get_active_pane_id(client_id)
- .ok_or(anyhow!("Failed to find pane at position"))?;
- let pane_id_at_position = self
- .get_pane_at(&event.position, false)
- .with_context(err_context)?
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?
- .pid();
- if active_pane_id == pane_id_at_position {
- self.write_mouse_event_to_active_pane(event, client_id)?;
- }
- }
- if leave_clipboard_message {
- Ok(MouseEffect::leave_clipboard_message())
- } else {
- Ok(MouseEffect::default())
- }
- }
-
- pub fn handle_right_click(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context = || format!("failed to handle mouse right click for client {client_id}");
-
- let absolute_position = event.position;
- let active_pane_id = self
- .get_active_pane_id(client_id)
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
-
- if let Some(pane) = self
- .get_pane_at(&absolute_position, false)
- .with_context(err_context)?
- {
- if pane.pid() == active_pane_id {
- let relative_position = pane.relative_position(&absolute_position);
- let mut event_for_pane = event.clone();
- event_for_pane.position = relative_position;
- if let Some(mouse_event) = pane.mouse_event(&event_for_pane, client_id) {
- if !pane.position_is_on_frame(&absolute_position) {
- self.write_to_active_terminal(
- &None,
- mouse_event.into_bytes(),
- false,
- client_id,
- )
- .with_context(err_context)?;
- }
- } else {
- pane.handle_right_click(&relative_position, client_id);
- }
- }
- };
- Ok(MouseEffect::default())
- }
-
- fn handle_middle_click(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context = || format!("failed to handle mouse middle click for client {client_id}");
- let absolute_position = event.position;
-
- let active_pane_id = self
- .get_active_pane_id(client_id)
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
-
- if let Some(pane) = self
- .get_pane_at(&absolute_position, false)
- .with_context(err_context)?
- {
- if pane.pid() == active_pane_id {
- let relative_position = pane.relative_position(&absolute_position);
- let mut event_for_pane = event.clone();
- event_for_pane.position = relative_position;
- if let Some(mouse_event) = pane.mouse_event(&event_for_pane, client_id) {
- if !pane.position_is_on_frame(&absolute_position) {
- self.write_to_active_terminal(
- &None,
- mouse_event.into_bytes(),
- false,
- client_id,
- )
- .with_context(err_context)?;
- }
- }
- }
- };
- Ok(MouseEffect::default())
- }
-
- fn handle_mouse_no_click(
- &mut self,
- event: &MouseEvent,
- client_id: ClientId,
- ) -> Result<MouseEffect> {
- let err_context = || format!("failed to handle mouse no click for client {client_id}");
- let absolute_position = event.position;
-
- let active_pane_id = self
- .get_active_pane_id(client_id)
- .ok_or_else(|| anyhow!("Failed to find pane at position"))?;
-
- if let Some(pane) = self
- .get_pane_at(&absolute_position, false)
- .with_context(err_context)?
- {
- if pane.pid() == active_pane_id {
- let relative_position = pane.relative_position(&absolute_position);
- let mut event_for_pane = event.clone();
- event_for_pane.position = relative_position;
- if let Some(mouse_event) = pane.mouse_event(&event_for_pane, client_id) {
- if !pane.position_is_on_frame(&absolute_position) {
- self.write_to_active_terminal(
- &None,
- mouse_event.into_bytes(),
- false,
- client_id,
- )
- .with_context(err_context)?;
- }
- }
- self.mouse_hover_pane_id.remove(&client_id);
- } else {
- let pane_id = pane.pid();
- // if the pane is not selectable, we don't want to create a hover effect over it
- // we do however want to remove the hover effect from other panes
- let pane_is_selectable = pane.selectable();
- if self.advanced_mouse_actions && pane_is_selectable {
- self.mouse_hover_pane_id.insert(client_id, pane_id);
- } else if self.advanced_mouse_actions {
- self.mouse_hover_pane_id.remove(&client_id);
- }
- }
- };
- Ok(MouseEffect::leave_clipboard_message())
- }
-
- fn unselectable_pane_at_position(&mut self, point: &Position) -> Option<&mut Box<dyn Pane>> {
- // the repetition in this function is to appease the borrow checker, I don't like it either
- let floating_panes_are_visible = self.floating_panes.panes_are_visible();
- if floating_panes_are_visible {
- if let Ok(Some(clicked_pane_id)) = self.floating_panes.get_pane_id_at(point, true) {
- if let Some(pane) = self.floating_panes.get_pane_mut(clicked_pane_id) {
- if !pane.selectable() {
- return Some(pane);
- }
- }
- } else if let Ok(Some(clicked_pane_id)) = self.get_pane_id_at(point, false) {
- if let Some(pane) = self.tiled_panes.get_pane_mut(clicked_pane_id) {
- if !pane.selectable() {
- return Some(pane);
- }
- }
- }
- } else if let Ok(Some(clicked_pane_id)) = self.get_pane_id_at(point, false) {
- if let Some(pane) = self.tiled_panes.get_pane_mut(clicked_pane_id) {
- if !pane.selectable() {
- return Some(pane);
- }
- }
- }
- None
- }
- fn focus_pane_at(&mut self, point: &Position, client_id: ClientId) -> Result<()> {
- let err_context =
- || format!("failed to focus pane at position {point:?} for client {client_id}");
-
- if self.floating_panes.panes_are_visible() {
- if let Some(clicked_pane) = self
- .floating_panes
- .get_pane_id_at(point, true)
- .with_context(err_context)?
- {
- self.floating_panes.focus_pane(clicked_pane, client_id);
- self.set_pane_active_at(clicked_pane);
- return Ok(());
- }
- }
- if let Some(clicked_pane) = self.get_pane_id_at(point, true).with_context(err_context)? {
- self.tiled_panes.focus_pane(clicked_pane, client_id);
- self.set_pane_active_at(clicked_pane);
- if self.floating_panes.panes_are_visible() {
- self.hide_floating_panes();
- self.set_force_render();
- }
- }
- Ok(())
- }
-
- #[cfg(test)]
- pub fn handle_right_mouse_release(
- &mut self,
- position: &Position,
- client_id: ClientId,
- ) -> Result<()> {
- let err_context = || {
- format!("failed to handle right mouse release at position {position:?} for client {client_id}")
- };
-
- let active_pane = self.get_active_pane_or_floating_pane_mut(client_id);
- if let Some(active_pane) = active_pane {
- let mut relative_position = active_pane.relative_position(position);
- relative_position.change_column(
- (relative_position.column())
- .max(0)
- .min(active_pane.get_content_columns()),
- );
-
- relative_position.change_line(
- (relative_position.line())
- .max(0)
- .min(active_pane.get_content_rows() as isize),
- );
-
- if let Some(mouse_event) = active_pane.mouse_right_click_release(&relative_position) {
- self.write_to_active_terminal(&None, mouse_event.into_bytes(), false, client_id)
- .with_context(err_context)?;
- }
- }
- Ok(())
+ MouseHandler::handle_mouse_event(self, event, client_id)
}
- #[cfg(test)]
- fn handle_middle_mouse_release(
- &mut self,
- position: &Position,
- client_id: ClientId,
- ) -> Result<()> {
- let err_context = || {
- format!("failed to handle middle mouse release at position {position:?} for client {client_id}")
- };
-
- let active_pane = self.get_active_pane_or_floating_pane_mut(client_id);
- if let Some(active_pane) = active_pane {
- let mut relative_position = active_pane.relative_position(position);
- relative_position.change_column(
- (relative_position.column())
- .max(0)
- .min(active_pane.get_content_columns()),
- );
-
- relative_position.change_line(
- (relative_position.line())
- .max(0)
- .min(active_pane.get_content_rows() as isize),
- );
-
- if let Some(mouse_event) = active_pane.mouse_middle_click_release(&relative_position) {
- self.write_to_active_terminal(&None, mouse_event.into_bytes(), false, client_id)
- .with_context(err_context)?;
- }
- }
- Ok(())
- }
pub fn copy_selection(&self, client_id: ClientId) -> Result<()> {
let selected_text = self
.get_active_pane(client_id)
@@ -4941,6 +4313,10 @@ impl Tab {
Ok(())
}
+ pub fn clear_mouse_help_text(&mut self, client_id: ClientId) {
+ self.mouse_help_text_visible.insert(client_id, false);
+ }
+
pub fn update_active_pane_name(&mut self, buf: Vec<u8>, client_id: ClientId) -> Result<()> {
let err_context =
|| format!("failed to update name of active pane to '{buf:?}' for client {client_id}");
@@ -5709,6 +5085,13 @@ impl Tab {
pub fn update_advanced_mouse_actions(&mut self, advanced_mouse_actions: bool) {
self.advanced_mouse_actions = advanced_mouse_actions;
}
+ pub fn update_mouse_hover_effects(&mut self, mouse_hover_effects: bool) {
+ self.mouse_hover_effects = mouse_hover_effects;
+ }
+ pub fn clear_mouse_hover_state(&mut self) {
+ self.mouse_hover_pane_id.clear();
+ self.mouse_help_text_visible.clear();
+ }
pub fn update_web_sharing(&mut self, web_sharing: WebSharing) {
let old_value = self.web_sharing;
self.web_sharing = web_sharing;
@@ -5908,6 +5291,10 @@ impl Tab {
pub fn get_client_input_mode(&self, client_id: ClientId) -> Option<InputMode> {
self.mode_info.borrow().get(&client_id).map(|m| m.mode)
}
+ #[allow(unused)] // this is used for tests
+ pub fn query_mouse_hover_pane_id(&self) -> HashMap<ClientId, PaneId> {
+ self.mouse_hover_pane_id.clone()
+ }
fn new_scrollback_editor_pane(&self, pid: u32) -> TerminalPane {
let next_terminal_position = self.get_next_terminal_position();
let mut new_pane = TerminalPane::new(
diff --git a/zellij-server/src/tab/mouse_handler.rs b/zellij-server/src/tab/mouse_handler.rs
new file mode 100644
index 00000000..037c5acd
--- /dev/null
+++ b/zellij-server/src/tab/mouse_handler.rs
@@ -0,0 +1,1465 @@
+use std::time::Instant;
+use zellij_utils::data::{Direction, Resize, ResizeStrategy};
+use zellij_utils::errors::prelude::*;
+use zellij_utils::input::mouse::{MouseEvent, MouseEventType};
+use zellij_utils::pane_size::PaneGeom;
+use zellij_utils::position::Position;
+
+use crate::background_jobs::BackgroundJob;
+use crate::panes::PaneId;
+use crate::ClientId;
+
+use super::{Pane, Tab};
+
+#[derive(Debug, Default, Copy, Clone)]
+pub struct MouseEffect {
+ pub state_changed: bool,
+ pub leave_clipboard_message: bool,
+ pub group_toggle: Option<PaneId>,
+ pub group_add: Option<PaneId>,
+ pub ungroup: bool,
+}
+
+impl MouseEffect {
+ pub fn state_changed() -> Self {
+ MouseEffect {
+ state_changed: true,
+ leave_clipboard_message: false,
+ group_toggle: None,
+ group_add: None,
+ ungroup: false,
+ }
+ }
+ pub fn leave_clipboard_message() -> Self {
+ MouseEffect {
+ state_changed: false,
+ leave_clipboard_message: true,
+ group_toggle: None,
+ group_add: None,
+ ungroup: false,
+ }
+ }
+ pub fn state_changed_and_leave_clipboard_message() -> Self {
+ MouseEffect {
+ state_changed: true,
+ leave_clipboard_message: true,
+ group_toggle: None,
+ group_add: None,
+ ungroup: false,
+ }
+ }
+ pub fn group_toggle(pane_id: PaneId) -> Self {
+ MouseEffect {
+ state_changed: true,
+ leave_clipboard_message: false,
+ group_toggle: Some(pane_id),
+ group_add: None,
+ ungroup: false,
+ }
+ }
+ pub fn group_add(pane_id: PaneId) -> Self {
+ MouseEffect {
+ state_changed: true,
+ leave_clipboard_message: false,
+ group_toggle: None,
+ group_add: Some(pane_id),
+ ungroup: false,
+ }
+ }
+ pub fn ungroup() -> Self {
+ MouseEffect {
+ state_changed: true,
+ leave_clipboard_message: false,
+ group_toggle: None,
+ group_add: None,
+ ungroup: true,
+ }
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+enum MouseAction {
+ GroupToggle(PaneId),
+ GroupAdd(PaneId),
+ Ungroup,
+ StartResize {
+ pane_id: PaneId,
+ edge: PaneEdge,
+ is_floating: bool,
+ position: Position,
+ },
+ ContinueResize {
+ position: Position,
+ },
+ StopResize {
+ position: Position,
+ },
+ FocusPane {
+ pane_id: PaneId,
+ position: Position,
+ },
+ ShowFloatingPanesAndFocus {
+ pane_id: PaneId,
+ },
+ StartSelection {
+ pane_id: PaneId,
+ position: Position,
+ },
+ UpdateSelection {
+ position: Position,
+ },
+ EndSelection {
+ position: Position,
+ },
+ StartMovingFloatingPane {
+ position: Position,
+ },
+ ContinueMovingFloatingPane {
+ position: Position,
+ },
+ StopMovingFloatingPane {
+ position: Position,
+ },
+ ScrollUp {
+ pane_id: PaneId,
+ lines: usize,
+ },
+ ScrollDown {
+ pane_id: PaneId,
+ lines: usize,
+ },
+ ResizeScrollUp {
+ pane_id: PaneId,
+ },
+ ResizeScrollDown {
+ pane_id: PaneId,
+ },
+ UpdateHover {
+ pane_id: Option<PaneId>,
+ },
+ SendToTerminal {
+ pane_id: PaneId,
+ event: MouseEvent,
+ },
+ FrameIntercepted {
+ pane_id: PaneId,
+ },
+ NoAction,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum PaneEdge {
+ Left,
+ Right,
+ Top,
+ Bottom,
+ TopLeft,
+ TopRight,
+ BottomLeft,
+ BottomRight,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct PaneResizeState {
+ pub pane_id: PaneId,
+ pub edge: PaneEdge,
+ pub start_position: Position,
+ pub start_geom: PaneGeom,
+ pub is_floating: bool,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+struct ClickedPaneDetails {
+ pane_id: PaneId,
+ on_frame: bool,
+ frame_intercepted: bool,
+ edge: Option<PaneEdge>,
+ is_floating: bool,
+ terminal_wants_mouse: bool,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+struct MouseEventContext {
+ pane_id_at_position: Option<PaneId>,
+ active_pane_id: Option<PaneId>,
+ floating_visible: bool,
+ pane_being_resized: bool,
+ selecting_with_mouse: bool,
+ pane_being_moved: bool,
+ clicked_pane: Option<ClickedPaneDetails>,
+ pinned_selectable: Option<PaneId>,
+ pinned_unselectable: Option<PaneId>,
+}
+
+fn edge_and_delta_to_strategies(
+ edge: PaneEdge,
+ delta_x: isize,
+ delta_y: isize,
+) -> Vec<ResizeStrategy> {
+ use Direction::*;
+ use Resize::*;
+
+ match edge {
+ PaneEdge::Left => {
+ let resize = if delta_x < 0 { Increase } else { Decrease };
+ vec![ResizeStrategy {
+ resize,
+ direction: Some(Left),
+ invert_on_boundaries: false,
+ }]
+ },
+ PaneEdge::Right => {
+ let resize = if delta_x > 0 { Increase } else { Decrease };
+ vec![ResizeStrategy {
+ resize,
+ direction: Some(Right),
+ invert_on_boundaries: false,
+ }]
+ },
+ PaneEdge::Top => {
+ let resize = if delta_y < 0 { Increase } else { Decrease };
+ vec![ResizeStrategy {
+ resize,
+ direction: Some(Up),
+ invert_on_boundaries: false,
+ }]
+ },
+ PaneEdge::Bottom => {
+ let resize = if delta_y > 0 { Increase } else { Decrease };
+ vec![ResizeStrategy {
+ resize,
+ direction: Some(Down),
+ invert_on_boundaries: false,
+ }]
+ },
+ PaneEdge::TopLeft => {
+ let mut strategies = vec![];
+ // Top edge
+ let resize_y = if delta_y < 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_y,
+ direction: Some(Up),
+ invert_on_boundaries: false,
+ });
+ // Left edge
+ let resize_x = if delta_x < 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_x,
+ direction: Some(Left),
+ invert_on_boundaries: false,
+ });
+ strategies
+ },
+ PaneEdge::TopRight => {
+ let mut strategies = vec![];
+ // Top edge
+ let resize_y = if delta_y < 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_y,
+ direction: Some(Up),
+ invert_on_boundaries: false,
+ });
+ // Right edge
+ let resize_x = if delta_x > 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_x,
+ direction: Some(Right),
+ invert_on_boundaries: false,
+ });
+ strategies
+ },
+ PaneEdge::BottomLeft => {
+ let mut strategies = vec![];
+ // Bottom edge
+ let resize_y = if delta_y > 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_y,
+ direction: Some(Down),
+ invert_on_boundaries: false,
+ });
+ // Left edge
+ let resize_x = if delta_x < 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_x,
+ direction: Some(Left),
+ invert_on_boundaries: false,
+ });
+ strategies
+ },
+ PaneEdge::BottomRight => {
+ let mut strategies = vec![];
+ // Bottom edge
+ let resize_y = if delta_y > 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_y,
+ direction: Some(Down),
+ invert_on_boundaries: false,
+ });
+ // Right edge
+ let resize_x = if delta_x > 0 { Increase } else { Decrease };
+ strategies.push(ResizeStrategy {
+ resize: resize_x,
+ direction: Some(Right),
+ invert_on_boundaries: false,
+ });
+ strategies
+ },
+ }
+}
+
+pub struct MouseHandler;
+
+impl MouseHandler {
+ pub fn handle_mouse_event(
+ tab: &mut Tab,
+ event: &MouseEvent,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let context = Self::gather_mouse_event_context(tab, event, client_id)?;
+ let action = Self::determine_mouse_action(event, &context)?;
+ Self::execute_mouse_action(tab, action, event, client_id)
+ }
+
+ fn gather_mouse_event_context(
+ tab: &mut Tab,
+ event: &MouseEvent,
+ client_id: ClientId,
+ ) -> Result<MouseEventContext> {
+ let err_context = || format!("failed to gather context for event {event:?}");
+
+ let pane_id_at_position = Self::get_pane_at(tab, &event.position, false)
+ .with_context(err_context)?
+ .map(|p| p.pid());
+ let active_pane_id = tab.get_active_pane_id(client_id);
+ let floating_visible = tab.floating_panes.panes_are_visible();
+
+ let clicked_pane = pane_id_at_position.and_then(|id| {
+ Self::gather_clicked_pane_details(
+ tab,
+ id,
+ &event.position,
+ active_pane_id,
+ event,
+ client_id,
+ )
+ });
+
+ let (pinned_selectable, pinned_unselectable) = if !floating_visible {
+ let selectable = tab
+ .floating_panes
+ .get_pinned_pane_id_at(&event.position, true)
+ .ok()
+ .flatten();
+ let unselectable = tab
+ .floating_panes
+ .get_pinned_pane_id_at(&event.position, false)
+ .ok()
+ .flatten();
+ (selectable, unselectable)
+ } else {
+ (None, None)
+ };
+
+ Ok(MouseEventContext {
+ pane_id_at_position,
+ active_pane_id,
+ floating_visible,
+ pane_being_resized: tab.pane_being_resized_with_mouse.is_some(),
+ selecting_with_mouse: tab.selecting_with_mouse_in_pane.is_some(),
+ pane_being_moved: tab.floating_panes.pane_is_being_moved_with_mouse(),
+ clicked_pane,
+ pinned_selectable,
+ pinned_unselectable,
+ })
+ }
+
+ fn gather_clicked_pane_details(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ position: &Position,
+ active_pane_id: Option<PaneId>,
+ event: &MouseEvent,
+ client_id: ClientId,
+ ) -> Option<ClickedPaneDetails> {
+ let is_floating = tab.floating_panes.panes_contain(&pane_id);
+ let pane = Self::get_pane_at(tab, position, false).ok()??;
+
+ let on_frame = pane.position_is_on_frame(position);
+ let frame_intercepted = on_frame && pane.intercept_mouse_event_on_frame(event, client_id);
+ let edge = if on_frame {
+ pane.get_edge_at_position(position)
+ } else {
+ None
+ };
+ let terminal_wants_mouse = if Some(pane_id) == active_pane_id {
+ let relative_position = pane.relative_position(position);
+ pane.mouse_left_click(&relative_position, false).is_some()
+ } else {
+ false
+ };
+
+ Some(ClickedPaneDetails {
+ pane_id,
+ on_frame,
+ frame_intercepted,
+ edge,
+ is_floating,
+ terminal_wants_mouse,
+ })
+ }
+
+ fn start_pane_resize_with_mouse(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ edge: PaneEdge,
+ position: Position,
+ _client_id: ClientId,
+ ) -> Result<()> {
+ let err_context = || format!("failed to start pane resize for pane {pane_id:?}");
+
+ // Determine if floating or tiled
+ let is_floating = tab.floating_panes.panes_contain(&pane_id);
+
+ // Get current pane geometry
+ let start_geom = if is_floating {
+ tab.floating_panes
+ .get_pane(pane_id)
+ .map(|p| p.position_and_size())
+ .with_context(err_context)?
+ } else {
+ tab.tiled_panes
+ .get_pane(pane_id)
+ .map(|p| p.position_and_size())
+ .with_context(err_context)?
+ };
+
+ tab.pane_being_resized_with_mouse = Some(PaneResizeState {
+ pane_id,
+ edge,
+ start_position: position,
+ start_geom,
+ is_floating,
+ });
+
+ Ok(())
+ }
+
+ fn continue_pane_resize_with_mouse(
+ tab: &mut Tab,
+ current_position: Position,
+ _client_id: ClientId,
+ ) -> Result<bool> {
+ // bool -> state changed
+ let err_context = || "failed to continue pane resize with mouse";
+
+ // Extract needed values from resize_state to avoid borrow issues
+ let (pane_id, edge, is_floating, delta_x, delta_y) =
+ if let Some(resize_state) = &tab.pane_being_resized_with_mouse {
+ // Calculate delta from start_position to current_position
+ let delta_x = current_position.column() as isize
+ - resize_state.start_position.column() as isize;
+ let delta_y = current_position.line() - resize_state.start_position.line();
+
+ // Only proceed if there's a meaningful delta
+ if delta_x == 0 && delta_y == 0 {
+ return Ok(false);
+ }
+
+ (
+ resize_state.pane_id,
+ resize_state.edge,
+ resize_state.is_floating,
+ delta_x,
+ delta_y,
+ )
+ } else {
+ return Ok(true);
+ };
+
+ // Convert edge + delta to ResizeStrategy
+ let strategies = edge_and_delta_to_strategies(edge, delta_x, delta_y);
+
+ // Apply appropriate resize function
+ if is_floating {
+ Self::resize_floating_pane_with_strategies(
+ tab,
+ pane_id,
+ &strategies,
+ (delta_x.unsigned_abs(), delta_y.unsigned_abs()),
+ )
+ .with_context(err_context)?;
+ } else {
+ Self::resize_tiled_pane_with_strategies(
+ tab,
+ pane_id,
+ &strategies,
+ (delta_x.abs() as f64, delta_y.abs() as f64),
+ )
+ .with_context(err_context)?;
+ }
+
+ // Update start_position to current position (incremental)
+ if let Some(resize_state) = tab.pane_being_resized_with_mouse.as_mut() {
+ resize_state.start_position = current_position;
+ }
+
+ tab.set_force_render();
+
+ Ok(true)
+ }
+
+ fn stop_pane_resize_with_mouse(
+ tab: &mut Tab,
+ final_position: Position,
+ client_id: ClientId,
+ ) -> Result<bool> {
+ // bool -> never_resized
+ let err_context = || "failed to stop pane resize with mouse";
+
+ // Perform final resize with any remaining delta
+ let start_geom = tab
+ .pane_being_resized_with_mouse
+ .as_ref()
+ .map(|p| p.start_geom.clone());
+ let pane_id = tab
+ .pane_being_resized_with_mouse
+ .as_ref()
+ .map(|p| p.pane_id);
+ let _resized = Self::continue_pane_resize_with_mouse(tab, final_position, client_id)
+ .with_context(err_context)?;
+ let last_geom = pane_id
+ .and_then(|pane_id| tab.get_pane_with_id(pane_id))
+ .map(|p| p.position_and_size());
+ let never_resized = match (start_geom, last_geom) {
+ (Some(start_geom), Some(last_geom)) => start_geom == last_geom,
+ _ => false,
+ };
+
+ // Clear resize state
+ tab.pane_being_resized_with_mouse = None;
+
+ Ok(never_resized)
+ }
+
+ fn resize_floating_pane_with_strategies(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ strategies: &[ResizeStrategy],
+ change_by: (usize, usize),
+ ) -> Result<()> {
+ let err_context = || format!("failed to resize floating pane {pane_id:?}");
+
+ tab.floating_panes
+ .resize_pane_with_strategies(pane_id, strategies, change_by)
+ .with_context(err_context)?;
+
+ tab.swap_layouts.set_is_floating_damaged();
+
+ Ok(())
+ }
+
+ fn resize_tiled_pane_with_strategies(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ strategies: &[ResizeStrategy],
+ change_by: (f64, f64),
+ ) -> Result<()> {
+ let err_context = || format!("failed to resize tiled pane {pane_id:?}");
+
+ // Calculate percentage based on total viewport size for 1:1 cell mapping
+ // Formula: (delta_cells / total_viewport_cells) * 100.0 = percentage
+ // This ensures 1 cell of mouse movement = exactly 1 cell of pane resize
+ let viewport = tab.viewport.borrow();
+ let viewport_cols = viewport.cols;
+ let viewport_rows = viewport.rows;
+
+ let change_by_percent = (
+ if viewport_cols > 0 {
+ (change_by.0 / viewport_cols as f64) * 100.0 // cols
+ } else {
+ 0.0
+ },
+ if viewport_rows > 0 {
+ (change_by.1 / viewport_rows as f64) * 100.0 // rows
+ } else {
+ 0.0
+ },
+ );
+
+ tab.tiled_panes
+ .resize_pane_with_strategies(pane_id, strategies, change_by_percent)
+ .with_context(err_context)?;
+
+ tab.swap_layouts.set_is_tiled_damaged();
+
+ Ok(())
+ }
+
+ fn resize_tiled_pane_with_stacked_resize(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ strategy: &ResizeStrategy,
+ ) -> Result<()> {
+ let err_context = || format!("failed to resize tiled pane {pane_id:?}");
+
+ tab.tiled_panes
+ // we override the resize percent because it's better UX to have smaller increments
+ // with the mouse wheel
+ .stacked_resize_pane_with_id(pane_id, strategy, Some((5.0, 5.0)))
+ .with_context(err_context)?;
+
+ tab.swap_layouts.set_is_tiled_damaged();
+
+ Ok(())
+ }
+
+ fn execute_mouse_action(
+ tab: &mut Tab,
+ action: MouseAction,
+ event: &MouseEvent,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context =
+ || format!("failed to execute mouse action {action:?} for client {client_id}");
+
+ if !matches!(action, MouseAction::UpdateHover { .. }) {
+ tab.mouse_help_text_visible.remove(&client_id);
+ }
+
+ match action {
+ MouseAction::GroupToggle(pane_id) => Ok(MouseEffect::group_toggle(pane_id)),
+ MouseAction::GroupAdd(pane_id) => Ok(MouseEffect::group_add(pane_id)),
+ MouseAction::Ungroup => Ok(MouseEffect::ungroup()),
+ MouseAction::StartResize {
+ pane_id,
+ edge,
+ is_floating: _,
+ position,
+ } => {
+ tab.mouse_hover_pane_id.remove(&client_id);
+ Self::start_pane_resize_with_mouse(tab, pane_id, edge, position, client_id)
+ .with_context(err_context)?;
+ Ok(MouseEffect::state_changed())
+ },
+ MouseAction::ContinueResize { position } => {
+ let state_changed = Self::continue_pane_resize_with_mouse(tab, position, client_id)
+ .with_context(err_context)?;
+ if state_changed {
+ Ok(MouseEffect::state_changed())
+ } else {
+ Ok(MouseEffect::default())
+ }
+ },
+ MouseAction::StopResize { position } => {
+ Self::execute_stop_resize(tab, position, client_id)
+ },
+ MouseAction::FocusPane {
+ pane_id: _,
+ position,
+ } => Self::execute_focus_pane(tab, position, client_id),
+ MouseAction::ShowFloatingPanesAndFocus { pane_id } => {
+ tab.show_floating_panes();
+ tab.floating_panes.focus_pane(pane_id, client_id);
+ Ok(MouseEffect::state_changed())
+ },
+ MouseAction::StartSelection { pane_id, position } => {
+ let pane = tab
+ .get_pane_with_id_mut(pane_id)
+ .ok_or_else(|| anyhow!("Failed to find pane {pane_id:?}"))?;
+ let relative_position = pane.relative_position(&position);
+ let mut leave_clipboard_message = false;
+ pane.start_selection(&relative_position, client_id);
+ if pane.get_selected_text(client_id).is_some() {
+ leave_clipboard_message = true;
+ }
+ if pane.supports_mouse_selection() {
+ tab.selecting_with_mouse_in_pane = Some(pane_id);
+ }
+ if leave_clipboard_message {
+ Ok(MouseEffect::leave_clipboard_message())
+ } else {
+ Ok(MouseEffect::default())
+ }
+ },
+ MouseAction::UpdateSelection { position } => {
+ if let Some(pane_id_with_selection) = tab.selecting_with_mouse_in_pane {
+ if let Some(pane_with_selection) =
+ tab.get_pane_with_id_mut(pane_id_with_selection)
+ {
+ let relative_position = pane_with_selection.relative_position(&position);
+ pane_with_selection.update_selection(&relative_position, client_id);
+ }
+ }
+ Ok(MouseEffect::default())
+ },
+ MouseAction::EndSelection { position } => {
+ Self::execute_end_selection(tab, position, client_id)
+ },
+ MouseAction::StartMovingFloatingPane { position } => {
+ Self::execute_move_floating_pane(tab, position)
+ },
+ MouseAction::ContinueMovingFloatingPane { position } => {
+ Self::execute_move_floating_pane(tab, position)
+ },
+ MouseAction::StopMovingFloatingPane { position } => {
+ Self::execute_stop_moving_floating_pane(tab, position, client_id)
+ },
+ MouseAction::ScrollUp { pane_id: _, lines } => {
+ Self::handle_scrollwheel_up(tab, &event.position, lines, client_id)
+ .with_context(err_context)
+ },
+ MouseAction::ScrollDown { pane_id: _, lines } => {
+ Self::handle_scrollwheel_down(tab, &event.position, lines, client_id)
+ .with_context(err_context)
+ },
+ MouseAction::ResizeScrollUp { pane_id } => {
+ Self::handle_resize_scroll_up(tab, pane_id, client_id).with_context(err_context)
+ },
+ MouseAction::ResizeScrollDown { pane_id } => {
+ Self::handle_resize_scroll_down(tab, pane_id, client_id).with_context(err_context)
+ },
+ MouseAction::UpdateHover { pane_id } => {
+ Self::execute_update_hover(tab, pane_id, client_id)
+ },
+ MouseAction::SendToTerminal { pane_id, event } => {
+ Self::execute_send_to_terminal(tab, pane_id, event, client_id)
+ },
+ MouseAction::FrameIntercepted { pane_id: _ } => {
+ tab.set_force_render();
+ Ok(MouseEffect::state_changed())
+ },
+ MouseAction::NoAction => Ok(MouseEffect::default()),
+ }
+ }
+
+ fn execute_stop_resize(
+ tab: &mut Tab,
+ position: Position,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || "failed to stop resize";
+ let never_resized = Self::stop_pane_resize_with_mouse(tab, position, client_id)
+ .with_context(err_context)?;
+ if never_resized {
+ let pane_id_at_position = Self::get_pane_at(tab, &position, false)
+ .with_context(err_context)?
+ .map(|p| p.pid());
+ let active_pane_id = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+ if let Some(pane_id) = pane_id_at_position {
+ if pane_id != active_pane_id {
+ Self::focus_pane_at(tab, &position, client_id).with_context(err_context)?;
+ }
+ }
+ }
+ Ok(MouseEffect::state_changed())
+ }
+
+ fn execute_focus_pane(
+ tab: &mut Tab,
+ position: Position,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || "failed to focus pane";
+ tab.mouse_hover_pane_id.remove(&client_id);
+ let active_pane_id_before = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+
+ Self::focus_pane_at(tab, &position, client_id).with_context(err_context)?;
+
+ if let Some(pane_at_position) = Self::unselectable_pane_at_position(tab, &position) {
+ let relative_position = pane_at_position.relative_position(&position);
+ pane_at_position.start_selection(&relative_position, client_id);
+ }
+
+ if tab.floating_panes.panes_are_visible() {
+ let search_selectable = false;
+ let moved_pane_with_mouse = tab
+ .floating_panes
+ .move_pane_with_mouse(position, search_selectable);
+ let active_pane_id_after = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+ if moved_pane_with_mouse || active_pane_id_before != active_pane_id_after {
+ return Ok(MouseEffect::state_changed());
+ } else {
+ return Ok(MouseEffect::default());
+ }
+ }
+
+ let active_pane_id_after = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+ if active_pane_id_before != active_pane_id_after {
+ Ok(MouseEffect::state_changed())
+ } else {
+ Ok(MouseEffect::default())
+ }
+ }
+
+ fn execute_end_selection(
+ tab: &mut Tab,
+ position: Position,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || "failed to end selection";
+ let mut leave_clipboard_message = false;
+ let copy_on_release = tab.copy_on_select;
+
+ if let Some(pane_with_selection) = tab
+ .selecting_with_mouse_in_pane
+ .and_then(|p_id| tab.get_pane_with_id_mut(p_id))
+ {
+ let mut relative_position = pane_with_selection.relative_position(&position);
+
+ relative_position.change_column(
+ (relative_position.column())
+ .max(0)
+ .min(pane_with_selection.get_content_columns()),
+ );
+
+ relative_position.change_line(
+ (relative_position.line())
+ .max(0)
+ .min(pane_with_selection.get_content_rows() as isize),
+ );
+
+ if let Some(mouse_event) =
+ pane_with_selection.mouse_left_click_release(&relative_position)
+ {
+ tab.write_to_active_terminal(&None, mouse_event.into_bytes(), false, client_id)
+ .with_context(err_context)?;
+ } else {
+ let relative_position = pane_with_selection.relative_position(&position);
+ pane_with_selection.end_selection(&relative_position, client_id);
+ if pane_with_selection.supports_mouse_selection() {
+ if copy_on_release {
+ let selected_text = pane_with_selection.get_selected_text(client_id);
+ if let Some(selected_text) = selected_text {
+ leave_clipboard_message = true;
+ tab.write_selection_to_clipboard(&selected_text)
+ .with_context(err_context)?;
+ }
+ }
+ }
+ tab.selecting_with_mouse_in_pane = None;
+ }
+ }
+
+ if leave_clipboard_message {
+ Ok(MouseEffect::leave_clipboard_message())
+ } else {
+ Ok(MouseEffect::default())
+ }
+ }
+
+ fn execute_move_floating_pane(tab: &mut Tab, position: Position) -> Result<MouseEffect> {
+ let search_selectable = false;
+ if tab
+ .floating_panes
+ .move_pane_with_mouse(position, search_selectable)
+ {
+ tab.swap_layouts.set_is_floating_damaged();
+ tab.set_force_render();
+ Ok(MouseEffect::state_changed())
+ } else {
+ Ok(MouseEffect::default())
+ }
+ }
+
+ fn execute_stop_moving_floating_pane(
+ tab: &mut Tab,
+ position: Position,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || "failed to stop moving floating pane";
+ let never_moved = tab.floating_panes.stop_moving_pane_with_mouse(position);
+ if never_moved {
+ let active_pane_id = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+ let pane_id_at_position = Self::get_pane_at(tab, &position, false)
+ .with_context(err_context)?
+ .ok_or_else(|| anyhow!("Failed to find pane at position"))?
+ .pid();
+ if active_pane_id != pane_id_at_position {
+ Self::focus_pane_at(tab, &position, client_id).with_context(err_context)?;
+ }
+ }
+ Ok(MouseEffect::default())
+ }
+
+ fn execute_update_hover(
+ tab: &mut Tab,
+ pane_id: Option<PaneId>,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let mut should_render = false;
+ match pane_id {
+ Some(pid) => {
+ if let Some(pane) = tab.get_pane_with_id(pid) {
+ let pane_is_selectable = pane.selectable();
+ if tab.advanced_mouse_actions && tab.mouse_hover_effects && pane_is_selectable {
+ tab.mouse_hover_pane_id.insert(client_id, pid);
+ } else if tab.advanced_mouse_actions || !tab.mouse_hover_effects {
+ tab.mouse_hover_pane_id.remove(&client_id);
+ }
+ should_render = true;
+ }
+ },
+ None => {
+ let removed = tab.mouse_hover_pane_id.remove(&client_id);
+ if removed.is_some() {
+ should_render = true;
+ }
+ },
+ }
+
+ if tab.mouse_help_text_visible.remove(&client_id).is_some() {
+ should_render = true;
+ }
+
+ let mut mouse_effect = if should_render {
+ MouseEffect::state_changed()
+ } else {
+ MouseEffect::default()
+ };
+ mouse_effect.leave_clipboard_message = true;
+ Ok(mouse_effect)
+ }
+
+ fn execute_send_to_terminal(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ event: MouseEvent,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || format!("failed to send to terminal for pane {pane_id:?}");
+ let mut should_render = false;
+ let active_pane_id = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+ if pane_id == active_pane_id {
+ let pane = tab
+ .get_pane_with_id(pane_id)
+ .ok_or_else(|| anyhow!("Failed to find pane {pane_id:?}"))?;
+ let relative_position = pane.relative_position(&event.position);
+ let mut event_for_pane = event.clone();
+ event_for_pane.position = relative_position;
+ if let Some(mouse_event) = pane.mouse_event(&event_for_pane, client_id) {
+ if !pane.position_is_on_frame(&event.position) {
+ tab.write_to_active_terminal(&None, mouse_event.into_bytes(), false, client_id)
+ .with_context(err_context)?;
+ }
+ }
+ let removed_hover = tab.mouse_hover_pane_id.remove(&client_id);
+ if removed_hover.is_some() {
+ should_render = true;
+ }
+
+ if event.event_type == MouseEventType::Motion && tab.mouse_hover_effects {
+ tab.last_mouse_activity_time
+ .insert(client_id, Instant::now());
+ let was_visible = tab
+ .mouse_help_text_visible
+ .get(&client_id)
+ .copied()
+ .unwrap_or(false);
+ tab.mouse_help_text_visible.insert(client_id, true);
+ if !was_visible {
+ should_render = true;
+ }
+
+ tab.senders
+ .send_to_background_jobs(BackgroundJob::ClearHelpText { client_id })
+ .with_context(err_context)?;
+ }
+ }
+ let mouse_effect = if should_render {
+ MouseEffect::state_changed()
+ } else {
+ MouseEffect::default()
+ };
+ Ok(mouse_effect)
+ }
+
+ fn determine_mouse_action(event: &MouseEvent, ctx: &MouseEventContext) -> Result<MouseAction> {
+ if ctx.pane_being_resized {
+ return Ok(match event.event_type {
+ MouseEventType::Motion => MouseAction::ContinueResize {
+ position: event.position,
+ },
+ MouseEventType::Release => MouseAction::StopResize {
+ position: event.position,
+ },
+ _ => MouseAction::NoAction,
+ });
+ }
+
+ if ctx.selecting_with_mouse {
+ return Ok(match event.event_type {
+ MouseEventType::Motion if event.left => MouseAction::UpdateSelection {
+ position: event.position,
+ },
+ MouseEventType::Release if event.left => MouseAction::EndSelection {
+ position: event.position,
+ },
+ _ => MouseAction::NoAction,
+ });
+ }
+
+ if ctx.pane_being_moved {
+ return Ok(match event.event_type {
+ MouseEventType::Motion if event.left => MouseAction::ContinueMovingFloatingPane {
+ position: event.position,
+ },
+ MouseEventType::Release if event.left => MouseAction::StopMovingFloatingPane {
+ position: event.position,
+ },
+ _ => MouseAction::NoAction,
+ });
+ }
+
+ if event.alt {
+ let is_left_press = event.left && event.event_type == MouseEventType::Press;
+ let is_left_motion = event.left && event.event_type == MouseEventType::Motion;
+
+ if is_left_press {
+ if let Some(pane_id) = ctx.pane_id_at_position {
+ return Ok(MouseAction::GroupToggle(pane_id));
+ }
+ }
+ if is_left_motion {
+ if let Some(pane_id) = ctx.pane_id_at_position {
+ return Ok(MouseAction::GroupAdd(pane_id));
+ }
+ }
+ if event.right {
+ return Ok(MouseAction::Ungroup);
+ }
+ return Ok(MouseAction::NoAction);
+ }
+
+ if event.wheel_up || event.wheel_down {
+ if let Some(pane_id) = ctx.pane_id_at_position {
+ if event.ctrl {
+ if event.wheel_up {
+ return Ok(MouseAction::ResizeScrollUp { pane_id });
+ }
+ if event.wheel_down {
+ return Ok(MouseAction::ResizeScrollDown { pane_id });
+ }
+ }
+ if event.wheel_up {
+ return Ok(MouseAction::ScrollUp { pane_id, lines: 3 });
+ }
+ if event.wheel_down {
+ return Ok(MouseAction::ScrollDown { pane_id, lines: 3 });
+ }
+ }
+ return Ok(MouseAction::NoAction);
+ }
+
+ let is_ctrl_left_press =
+ event.ctrl && event.left && event.event_type == MouseEventType::Press;
+ if is_ctrl_left_press {
+ let Some(details) = &ctx.clicked_pane else {
+ return Ok(MouseAction::NoAction);
+ };
+ if details.on_frame {
+ if details.frame_intercepted {
+ return Ok(MouseAction::FrameIntercepted {
+ pane_id: details.pane_id,
+ });
+ }
+ if let Some(edge) = details.edge {
+ return Ok(MouseAction::StartResize {
+ pane_id: details.pane_id,
+ edge,
+ is_floating: details.is_floating,
+ position: event.position,
+ });
+ }
+ }
+ return Ok(MouseAction::NoAction);
+ }
+
+ let is_plain_left_press =
+ event.left && event.event_type == MouseEventType::Press && !event.ctrl && !event.alt;
+ if is_plain_left_press {
+ let Some(details) = &ctx.clicked_pane else {
+ return Ok(MouseAction::NoAction);
+ };
+
+ let is_active_pane = Some(details.pane_id) == ctx.active_pane_id;
+ let is_pinned_pane = ctx
+ .pinned_selectable
+ .map(|id| id == details.pane_id)
+ .unwrap_or(false);
+
+ if details.on_frame {
+ if details.frame_intercepted {
+ return Ok(MouseAction::FrameIntercepted {
+ pane_id: details.pane_id,
+ });
+ }
+
+ let should_start_moving = ctx.floating_visible || is_pinned_pane;
+ if should_start_moving {
+ return Ok(MouseAction::StartMovingFloatingPane {
+ position: event.position,
+ });
+ }
+
+ if let Some(edge) = details.edge {
+ return Ok(MouseAction::StartResize {
+ pane_id: details.pane_id,
+ edge,
+ is_floating: false,
+ position: event.position,
+ });
+ }
+ }
+
+ if is_active_pane {
+ if details.terminal_wants_mouse {
+ return Ok(MouseAction::SendToTerminal {
+ pane_id: details.pane_id,
+ event: *event,
+ });
+ } else {
+ return Ok(MouseAction::StartSelection {
+ pane_id: details.pane_id,
+ position: event.position,
+ });
+ }
+ }
+
+ if !ctx.floating_visible {
+ if let Some(pinned_id) = ctx.pinned_selectable {
+ return Ok(MouseAction::ShowFloatingPanesAndFocus { pane_id: pinned_id });
+ }
+ if ctx.pinned_unselectable.is_some() {
+ return Ok(MouseAction::NoAction);
+ }
+ }
+
+ return Ok(MouseAction::FocusPane {
+ pane_id: details.pane_id,
+ position: event.position,
+ });
+ }
+
+ if event.right {
+ let Some(pane_id) = ctx.pane_id_at_position else {
+ return Ok(MouseAction::NoAction);
+ };
+ let is_active_pane = Some(pane_id) == ctx.active_pane_id;
+ if is_active_pane {
+ return Ok(MouseAction::SendToTerminal {
+ pane_id,
+ event: *event,
+ });
+ }
+ return Ok(MouseAction::NoAction);
+ }
+
+ if event.middle {
+ let Some(pane_id) = ctx.pane_id_at_position else {
+ return Ok(MouseAction::NoAction);
+ };
+ let is_active_pane = Some(pane_id) == ctx.active_pane_id;
+ if is_active_pane {
+ return Ok(MouseAction::SendToTerminal {
+ pane_id,
+ event: *event,
+ });
+ }
+ return Ok(MouseAction::NoAction);
+ }
+
+ let is_left_motion_or_release = event.left
+ && (event.event_type == MouseEventType::Motion
+ || event.event_type == MouseEventType::Release);
+ if is_left_motion_or_release {
+ let Some(details) = &ctx.clicked_pane else {
+ return Ok(MouseAction::NoAction);
+ };
+ let is_active_pane = Some(details.pane_id) == ctx.active_pane_id;
+ if is_active_pane && details.terminal_wants_mouse {
+ return Ok(MouseAction::SendToTerminal {
+ pane_id: details.pane_id,
+ event: *event,
+ });
+ }
+ return Ok(MouseAction::NoAction);
+ }
+
+ let is_buttonless_motion = event.event_type == MouseEventType::Motion
+ && !event.left
+ && !event.right
+ && !event.middle;
+ if is_buttonless_motion {
+ let Some(pane_id) = ctx.pane_id_at_position else {
+ return Ok(MouseAction::UpdateHover { pane_id: None });
+ };
+ let is_active_pane = Some(pane_id) == ctx.active_pane_id;
+ if is_active_pane {
+ return Ok(MouseAction::SendToTerminal {
+ pane_id,
+ event: *event,
+ });
+ }
+ return Ok(MouseAction::UpdateHover {
+ pane_id: Some(pane_id),
+ });
+ }
+
+ Ok(MouseAction::NoAction)
+ }
+
+ fn unselectable_pane_at_position<'a>(
+ tab: &'a mut Tab,
+ point: &Position,
+ ) -> Option<&'a mut Box<dyn Pane>> {
+ // the repetition in this function is to appease the borrow checker, I don't like it either
+ let floating_panes_are_visible = tab.floating_panes.panes_are_visible();
+ if floating_panes_are_visible {
+ if let Ok(Some(clicked_pane_id)) = tab.floating_panes.get_pane_id_at(point, true) {
+ if let Some(pane) = tab.floating_panes.get_pane_mut(clicked_pane_id) {
+ if !pane.selectable() {
+ return Some(pane);
+ }
+ }
+ } else if let Ok(Some(clicked_pane_id)) = tab.get_pane_id_at(point, false) {
+ if let Some(pane) = tab.tiled_panes.get_pane_mut(clicked_pane_id) {
+ if !pane.selectable() {
+ return Some(pane);
+ }
+ }
+ }
+ } else if let Ok(Some(clicked_pane_id)) = tab.get_pane_id_at(point, false) {
+ if let Some(pane) = tab.tiled_panes.get_pane_mut(clicked_pane_id) {
+ if !pane.selectable() {
+ return Some(pane);
+ }
+ }
+ }
+ None
+ }
+
+ fn focus_pane_at(tab: &mut Tab, point: &Position, client_id: ClientId) -> Result<()> {
+ let err_context =
+ || format!("failed to focus pane at position {point:?} for client {client_id}");
+
+ if tab.floating_panes.panes_are_visible() {
+ if let Some(clicked_pane) = tab
+ .floating_panes
+ .get_pane_id_at(point, true)
+ .with_context(err_context)?
+ {
+ tab.floating_panes.focus_pane(clicked_pane, client_id);
+ tab.set_pane_active_at(clicked_pane);
+ return Ok(());
+ }
+ }
+ if tab.floating_panes.has_pinned_panes() {
+ let search_selectable = false;
+ if let Some(pane_id) = tab
+ .floating_panes
+ .get_pinned_pane_id_at(point, search_selectable)
+ .with_context(err_context)?
+ {
+ tab.floating_panes.focus_pane(pane_id, client_id);
+ tab.set_pane_active_at(pane_id);
+ tab.show_floating_panes();
+ return Ok(());
+ }
+ }
+ if let Some(clicked_pane) = tab.get_pane_id_at(point, true).with_context(err_context)? {
+ tab.tiled_panes.focus_pane(clicked_pane, client_id);
+ tab.set_pane_active_at(clicked_pane);
+ if tab.floating_panes.panes_are_visible() {
+ tab.hide_floating_panes();
+ tab.set_force_render();
+ }
+ }
+ Ok(())
+ }
+
+ pub fn handle_scrollwheel_up(
+ tab: &mut Tab,
+ point: &Position,
+ lines: usize,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || {
+ format!("failed to handle scrollwheel up at position {point:?} for client {client_id}")
+ };
+
+ if let Some(pane) = Self::get_pane_at(tab, point, false).with_context(err_context)? {
+ let relative_position = pane.relative_position(point);
+ if let Some(mouse_event) = pane.mouse_scroll_up(&relative_position) {
+ tab.write_to_terminal_at(mouse_event.into_bytes(), point, client_id)
+ .with_context(err_context)?;
+ } else if pane.is_alternate_mode_active() {
+ // faux scrolling, send UP n times
+ // do n separate writes to make sure the sequence gets adjusted for cursor keys mode
+ for _ in 0..lines {
+ tab.write_to_terminal_at("\u{1b}[A".as_bytes().to_owned(), point, client_id)
+ .with_context(err_context)?;
+ }
+ } else {
+ pane.scroll_up(lines, client_id);
+ }
+ }
+ Ok(MouseEffect::default())
+ }
+
+ pub fn handle_scrollwheel_down(
+ tab: &mut Tab,
+ point: &Position,
+ lines: usize,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || {
+ format!(
+ "failed to handle scrollwheel down at position {point:?} for client {client_id}"
+ )
+ };
+
+ if let Some(pane) = Self::get_pane_at(tab, point, false).with_context(err_context)? {
+ let relative_position = pane.relative_position(point);
+ if let Some(mouse_event) = pane.mouse_scroll_down(&relative_position) {
+ tab.write_to_terminal_at(mouse_event.into_bytes(), point, client_id)
+ .with_context(err_context)?;
+ } else if pane.is_alternate_mode_active() {
+ // faux scrolling, send DOWN n times
+ // do n separate writes to make sure the sequence gets adjusted for cursor keys mode
+ for _ in 0..lines {
+ tab.write_to_terminal_at("\u{1b}[B".as_bytes().to_owned(), point, client_id)
+ .with_context(err_context)?;
+ }
+ } else {
+ pane.scroll_down(lines, client_id);
+ if !pane.is_scrolled() {
+ if let PaneId::Terminal(pid) = pane.pid() {
+ tab.process_pending_vte_events(pid)
+ .with_context(err_context)?;
+ }
+ }
+ }
+ }
+ Ok(MouseEffect::default())
+ }
+
+ fn handle_resize_scroll_up(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || format!("failed to handle resize scroll up for pane {pane_id:?}");
+
+ let is_floating = tab.floating_panes.panes_contain(&pane_id);
+
+ let strategy = ResizeStrategy {
+ resize: Resize::Increase,
+ direction: None,
+ invert_on_boundaries: false,
+ };
+
+ if is_floating {
+ Self::resize_floating_pane_with_strategies(tab, pane_id, &[strategy], (5, 2))
+ .with_context(err_context)?;
+ tab.swap_layouts.set_is_floating_damaged();
+ } else {
+ // we only resize the active pane for tiled panes (better ux)
+ let active_pane_id = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+
+ Self::resize_tiled_pane_with_stacked_resize(tab, active_pane_id, &strategy)
+ .with_context(err_context)?;
+ tab.swap_layouts.set_is_tiled_damaged();
+ }
+
+ tab.set_force_render();
+ Ok(MouseEffect::state_changed())
+ }
+
+ fn handle_resize_scroll_down(
+ tab: &mut Tab,
+ pane_id: PaneId,
+ client_id: ClientId,
+ ) -> Result<MouseEffect> {
+ let err_context = || format!("failed to handle resize scroll down for pane {pane_id:?}");
+
+ let is_floating = tab.floating_panes.panes_contain(&pane_id);
+
+ let strategy = ResizeStrategy {
+ resize: Resize::Decrease,
+ direction: None,
+ invert_on_boundaries: false,
+ };
+
+ if is_floating {
+ Self::resize_floating_pane_with_strategies(tab, pane_id, &[strategy], (5, 2))
+ .with_context(err_context)?;
+ tab.swap_layouts.set_is_floating_damaged();
+ } else {
+ // we only resize the active pane for tiled panes (better ux)
+ let active_pane_id = tab
+ .get_active_pane_id(client_id)
+ .ok_or_else(|| anyhow!("Failed to find active pane"))?;
+
+ Self::resize_tiled_pane_with_stacked_resize(tab, active_pane_id, &strategy)
+ .with_context(err_context)?;
+ tab.swap_layouts.set_is_tiled_damaged();
+ }
+
+ tab.set_force_render();
+ Ok(MouseEffect::state_changed())
+ }
+
+ fn get_pane_at<'a>(
+ tab: &'a mut Tab,
+ point: &Position,
+ search_selectable: bool,
+ ) -> Result<Option<&'a mut Box<dyn Pane>>> {
+ let err_context = || format!("failed to get pane at position {point:?}");
+
+ if tab.floating_panes.panes_are_visible() {
+ if let Some(pane_id) = tab
+ .floating_panes
+ .get_pane_id_at(point, search_selectable)
+ .with_context(err_context)?
+ {
+ return Ok(tab.floating_panes.get_pane_mut(pane_id));
+ }
+ } else if tab.floating_panes.has_pinned_panes() {
+ if let Some(pane_id) = tab
+ .floating_panes
+ .get_pinned_pane_id_at(point, search_selectable)
+ .with_context(err_context)?
+ {
+ return Ok(tab.floating_panes.get_pane_mut(pane_id));
+ }
+ }
+ if let Some(pane_id) = tab
+ .get_pane_id_at(point, search_selectable)
+ .with_context(err_context)?
+ {
+ Ok(tab.tiled_panes.get_pane_mut(pane_id))
+ } else {
+ Ok(None)
+ }
+ }
+
+ pub fn set_mouse_selection_support(tab: &mut Tab, pane_id: PaneId, selection_support: bool) {
+ if let Some(pane) = tab.get_pane_with_id_mut(pane_id) {
+ pane.set_mouse_selection_support(selection_support);
+ }
+ }
+}
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_click_on_floating_pin_button_toggles_pin.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_click_on_floating_pin_button_toggles_pin.snap
new file mode 100644
index 00000000..53321f60
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_click_on_floating_pin_button_toggles_pin.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ ┌ Pane #2 ──────────────────────────────────────── PIN [+] ┐ │
+06 (C): │ │Pin toggle test │ │
+07 (C): │ │ │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ └──────────────────────────────────────────────────────────┘ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_corner.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_corner.snap
new file mode 100644
index 00000000..9999594f
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_corner.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ ┌ Pane #2 ┐ │
+06 (C): │ │Corner re│ │
+07 (C): │ │size test│ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ └─────────┘ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_edge.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_edge.snap
new file mode 100644
index 00000000..c5dd2920
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_floating_pane_from_edge.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ ┌ Pane #2 ┐ │
+06 (C): │ │Floating │ │
+07 (C): │ │pane │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ └─────────┘ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_pinned_floating_pane_when_floating_panes_not_shown.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_pinned_floating_pane_when_floating_panes_not_shown.snap
new file mode 100644
index 00000000..73f382f2
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_pinned_floating_pane_when_floating_panes_not_shown.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ ┌ Pane #2 ────── PIN [+] ┐ │
+06 (C): │ │Corner resize test │ │
+07 (C): │ │ │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ └────────────────────────┘ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_horizontally.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_horizontally.snap
new file mode 100644
index 00000000..b425c617
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_horizontally.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────┐┌ Pane #2 ────────────────────────────────────────────────┐
+01 (C): │Left pane content ││Right pane content │
+02 (C): │ ││ │
+03 (C): │ ││ │
+04 (C): │ ││ │
+05 (C): │ ││ │
+06 (C): │ ││ │
+07 (C): │ ││ │
+08 (C): │ ││ │
+09 (C): │ ││ │
+10 (C): │ ││ │
+11 (C): │ ││ │
+12 (C): │ ││ │
+13 (C): │ ││ │
+14 (C): │ ││ │
+15 (C): │ ││ │
+16 (C): │ ││ │
+17 (C): │ ││ │
+18 (C): │ ││ │
+19 (C): └───────────────────────────────────────────────────────────┘└─────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_vertically.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_vertically.snap
new file mode 100644
index 00000000..d55bc67c
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_tiled_pane_vertically.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │Top pane │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ │
+06 (C): │ │
+07 (C): │ │
+08 (C): │ │
+09 (C): │ │
+10 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+11 (C): ┌ Pane #2 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+12 (C): │Bottom pane │
+13 (C): │ │
+14 (C): │ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_unfocused_tiled_pane_vertically.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_unfocused_tiled_pane_vertically.snap
new file mode 100644
index 00000000..d55bc67c
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_drag_resizes_unfocused_tiled_pane_vertically.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │Top pane │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ │
+06 (C): │ │
+07 (C): │ │
+08 (C): │ │
+09 (C): │ │
+10 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+11 (C): ┌ Pane #2 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+12 (C): │Bottom pane │
+13 (C): │ │
+14 (C): │ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_floating_pane_size.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_floating_pane_size.snap
new file mode 100644
index 00000000..3dee5aa5
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_floating_pane_size.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │Tiled pane │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ │
+06 (C): │ ┌ Pane #2 ──────────────────────────────────── PIN [ ] ┐ │
+07 (C): │ │Floating pane │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ └──────────────────────────────────────────────────────┘ │
+14 (C): │ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_pinned_floating_pane_size_when_floating_panes_hidden.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_pinned_floating_pane_size_when_floating_panes_hidden.snap
new file mode 100644
index 00000000..32011984
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_decreases_pinned_floating_pane_size_when_floating_panes_hidden.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │Tiled pane │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ │
+06 (C): │ ┌ Pane #2 ────── PIN [+] ┐ │
+07 (C): │ │Floating pane │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ └────────────────────────┘ │
+14 (C): │ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_active_tiled_pane_decreases_pane_size.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_active_tiled_pane_decreases_pane_size.snap
new file mode 100644
index 00000000..883bb2ef
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_active_tiled_pane_decreases_pane_size.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ───────────────────────────────────────────────────────┐┌ Pane #2 ───────────────────────────────────────────┐
+01 (C): │Left pane ││Right pane │
+02 (C): │ ││ │
+03 (C): │ ││ │
+04 (C): │ ││ │
+05 (C): │ ││ │
+06 (C): │ ││ │
+07 (C): │ ││ │
+08 (C): │ ││ │
+09 (C): │ ││ │
+10 (C): │ ││ │
+11 (C): │ ││ │
+12 (C): │ ││ │
+13 (C): │ ││ │
+14 (C): │ ││ │
+15 (C): │ ││ │
+16 (C): │ ││ │
+17 (C): │ ││ │
+18 (C): │ ││ │
+19 (C): └────────────────────────────────────────────────────────────────┘└────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_inactive_tiled_pane_decreases_active_tiled_pane_size.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_inactive_tiled_pane_decreases_active_tiled_pane_size.snap
new file mode 100644
index 00000000..883bb2ef
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_down_on_inactive_tiled_pane_decreases_active_tiled_pane_size.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ───────────────────────────────────────────────────────┐┌ Pane #2 ───────────────────────────────────────────┐
+01 (C): │Left pane ││Right pane │
+02 (C): │ ││ │
+03 (C): │ ││ │
+04 (C): │ ││ │
+05 (C): │ ││ │
+06 (C): │ ││ │
+07 (C): │ ││ │
+08 (C): │ ││ │
+09 (C): │ ││ │
+10 (C): │ ││ │
+11 (C): │ ││ │
+12 (C): │ ││ │
+13 (C): │ ││ │
+14 (C): │ ││ │
+15 (C): │ ││ │
+16 (C): │ ││ │
+17 (C): │ ││ │
+18 (C): │ ││ │
+19 (C): └────────────────────────────────────────────────────────────────┘└────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_floating_pane_size.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_floating_pane_size.snap
new file mode 100644
index 00000000..6931cea6
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_floating_pane_size.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │Tiled pane │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ ┌ Pane #2 ──────────────────────────────────────────── PIN [ ] ┐ │
+05 (C): │ │Floating pane │ │
+06 (C): │ │ │ │
+07 (C): │ │ │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ └──────────────────────────────────────────────────────────────┘ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_pinned_floating_pane_size_when_floating_panes_hidden.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_pinned_floating_pane_size_when_floating_panes_hidden.snap
new file mode 100644
index 00000000..6a704349
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_increases_pinned_floating_pane_size_when_floating_panes_hidden.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │Tiled pane │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ ┌ Pane #2 ────────────── PIN [+] ┐ │
+05 (C): │ │Floating pane │ │
+06 (C): │ │ │ │
+07 (C): │ │ │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ └────────────────────────────────┘ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_active_tiled_pane_increases_pane_size.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_active_tiled_pane_increases_pane_size.snap
new file mode 100644
index 00000000..895a9ba6
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_active_tiled_pane_increases_pane_size.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ───────────────────────────────────────────┐┌ Pane #2 ───────────────────────────────────────────────────────┐
+01 (C): │Left pane ││Right pane │
+02 (C): │ ││ │
+03 (C): │ ││ │
+04 (C): │ ││ │
+05 (C): │ ││ │
+06 (C): │ ││ │
+07 (C): │ ││ │
+08 (C): │ ││ │
+09 (C): │ ││ │
+10 (C): │ ││ │
+11 (C): │ ││ │
+12 (C): │ ││ │
+13 (C): │ ││ │
+14 (C): │ ││ │
+15 (C): │ ││ │
+16 (C): │ ││ │
+17 (C): │ ││ │
+18 (C): │ ││ │
+19 (C): └────────────────────────────────────────────────────┘└────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_inactive_tiled_pane_increases_active_tiled_pane_size.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_inactive_tiled_pane_increases_active_tiled_pane_size.snap
new file mode 100644
index 00000000..895a9ba6
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__ctrl_scroll_up_on_inactive_tiled_pane_increases_active_tiled_pane_size.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ───────────────────────────────────────────┐┌ Pane #2 ───────────────────────────────────────────────────────┐
+01 (C): │Left pane ││Right pane │
+02 (C): │ ││ │
+03 (C): │ ││ │
+04 (C): │ ││ │
+05 (C): │ ││ │
+06 (C): │ ││ │
+07 (C): │ ││ │
+08 (C): │ ││ │
+09 (C): │ ││ │
+10 (C): │ ││ │
+11 (C): │ ││ │
+12 (C): │ ││ │
+13 (C): │ ││ │
+14 (C): │ ││ │
+15 (C): │ ││ │
+16 (C): │ ││ │
+17 (C): │ ││ │
+18 (C): │ ││ │
+19 (C): └────────────────────────────────────────────────────┘└────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__drag_pane_with_mouse.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__drag_pane_with_mouse.snap
index 7450c0fd..53882774 100644
--- a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__drag_pane_with_mouse.snap
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__drag_pane_with_mouse.snap
@@ -1,6 +1,5 @@
---
source: zellij-server/src/tab/./unit/tab_integration_tests.rs
-assertion_line: 1944
expression: snapshot
---
00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
@@ -10,17 +9,16 @@ expression: snapshot
04 (C): │ │E┌ Pane #6 ───── SCROLL: 0/1 | PIN [ ] ┐ │
05 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
06 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
-07 (C): │ └─│EEEEEEEEEEEEEEEEEEEEEEEEEEEEE┌ Pane #2 ──────────────────────────────────────── PIN [ ] ┐ │
-08 (C): │ │EEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │ │
-09 (C): │ └─────────────────────────────│ │ │
-10 (C): │ │E│ │ │
-11 (C): │ │E│ I am scratch terminal │ │
-12 (C): │ │E│ │ │
-13 (C): │ │E│ │ │
-14 (C): │ │E│ │ │
-15 (C): │ │E│ │ │
-16 (C): │ └─└──────────────────────────────────────────────────────────┘ │
+07 (C): │ └─│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│─────────────────────── SCROLL: 0/1 | PIN [ ] ┐ ┐ │
+08 (C): │ │EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │ │
+09 (C): │ └──────────────────────────────────────┘───────────────────────── SCROLL: 0/1 | PIN [ ] ┐ │
+10 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
+11 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
+12 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
+13 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
+14 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
+15 (C): │ │E│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
+16 (C): │ └─│EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
17 (C): │ │EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE│ │
18 (C): │ └──────────────────────────────────────────────────────────┘ │
19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_active_pane_unsets_hover.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_active_pane_unsets_hover.snap
new file mode 100644
index 00000000..1499546a
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_active_pane_unsets_hover.snap
@@ -0,0 +1,5 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{:?}\", hover_panes)"
+---
+{}
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_inactive_pane_sets_hover_state.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_inactive_pane_sets_hover_state.snap
new file mode 100644
index 00000000..9d87b33c
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__hover_over_inactive_pane_sets_hover_state.snap
@@ -0,0 +1,5 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{:?}\", hover_panes)"
+---
+{1: Terminal(1)}
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_floating_frame_not_on_pin_moves_pane.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_floating_frame_not_on_pin_moves_pane.snap
new file mode 100644
index 00000000..678d7a5e
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_floating_frame_not_on_pin_moves_pane.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ │
+06 (C): │ ┌ Pane #2 ──────────────────────────────────────── PIN [ ] ┐ │
+07 (C): │ │Movable pane │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ └──────────────────────────────────────────────────────────┘ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_pinned_floating_pane.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_pinned_floating_pane.snap
new file mode 100644
index 00000000..77f8a953
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_click_on_pinned_floating_pane.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ ┌ Pane #2 ────────── PIN [+] ┐ ┌ Pane #3 ────────── PIN [ ] ┐ │
+06 (C): │ │Pinned pane │ │ │ │
+07 (C): │ │ │ │ │ │
+08 (C): │ │ │ │ │ │
+09 (C): │ │ │ │ │ │
+10 (C): │ │ │ │ │ │
+11 (C): │ │ │ │ │ │
+12 (C): │ │ │ │ │ │
+13 (C): │ │ │ │ │ │
+14 (C): │ └────────────────────────────┘ └────────────────────────────┘ │
+15 (C): │ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_drag_moves_floating_pane.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_drag_moves_floating_pane.snap
new file mode 100644
index 00000000..860e1d6d
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__left_drag_moves_floating_pane.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+01 (C): │ │
+02 (C): │ │
+03 (C): │ │
+04 (C): │ │
+05 (C): │ │
+06 (C): │ ┌ Pane #2 ──────────────────────────────────────── PIN [ ] ┐ │
+07 (C): │ │Moving pane │ │
+08 (C): │ │ │ │
+09 (C): │ │ │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ └──────────────────────────────────────────────────────────┘ │
+16 (C): │ │
+17 (C): │ │
+18 (C): │ │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__resize_tiled_then_move_floating_sequence.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__resize_tiled_then_move_floating_sequence.snap
new file mode 100644
index 00000000..4dbbeaa3
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__resize_tiled_then_move_floating_sequence.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot)"
+---
+00 (C): ┌ Pane #1 ───────────────────────────────────────────────────────────┐┌ Pane #2 ────────────────────────────────────────┐
+01 (C): │Tiled Left ││Tiled Right │
+02 (C): │ ││ │
+03 (C): │ ││ │
+04 (C): │ ││ │
+05 (C): │ ││ │
+06 (C): │ ││ │
+07 (C): │ ││ │
+08 (C): │ ┌ Pane #3 ──────────────────────────────────────── PIN [ ] ┐ │
+09 (C): │ │Floating │ │
+10 (C): │ │ │ │
+11 (C): │ │ │ │
+12 (C): │ │ │ │
+13 (C): │ │ │ │
+14 (C): │ │ │ │
+15 (C): │ │ │ │
+16 (C): │ │ │ │
+17 (C): │ └──────────────────────────────────────────────────────────┘ │
+18 (C): │ ││ │
+19 (C): └────────────────────────────────────────────────────────────────────┘└─────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_on_inactive_pane_scrolls_that_pane.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_on_inactive_pane_scrolls_that_pane.snap
new file mode 100644
index 00000000..ac16ea2e
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_on_inactive_pane_scrolls_that_pane.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ─────────────────────────────────── SCROLL: 3/33 ┐
+01 (C): │Left Line 30 │
+02 (C): │Left Line 31 │
+03 (C): │Left Line 32 │
+04 (C): │Left Line 33 │
+05 (C): │Left Line 34 │
+06 (C): │Left Line 35 │
+07 (C): │Left Line 36 │
+08 (C): │Left Line 37 │
+09 (C): │Left Line 38 │
+10 (C): │Left Line 39 │
+11 (C): │Left Line 40 │
+12 (C): │Left Line 41 │
+13 (C): │Left Line 42 │
+14 (C): │Left Line 43 │
+15 (C): │Left Line 44 │
+16 (C): │Left Line 45 │
+17 (C): │Left Line 46 │
+18 (C): │Left Line 47 │
+19 (C): └───────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_down_scrolls_pane.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_down_scrolls_pane.snap
new file mode 100644
index 00000000..c17b8c7f
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_down_scrolls_pane.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ─────────────────────────────────────────────────────────────────────────────────────────────── SCROLL: 6/33 ┐
+01 (C): │Line 27 │
+02 (C): │Line 28 │
+03 (C): │Line 29 │
+04 (C): │Line 30 │
+05 (C): │Line 31 │
+06 (C): │Line 32 │
+07 (C): │Line 33 │
+08 (C): │Line 34 │
+09 (C): │Line 35 │
+10 (C): │Line 36 │
+11 (C): │Line 37 │
+12 (C): │Line 38 │
+13 (C): │Line 39 │
+14 (C): │Line 40 │
+15 (C): │Line 41 │
+16 (C): │Line 42 │
+17 (C): │Line 43 │
+18 (C): │Line 44 │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_up_scrolls_pane.snap b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_up_scrolls_pane.snap
new file mode 100644
index 00000000..1ec7adee
--- /dev/null
+++ b/zellij-server/src/tab/unit/snapshots/zellij_server__tab__tab_integration_tests__scroll_wheel_up_scrolls_pane.snap
@@ -0,0 +1,24 @@
+---
+source: zellij-server/src/tab/./unit/tab_integration_tests.rs
+expression: "format!(\"{}\", snapshot_after)"
+---
+00 (C): ┌ Pane #1 ─────────────────────────────────────────────────────────────────────────────────────────────── SCROLL: 3/33 ┐
+01 (C): │Line 30 │
+02 (C): │Line 31 │
+03 (C): │Line 32 │
+04 (C): │Line 33 │
+05 (C): │Line 34 │
+06 (C): │Line 35 │
+07 (C): │Line 36 │
+08 (C): │Line 37 │
+09 (C): │Line 38 │
+10 (C): │Line 39 │
+11 (C): │Line 40 │
+12 (C): │Line 41 │
+13 (C): │Line 42 │
+14 (C): │Line 43 │
+15 (C): │Line 44 │
+16 (C): │Line 45 │
+17 (C): │Line 46 │
+18 (C): │Line 47 │
+19 (C): └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/zellij-server/src/tab/unit/tab_integration_tests.rs b/zellij-server/src/tab/unit/tab_integration_tests.rs
index 8b109def..7b75223a 100644
--- a/zellij-server/src/tab/unit/tab_integration_tests.rs
+++ b/zellij-server/src/tab/unit/tab_integration_tests.rs
@@ -275,6 +275,7 @@ fn create_new_tab(size: Size, default_mode: ModeInfo) -> Tab {
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -359,6 +360,7 @@ fn create_new_tab_without_pane_frames(size: Size, default_mode: ModeInfo) -> Tab
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -458,6 +460,7 @@ fn create_new_tab_with_swap_layouts(
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -558,6 +561,7 @@ fn create_new_tab_with_os_api(
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -644,6 +648,7 @@ fn create_new_tab_with_layout(size: Size, default_mode: ModeInfo, layout: &str)
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -744,6 +749,7 @@ fn create_new_tab_with_mock_pty_writer(
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -835,6 +841,7 @@ fn create_new_tab_with_sixel_support(
current_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -2381,7 +2388,7 @@ fn move_floating_pane_focus_with_mouse() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(9, 71)),
client_id,
)
@@ -2491,7 +2498,7 @@ fn move_pane_focus_with_mouse_to_non_floating_pane() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(4, 71)),
client_id,
)
@@ -2601,7 +2608,12 @@ fn drag_pane_with_mouse() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
@@ -2613,11 +2625,6 @@ fn drag_pane_with_mouse() {
size.cols,
Palette::default(),
);
- assert_eq!(
- cursor_coordinates,
- Some((75, 11)),
- "cursor coordinates moved to the clicked pane"
- );
assert_snapshot!(snapshot);
}
@@ -2715,7 +2722,7 @@ fn mark_text_inside_floating_pane() {
tab.selecting_with_mouse_in_pane.is_some(),
"started selecting with mouse on click"
);
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(5, 15)),
client_id,
)
@@ -3400,7 +3407,12 @@ fn move_floating_pane_with_sixel_image() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
@@ -3454,7 +3466,12 @@ fn floating_pane_above_sixel_image() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
@@ -3890,17 +3907,17 @@ fn pane_in_sgr_button_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_motion(
+ tab.handle_mouse_event(
&MouseEvent::new_left_motion_event(Position::new(9, 72)),
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
.unwrap();
- tab.handle_right_click(
+ tab.handle_mouse_event(
&MouseEvent::new_right_press_event(Position::new(5, 71)),
client_id,
)
@@ -3910,9 +3927,13 @@ fn pane_in_sgr_button_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
- tab.handle_middle_click(
+ // tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_right_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_middle_press_event(Position::new(5, 71)),
client_id,
)
@@ -3922,8 +3943,12 @@ fn pane_in_sgr_button_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
+ // tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_middle_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
tab.handle_scrollwheel_up(&Position::new(5, 71), 1, client_id)
.unwrap();
tab.handle_scrollwheel_down(&Position::new(5, 71), 1, client_id)
@@ -3973,17 +3998,17 @@ fn pane_in_sgr_normal_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_motion(
+ tab.handle_mouse_event(
&MouseEvent::new_left_motion_event(Position::new(9, 72)),
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
.unwrap();
- tab.handle_right_click(
+ tab.handle_mouse_event(
&MouseEvent::new_right_press_event(Position::new(5, 71)),
client_id,
)
@@ -3993,9 +4018,13 @@ fn pane_in_sgr_normal_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
- tab.handle_middle_click(
+ // tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_right_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_middle_press_event(Position::new(5, 71)),
client_id,
)
@@ -4005,8 +4034,12 @@ fn pane_in_sgr_normal_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
+ // tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_middle_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
tab.handle_scrollwheel_up(&Position::new(5, 71), 1, client_id)
.unwrap();
tab.handle_scrollwheel_down(&Position::new(5, 71), 1, client_id)
@@ -4056,17 +4089,17 @@ fn pane_in_sgr_any_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_motion(
+ tab.handle_mouse_event(
&MouseEvent::new_left_motion_event(Position::new(9, 72)),
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
.unwrap();
- tab.handle_right_click(
+ tab.handle_mouse_event(
&MouseEvent::new_right_press_event(Position::new(5, 71)),
client_id,
)
@@ -4076,9 +4109,13 @@ fn pane_in_sgr_any_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
- tab.handle_middle_click(
+ // tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_right_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_middle_press_event(Position::new(5, 71)),
client_id,
)
@@ -4088,8 +4125,12 @@ fn pane_in_sgr_any_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
+ // tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_middle_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
tab.handle_scrollwheel_up(&Position::new(5, 71), 1, client_id)
.unwrap();
tab.handle_scrollwheel_down(&Position::new(5, 71), 1, client_id)
@@ -4145,17 +4186,17 @@ fn pane_in_utf8_button_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_motion(
+ tab.handle_mouse_event(
&MouseEvent::new_left_motion_event(Position::new(9, 72)),
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
.unwrap();
- tab.handle_right_click(
+ tab.handle_mouse_event(
&MouseEvent::new_right_press_event(Position::new(5, 71)),
client_id,
)
@@ -4165,9 +4206,13 @@ fn pane_in_utf8_button_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
- tab.handle_middle_click(
+ // tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_right_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_middle_press_event(Position::new(5, 71)),
client_id,
)
@@ -4177,8 +4222,12 @@ fn pane_in_utf8_button_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
+ // tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_middle_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
tab.handle_scrollwheel_up(&Position::new(5, 71), 1, client_id)
.unwrap();
tab.handle_scrollwheel_down(&Position::new(5, 71), 1, client_id)
@@ -4228,17 +4277,17 @@ fn pane_in_utf8_normal_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_motion(
+ tab.handle_mouse_event(
&MouseEvent::new_left_motion_event(Position::new(9, 72)),
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
.unwrap();
- tab.handle_right_click(
+ tab.handle_mouse_event(
&MouseEvent::new_right_press_event(Position::new(5, 71)),
client_id,
)
@@ -4248,9 +4297,13 @@ fn pane_in_utf8_normal_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
- tab.handle_middle_click(
+ // tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_right_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_middle_press_event(Position::new(5, 71)),
client_id,
)
@@ -4260,8 +4313,12 @@ fn pane_in_utf8_normal_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
+ // tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_middle_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
tab.handle_scrollwheel_up(&Position::new(5, 71), 1, client_id)
.unwrap();
tab.handle_scrollwheel_down(&Position::new(5, 71), 1, client_id)
@@ -4311,17 +4368,17 @@ fn pane_in_utf8_any_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_left_mouse_motion(
+ tab.handle_mouse_event(
&MouseEvent::new_left_motion_event(Position::new(9, 72)),
client_id,
)
.unwrap();
- tab.handle_left_mouse_release(
+ tab.handle_mouse_event(
&MouseEvent::new_left_release_event(Position::new(7, 75)),
client_id,
)
.unwrap();
- tab.handle_right_click(
+ tab.handle_mouse_event(
&MouseEvent::new_right_press_event(Position::new(5, 71)),
client_id,
)
@@ -4331,9 +4388,13 @@ fn pane_in_utf8_any_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
- tab.handle_middle_click(
+ // tab.handle_right_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_right_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_middle_press_event(Position::new(5, 71)),
client_id,
)
@@ -4343,8 +4404,12 @@ fn pane_in_utf8_any_event_tracking_mouse_mode() {
client_id,
)
.unwrap();
- tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
- .unwrap();
+ // tab.handle_middle_mouse_release(&Position::new(7, 75), client_id)
+ tab.handle_mouse_event(
+ &MouseEvent::new_middle_release_event(Position::new(7, 75)),
+ client_id,
+ )
+ .unwrap();
tab.handle_scrollwheel_up(&Position::new(5, 71), 1, client_id)
.unwrap();
tab.handle_scrollwheel_down(&Position::new(5, 71), 1, client_id)
@@ -7203,6 +7268,11 @@ fn focus_stacked_pane_over_flexible_pane_with_the_mouse() {
client_id,
)
.unwrap();
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_event(Position::new(1, 71)),
+ client_id,
+ )
+ .unwrap();
tab.render(&mut output, None).unwrap();
let snapshot = take_snapshot(
output.serialize().unwrap().get(&client_id).unwrap(),
@@ -7427,10 +7497,20 @@ fn close_stacked_pane_with_previously_focused_other_pane() {
)
.unwrap();
tab.handle_mouse_event(
+ &MouseEvent::new_left_release_event(Position::new(2, 71)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
&MouseEvent::new_left_press_event(Position::new(1, 71)),
client_id,
)
.unwrap();
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_event(Position::new(1, 71)),
+ client_id,
+ )
+ .unwrap();
tab.close_pane(PaneId::Terminal(4), false, None);
tab.render(&mut output, None).unwrap();
let (snapshot, cursor_coordinates) = take_snapshot_and_cursor_position(
@@ -10206,3 +10286,2054 @@ fn cursor_visible_when_pinned_pane_is_focused() {
"Cursor should be visible when focused on pinned pane that's on top"
);
}
+
+#[test]
+fn test_left_click_on_inactive_tiled_pane_changes_focus() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right pane".as_bytes()))
+ .unwrap();
+
+ assert_eq!(tab.get_active_pane_id(client_id), Some(new_pane_id));
+
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_event(Position::new(5, 30)),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+ assert_eq!(tab.get_active_pane_id(client_id), Some(PaneId::Terminal(1)));
+}
+
+#[test]
+fn test_left_release_after_selection_copies_to_clipboard() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let mut output = Output::default();
+
+ // Fill the pane with some text content
+ tab.handle_pty_bytes(1, Vec::from("Selectable text content here".as_bytes()))
+ .unwrap();
+
+ // Start text selection with left press
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_event(Position::new(1, 5)),
+ client_id,
+ )
+ .unwrap();
+
+ // Drag to create selection
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(Position::new(1, 15)),
+ client_id,
+ )
+ .unwrap();
+
+ // Release should trigger clipboard copy
+ let release_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_release_event(Position::new(1, 15)),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify clipboard message was sent
+ assert!(release_effect.leave_clipboard_message);
+}
+
+#[test]
+fn test_ctrl_click_on_tiled_pane_edge_starts_resize() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // Click on the edge between panes with Ctrl
+ // For a vertical split at cols=121, the edge is around column 60-61
+ let edge_position = Position::new(5, 60);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(edge_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify resize started
+ assert!(effect.state_changed);
+}
+
+#[test]
+fn test_ctrl_drag_resizes_tiled_pane_horizontally() {
+ let size = Size {
+ cols: 120,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left pane content".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right pane content".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let edge_position = Position::new(5, 60);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(edge_position),
+ client_id,
+ )
+ .unwrap();
+
+ let motion_position = Position::new(5, 61);
+ let motion_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(motion_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_drag_resizes_tiled_pane_vertically() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.horizontal_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Top pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Bottom pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let edge_position = Position::new(10, 60);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(edge_position),
+ client_id,
+ )
+ .unwrap();
+
+ let motion_position = Position::new(11, 60);
+ let motion_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(motion_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_drag_resizes_unfocused_tiled_pane_vertically() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.horizontal_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Top pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Bottom pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let edge_position = Position::new(10, 60);
+ let _ = tab.focus_pane_with_id(PaneId::Terminal(1), false, false, client_id); // focus top pane
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(edge_position),
+ client_id,
+ )
+ .unwrap();
+
+ let motion_position = Position::new(11, 60);
+ let motion_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(motion_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+ let focused_pane = tab.get_active_pane_id(client_id).unwrap();
+
+ assert_ne!(focused_pane, new_pane_id, "resize did not change focus");
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_click_on_pane_body_does_nothing() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // Click in the center of a pane (not on an edge)
+ let center_position = Position::new(10, 30);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(center_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Should not trigger any state change
+ assert!(!effect.state_changed);
+}
+
+#[test]
+fn test_ctrl_drag_resizes_floating_pane_from_edge() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ let coordinates = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(10)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: None,
+ borderless: Some(false),
+ };
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Floating pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let edge_position = Position::new(7, 14); // Approximate right edge
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(edge_position),
+ client_id,
+ )
+ .unwrap();
+
+ let motion_position = Position::new(7, 15);
+ let motion_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(motion_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_drag_resizes_floating_pane_from_corner() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ let coordinates = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(10)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: None,
+ borderless: Some(false),
+ };
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Corner resize test".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let corner_position = Position::new(14, 14);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(corner_position),
+ client_id,
+ )
+ .unwrap();
+
+ let motion_position = Position::new(15, 15);
+ let motion_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(motion_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_drag_resizes_pinned_floating_pane_when_floating_panes_not_shown() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ let coordinates = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(25)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: Some(true),
+ borderless: Some(false),
+ };
+
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Corner resize test".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+ eprintln!("{}", snapshot_before);
+
+ let corner_position = Position::new(14, 29);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(corner_position),
+ client_id,
+ )
+ .unwrap();
+
+ let motion_position = Position::new(15, 30);
+ let motion_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(motion_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ eprintln!("{}", snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_click_on_floating_pin_button_toggles_pin() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Toggle floating panes mode and create a floating pane
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Pin toggle test".as_bytes()))
+ .unwrap();
+
+ // Render before pin toggle
+ tab.render(&mut output, None).unwrap();
+
+ // Calculate pin button position (3 cells left of top-right corner of floating pane)
+ // Default floating pane is roughly at y=5, right edge around x=90
+ // Pin button should be at approximately (5, 87)
+ let pin_position = Position::new(5, 87);
+
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(pin_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify state changed (pin toggle should trigger this)
+ assert!(effect.state_changed);
+
+ // Render after pin toggle
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Snapshot should show pin indicator change
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_click_on_floating_frame_not_on_pin_starts_resize() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Toggle floating panes mode and create a floating pane
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Frame click test".as_bytes()))
+ .unwrap();
+
+ // Click on frame but NOT on pin button location
+ // Use left edge of frame instead
+ let frame_position = Position::new(5, 30);
+
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(frame_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Should start resize (if on edge), state_changed should be true
+ assert!(effect.state_changed);
+}
+
+#[test]
+fn test_left_drag_moves_floating_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Toggle floating panes mode and create a floating pane
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Moving pane".as_bytes()))
+ .unwrap();
+
+ // Render before move
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Click on frame (not ctrl, not pin location) to start move
+ let frame_position = Position::new(5, 30);
+ let press_effect = tab
+ .handle_mouse_event(&MouseEvent::new_left_press_event(frame_position), client_id)
+ .unwrap();
+
+ // Drag to move the pane
+ let motion_position = Position::new(6, 31);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Release
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify state changed
+ assert!(press_effect.state_changed);
+
+ // Render after move
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Snapshots should be different
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_left_click_on_floating_pane_changes_focus() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id_1 = PaneId::Terminal(2);
+ let floating_pane_id_2 = PaneId::Terminal(3);
+
+ let coordinates_1 = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(10)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: None,
+ borderless: Some(false),
+ };
+
+ let coordinates_2 = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(20)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(10)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: None,
+ borderless: Some(false),
+ };
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id_1,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates_1)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id_2,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates_2)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Pane 1".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(3, Vec::from("Pane 2".as_bytes()))
+ .unwrap();
+
+ assert_eq!(tab.get_active_pane_id(client_id), Some(floating_pane_id_2));
+
+ let pane1_position = Position::new(7, 7);
+ let effect = tab
+ .handle_mouse_event(&MouseEvent::new_left_press_event(pane1_position), client_id)
+ .unwrap();
+
+ assert!(effect.state_changed);
+ assert_eq!(tab.get_active_pane_id(client_id), Some(floating_pane_id_1));
+}
+
+#[test]
+fn test_left_click_on_pinned_floating_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id_1 = PaneId::Terminal(2);
+ let floating_pane_id_2 = PaneId::Terminal(3);
+ let mut output = Output::default();
+
+ let coordinates_1 = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(30)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: None,
+ borderless: Some(false),
+ };
+
+ let coordinates_2 = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(60)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(30)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: None,
+ borderless: Some(false),
+ };
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+
+ // will be pinned
+ tab.new_pane(
+ floating_pane_id_1,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates_1)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ // will not be pinned
+ tab.new_pane(
+ floating_pane_id_2,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates_2)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Pinned pane".as_bytes()))
+ .unwrap();
+
+ // render once so that the client's frame will be registered
+ tab.render(&mut output, None).unwrap();
+
+ let pin_position = Position::new(5, 31);
+ tab.handle_mouse_event(&MouseEvent::new_left_press_event(pin_position), client_id)
+ .unwrap();
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+
+ let pane_position = Position::new(6, 25);
+ let _effect = tab
+ .handle_mouse_event(&MouseEvent::new_left_press_event(pane_position), client_id)
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Verify pinned pane is still visible in snapshot
+ assert_snapshot!(format!("{}", snapshot));
+}
+
+#[test]
+fn test_alt_left_click_toggles_pane_group() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // Alt+click on a pane to toggle group
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_alt_event(Position::new(5, 30)),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify group_toggle effect returned
+ assert!(effect.group_toggle.is_some());
+ assert_eq!(effect.group_toggle, Some(PaneId::Terminal(1)));
+}
+
+#[test]
+fn test_alt_left_drag_adds_panes_to_group() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id_2 = PaneId::Terminal(2);
+ let new_pane_id_3 = PaneId::Terminal(3);
+ let mut output = Output::default();
+
+ // Create two vertical splits (3 panes)
+ tab.vertical_split(new_pane_id_2, None, client_id, None, None)
+ .unwrap();
+ tab.vertical_split(new_pane_id_3, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Pane 1".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Pane 2".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(3, Vec::from("Pane 3".as_bytes()))
+ .unwrap();
+
+ // Alt+press on first pane
+ let press_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_alt_event(Position::new(5, 10)),
+ client_id,
+ )
+ .unwrap();
+ assert!(press_effect.group_toggle.is_some());
+
+ // Alt+drag to second pane
+ let motion_effect_1 = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_alt_event(Position::new(5, 40)),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify group_add effect
+ assert!(motion_effect_1.group_add.is_some());
+
+ // Alt+drag to third pane
+ let motion_effect_2 = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_alt_event(Position::new(5, 80)),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify group_add effect
+ assert!(motion_effect_2.group_add.is_some());
+}
+
+#[test]
+fn test_right_alt_click_ungroups_panes() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // First, create a group with Alt+click
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_alt_event(Position::new(5, 30)),
+ client_id,
+ )
+ .unwrap();
+
+ // Right+Alt click to ungroup
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_right_press_with_alt_event(Position::new(5, 30)),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify ungroup effect returned
+ assert!(effect.ungroup);
+}
+
+#[test]
+fn test_scroll_wheel_up_scrolls_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let mut output = Output::default();
+
+ // Fill the pane with many lines to enable scrolling
+ let mut content = String::new();
+ for i in 0..50 {
+ content.push_str(&format!("Line {}\r\n", i));
+ }
+ tab.handle_pty_bytes(1, Vec::from(content.as_bytes()))
+ .unwrap();
+
+ // Render before scroll
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Scroll up
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_scroll_up_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+
+ // Render after scroll
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Snapshots should be different (viewport moved)
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_scroll_wheel_down_scrolls_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let mut output = Output::default();
+
+ // Fill the pane with many lines to enable scrolling
+ let mut content = String::new();
+ for i in 0..50 {
+ content.push_str(&format!("Line {}\r\n", i));
+ }
+ tab.handle_pty_bytes(1, Vec::from(content.as_bytes()))
+ .unwrap();
+
+ // First scroll up to have content above viewport
+ tab.handle_mouse_event(
+ &MouseEvent::new_scroll_up_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
+ &MouseEvent::new_scroll_up_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
+ &MouseEvent::new_scroll_up_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+
+ // Render before scrolling down
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Scroll down
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_scroll_down_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+
+ // Render after scroll
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Snapshots should be different (viewport moved)
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_scroll_on_inactive_pane_scrolls_that_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ // Fill both panes with scrollable content
+ let mut content = String::new();
+ for i in 0..50 {
+ content.push_str(&format!("Left Line {}\r\n", i));
+ }
+ tab.handle_pty_bytes(1, Vec::from(content.as_bytes()))
+ .unwrap();
+
+ let mut content = String::new();
+ for i in 0..50 {
+ content.push_str(&format!("Right Line {}\r\n", i));
+ }
+ tab.handle_pty_bytes(2, Vec::from(content.as_bytes()))
+ .unwrap();
+
+ // Active pane is pane 2 (right), scroll on pane 1 (left)
+ assert_eq!(tab.get_active_pane_id(client_id), Some(PaneId::Terminal(2)));
+
+ // Render before scroll
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Scroll up on the left (inactive) pane
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_scroll_up_event(Position::new(10, 30)),
+ client_id,
+ )
+ .unwrap();
+
+ // Render after scroll
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ // Snapshots should be different (left pane scrolled)
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_right_click_forwards_to_active_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let mut output = Output::default();
+
+ tab.handle_pty_bytes(1, Vec::from("Active pane".as_bytes()))
+ .unwrap();
+
+ // Right click on the active pane
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_right_press_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+
+ // Event should be forwarded (verified via MouseEffect or no error)
+ // The effect may not indicate state change, but should succeed
+ assert!(effect.group_toggle.is_none());
+}
+
+#[test]
+fn test_middle_click_forwards_to_active_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let mut output = Output::default();
+
+ tab.handle_pty_bytes(1, Vec::from("Active pane".as_bytes()))
+ .unwrap();
+
+ // Middle click on the active pane
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_middle_press_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+
+ // Event should be forwarded (verified via MouseEffect or no error)
+ assert!(effect.group_toggle.is_none());
+}
+
+#[test]
+fn test_hover_over_inactive_pane_sets_hover_state() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // Active pane is pane 2 (right)
+ assert_eq!(tab.get_active_pane_id(client_id), Some(PaneId::Terminal(2)));
+
+ // Hover over inactive pane (left) with buttonless motion
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_buttonless_motion(Position::new(10, 30)),
+ client_id,
+ )
+ .unwrap();
+
+ let hover_panes = tab.query_mouse_hover_pane_id();
+ assert_snapshot!(format!("{:?}", hover_panes));
+ assert!(effect.state_changed);
+}
+
+#[test]
+fn test_hover_over_active_pane_unsets_hover() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // Active pane is pane 2 (right)
+ assert_eq!(tab.get_active_pane_id(client_id), Some(PaneId::Terminal(2)));
+
+ // Hover over inactive pane (left) with buttonless motion
+ let _effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_buttonless_motion(Position::new(10, 30)),
+ client_id,
+ )
+ .unwrap();
+ // Hover over active pane (right) with buttonless motion
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_buttonless_motion(Position::new(10, 90)),
+ client_id,
+ )
+ .unwrap();
+
+ let hover_panes = tab.query_mouse_hover_pane_id();
+ assert_snapshot!(format!("{:?}", hover_panes));
+ assert!(effect.state_changed);
+}
+
+#[test]
+fn test_resize_tiled_then_move_floating_sequence() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let tiled_pane_id = PaneId::Terminal(2);
+ let floating_pane_id = PaneId::Terminal(3);
+ let mut output = Output::default();
+
+ // Create tiled split
+ tab.vertical_split(tiled_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Tiled Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Tiled Right".as_bytes()))
+ .unwrap();
+
+ // Resize tiled pane with Ctrl+drag
+ let edge_position = Position::new(5, 60);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_press_with_ctrl_event(edge_position),
+ client_id,
+ )
+ .unwrap();
+ let motion_position = Position::new(5, 70);
+ let resize_effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_motion_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_with_ctrl_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(resize_effect.state_changed);
+
+ // Now toggle floating and create a floating pane
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(3, Vec::from("Floating".as_bytes()))
+ .unwrap();
+
+ // Move floating pane
+ let frame_position = Position::new(5, 30);
+ let move_effect = tab
+ .handle_mouse_event(&MouseEvent::new_left_press_event(frame_position), client_id)
+ .unwrap();
+ let motion_position = Position::new(8, 40);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ // Both operations should have succeeded
+ assert!(move_effect.state_changed);
+
+ // Render final state
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_snapshot!(format!("{}", snapshot));
+}
+
+#[test]
+fn test_alt_click_works_on_floating_panes() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Toggle floating panes mode and create a floating pane
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Floating pane".as_bytes()))
+ .unwrap();
+
+ // Alt+click on floating pane to toggle group
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_left_press_with_alt_event(Position::new(10, 60)),
+ client_id,
+ )
+ .unwrap();
+
+ // Verify group_toggle effect returned
+ assert!(effect.group_toggle.is_some());
+ assert_eq!(effect.group_toggle, Some(PaneId::Terminal(2)));
+}
+
+#[test]
+fn test_left_click_on_tiled_frame_edge_starts_resize() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ // Create a vertical split
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right".as_bytes()))
+ .unwrap();
+
+ // Click on the edge between panes (without Ctrl)
+ let edge_position = Position::new(5, 60);
+ let effect = tab
+ .handle_mouse_event(&MouseEvent::new_left_press_event(edge_position), client_id)
+ .unwrap();
+
+ // Edge detection should start resize even without Ctrl for tiled panes
+ assert!(effect.state_changed);
+}
+
+#[test]
+fn test_left_click_on_floating_frame_not_on_pin_moves_pane() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let floating_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ floating_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(2, Vec::from("Movable pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let frame_position = Position::new(5, 30);
+ let press_effect = tab
+ .handle_mouse_event(&MouseEvent::new_left_press_event(frame_position), client_id)
+ .unwrap();
+
+ let motion_position = Position::new(6, 31);
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_motion_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ tab.handle_mouse_event(
+ &MouseEvent::new_left_release_event(motion_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(press_effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_up_on_active_tiled_pane_increases_pane_size() {
+ let size = Size {
+ cols: 120,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let active_pane_position = Position::new(5, 70);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_up_event(active_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_down_on_active_tiled_pane_decreases_pane_size() {
+ let size = Size {
+ cols: 120,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let active_pane_position = Position::new(5, 70);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_down_event(active_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_up_on_inactive_tiled_pane_increases_active_tiled_pane_size() {
+ let size = Size {
+ cols: 120,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let inactive_pane_position = Position::new(5, 10);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_up_event(inactive_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_down_on_inactive_tiled_pane_decreases_active_tiled_pane_size() {
+ let size = Size {
+ cols: 120,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.vertical_split(new_pane_id, None, client_id, None, None)
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Left pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Right pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let inactive_pane_position = Position::new(5, 10);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_down_event(inactive_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_up_increases_floating_pane_size() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ new_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Tiled pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Floating pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let floating_pane_position = Position::new(5, 50);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_up_event(floating_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_down_decreases_floating_pane_size() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ tab.toggle_floating_panes(Some(client_id), None, None)
+ .unwrap();
+ tab.new_pane(
+ new_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::default(),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Tiled pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Floating pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let floating_pane_position = Position::new(5, 50);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_down_event(floating_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_up_increases_pinned_floating_pane_size_when_floating_panes_hidden() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ let coordinates = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(30)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: Some(true),
+ borderless: Some(false),
+ };
+
+ tab.new_pane(
+ new_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Tiled pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Floating pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let floating_pane_position = Position::new(10, 10);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_up_event(floating_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
+
+#[test]
+fn test_ctrl_scroll_down_decreases_pinned_floating_pane_size_when_floating_panes_hidden() {
+ let size = Size {
+ cols: 121,
+ rows: 20,
+ };
+ let client_id = 1;
+ let mut tab = create_new_tab(size, ModeInfo::default());
+ let new_pane_id = PaneId::Terminal(2);
+ let mut output = Output::default();
+
+ let coordinates = FloatingPaneCoordinates {
+ x: Some(PercentOrFixed::Fixed(5)),
+ y: Some(PercentOrFixed::Fixed(5)),
+ width: Some(PercentOrFixed::Fixed(30)),
+ height: Some(PercentOrFixed::Fixed(10)),
+ pinned: Some(true),
+ borderless: Some(false),
+ };
+
+ tab.new_pane(
+ new_pane_id,
+ None,
+ None,
+ false,
+ true,
+ NewPanePlacement::Floating(Some(coordinates)),
+ Some(client_id),
+ None,
+ )
+ .unwrap();
+
+ tab.handle_pty_bytes(1, Vec::from("Tiled pane".as_bytes()))
+ .unwrap();
+ tab.handle_pty_bytes(2, Vec::from("Floating pane".as_bytes()))
+ .unwrap();
+
+ tab.render(&mut output, None).unwrap();
+ let snapshot_before = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ let floating_pane_position = Position::new(6, 10);
+ let effect = tab
+ .handle_mouse_event(
+ &MouseEvent::new_ctrl_scroll_down_event(floating_pane_position),
+ client_id,
+ )
+ .unwrap();
+
+ assert!(effect.state_changed);
+
+ let mut output = Output::default();
+ tab.render(&mut output, None).unwrap();
+ let snapshot_after = take_snapshot(
+ output.serialize().unwrap().get(&client_id).unwrap(),
+ size.rows,
+ size.cols,
+ Palette::default(),
+ );
+
+ assert_ne!(snapshot_before, snapshot_after);
+ eprintln!("{}", snapshot_before);
+ eprintln!("{}", snapshot_after);
+ assert_snapshot!(format!("{}", snapshot_after));
+}
diff --git a/zellij-server/src/tab/unit/tab_tests.rs b/zellij-server/src/tab/unit/tab_tests.rs
index eea12a55..0a8eb976 100644
--- a/zellij-server/src/tab/unit/tab_tests.rs
+++ b/zellij-server/src/tab/unit/tab_tests.rs
@@ -215,6 +215,7 @@ fn create_new_tab(size: Size, stacked_resize: bool) -> Tab {
current_pane_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -298,6 +299,7 @@ fn create_new_tab_with_layout(size: Size, layout: TiledPaneLayout) -> Tab {
current_pane_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
@@ -387,6 +389,7 @@ fn create_new_tab_with_cell_size(
current_pane_group,
currently_marking_pane_group,
advanced_mouse_actions,
+ true, // mouse_hover_effects
web_server_ip,
web_server_port,
);
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index 77afd9f0..57a69559 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -65,6 +65,7 @@ pub struct FrameParams {
pub content_offset: Offset,
pub mouse_is_hovering_over_pane: bool,
pub pane_is_selectable: bool,
+ pub show_help_text: bool,
}
#[derive(Default, PartialEq)]
@@ -88,6 +89,7 @@ pub struct PaneFrame {
content_offset: Offset,
mouse_is_hovering_over_pane: bool,
is_selectable: bool,
+ show_help_text: bool,
}
impl PaneFrame {
@@ -117,6 +119,7 @@ impl PaneFrame {
content_offset: frame_params.content_offset,
mouse_is_hovering_over_pane: frame_params.mouse_is_hovering_over_pane,
is_selectable: frame_params.pane_is_selectable,
+ show_help_text: frame_params.show_help_text,
}
}
pub fn is_pinned(mut self, is_pinned: bool) -> Self {
@@ -705,6 +708,89 @@ impl PaneFrame {
.or_else(|| Some(self.title_line_without_middle()))
.with_context(|| format!("failed to render title '{}'", self.title))
}
+ fn render_help_text_undertitle(&self) -> Result<Vec<TerminalCharacter>> {
+ let max_undertitle_length = self.geom.cols.saturating_sub(2);
+
+ let mut left_boundary =
+ foreground_color(self.get_corner(boundary_type::BOTTOM_LEFT), self.color);
+ let mut right_boundary =
+ foreground_color(self.get_corner(boundary_type::BOTTOM_RIGHT), self.color);
+
+ // Try different versions of the help text from longest to shortest
+ let (mut help_text_characters, help_text_len) = if let Some((chars, len)) =
+ self.help_text_version_full(max_undertitle_length)
+ {
+ (chars, len)
+ } else if let Some((chars, len)) = self.help_text_version_medium(max_undertitle_length) {
+ (chars, len)
+ } else if let Some((chars, len)) = self.help_text_version_short(max_undertitle_length) {
+ (chars, len)
+ } else {
+ return Ok(self.empty_undertitle(max_undertitle_length));
+ };
+
+ let padding_len = max_undertitle_length.saturating_sub(help_text_len);
+ let mut padding = String::new();
+ for _ in 0..padding_len {
+ padding.push_str(boundary_type::HORIZONTAL);
+ }
+
+ let mut ret = vec![];
+ ret.append(&mut left_boundary);
+ ret.append(&mut help_text_characters);
+ ret.append(&mut foreground_color(&padding, self.color));
+ ret.append(&mut right_boundary);
+ Ok(ret)
+ }
+
+ fn help_text_version_full(&self, max_length: usize) -> Option<(Vec<TerminalCharacter>, usize)> {
+ let text = if self.is_floating {
+ " Ctrl <MouseScroll> or Ctrl <drag borders> to resize "
+ } else {
+ " Ctrl <MouseScroll> or <drag borders> to resize "
+ };
+ let len = text.chars().count();
+ if len <= max_length {
+ Some((foreground_color(text, self.color), len))
+ } else {
+ None
+ }
+ }
+
+ fn help_text_version_medium(
+ &self,
+ max_length: usize,
+ ) -> Option<(Vec<TerminalCharacter>, usize)> {
+ let text = if self.is_floating {
+ " <Ctrl MouseScroll/drag borders> resize "
+ } else {
+ " <Ctrl MouseScroll>/<drag borders> resize "
+ };
+ let len = text.chars().count();
+ if len <= max_length {
+ Some((foreground_color(text, self.color), len))
+ } else {
+ None
+ }
+ }
+
+ fn help_text_version_short(
+ &self,
+ max_length: usize,
+ ) -> Option<(Vec<TerminalCharacter>, usize)> {
+ let text = if self.is_floating {
+ " <Ctrl MouseScroll/drag borders> "
+ } else {
+ " <Ctrl MouseScroll>/<drag borders> "
+ };
+ let len = text.chars().count();
+ if len <= max_length {
+ Some((foreground_color(text, self.color), len))
+ } else {
+ None
+ }
+ }
+
fn render_held_undertitle(&self) -> Result<Vec<TerminalCharacter>> {
let max_undertitle_length = self.geom.cols.saturating_sub(2); // 2 for the left and right corners
let (mut first_part, first_part_len) = self.first_exited_held_title_part_full();
@@ -846,7 +932,16 @@ impl PaneFrame {
character_chunks.push(CharacterChunk::new(title, x, y));
} else if row == self.geom.rows - 1 {
// bottom row
- if self.mouse_is_hovering_over_pane && !self.is_main_client {
+ if self.show_help_text && self.is_main_client {
+ let x = self.geom.x;
+ let y = self.geom.y + row;
+ character_chunks.push(CharacterChunk::new(
+ self.render_help_text_undertitle()
+ .with_context(err_context)?,
+ x,
+ y,
+ ));
+ } else if self.mouse_is_hovering_over_pane && !self.is_main_client {
let x = self.geom.x;
let y = self.geom.y + row;
character_chunks.push(CharacterChunk::new(
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index 6e4f8c74..420ba6e4 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -19,6 +19,7 @@ pub struct PaneContentsAndUi<'a> {
should_draw_pane_frames: bool,
mouse_is_hovering_over_pane_for_clients: HashSet<ClientId>,
current_pane_group: HashMap<ClientId, Vec<PaneId>>,
+ show_help_text: bool,
}
impl<'a> PaneContentsAndUi<'a> {
@@ -34,6 +35,7 @@ impl<'a> PaneContentsAndUi<'a> {
should_draw_pane_frames: bool,
mouse_hover_pane_id: &HashMap<ClientId, PaneId>,
current_pane_group: HashMap<ClientId, Vec<PaneId>>,
+ show_help_text: bool,
) -> Self {
let mut focused_clients: Vec<ClientId> = active_panes
.iter()
@@ -63,6 +65,7 @@ impl<'a> PaneContentsAndUi<'a> {
should_draw_pane_frames,
mouse_is_hovering_over_pane_for_clients,
current_pane_group,
+ show_help_text,
}
}
pub fn render_pane_contents_to_multiple_clients(
@@ -248,6 +251,7 @@ impl<'a> PaneContentsAndUi<'a> {
.mouse_is_hovering_over_pane_for_clients
.contains(&client_id),
pane_is_selectable,
+ show_help_text: self.show_help_text,
}
} else {
FrameParams {
@@ -266,6 +270,7 @@ impl<'a> PaneContentsAndUi<'a> {
.mouse_is_hovering_over_pane_for_clients
.contains(&client_id),
pane_is_selectable,
+ show_help_text: self.show_help_text,
}
};
diff --git a/zellij-server/src/unit/screen_tests.rs b/zellij-server/src/unit/screen_tests.rs
index 9bad6c92..a3aa89c9 100644
--- a/zellij-server/src/unit/screen_tests.rs
+++ b/zellij-server/src/unit/screen_tests.rs
@@ -256,7 +256,11 @@ impl ServerOsApi for FakeInputOutput {
}
}
-fn create_new_screen(size: Size, advanced_mouse_actions: bool) -> Screen {
+fn create_new_screen(
+ size: Size,
+ advanced_mouse_actions: bool,
+ mouse_hover_effects: bool,
+) -> Screen {
let mut bus: Bus<ScreenInstruction> = Bus::empty();
let fake_os_input = FakeInputOutput::default();
bus.os_input = Some(Box::new(fake_os_input));
@@ -314,6 +318,7 @@ fn create_new_screen(size: Size, advanced_mouse_actions: bool) -> Screen {
false,
web_sharing,
advanced_mouse_actions,
+ mouse_hover_effects,
web_server_ip,
web_server_port,
);
@@ -783,7 +788,7 @@ fn open_new_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
new_tab(&mut screen, 2, 1);
@@ -802,7 +807,7 @@ pub fn switch_to_prev_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -821,7 +826,7 @@ pub fn switch_to_next_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -841,7 +846,7 @@ pub fn switch_to_tab_name() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -875,7 +880,7 @@ pub fn close_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -895,7 +900,7 @@ pub fn close_the_middle_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -917,7 +922,7 @@ fn move_focus_left_at_left_screen_edge_changes_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -955,6 +960,7 @@ fn create_fixed_size_screen() -> Screen {
rows: 20,
},
true,
+ true,
)
}
@@ -1085,7 +1091,7 @@ fn move_focus_right_at_right_screen_edge_changes_tab() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -1106,7 +1112,7 @@ pub fn toggle_to_previous_tab_simple() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(position_and_size, true);
+ let mut screen = create_new_screen(position_and_size, true, true);
new_tab(&mut screen, 1, 1);
new_tab(&mut screen, 2, 2);
@@ -1134,7 +1140,7 @@ pub fn toggle_to_previous_tab_create_tabs_only() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(position_and_size, true);
+ let mut screen = create_new_screen(position_and_size, true, true);
new_tab(&mut screen, 1, 0);
new_tab(&mut screen, 2, 1);
@@ -1184,7 +1190,7 @@ pub fn toggle_to_previous_tab_delete() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(position_and_size, true);
+ let mut screen = create_new_screen(position_and_size, true, true);
new_tab(&mut screen, 1, 0);
new_tab(&mut screen, 2, 1);
@@ -1280,7 +1286,7 @@ fn switch_to_tab_with_fullscreen() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 1);
{
@@ -1325,7 +1331,7 @@ fn update_screen_pixel_dimensions() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
let initial_pixel_dimensions = screen.pixel_dimensions;
screen.update_pixel_dimensions(PixelDimensions {
character_cell_size: Some(SizeInPixels {
@@ -1404,7 +1410,7 @@ fn attach_after_first_tab_closed() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
{
@@ -1436,7 +1442,7 @@ fn open_new_floating_pane_with_custom_coordinates() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1472,7 +1478,7 @@ fn open_new_floating_pane_with_custom_coordinates_exceeding_viewport() {
cols: 121,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1508,7 +1514,7 @@ fn floating_pane_auto_centers_horizontally_with_only_width() {
cols: 120,
rows: 20,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1544,7 +1550,7 @@ fn floating_pane_auto_centers_vertically_with_only_height() {
cols: 120,
rows: 40,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1580,7 +1586,7 @@ fn floating_pane_auto_centers_both_axes_with_only_size() {
cols: 120,
rows: 40,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1616,7 +1622,7 @@ fn floating_pane_respects_explicit_coordinates_with_size() {
cols: 120,
rows: 40,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1652,7 +1658,7 @@ fn floating_pane_centers_with_percentage_width() {
cols: 120,
rows: 40,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1693,7 +1699,7 @@ fn floating_pane_centers_large_pane_safely() {
cols: 100,
rows: 30,
};
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
let active_tab = screen.get_active_tab_mut(1).unwrap();
@@ -1813,7 +1819,7 @@ fn group_panes_with_mouse() {
rows: 20,
};
let client_id = 1;
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
new_tab(&mut screen, 2, 1);
@@ -1855,7 +1861,7 @@ fn group_panes_with_keyboard() {
rows: 20,
};
let client_id = 1;
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
new_tab(&mut screen, 2, 1);
@@ -1891,7 +1897,7 @@ fn group_panes_following_focus() {
rows: 20,
};
let client_id = 1;
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
@@ -1952,7 +1958,7 @@ fn break_group_with_mouse() {
rows: 20,
};
let client_id = 1;
- let mut screen = create_new_screen(size, true);
+ let mut screen = create_new_screen(size, true, true);
new_tab(&mut screen, 1, 0);
diff --git a/zellij-utils/assets/config/default.kdl b/zellij-utils/assets/config/default.kdl
index ee7b09a4..288390b3 100644
--- a/zellij-utils/assets/config/default.kdl
+++ b/zellij-utils/assets/config/default.kdl
@@ -520,6 +520,11 @@ load_plugins {
//
// advanced_mouse_actions false
+// Whether to enable mouse hover visual effects (frame highlight and help text)
+// Default: true
+//
+// mouse_hover_effects false
+
// Whether to output OSC8 hyperlink sequences
// Default: true
//
diff --git a/zellij-utils/assets/prost_ipc/client_server_contract.rs b/zellij-utils/assets/prost_ipc/client_server_contract.rs
index abca86cc..92f50fe0 100644
--- a/zellij-utils/assets/prost_ipc/client_server_contract.rs
+++ b/zellij-utils/assets/prost_ipc/client_server_contract.rs
@@ -1669,6 +1669,8 @@ pub struct Options {
pub post_command_discovery_hook: ::core::option::Option<::prost::alloc::string::String>,
#[prost(bool, optional, tag="40")]
pub osc8_hyperlinks: ::core::option::Option<bool>,
+ #[prost(bool, optional, tag="41")]
+ pub mouse_hover_effects: ::core::option::Option<bool>,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
#[repr(i32)]
diff --git a/zellij-utils/src/client_server_contract/common_types.proto b/zellij-utils/src/client_server_contract/common_types.proto
index 848d4d42..1e7d5be8 100644
--- a/zellij-utils/src/client_server_contract/common_types.proto
+++ b/zellij-utils/src/client_server_contract/common_types.proto
@@ -1026,6 +1026,7 @@ message Options {
optional bool enforce_https_for_localhost = 38;
optional string post_command_discovery_hook = 39;
optional bool osc8_hyperlinks = 40;
+ optional bool mouse_hover_effects = 41;
}
enum OnForceClose {
diff --git a/zellij-utils/src/errors.rs b/zellij-utils/src/errors.rs
index 25265f89..37402b19 100644
--- a/zellij-utils/src/errors.rs
+++ b/zellij-utils/src/errors.rs
@@ -398,7 +398,8 @@ pub enum ScreenContext {
AddWatcherClient,
RemoveWatcherClient,
SetFollowedClient,
- WatcherTerminalResize, // NEW
+ WatcherTerminalResize,
+ ClearMouseHelpText,
}
/// Stack call representations corresponding to the different types of [`PtyInstruction`]s.
@@ -538,6 +539,7 @@ pub enum ServerContext {
WebServerStarted,
FailedToStartWebServer,
SendWebClientsForbidden,
+ ClearMouseHelpText,
}
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
@@ -564,6 +566,7 @@ pub enum BackgroundJobContext {
RenderToClients,
HighlightPanesWithMessage,
QueryZellijWebServerStatus,
+ ClearHelpText,
Exit,
}
diff --git a/zellij-utils/src/input/mouse.rs b/zellij-utils/src/input/mouse.rs
index 0977d5e7..a8fcb5a7 100644
--- a/zellij-utils/src/input/mouse.rs
+++ b/zellij-utils/src/input/mouse.rs
@@ -238,6 +238,126 @@ impl MouseEvent {
};
event
}
+ pub fn new_left_press_with_ctrl_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Press,
+ left: true,
+ right: false,
+ middle: false,
+ wheel_up: false,
+ wheel_down: false,
+ shift: false,
+ alt: false,
+ ctrl: true,
+ position,
+ };
+ event
+ }
+ pub fn new_left_motion_with_ctrl_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Motion,
+ left: true,
+ right: false,
+ middle: false,
+ wheel_up: false,
+ wheel_down: false,
+ shift: false,
+ alt: false,
+ ctrl: true,
+ position,
+ };
+ event
+ }
+ pub fn new_left_release_with_ctrl_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Release,
+ left: true,
+ right: false,
+ middle: false,
+ wheel_up: false,
+ wheel_down: false,
+ shift: false,
+ alt: false,
+ ctrl: true,
+ position,
+ };
+ event
+ }
+ pub fn new_left_motion_with_alt_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Motion,
+ left: true,
+ right: false,
+ middle: false,
+ wheel_up: false,
+ wheel_down: false,
+ shift: false,
+ alt: true,
+ ctrl: false,
+ position,
+ };
+ event
+ }
+ pub fn new_scroll_up_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Press,
+ left: false,
+ right: false,
+ middle: false,
+ wheel_up: true,
+ wheel_down: false,
+ shift: false,
+ alt: false,
+ ctrl: false,
+ position,
+ };
+ event
+ }
+ pub fn new_scroll_down_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Press,
+ left: false,
+ right: false,
+ middle: false,
+ wheel_up: false,
+ wheel_down: true,
+ shift: false,
+ alt: false,
+ ctrl: false,
+ position,
+ };
+ event
+ }
+ pub fn new_ctrl_scroll_up_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Press,
+ left: false,
+ right: false,
+ middle: false,
+ wheel_up: true,
+ wheel_down: false,
+ shift: false,
+ alt: false,
+ ctrl: true,
+ position,
+ };
+ event
+ }
+ pub fn new_ctrl_scroll_down_event(position: Position) -> Self {
+ let event = MouseEvent {
+ event_type: MouseEventType::Press,
+ left: false,
+ right: false,
+ middle: false,
+ wheel_up: false,
+ wheel_down: true,
+ shift: false,
+ alt: false,
+ ctrl: true,
+ position,
+ };
+ event
+ }
}
impl Default for MouseEvent {
diff --git a/zellij-utils/src/input/options.rs b/zellij-utils/src/input/options.rs
index 6def4a88..dad535a6 100644
--- a/zellij-utils/src/input/options.rs
+++ b/zellij-utils/src/input/options.rs
@@ -225,6 +225,12 @@ pub struct Options {
#[serde(default)]
pub advanced_mouse_actions: Option<bool>,
+ /// Whether to enable mouse hover visual effects (frame highlight and help text)
+ /// default is true
+ #[clap(long, value_parser)]
+ #[serde(default)]
+ pub mouse_hover_effects: Option<bool>,
+
// these are intentionally excluded from the CLI options as they must be specified in the
// configuration file
pub web_server_ip: Option<IpAddr>,
@@ -321,6 +327,7 @@ impl Options {
let show_startup_tips = other.show_startup_tips.or(self.show_startup_tips);
let show_release_notes = other.show_release_notes.or(self.show_release_notes);
let advanced_mouse_actions = other.advanced_mouse_actions.or(self.advanced_mouse_actions);
+ let mouse_hover_effects = other.mouse_hover_effects.or(self.mouse_hover_effects);
let web_server_ip = other.web_server_ip.or(self.web_server_ip);
let web_server_port = other.web_server_port.or(self.web_server_port);
let web_server_cert = other
@@ -369,6 +376,7 @@ impl Options {
show_startup_tips,
show_release_notes,
advanced_mouse_actions,
+ mouse_hover_effects,
web_server_ip,
web_server_port,
web_server_cert,
@@ -440,6 +448,7 @@ impl Options {
let show_startup_tips = other.show_startup_tips.or(self.show_startup_tips);
let show_release_notes = other.show_release_notes.or(self.show_release_notes);
let advanced_mouse_actions = other.advanced_mouse_actions.or(self.advanced_mouse_actions);
+ let mouse_hover_effects = other.mouse_hover_effects.or(self.mouse_hover_effects);
let web_server_ip = other.web_server_ip.or(self.web_server_ip);
let web_server_port = other.web_server_port.or(self.web_server_port);
let web_server_cert = other
@@ -488,6 +497,7 @@ impl Options {
show_startup_tips,
show_release_notes,
advanced_mouse_actions,
+ mouse_hover_effects,
web_server_ip,
web_server_port,
web_server_cert,
diff --git a/zellij-utils/src/ipc/protobuf_conversion.rs b/zellij-utils/src/ipc/protobuf_conversion.rs
index eacf8508..0b0c72c0 100644
--- a/zellij-utils/src/ipc/protobuf_conversion.rs
+++ b/zellij-utils/src/ipc/protobuf_conversion.rs
@@ -603,6 +603,7 @@ impl From<crate::input::options::Options>
show_startup_tips: options.show_startup_tips,
show_release_notes: options.show_release_notes,
advanced_mouse_actions: options.advanced_mouse_actions,
+ mouse_hover_effects: options.mouse_hover_effects,
web_server_ip: options.web_server_ip.map(|ip| ip.to_string()),
web_server_port: options.web_server_port.map(|p| p as u32),
web_server_cert: options
@@ -693,6 +694,7 @@ impl TryFrom<crate::client_server_contract::client_server_contract::Options>
show_startup_tips: options.show_startup_tips,
show_release_notes: options.show_release_notes,
advanced_mouse_actions: options.advanced_mouse_actions,
+ mouse_hover_effects: options.mouse_hover_effects,
web_server_ip: options
.web_server_ip
.map(|ip| ip.parse())
diff --git a/zellij-utils/src/ipc/tests/roundtrip_tests.rs b/zellij-utils/src/ipc/tests/roundtrip_tests.rs
index 5e2e000a..8b033cb7 100644
--- a/zellij-utils/src/ipc/tests/roundtrip_tests.rs
+++ b/zellij-utils/src/ipc/tests/roundtrip_tests.rs
@@ -471,6 +471,7 @@ fn test_client_messages() {
web_server_key: Some(PathBuf::from("web_server_key")),
enforce_https_for_localhost: Some(true),
post_command_discovery_hook: Some("post_command_discovery_hook".to_owned()),
+ mouse_hover_effects: Some(false),
}),
layout: None,
terminal_window_size: Size { rows: 80, cols: 42 },
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 0780aa2a..fb152dd1 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2675,6 +2675,9 @@ impl Options {
let advanced_mouse_actions =
kdl_property_first_arg_as_bool_or_error!(kdl_options, "advanced_mouse_actions")
.map(|(v, _)| v);
+ let mouse_hover_effects =
+ kdl_property_first_arg_as_bool_or_error!(kdl_options, "mouse_hover_effects")
+ .map(|(v, _)| v);
let web_server_ip =
match kdl_property_first_arg_as_string_or_error!(kdl_options, "web_server_ip") {
Some((string, entry)) => Some(IpAddr::from_str(string).map_err(|_| {
@@ -2736,6 +2739,7 @@ impl Options {
show_startup_tips,
show_release_notes,
advanced_mouse_actions,
+ mouse_hover_effects,
web_server_ip,
web_server_port,
web_server_cert,
@@ -3839,6 +3843,33 @@ impl Options {
None
}
}
+ fn mouse_hover_effects_to_kdl(&self, add_comments: bool) -> Option<KdlNode> {
+ let comment_text = format!(
+ "{}\n{}\n{}",
+ " ",
+ "// Whether to enable mouse hover visual effects (frame highlight and help text)",
+ "// default is true",
+ );
+
+ let create_node = |node_value: bool| -> KdlNode {
+ let mut node = KdlNode::new("mouse_hover_effects");
+ node.push(KdlValue::Bool(node_value));
+ node
+ };
+ if let Some(mouse_hover_effects) = self.mouse_hover_effects {
+ let mut node = create_node(mouse_hover_effects);
+ if add_comments {
+ node.set_leading(format!("{}\n", comment_text));
+ }
+ Some(node)
+ } else if add_comments {
+ let mut node = create_node(false);
+ node.set_leading(format!("{}\n// ", comment_text));
+ Some(node)
+ } else {
+ None
+ }
+ }
fn web_server_ip_to_kdl(&self, add_comments: bool) -> Option<KdlNode> {
let comment_text = format!(
"{}\n{}\n{}\n{}",
@@ -4044,6 +4075,9 @@ impl Options {
if let Some(advanced_mouse_actions) = self.advanced_mouse_actions_to_kdl(add_comments) {
nodes.push(advanced_mouse_actions);
}
+ if let Some(mouse_hover_effects) = self.mouse_hover_effects_to_kdl(add_comments) {
+ nodes.push(mouse_hover_effects);
+ }
if let Some(web_server_ip) = self.web_server_ip_to_kdl(add_comments) {
nodes.push(web_server_ip);
}
diff --git a/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__bare_config_from_default_assets_to_string_with_comments.snap b/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__bare_config_from_default_assets_to_string_with_comments.snap
index 6767921f..2faf486d 100644
--- a/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__bare_config_from_default_assets_to_string_with_comments.snap
+++ b/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__bare_config_from_default_assets_to_string_with_comments.snap
@@ -539,6 +539,10 @@ web_client {
// default is true
// advanced_mouse_actions false
+// Whether to enable mouse hover visual effects (frame highlight and help text)
+// default is true
+// mouse_hover_effects false
+
// The ip address the web server should listen on when it starts
// Default: "127.0.0.1"
// (Requires restart)
diff --git a/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__config_options_to_string_with_comments.snap b/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__config_options_to_string_with_comments.snap
index 2a6a6a9f..7d45fb9d 100644
--- a/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__config_options_to_string_with_comments.snap
+++ b/zellij-utils/src/kdl/snapshots/zellij_utils__kdl__config_options_to_string_with_comments.snap
@@ -252,6 +252,10 @@ web_sharing "disabled"
// default is true
// advanced_mouse_actions false
+// Whether to enable mouse hover visual effects (frame highlight and help text)
+// default is true
+// mouse_hover_effects false
+
// The ip address the web server should listen on when it starts
// Default: "127.0.0.1"
// (Requires restart)
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap
index 90e16136..6722abf1 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_config_options.snap
@@ -39,6 +39,7 @@ Options {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap
index 1a977a04..316fb2b4 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__cli_arguments_override_layout_options.snap
@@ -39,6 +39,7 @@ Options {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap
index 15447ff4..2c0e233d 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments-3.snap
@@ -37,6 +37,7 @@ Options {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap
index 437a0c56..2b0157f4 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__default_config_with_no_cli_arguments.snap
@@ -6030,6 +6030,7 @@ Config {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_env_vars_override_config_env_vars.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_env_vars_override_config_env_vars.snap
index be893c70..938c3e41 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_env_vars_override_config_env_vars.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_env_vars_override_config_env_vars.snap
@@ -6030,6 +6030,7 @@ Config {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_keybinds_override_config_keybinds.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_keybinds_override_config_keybinds.snap
index 94b90bde..35a612b6 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_keybinds_override_config_keybinds.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_keybinds_override_config_keybinds.snap
@@ -124,6 +124,7 @@ Config {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_options_override_config_options.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_options_override_config_options.snap
index ca0ddf5c..f3801fc1 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_options_override_config_options.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_options_override_config_options.snap
@@ -39,6 +39,7 @@ Options {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
index 7fc5882a..0a2989f5 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
@@ -6030,6 +6030,7 @@ Config {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_ui_config_overrides_config_ui_config.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_ui_config_overrides_config_ui_config.snap
index 48a25d83..a45cd50c 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_ui_config_overrides_config_ui_config.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_ui_config_overrides_config_ui_config.snap
@@ -6030,6 +6030,7 @@ Config {
show_startup_tips: None,
show_release_notes: None,
advanced_mouse_actions: None,
+ mouse_hover_effects: None,
web_server_ip: None,
web_server_port: None,
web_server_cert: None,