update mouse shape parsing function

wez · Oct 19, 2024 · 683d134 · 683d134
1 parent b67cf84
commit 683d134
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/wezterm-gui/src/termwindow/mod.rs b/wezterm-gui/src/termwindow/mod.rs
@@ -3541,13 +3541,13 @@ impl TermWindow {
         }
     }
 
-    fn parse_mouse_cursor_shape_string(
-        &self,
-        mouse_cursor_shape_string: Option<String>,
-    ) -> Option<MouseCursor> {
-        match mouse_cursor_shape_string.as_deref()? {
-            "pointer" => Some(MouseCursor::Hand),
-            _ => None,
+    fn parse_mouse_cursor_shape(&self, mouse_cursor_shape: &str) -> MouseCursor {
+        match mouse_cursor_shape {
+            "pointer" => MouseCursor::Hand,
+            "text" => MouseCursor::Text,
+            "row-resize" | "ns-resize" => MouseCursor::SizeUpDown,
+            "col-resize" | "ew-resize" => MouseCursor::SizeLeftRight,
+            _ => MouseCursor::Arrow,
         }
     }
 }

diff --git a/wezterm-gui/src/termwindow/mouseevent.rs b/wezterm-gui/src/termwindow/mouseevent.rs
@@ -839,14 +839,12 @@ impl super::TermWindow {
             MouseCursor::Hand
         } else if pane.is_mouse_grabbed() || outside_window {
             MouseCursor::Arrow
+        } else if let Some(shape) = pane.get_mouse_cursor_shape() {
+            self.parse_mouse_cursor_shape(shape.as_str())
         } else {
             MouseCursor::Text
         }));
 
-        if let Some(pane) = self.get_active_pane_or_overlay() {
-            context.set_cursor(self.parse_mouse_cursor_shape_string(pane.get_mouse_cursor_shape()));
-        }
-
         let event_trigger_type = match &event.kind {
             WMEK::Press(press) => {
                 let press = mouse_press_to_tmb(press);