Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

Add Windows portable workflow and tweak sidebar toggle

RoversXbbd131e88151
diff --git a/.github/workflows/thinkterm-windows-x64-portable.yml b/.github/workflows/thinkterm-windows-x64-portable.yml
new file mode 100644
index 00000000..2327d5de
--- /dev/null
+++ b/.github/workflows/thinkterm-windows-x64-portable.yml
@@ -0,0 +1,74 @@
+name: thinkterm-windows-x64-portable
+
+on:
+ workflow_dispatch:
+
+jobs:
+ build:
+ runs-on: windows-2022
+
+ env:
+ CARGO_INCREMENTAL: "0"
+ SCCACHE_GHA_ENABLED: "true"
+ RUSTC_WRAPPER: "sccache"
+ RUSTUP_WINDOWS_PATH_ADD_BIN: "1"
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ submodules: recursive
+
+ - name: Install Rust
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ target: x86_64-pc-windows-msvc
+
+ - name: Compile with sccache
+ uses: mozilla-actions/[email protected]
+
+ - name: Build release binaries
+ shell: cmd
+ run: |
+ PATH C:\Strawberry\perl\bin;%PATH%
+ cargo build --release -p wezterm -p wezterm-gui -p wezterm-mux-server -p strip-ansi-escapes
+
+ - name: Package portable zip
+ shell: pwsh
+ run: |
+ $ErrorActionPreference = "Stop"
+ $package = "ThinkTerm-windows-x64-portable"
+ $zip = "$package.zip"
+
+ Remove-Item -Recurse -Force $package, $zip -ErrorAction SilentlyContinue
+ New-Item -ItemType Directory -Path $package | Out-Null
+ New-Item -ItemType Directory -Path "$package\mesa" | Out-Null
+
+ Copy-Item target\release\wezterm.exe $package\
+ Copy-Item target\release\wezterm-gui.exe $package\
+ Copy-Item target\release\wezterm-mux-server.exe $package\
+ Copy-Item target\release\strip-ansi-escapes.exe $package\
+
+ if (Test-Path target\release\wezterm.pdb) {
+ Copy-Item target\release\wezterm.pdb $package\
+ }
+
+ Copy-Item assets\windows\conhost\conpty.dll $package\
+ Copy-Item assets\windows\conhost\OpenConsole.exe $package\
+ Copy-Item assets\windows\angle\libEGL.dll $package\
+ Copy-Item assets\windows\angle\libGLESv2.dll $package\
+
+ if (Test-Path target\release\mesa\opengl32.dll) {
+ Copy-Item target\release\mesa\opengl32.dll "$package\mesa\"
+ } else {
+ Copy-Item assets\windows\mesa\opengl32.dll "$package\mesa\"
+ }
+
+ Compress-Archive -Path $package -DestinationPath $zip -Force
+
+ - name: Upload portable zip
+ uses: actions/upload-artifact@v4
+ with:
+ name: ThinkTerm-windows-x64-portable
+ path: ThinkTerm-windows-x64-portable.zip
+ retention-days: 7
diff --git a/wezterm-gui/src/termwindow/mouseevent.rs b/wezterm-gui/src/termwindow/mouseevent.rs
index f3c714a3..f6658553 100644
--- a/wezterm-gui/src/termwindow/mouseevent.rs
+++ b/wezterm-gui/src/termwindow/mouseevent.rs
@@ -97,6 +97,15 @@ impl super::TermWindow {
.shows_sidebar_toggle_action()
}
+ pub(super) fn window_tab_sidebar_toggle_uses_fullscreen_style(&self) -> bool {
+ self.window_tab_chrome_params()
+ .sidebar_toggle_uses_fullscreen_style()
+ }
+
+ pub(super) fn window_tab_sidebar_toggle_button_size(&self) -> usize {
+ self.window_tab_chrome_params().sidebar_toggle_button_size()
+ }
+
pub(super) fn window_tab_leading_action_start_pixels(&self) -> f32 {
self.window_tab_chrome_params()
.leading_action_start_pixels()
diff --git a/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs b/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
index c95c669d..04f14072 100644
--- a/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
+++ b/wezterm-gui/src/termwindow/render/fancy_tab_bar.rs
@@ -5,10 +5,10 @@ use crate::termwindow::ui::icons::SvgIcon;
use crate::termwindow::ui::tokens::{
CAPSULE_BORDER_WIDTH, ICON_BUTTON_BORDER_WIDTH, SIDEBAR_INSET, TAB_CLOSE_HOVER_INSET,
TAB_CLOSE_HOVER_RADIUS, TAB_CLOSE_RIGHT_GAP, TAB_ROW_START_PADDING, TAB_VERTICAL_PADDING,
- WINDOW_TAB_ADD_BUTTON_RADIUS, WINDOW_TAB_FULLSCREEN_SIDEBAR_BUTTON_SIZE,
- WINDOW_TAB_FULLSCREEN_SIDEBAR_BUTTON_Y_OFFSET, WINDOW_TAB_FULLSCREEN_SIDEBAR_ICON_SIZE,
- WINDOW_TAB_GAP, WINDOW_TAB_LEADING_ACTION_BUTTON_SIZE, WINDOW_TAB_LEADING_ACTION_GAP,
- WINDOW_TAB_LEADING_ACTION_ICON_SIZE, WINDOW_TAB_RADIUS, WINDOW_TAB_TOP_SPACER,
+ WINDOW_TAB_ADD_BUTTON_RADIUS, WINDOW_TAB_FULLSCREEN_SIDEBAR_BUTTON_Y_OFFSET,
+ WINDOW_TAB_FULLSCREEN_SIDEBAR_ICON_SIZE, WINDOW_TAB_GAP, WINDOW_TAB_LEADING_ACTION_BUTTON_SIZE,
+ WINDOW_TAB_LEADING_ACTION_GAP, WINDOW_TAB_LEADING_ACTION_ICON_SIZE, WINDOW_TAB_RADIUS,
+ WINDOW_TAB_TOP_SPACER,
};
use crate::termwindow::{TermWindowNotif, UIItem, UIItemType};
use crate::ui::UiPalette;
@@ -305,17 +305,19 @@ impl crate::TermWindow {
for action_idx in 0..action_slot_count {
let is_sidebar_toggle =
action_idx == 0 && self.window_tab_shows_sidebar_toggle_action();
+ let is_fullscreen_sidebar_toggle =
+ is_sidebar_toggle && self.window_tab_sidebar_toggle_uses_fullscreen_style();
let action_button_size = if is_sidebar_toggle {
- WINDOW_TAB_FULLSCREEN_SIDEBAR_BUTTON_SIZE
+ self.window_tab_sidebar_toggle_button_size()
} else {
WINDOW_TAB_LEADING_ACTION_BUTTON_SIZE
};
- let action_icon_size = if is_sidebar_toggle {
+ let action_icon_size = if is_fullscreen_sidebar_toggle {
WINDOW_TAB_FULLSCREEN_SIDEBAR_ICON_SIZE
} else {
WINDOW_TAB_LEADING_ACTION_ICON_SIZE
};
- let button_size = if is_sidebar_toggle {
+ let button_size = if is_fullscreen_sidebar_toggle {
action_button_size
} else {
action_button_size.min(row_height.saturating_sub(4)).max(1)
@@ -323,7 +325,7 @@ impl crate::TermWindow {
let icon_size = action_icon_size.min(button_size.saturating_sub(2));
if is_sidebar_toggle {
- let button_y = if self.config.tab_bar_at_bottom {
+ let button_y = if self.config.tab_bar_at_bottom || !is_fullscreen_sidebar_toggle {
row_y + (row_height.saturating_sub(button_size) / 2)
} else {
row_y.saturating_sub(WINDOW_TAB_TOP_SPACER)
diff --git a/wezterm-gui/src/termwindow/ui/platform_chrome.rs b/wezterm-gui/src/termwindow/ui/platform_chrome.rs
index 4b96c720..09f070dc 100644
--- a/wezterm-gui/src/termwindow/ui/platform_chrome.rs
+++ b/wezterm-gui/src/termwindow/ui/platform_chrome.rs
@@ -25,7 +25,7 @@ impl WindowTabChromeParams {
return 0;
}
- if self.window_state.contains(WindowState::FULL_SCREEN) {
+ if self.shows_sidebar_toggle_action() {
return 1;
}
@@ -39,7 +39,7 @@ impl WindowTabChromeParams {
pub fn shows_sidebar_toggle_action(self) -> bool {
self.use_fancy_tab_bar
&& self.workspace_sidebar_width == 0
- && self.window_state.contains(WindowState::FULL_SCREEN)
+ && (self.window_state.contains(WindowState::FULL_SCREEN) || !cfg!(target_os = "macos"))
}
pub fn leading_action_start_pixels(self) -> f32 {
@@ -50,7 +50,7 @@ impl WindowTabChromeParams {
} else if cfg!(target_os = "macos") {
MACOS_TRAFFIC_LIGHT_CLEARANCE_WIDTH as f32
} else {
- 0.0
+ WINDOW_TAB_LEADING_ACTION_GAP as f32
}
}
@@ -61,13 +61,25 @@ impl WindowTabChromeParams {
}
let button_size = if self.shows_sidebar_toggle_action() {
- WINDOW_TAB_FULLSCREEN_SIDEBAR_BUTTON_SIZE
+ self.sidebar_toggle_button_size()
} else {
WINDOW_TAB_LEADING_ACTION_BUTTON_SIZE
};
(count * (button_size + WINDOW_TAB_LEADING_ACTION_GAP)) as f32
}
+ pub fn sidebar_toggle_uses_fullscreen_style(self) -> bool {
+ self.window_state.contains(WindowState::FULL_SCREEN)
+ }
+
+ pub fn sidebar_toggle_button_size(self) -> usize {
+ if self.sidebar_toggle_uses_fullscreen_style() {
+ WINDOW_TAB_FULLSCREEN_SIDEBAR_BUTTON_SIZE
+ } else {
+ WINDOW_TAB_LEADING_ACTION_BUTTON_SIZE
+ }
+ }
+
pub fn left_padding_pixels(self) -> f32 {
if self.workspace_sidebar_width > 0 {
return 0.0;