More consistent local/remote naming.

wez · Feb 13, 2024 · 3941fdc · 3941fdc
1 parent 675256b
commit 3941fdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/mux/src/lib.rs b/mux/src/lib.rs
@@ -1341,7 +1341,7 @@ impl Mux {
             None => anyhow::bail!("Invalid tab id {}", tab_id),
         };
 
-        tab.swap_active_with_index(with_pane_index, keep_focus);
+        tab.local_swap_active_with_index(with_pane_index, keep_focus);
         Ok(())
     }
     pub async fn spawn_tab_or_window(

diff --git a/mux/src/tab.rs b/mux/src/tab.rs
@@ -714,10 +714,10 @@ impl Tab {
     }
 
     /// Swap the active pane with the specified pane_index
-    pub fn swap_active_with_index(&self, pane_index: usize, keep_focus: bool) -> Option<()> {
+    pub fn local_swap_active_with_index(&self, pane_index: usize, keep_focus: bool) -> Option<()> {
         self.inner
             .lock()
-            .swap_active_with_index(pane_index, keep_focus)
+            .local_swap_active_with_index(pane_index, keep_focus)
     }
 
     /// Computes the size of the pane that would result if the specified
@@ -1801,7 +1801,7 @@ impl TabInner {
         cell_dimensions(&self.size)
     }
 
-    fn swap_active_with_index(&mut self, pane_index: usize, keep_focus: bool) -> Option<()> {
+    fn local_swap_active_with_index(&mut self, pane_index: usize, keep_focus: bool) -> Option<()> {
         let active_idx = self.get_active_idx();
         let mut pane = self.get_active_pane()?;
         log::trace!(

diff --git a/wezterm-mux-server-impl/src/sessionhandler.rs b/wezterm-mux-server-impl/src/sessionhandler.rs
@@ -620,7 +620,7 @@ impl SessionHandler {
                             let tab = mux
                                 .get_tab(tab_id)
                                 .ok_or_else(|| anyhow!("no such tab {}", tab_id))?;
-                            tab.swap_active_with_index(with_pane_index, keep_focus);
+                            tab.local_swap_active_with_index(with_pane_index, keep_focus);
                             Ok(Pdu::UnitResponse(UnitResponse {}))
                         },
                         send_response,