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.

fix(settings): support OpenGL rendering and WebGPU fallback

RoversXa8520f66e1ac
diff --git a/thinkterm-i18n/i18n/de-DE.ftl b/thinkterm-i18n/i18n/de-DE.ftl
index cc901fe3..dc189648 100644
--- a/thinkterm-i18n/i18n/de-DE.ftl
+++ b/thinkterm-i18n/i18n/de-DE.ftl
@@ -1,6 +1,7 @@
language-system = Systemeinstellung folgen
language-system-resolved = Systemeinstellung folgen ({ $language })
settings-window-title = ThinkTerm-Einstellungen
+settings-window-open-error = Die Einstellungen konnten nicht geöffnet werden: { $error }
settings-language = Sprache
settings-language-description = Ändert die Sprache der ThinkTerm-Oberfläche sofort.
settings-language-changed = Sprache der Oberfläche auf { $language } geändert.
@@ -65,8 +66,8 @@ settings-theme-dark = Dunkel
settings-theme-follow-terminal = Terminalfarben folgen
settings-theme-changed = Design-Modus ist jetzt { $mode }.
settings-theme-save-error = Design-Modus konnte nicht gespeichert werden: { $error }
-settings-main-renderer = Renderer des Hauptfensters
-settings-main-renderer-description = Gilt nach einem Neustart für das Haupt-Terminalfenster.
+settings-main-renderer = Renderer
+settings-main-renderer-description = Wird für Terminal- und Einstellungsfenster verwendet. Starten Sie ThinkTerm neu, um die Änderung anzuwenden.
settings-restore-window-frame = Fensterrahmen des Hauptfensters wiederherstellen
settings-restore-window-frame-description = Öffnet das Haupt-Terminalfenster wieder in der zuletzt verwendeten Größe und Position.
settings-restart = ThinkTerm neu starten
@@ -580,7 +581,7 @@ settings-status-stop-session-server-lingering = Der Sitzungsserver wurde zum Sto
settings-status-stop-session-server-error = Der Sitzungsserver konnte nicht gestoppt werden: { $error }
settings-status-window-restore-off = Wiederherstellen des Fensterrahmens für neue macOS-Fenster deaktiviert.
settings-status-window-restore-error = Einstellung zum Wiederherstellen des Fensters konnte nicht gespeichert werden: { $error }
-settings-status-renderer = Renderer des Hauptfensters auf { $renderer } gesetzt; starten Sie ThinkTerm neu, um ihn anzuwenden.
+settings-status-renderer = Renderer auf { $renderer } gesetzt; starten Sie ThinkTerm neu, um ihn anzuwenden.
settings-status-renderer-error = Renderer-Einstellung konnte nicht gespeichert werden: { $error }
settings-status-restarting = ThinkTerm wird neu gestartet…
settings-status-restart-error = ThinkTerm konnte nicht neu gestartet werden: { $error }
diff --git a/thinkterm-i18n/i18n/en-US.ftl b/thinkterm-i18n/i18n/en-US.ftl
index e4be5d5b..ea3686ef 100644
--- a/thinkterm-i18n/i18n/en-US.ftl
+++ b/thinkterm-i18n/i18n/en-US.ftl
@@ -1,6 +1,7 @@
language-system = Follow System
language-system-resolved = Follow System ({ $language })
settings-window-title = ThinkTerm Settings
+settings-window-open-error = Unable to open settings: { $error }
settings-language = Language
settings-language-description = Changes the language of ThinkTerm's interface immediately.
settings-language-changed = Interface language changed to { $language }.
@@ -65,8 +66,8 @@ settings-theme-dark = Dark
settings-theme-follow-terminal = Follow terminal colours
settings-theme-changed = Theme mode is now { $mode }.
settings-theme-save-error = Unable to save theme mode: { $error }
-settings-main-renderer = Main Window Renderer
-settings-main-renderer-description = Applies to the main terminal window after restart.
+settings-main-renderer = Renderer
+settings-main-renderer-description = Used by terminal and settings windows. Restart ThinkTerm to apply.
settings-restore-window-frame = Restore Main Window Frame
settings-restore-window-frame-description = Reopen the main terminal window at the size and position it was last left.
settings-restart = Restart ThinkTerm
@@ -580,7 +581,7 @@ settings-status-stop-session-server-lingering = The session server was asked to
settings-status-stop-session-server-error = Could not stop the session server: { $error }
settings-status-window-restore-off = Main window frame restore disabled for new macOS windows.
settings-status-window-restore-error = Unable to save window restore setting: { $error }
-settings-status-renderer = Main window renderer set to { $renderer }; restart ThinkTerm to apply it.
+settings-status-renderer = Renderer set to { $renderer }; restart ThinkTerm to apply it.
settings-status-renderer-error = Unable to save renderer setting: { $error }
settings-status-restarting = Restarting ThinkTerm…
settings-status-restart-error = Unable to restart ThinkTerm: { $error }
diff --git a/thinkterm-i18n/i18n/fr-FR.ftl b/thinkterm-i18n/i18n/fr-FR.ftl
index 0836825b..c74043ec 100644
--- a/thinkterm-i18n/i18n/fr-FR.ftl
+++ b/thinkterm-i18n/i18n/fr-FR.ftl
@@ -1,6 +1,7 @@
language-system = Suivre le système
language-system-resolved = Suivre le système ({ $language })
settings-window-title = Réglages de ThinkTerm
+settings-window-open-error = Impossible d’ouvrir les réglages : { $error }
settings-language = Langue
settings-language-description = Change immédiatement la langue de l’interface de ThinkTerm.
settings-language-changed = La langue de l’interface est maintenant { $language }.
@@ -65,8 +66,8 @@ settings-theme-dark = Sombre
settings-theme-follow-terminal = Suivre les couleurs du terminal
settings-theme-changed = Le thème est maintenant { $mode }.
settings-theme-save-error = Impossible d’enregistrer le thème : { $error }
-settings-main-renderer = Moteur de rendu de la fenêtre principale
-settings-main-renderer-description = S’applique à la fenêtre principale du terminal après redémarrage.
+settings-main-renderer = Moteur de rendu
+settings-main-renderer-description = Utilisé par les fenêtres du terminal et des réglages. Redémarrez ThinkTerm pour appliquer ce choix.
settings-restore-window-frame = Restaurer la taille et la position de la fenêtre principale
settings-restore-window-frame-description = Rouvre la fenêtre principale du terminal à la taille et à la position où elle a été laissée.
settings-restart = Redémarrer ThinkTerm
@@ -580,7 +581,7 @@ settings-status-stop-session-server-lingering = L’arrêt du serveur de session
settings-status-stop-session-server-error = Impossible d’arrêter le serveur de session : { $error }
settings-status-window-restore-off = Restauration de la taille et position désactivée pour les nouvelles fenêtres macOS.
settings-status-window-restore-error = Impossible d’enregistrer la restauration de fenêtre : { $error }
-settings-status-renderer = Moteur de rendu principal défini sur { $renderer } ; redémarrez ThinkTerm pour l’appliquer.
+settings-status-renderer = Moteur de rendu défini sur { $renderer } ; redémarrez ThinkTerm pour l’appliquer.
settings-status-renderer-error = Impossible d’enregistrer le moteur de rendu : { $error }
settings-status-restarting = Redémarrage de ThinkTerm…
settings-status-restart-error = Impossible de redémarrer ThinkTerm : { $error }
diff --git a/thinkterm-i18n/i18n/ja-JP.ftl b/thinkterm-i18n/i18n/ja-JP.ftl
index e582cd26..006bfeb9 100644
--- a/thinkterm-i18n/i18n/ja-JP.ftl
+++ b/thinkterm-i18n/i18n/ja-JP.ftl
@@ -1,6 +1,7 @@
language-system = システム設定に従う
language-system-resolved = システム設定に従う({ $language })
settings-window-title = ThinkTerm 設定
+settings-window-open-error = 設定を開けませんでした:{ $error }
settings-language = 言語
settings-language-description = ThinkTerm のインターフェース言語をすぐに変更します。
settings-language-changed = インターフェース言語を{ $language }に変更しました。
@@ -62,8 +63,8 @@ settings-theme-dark = ダーク
settings-theme-follow-terminal = ターミナルの配色に合わせる
settings-theme-changed = テーマモードを{ $mode}に変更しました。
settings-theme-save-error = テーマモードを保存できません:{ $error }
-settings-main-renderer = メインウィンドウのレンダラー
-settings-main-renderer-description = 再起動後にメインターミナルウィンドウへ適用します。
+settings-main-renderer = レンダラー
+settings-main-renderer-description = ターミナルと設定ウィンドウで使用します。ThinkTerm の再起動後に適用されます。
settings-restore-window-frame = メインウィンドウの位置とサイズを復元
settings-restore-window-frame-description = メインターミナルウィンドウを前回終了時のサイズと位置で開きます。
settings-restart = ThinkTerm を再起動
@@ -571,7 +572,7 @@ settings-status-stop-session-server-lingering = セッションサーバーに
settings-status-stop-session-server-error = セッションサーバーを停止できませんでした: { $error }
settings-status-window-restore-off = 新しい macOS ウィンドウで位置とサイズの復元を無効にしました。
settings-status-window-restore-error = ウィンドウ復元設定を保存できません:{ $error }
-settings-status-renderer = メインウィンドウのレンダラーを { $renderer } に設定しました。ThinkTerm の再起動後に適用されます。
+settings-status-renderer = レンダラーを { $renderer } に設定しました。ThinkTerm の再起動後に適用されます。
settings-status-renderer-error = レンダラー設定を保存できません:{ $error }
settings-status-restarting = ThinkTerm を再起動しています…
settings-status-restart-error = ThinkTerm を再起動できません:{ $error }
diff --git a/thinkterm-i18n/i18n/zh-CN.ftl b/thinkterm-i18n/i18n/zh-CN.ftl
index 30a311bf..2e6b04ff 100644
--- a/thinkterm-i18n/i18n/zh-CN.ftl
+++ b/thinkterm-i18n/i18n/zh-CN.ftl
@@ -1,6 +1,7 @@
language-system = 跟随系统
language-system-resolved = 跟随系统({ $language })
settings-window-title = ThinkTerm 设置
+settings-window-open-error = 无法打开设置:{ $error }
settings-language = 语言
settings-language-description = 立即更改 ThinkTerm 界面的显示语言。
settings-language-changed = 界面语言已切换为{ $language }。
@@ -62,8 +63,8 @@ settings-theme-dark = 深色
settings-theme-follow-terminal = 跟随终端配色
settings-theme-changed = 主题模式已切换为{ $mode }。
settings-theme-save-error = 无法保存主题模式:{ $error }
-settings-main-renderer = 主窗口渲染器
-settings-main-renderer-description = 重启后应用于主终端窗口。
+settings-main-renderer = 渲染器
+settings-main-renderer-description = 用于终端和设置窗口,重启 ThinkTerm 后生效。
settings-restore-window-frame = 恢复主窗口位置与大小
settings-restore-window-frame-description = 按上次关闭时的大小和位置重新打开主终端窗口。
settings-restart = 重启 ThinkTerm
@@ -571,7 +572,7 @@ settings-status-stop-session-server-lingering = 已要求会话服务器停止,
settings-status-stop-session-server-error = 无法停止会话服务器:{ $error }
settings-status-window-restore-off = 已为新的 macOS 窗口关闭主窗口位置与大小恢复。
settings-status-window-restore-error = 无法保存窗口恢复设置:{ $error }
-settings-status-renderer = 主窗口渲染器已设为 { $renderer };重启 ThinkTerm 后生效。
+settings-status-renderer = 渲染器已设为 { $renderer };重启 ThinkTerm 后生效。
settings-status-renderer-error = 无法保存渲染器设置:{ $error }
settings-status-restarting = 正在重启 ThinkTerm…
settings-status-restart-error = 无法重启 ThinkTerm:{ $error }
diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rs
index 52df6e5f..35008ee5 100644
--- a/wezterm-gui/src/settings_window.rs
+++ b/wezterm-gui/src/settings_window.rs
@@ -6,7 +6,7 @@ use crate::termwindow::render::corners::{
BOTTOM_LEFT_ROUNDED_CORNER, BOTTOM_RIGHT_ROUNDED_CORNER, TOP_LEFT_ROUNDED_CORNER,
TOP_RIGHT_ROUNDED_CORNER,
};
-use crate::termwindow::render::draw::draw_webgpu_layers;
+use crate::termwindow::render::draw::{draw_opengl_layers, draw_webgpu_layers};
use crate::termwindow::webgpu::WebGpuState;
use crate::ui::{
rect, scale_ui_f32, scale_ui_usize, BrandIcon, ButtonSpec, ButtonVariant, ControlState,
@@ -2223,6 +2223,13 @@ pub fn show() {
}
});
log::error!("failed to open settings window: {err:#}");
+ wezterm_toast_notification::persistent_toast_notification(
+ &crate::i18n::tr("settings-window-title"),
+ &settings_tr(
+ "settings-window-open-error",
+ &[("error", format!("{err:#}"))],
+ ),
+ );
}
})
.detach();
@@ -2230,6 +2237,99 @@ pub fn show() {
}
}
+async fn create_settings_renderer<T>(
+ requested: NativeRendererBackend,
+ webgpu: impl std::future::Future<Output = anyhow::Result<T>>,
+ opengl: impl std::future::Future<Output = anyhow::Result<T>>,
+) -> anyhow::Result<T> {
+ if requested == NativeRendererBackend::OpenGL {
+ return opengl.await.context("OpenGL initialization failed");
+ }
+ match webgpu.await {
+ Ok(renderer) => Ok(renderer),
+ Err(webgpu_error) => {
+ log::warn!("settings WebGPU initialization failed: {webgpu_error:#}; trying OpenGL");
+ opengl.await.map_err(|opengl_error| {
+ anyhow::anyhow!(
+ "WebGPU initialization failed: {webgpu_error:#}; \
+ OpenGL initialization failed: {opengl_error:#}"
+ )
+ })
+ }
+ }
+}
+
+#[cfg(test)]
+mod renderer_tests {
+ use super::*;
+
+ #[test]
+ fn opengl_selection_never_initializes_webgpu() {
+ let result = smol::block_on(create_settings_renderer(
+ NativeRendererBackend::OpenGL,
+ async { panic!("WebGPU must not be polled") },
+ async { Ok("OpenGL") },
+ ));
+ assert_eq!(result.unwrap(), "OpenGL");
+ }
+
+ #[test]
+ fn webgpu_success_does_not_initialize_opengl() {
+ let result = smol::block_on(create_settings_renderer(
+ NativeRendererBackend::WebGpu,
+ async { Ok("WebGPU") },
+ async { panic!("OpenGL must not be polled") },
+ ));
+ assert_eq!(result.unwrap(), "WebGPU");
+ }
+
+ #[test]
+ fn webgpu_failure_falls_back_to_opengl() {
+ let attempts = RefCell::new(Vec::new());
+ let result = smol::block_on(create_settings_renderer(
+ NativeRendererBackend::WebGpu,
+ async {
+ attempts.borrow_mut().push("WebGPU");
+ anyhow::bail!("adapter unavailable")
+ },
+ async {
+ attempts.borrow_mut().push("OpenGL");
+ Ok("OpenGL")
+ },
+ ));
+ assert_eq!(result.unwrap(), "OpenGL");
+ assert_eq!(*attempts.borrow(), vec!["WebGPU", "OpenGL"]);
+ }
+
+ #[test]
+ fn both_renderer_failures_keep_both_causes() {
+ let error = smol::block_on(create_settings_renderer::<()>(
+ NativeRendererBackend::WebGpu,
+ async { Err(anyhow::anyhow!("adapter unavailable").context("device creation")) },
+ async { Err(anyhow::anyhow!("shader compilation failed")) },
+ ))
+ .unwrap_err();
+ let message = format!("{error:#}");
+ assert!(message
+ .contains("WebGPU initialization failed: device creation: adapter unavailable"));
+ assert!(message.contains("OpenGL initialization failed: shader compilation failed"));
+ }
+
+ #[test]
+ fn explicit_opengl_failure_reports_the_backend() {
+ let error = smol::block_on(create_settings_renderer::<()>(
+ NativeRendererBackend::OpenGL,
+ async { panic!("WebGPU must not be polled") },
+ async { anyhow::bail!("context creation failed") },
+ ))
+ .unwrap_err();
+ assert_eq!(
+ format!("{error:#}"),
+ "OpenGL initialization failed: context creation failed"
+ );
+ }
+}
+
/// One string, shaped and glyph-resolved once for one font.
///
/// `width` is the same sum the painter walks, so a measurement and the paint
@@ -2471,33 +2571,48 @@ impl SettingsWindow {
.await?;
window.set_title(&title);
- let webgpu = match WebGpuState::new(&window, dimensions, &config).await {
- Ok(webgpu) => Rc::new(webgpu),
+ let render_state = create_settings_renderer(
+ active_main_renderer,
+ async {
+ let webgpu = Rc::new(WebGpuState::new(&window, dimensions, &config).await?);
+ let settings = settings.borrow();
+ // Window creation can already have delivered a resize or DPI
+ // change. Keep the latest dimensions and font metrics.
+ webgpu.resize(settings.dimensions);
+ RenderState::new(
+ RenderContext::WebGpu(webgpu),
+ &settings.fonts,
+ &settings.metrics,
+ 256,
+ )
+ },
+ async {
+ let gl = window.enable_opengl().await?;
+ let settings = settings.borrow();
+ RenderState::new(
+ RenderContext::Glium(gl),
+ &settings.fonts,
+ &settings.metrics,
+ 256,
+ )
+ },
+ )
+ .await;
+ let render_state = match render_state {
+ Ok(render_state) => render_state,
Err(err) => {
window.close();
return Err(err);
}
};
- // `dimensions` is still the pre-window guess: we had to pick a dpi
- // before there was a window to ask. A Resized event can already have
- // landed while the window and its gpu surface were being created, and
- // that handler is what rebuilt the ui tokens and re-rasterized the
- // fonts. Writing the guess back wholesale would strand the geometry on
- // the old dpi while the tokens and fonts sit on the new one, which
- // paints half-size controls around full-size text.
- let mut dimensions = dimensions;
- dimensions.dpi = settings.borrow().dimensions.dpi;
- webgpu.resize(dimensions);
- let dimensions = *webgpu.dimensions.borrow();
{
let mut settings = settings.borrow_mut();
- settings.dimensions = dimensions;
- if let Err(err) = settings.created(RenderContext::WebGpu(Rc::clone(&webgpu))) {
- window.close();
- return Err(err);
+ if let RenderContext::WebGpu(webgpu) = &render_state.context {
+ settings.dimensions = *webgpu.dimensions.borrow();
+ settings.webgpu = Some(Rc::clone(webgpu));
}
- settings.webgpu.replace(webgpu);
- settings.window.replace(window.clone());
+ settings.render_state = Some(render_state);
+ settings.window = Some(window.clone());
}
let installed = SETTINGS_WINDOW.with(|slot| {
@@ -2526,12 +2641,6 @@ impl SettingsWindow {
Ok(())
}
- fn created(&mut self, context: RenderContext) -> anyhow::Result<()> {
- self.render_state
- .replace(RenderState::new(context, &self.fonts, &self.metrics, 256)?);
- Ok(())
- }
-
fn cleanup(&mut self) {
if self.cleaned_up {
return;
@@ -2851,10 +2960,10 @@ impl SettingsWindow {
fn settings_resource_lines(&self) -> Vec<String> {
let mut lines = vec![format!(
"Settings window: backend={} size={}x{} dpi={}",
- if self.webgpu.is_some() {
- "WebGpu"
- } else {
- "none"
+ match self.render_state.as_ref().map(|state| &state.context) {
+ Some(RenderContext::WebGpu(_)) => "WebGpu",
+ Some(RenderContext::Glium(_)) => "OpenGL",
+ None => "none",
},
self.dimensions.pixel_width,
self.dimensions.pixel_height,
@@ -5267,13 +5376,18 @@ impl SettingsWindow {
}
fn do_paint(&mut self, window: &Window) -> bool {
- if self.webgpu.is_none() || self.render_state.is_none() {
+ if self.render_state.is_none() {
return false;
}
let paint_start = crate::perf::now();
let animating = self.advance_scroll_animations(Instant::now());
- match self.do_paint_webgpu() {
+ let result = if self.webgpu.is_some() {
+ self.do_paint_webgpu()
+ } else {
+ self.do_paint_opengl(window)
+ };
+ match result {
Ok(ok) => {
crate::perf::log_duration("settings_paint", paint_start);
if animating {
@@ -5283,7 +5397,7 @@ impl SettingsWindow {
}
Err(err) => {
crate::perf::log_duration("settings_paint_failed", paint_start);
- log::error!("settings window webgpu paint failed: {err:#}");
+ log::error!("settings window paint failed: {err:#}");
false
}
}
@@ -5315,7 +5429,7 @@ impl SettingsWindow {
}
}
- fn do_paint_webgpu_impl(&mut self, webgpu: &WebGpuState) -> anyhow::Result<bool> {
+ fn prepare_paint(&mut self) -> anyhow::Result<bool> {
for _ in 0..3 {
let paint_pass_start = crate::perf::now();
match self.paint_pass() {
@@ -5386,6 +5500,84 @@ impl SettingsWindow {
}
}
+ Ok(true)
+ }
+
+ fn do_paint_opengl(&mut self, window: &Window) -> anyhow::Result<bool> {
+ if self.dimensions.pixel_width == 0 || self.dimensions.pixel_height == 0 {
+ return Ok(false);
+ }
+ if !self.prepare_paint()? {
+ return Ok(false);
+ }
+ let render_state = self
+ .render_state
+ .as_ref()
+ .context("settings render state missing")?;
+ let RenderContext::Glium(gl) = &render_state.context else {
+ anyhow::bail!("settings OpenGL context missing");
+ };
+ anyhow::ensure!(!gl.is_context_lost(), "settings OpenGL context was lost");
+ let config = configuration();
+ let corner_radius = crate::termwindow::render::draw::effective_window_corner_radius(
+ config.window_decorations,
+ self.window_state,
+ self.dimensions.dpi,
+ );
+ let clear_color = if corner_radius > 0.0 {
+ LinearRgba::with_components(0.0, 0.0, 0.0, 0.0)
+ } else {
+ self.palette().window_bg
+ };
+ let mut frame = window::glium::Frame::new(
+ Rc::clone(gl),
+ (
+ self.dimensions.pixel_width as u32,
+ self.dimensions.pixel_height as u32,
+ ),
+ );
+ let no_blink = std::array::from_fn(|_| crate::colorease::ColorEaseUniform {
+ in_function: [1.0; 4],
+ out_function: [0.0; 4],
+ in_duration_ms: 1,
+ out_duration_ms: 1,
+ });
+ let draw_result = draw_opengl_layers(
+ &mut frame,
+ render_state,
+ self.dimensions,
+ [1.0, 1.0, 1.0],
+ 0,
+ clear_color,
+ corner_radius,
+ crate::termwindow::render::draw::effective_window_border(
+ config.window_decorations,
+ self.window_state,
+ self.dimensions.dpi,
+ self.effective_appearance(),
+ ),
+ matches!(
+ config
+ .freetype_render_target
+ .unwrap_or(config.freetype_load_target),
+ config::FreeTypeLoadTarget::HorizontalLcd | config::FreeTypeLoadTarget::VerticalLcd
+ ),
+ &no_blink,
+ );
+ // glium panics when an unfinished Frame is dropped, even on draw failure.
+ let present_result = window
+ .finish_frame(frame)
+ .context("present settings OpenGL frame");
+ draw_result?;
+ present_result?;
+ Ok(true)
+ }
+
+ fn do_paint_webgpu_impl(&mut self, webgpu: &WebGpuState) -> anyhow::Result<bool> {
+ if !self.prepare_paint()? {
+ return Ok(false);
+ }
+
let corner_radius = crate::termwindow::render::draw::effective_window_corner_radius(
configuration().window_decorations,
self.window_state,
diff --git a/wezterm-gui/src/termwindow/render/draw.rs b/wezterm-gui/src/termwindow/render/draw.rs
index 0d571df4..565361f2 100644
--- a/wezterm-gui/src/termwindow/render/draw.rs
+++ b/wezterm-gui/src/termwindow/render/draw.rs
@@ -540,6 +540,143 @@ pub(crate) fn draw_webgpu_layers(
Ok(())
}
+/// Submit the shared UI layers through OpenGL for terminal and settings windows.
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn draw_opengl_layers(
+ frame: &mut glium::Frame,
+ gl_state: &RenderState,
+ dimensions: Dimensions,
+ foreground_text_hsb: [f32; 3],
+ milliseconds: u32,
+ clear_color: LinearRgba,
+ corner_radius: f32,
+ window_border: WindowBorder,
+ use_subpixel: bool,
+ blink_uniforms: &[ColorEaseUniform; 3],
+) -> anyhow::Result<()> {
+ let tex = gl_state.glyph_cache.borrow().atlas.texture();
+ let tex = tex
+ .downcast_ref::<LoggedSrgbTexture2d>()
+ .expect("OpenGL texture atlas")
+ .inner();
+
+ frame.clear_color(clear_color.0, clear_color.1, clear_color.2, clear_color.3);
+
+ let projection = euclid::Transform3D::<f32, f32, f32>::ortho(
+ -(dimensions.pixel_width as f32) / 2.0,
+ dimensions.pixel_width as f32 / 2.0,
+ dimensions.pixel_height as f32 / 2.0,
+ -(dimensions.pixel_height as f32) / 2.0,
+ -1.0,
+ 1.0,
+ )
+ .to_arrays_transposed();
+
+ let dual_source_blending = glium::DrawParameters {
+ blend: glium::Blend {
+ color: BlendingFunction::Addition {
+ source: LinearBlendingFactor::SourceOneColor,
+ destination: LinearBlendingFactor::OneMinusSourceOneColor,
+ },
+ alpha: BlendingFunction::Addition {
+ source: LinearBlendingFactor::SourceOneColor,
+ destination: LinearBlendingFactor::OneMinusSourceOneColor,
+ },
+ constant_value: (0.0, 0.0, 0.0, 0.0),
+ },
+
+ ..Default::default()
+ };
+
+ let alpha_blending = glium::DrawParameters {
+ blend: glium::Blend {
+ color: BlendingFunction::Addition {
+ source: LinearBlendingFactor::SourceAlpha,
+ destination: LinearBlendingFactor::OneMinusSourceAlpha,
+ },
+ alpha: BlendingFunction::Addition {
+ source: LinearBlendingFactor::One,
+ destination: LinearBlendingFactor::OneMinusSourceAlpha,
+ },
+ constant_value: (0.0, 0.0, 0.0, 0.0),
+ },
+ ..Default::default()
+ };
+
+ // Clamp and use the nearest texel rather than interpolate.
+ // This prevents things like the box cursor outlines from
+ // being randomly doubled in width or height
+ let atlas_nearest_sampler = Sampler::new(&*tex)
+ .wrap_function(SamplerWrapFunction::Clamp)
+ .magnify_filter(MagnifySamplerFilter::Nearest)
+ .minify_filter(MinifySamplerFilter::Nearest);
+
+ let atlas_linear_sampler = Sampler::new(&*tex)
+ .wrap_function(SamplerWrapFunction::Clamp)
+ .magnify_filter(MagnifySamplerFilter::Linear)
+ .minify_filter(MinifySamplerFilter::Linear);
+
+ let foreground_text_hsb = (
+ foreground_text_hsb[0],
+ foreground_text_hsb[1],
+ foreground_text_hsb[2],
+ );
+ let window_clip = (
+ dimensions.pixel_width as f32,
+ dimensions.pixel_height as f32,
+ corner_radius,
+ );
+ let window_border = (
+ window_border.color[0],
+ window_border.color[1],
+ window_border.color[2],
+ window_border.width,
+ );
+
+ let [cursor_blink, blink, rapid_blink] = blink_uniforms;
+
+ for layer in gl_state.layers.borrow().iter() {
+ for idx in 0..3 {
+ let vb = &layer.vb.borrow()[idx];
+ let (vertex_count, index_count) = vb.vertex_index_count();
+ if vertex_count > 0 {
+ let vertices = vb.current_vb_mut();
+ let subpixel_aa = use_subpixel && idx == 1;
+
+ let mut uniforms = UniformBuilder::default();
+
+ uniforms.add("projection", &projection);
+ uniforms.add("atlas_nearest_sampler", &atlas_nearest_sampler);
+ uniforms.add("atlas_linear_sampler", &atlas_linear_sampler);
+ uniforms.add("foreground_text_hsb", &foreground_text_hsb);
+ uniforms.add("subpixel_aa", &subpixel_aa);
+ uniforms.add("milliseconds", &milliseconds);
+ uniforms.add("window_clip", &window_clip);
+ uniforms.add("window_border", &window_border);
+ uniforms.add_struct("cursor_blink", cursor_blink);
+ uniforms.add_struct("blink", blink);
+ uniforms.add_struct("rapid_blink", rapid_blink);
+
+ frame.draw(
+ vertices.glium().slice(0..vertex_count).unwrap(),
+ vb.indices.glium().slice(0..index_count).unwrap(),
+ gl_state.glyph_prog.as_ref().unwrap(),
+ &uniforms,
+ if subpixel_aa {
+ &dual_source_blending
+ } else {
+ &alpha_blending
+ },
+ )?;
+ }
+
+ vb.next_index();
+ }
+ }
+
+ Ok(())
+}
+
impl crate::TermWindow {
pub fn call_draw(&mut self, frame: &mut RenderFrame) -> anyhow::Result<()> {
match frame {
@@ -603,153 +740,38 @@ impl crate::TermWindow {
}
fn call_draw_glium(&mut self, frame: &mut glium::Frame) -> anyhow::Result<()> {
- let gl_state = self.render_state.as_ref().unwrap();
- let tex = gl_state.glyph_cache.borrow().atlas.texture();
- let tex = tex
- .downcast_ref::<LoggedSrgbTexture2d>()
- .expect("OpenGL texture atlas")
- .inner();
-
- frame.clear_color(0., 0., 0., 0.);
-
- let projection = euclid::Transform3D::<f32, f32, f32>::ortho(
- -(self.dimensions.pixel_width as f32) / 2.0,
- self.dimensions.pixel_width as f32 / 2.0,
- self.dimensions.pixel_height as f32 / 2.0,
- -(self.dimensions.pixel_height as f32) / 2.0,
- -1.0,
- 1.0,
- )
- .to_arrays_transposed();
-
- let use_subpixel = match self
- .config
- .freetype_render_target
- .unwrap_or(self.config.freetype_load_target)
- {
- FreeTypeLoadTarget::HorizontalLcd | FreeTypeLoadTarget::VerticalLcd => true,
- _ => false,
- };
-
- let dual_source_blending = glium::DrawParameters {
- blend: glium::Blend {
- color: BlendingFunction::Addition {
- source: LinearBlendingFactor::SourceOneColor,
- destination: LinearBlendingFactor::OneMinusSourceOneColor,
- },
- alpha: BlendingFunction::Addition {
- source: LinearBlendingFactor::SourceOneColor,
- destination: LinearBlendingFactor::OneMinusSourceOneColor,
- },
- constant_value: (0.0, 0.0, 0.0, 0.0),
- },
-
- ..Default::default()
- };
-
- let alpha_blending = glium::DrawParameters {
- blend: glium::Blend {
- color: BlendingFunction::Addition {
- source: LinearBlendingFactor::SourceAlpha,
- destination: LinearBlendingFactor::OneMinusSourceAlpha,
- },
- alpha: BlendingFunction::Addition {
- source: LinearBlendingFactor::One,
- destination: LinearBlendingFactor::OneMinusSourceAlpha,
- },
- constant_value: (0.0, 0.0, 0.0, 0.0),
- },
- ..Default::default()
- };
-
- // Clamp and use the nearest texel rather than interpolate.
- // This prevents things like the box cursor outlines from
- // being randomly doubled in width or height
- let atlas_nearest_sampler = Sampler::new(&*tex)
- .wrap_function(SamplerWrapFunction::Clamp)
- .magnify_filter(MagnifySamplerFilter::Nearest)
- .minify_filter(MinifySamplerFilter::Nearest);
-
- let atlas_linear_sampler = Sampler::new(&*tex)
- .wrap_function(SamplerWrapFunction::Clamp)
- .magnify_filter(MagnifySamplerFilter::Linear)
- .minify_filter(MinifySamplerFilter::Linear);
-
- let foreground_text_hsb = self.config.foreground_text_hsb;
- let foreground_text_hsb = (
- foreground_text_hsb.hue,
- foreground_text_hsb.saturation,
- foreground_text_hsb.brightness,
+ let use_subpixel = matches!(
+ self.config
+ .freetype_render_target
+ .unwrap_or(self.config.freetype_load_target),
+ FreeTypeLoadTarget::HorizontalLcd | FreeTypeLoadTarget::VerticalLcd
);
-
- let milliseconds = self.created.elapsed().as_millis() as u32;
- let corner_radius = effective_window_corner_radius(
- self.config.window_decorations,
- self.window_state,
- self.dimensions.dpi,
- );
- let window_clip = (
- self.dimensions.pixel_width as f32,
- self.dimensions.pixel_height as f32,
- corner_radius,
- );
- let window_border = effective_window_border(
- self.config.window_decorations,
- self.window_state,
- self.dimensions.dpi,
- crate::native_settings::effective_appearance(),
- );
- let window_border = (
- window_border.color[0],
- window_border.color[1],
- window_border.color[2],
- window_border.width,
- );
-
- let cursor_blink: ColorEaseUniform = (*self.cursor_blink_state.borrow()).into();
- let blink: ColorEaseUniform = (*self.blink_state.borrow()).into();
- let rapid_blink: ColorEaseUniform = (*self.rapid_blink_state.borrow()).into();
-
- for layer in gl_state.layers.borrow().iter() {
- for idx in 0..3 {
- let vb = &layer.vb.borrow()[idx];
- let (vertex_count, index_count) = vb.vertex_index_count();
- if vertex_count > 0 {
- let vertices = vb.current_vb_mut();
- let subpixel_aa = use_subpixel && idx == 1;
-
- let mut uniforms = UniformBuilder::default();
-
- uniforms.add("projection", &projection);
- uniforms.add("atlas_nearest_sampler", &atlas_nearest_sampler);
- uniforms.add("atlas_linear_sampler", &atlas_linear_sampler);
- uniforms.add("foreground_text_hsb", &foreground_text_hsb);
- uniforms.add("subpixel_aa", &subpixel_aa);
- uniforms.add("milliseconds", &milliseconds);
- uniforms.add("window_clip", &window_clip);
- uniforms.add("window_border", &window_border);
- uniforms.add_struct("cursor_blink", &cursor_blink);
- uniforms.add_struct("blink", &blink);
- uniforms.add_struct("rapid_blink", &rapid_blink);
-
- frame.draw(
- vertices.glium().slice(0..vertex_count).unwrap(),
- vb.indices.glium().slice(0..index_count).unwrap(),
- gl_state.glyph_prog.as_ref().unwrap(),
- &uniforms,
- if subpixel_aa {
- &dual_source_blending
- } else {
- &alpha_blending
- },
- )?;
- }
-
- vb.next_index();
- }
- }
-
- Ok(())
+ let hsb = self.config.foreground_text_hsb;
+ draw_opengl_layers(
+ frame,
+ self.render_state.as_ref().unwrap(),
+ self.dimensions,
+ [hsb.hue, hsb.saturation, hsb.brightness],
+ self.created.elapsed().as_millis() as u32,
+ LinearRgba::with_components(0.0, 0.0, 0.0, 0.0),
+ effective_window_corner_radius(
+ self.config.window_decorations,
+ self.window_state,
+ self.dimensions.dpi,
+ ),
+ effective_window_border(
+ self.config.window_decorations,
+ self.window_state,
+ self.dimensions.dpi,
+ crate::native_settings::effective_appearance(),
+ ),
+ use_subpixel,
+ &[
+ (*self.cursor_blink_state.borrow()).into(),
+ (*self.blink_state.borrow()).into(),
+ (*self.rapid_blink_state.borrow()).into(),
+ ],
+ )
}
}