wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 05:12:40 +03:00
Code Issues Projects Releases Wiki Activity

wezterm: fix SpawnWindow not using cwd from current pane

Browse Source 
There were two problems:

* It was using an old code path that didn't even try to resolve the cwd
* The NewWindow code path would "forget" the originating window and then
  fail to resolve the current pane + path from the new, empty window
  that it is building.

closes: https://github.com/wez/wezterm/issues/322
This commit is contained in:
Wez Furlong 2020-11-12 08:21:35 -08:00
parent 72492c1517
commit c3c9ed881c
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.markdown
View File

@ -14,6 +14,7 @@ brief notes about them may accumulate here.
* Fix pixel dimensions after changing the pane size; this was mostly invisible but impacted image scaling when using sixel or iTerm2 image protocols. [#312](https://github.com/wez/wezterm/issues/312)
* Add support for OSC 133 which allows annotating output as `Output`, `Input` (that you typed) and `Prompt` (shell "chrome"). [Learn more about Semantic prompt and OSC 133](https://gitlab.freedesktop.org/Per_Bothner/specifications/blob/master/proposals/semantic-prompts.md)
* Add [`ScrollToPrompt`](config/lua/keyassignment/ScrollToPrompt.md) key assignment that scrolls the viewport to the prior/next shell prompt emitted using OSC 133 Semantic Prompt escapes. This assignment is not bound by default.
* Fixed an issue where `SpawnWindow` didn't use the current working directory from the current pane to spawn the new window
### 20201101-103216-403d002d

39
wezterm-gui/src/gui/termwindow.rs
View File

@ -1617,7 +1617,7 @@ impl TermWindow {
spawn: &SpawnCommand,
spawn_where: SpawnWhere,
size: PtySize,
mux_window_id: MuxWindowId,
src_window_id: MuxWindowId,
clipboard: ClipboardHelper,
) {
let spawn = spawn.clone();
@ -1627,17 +1627,17 @@ impl TermWindow {
let activity = Activity::new();
let mux_builder;
let mux_window_id = if spawn_where == SpawnWhere::NewWindow {
let target_window_id = if spawn_where == SpawnWhere::NewWindow {
mux_builder = mux.new_empty_window();
*mux_builder
} else {
mux_window_id
src_window_id
};
let (domain, cwd) = match spawn.domain {
SpawnTabDomain::DefaultDomain => {
let cwd = mux
.get_active_tab_for_window(mux_window_id)
.get_active_tab_for_window(src_window_id)
.and_then(|tab| tab.get_active_pane())
.and_then(|pane| pane.get_current_working_dir());
(mux.default_domain().clone(), cwd)
@ -1648,12 +1648,12 @@ impl TermWindow {
// It doesn't make sense to use it when spawning a new window,
// so we treat it as DefaultDomain instead.
let cwd = mux
.get_active_tab_for_window(mux_window_id)
.get_active_tab_for_window(src_window_id)
.and_then(|tab| tab.get_active_pane())
.and_then(|pane| pane.get_current_working_dir());
(mux.default_domain().clone(), cwd)
} else {
let tab = match mux.get_active_tab_for_window(mux_window_id) {
let tab = match mux.get_active_tab_for_window(src_window_id) {
Some(tab) => tab,
None => bail!("window has no tabs?"),
};
@ -1721,7 +1721,7 @@ impl TermWindow {
match spawn_where {
SpawnWhere::SplitPane(direction) => {
let mux = Mux::get().unwrap();
if let Some(tab) = mux.get_active_tab_for_window(mux_window_id) {
if let Some(tab) = mux.get_active_tab_for_window(target_window_id) {
let pane = tab
.get_active_pane()
.ok_or_else(|| anyhow!("tab to have a pane"))?;
@ -1735,7 +1735,9 @@ impl TermWindow {
}
}
_ => {
let tab = domain.spawn(size, cmd_builder, cwd, mux_window_id).await?;
let tab = domain
.spawn(size, cmd_builder, cwd, target_window_id)
.await?;
let tab_id = tab.tab_id();
let pane = tab
.get_active_pane()
@ -1745,7 +1747,7 @@ impl TermWindow {
let clipboard: Arc<dyn wezterm_term::Clipboard> = Arc::new(clipboard);
pane.set_clipboard(&clipboard);
let mut window = mux
.get_window_mut(mux_window_id)
.get_window_mut(target_window_id)
.ok_or_else(|| anyhow!("no such window!?"))?;
if let Some(idx) = window.idx_by_id(tab_id) {
window.set_active(idx);
@ -1838,7 +1840,7 @@ impl TermWindow {
self.spawn_tab(spawn_where);
}
SpawnWindow => {
self.spawn_new_window();
self.spawn_command(&SpawnCommand::default(), SpawnWhere::NewWindow);
}
SpawnCommandInNewTab(spawn) => {
self.spawn_command(spawn, SpawnWhere::NewTab);
@ -2058,23 +2060,6 @@ impl TermWindow {
Ok(())
}
pub fn spawn_new_window(&mut self) {
async fn new_window() -> anyhow::Result<()> {
let mux = Mux::get().unwrap();
let config = config::configuration();
let window_id = mux.new_empty_window();
let _tab = mux
.default_domain()
.spawn(config.initial_size(), None, None, *window_id)
.await?;
Ok::<(), anyhow::Error>(())
}
promise::spawn::spawn(async move {
new_window().await.ok();
})
.detach();
}
fn apply_scale_change(&mut self, dimensions: &Dimensions, font_scale: f64) {
self.fonts
.change_scaling(font_scale, dimensions.dpi as f64 / 96.);