refactor: consolidate shared ui helpers and prune unused code

This commit is contained in:
2026-11-22 18:23:21 +07:00
parent 4a72f2b4a0
commit 9daee9d54d
82 changed files with 3607 additions and 7184 deletions
+89 -89
View File
@@ -31,33 +31,6 @@ enum Backend {
Fallback,
}
fn home_dir() -> Option<PathBuf> {
std::env::var_os("HOME").map(PathBuf::from)
}
/// Whether the session runs on Wayland, where compositors state blur protocols.
fn wayland_session() -> bool {
std::env::var_os("WAYLAND_DISPLAY").is_some()
|| std::env::var("XDG_SESSION_TYPE").is_ok_and(|session| session == "wayland")
}
fn detect(home: &Path, portal_reachable: bool, gsettings_reachable: bool) -> Backend {
let omarchy_marker = home
.join(".local/state/omarchy/current/theme.name")
.exists()
|| home.join(".local/state/omarchy/current/theme").is_dir()
|| home.join(".config/omarchy").is_dir();
if omarchy_marker {
Backend::Omarchy
} else if home.join(".config/kdeglobals").exists() {
Backend::Kde
} else if portal_reachable || gsettings_reachable {
Backend::Portal
} else {
Backend::Fallback
}
}
/// What `gsettings` states for GNOME sessions.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
struct GSettingsSnapshot {
@@ -65,68 +38,6 @@ struct GSettingsSnapshot {
accent: Option<Hsla>,
}
fn gsettings_value(args: &[&str]) -> Option<String> {
let output = std::process::Command::new("gsettings")
.args(args)
.output()
.ok()?;
if !output.status.success() {
return None;
}
String::from_utf8(output.stdout).ok()
}
/// The named accent colors GNOME ships (libadwaita's background variants).
fn accent_rgb(name: &str) -> Option<Hsla> {
let hex = match name {
"blue" => 0x3584e4,
"teal" => 0x2190a4,
"green" => 0x3a944a,
"yellow" => 0xc88800,
"orange" => 0xed5b00,
"red" => 0xe62d42,
"pink" => 0xd56199,
"purple" => 0x9141ac,
"slate" => 0x6f8396,
_ => return None,
};
Some(Hsla::from(gpui::rgb(hex)))
}
fn read_gsettings() -> Option<GSettingsSnapshot> {
let variant = gsettings_value(&["get", "org.gnome.desktop.interface", "color-scheme"])
.and_then(|value| match value.trim().trim_matches('\'') {
"prefer-dark" => Some(ThemeVariant::Dark),
"prefer-light" => Some(ThemeVariant::Light),
_ => None,
});
let accent = gsettings_value(&["get", "org.gnome.desktop.interface", "accent-color"])
.and_then(|value| accent_rgb(value.trim().trim_matches('\'')));
if variant.is_none() && accent.is_none() {
return None;
}
Some(GSettingsSnapshot { variant, accent })
}
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
let portal = portal::io::PortalClient::connect();
let gsettings = read_gsettings();
let backend = home_dir()
.map(|home| detect(&home, portal.is_some(), gsettings.is_some()))
.unwrap_or(Backend::Fallback);
Box::new(LinuxSource {
backend,
portal,
gsettings,
file_watcher: None,
_signal: None,
})
}
impl LinuxSource {
fn gnome_snapshot(
&self,
@@ -280,3 +191,92 @@ impl ThemeSource for LinuxSource {
}
}
}
fn home_dir() -> Option<PathBuf> {
std::env::var_os("HOME").map(PathBuf::from)
}
/// Whether the session runs on Wayland, where compositors state blur protocols.
fn wayland_session() -> bool {
std::env::var_os("WAYLAND_DISPLAY").is_some()
|| std::env::var("XDG_SESSION_TYPE").is_ok_and(|session| session == "wayland")
}
fn detect(home: &Path, portal_reachable: bool, gsettings_reachable: bool) -> Backend {
let omarchy_marker = home
.join(".local/state/omarchy/current/theme.name")
.exists()
|| home.join(".local/state/omarchy/current/theme").is_dir()
|| home.join(".config/omarchy").is_dir();
if omarchy_marker {
Backend::Omarchy
} else if home.join(".config/kdeglobals").exists() {
Backend::Kde
} else if portal_reachable || gsettings_reachable {
Backend::Portal
} else {
Backend::Fallback
}
}
fn gsettings_value(args: &[&str]) -> Option<String> {
let output = std::process::Command::new("gsettings")
.args(args)
.output()
.ok()?;
if !output.status.success() {
return None;
}
String::from_utf8(output.stdout).ok()
}
/// The named accent colors GNOME ships (libadwaita's background variants).
fn accent_rgb(name: &str) -> Option<Hsla> {
let hex = match name {
"blue" => 0x3584e4,
"teal" => 0x2190a4,
"green" => 0x3a944a,
"yellow" => 0xc88800,
"orange" => 0xed5b00,
"red" => 0xe62d42,
"pink" => 0xd56199,
"purple" => 0x9141ac,
"slate" => 0x6f8396,
_ => return None,
};
Some(Hsla::from(gpui::rgb(hex)))
}
fn read_gsettings() -> Option<GSettingsSnapshot> {
let variant = gsettings_value(&["get", "org.gnome.desktop.interface", "color-scheme"])
.and_then(|value| match value.trim().trim_matches('\'') {
"prefer-dark" => Some(ThemeVariant::Dark),
"prefer-light" => Some(ThemeVariant::Light),
_ => None,
});
let accent = gsettings_value(&["get", "org.gnome.desktop.interface", "accent-color"])
.and_then(|value| accent_rgb(value.trim().trim_matches('\'')));
if variant.is_none() && accent.is_none() {
return None;
}
Some(GSettingsSnapshot { variant, accent })
}
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
let portal = portal::io::PortalClient::connect();
let gsettings = read_gsettings();
let backend = home_dir()
.map(|home| detect(&home, portal.is_some(), gsettings.is_some()))
.unwrap_or(Backend::Fallback);
Box::new(LinuxSource {
backend,
portal,
gsettings,
file_watcher: None,
_signal: None,
})
}
+9 -9
View File
@@ -44,15 +44,6 @@ define_class!(
}
);
impl ThemeObserver {
fn new(reapply: async_channel::Sender<()>) -> Retained<Self> {
let this = Self::alloc().set_ivars(reapply);
// SAFETY: `this` is freshly allocated with ivars set and not yet
// initialized, which is exactly the receiver `init` requires.
unsafe { msg_send![super(this), init] }
}
}
/// One watcher registration, kept so [`Drop`] can undo it.
enum Watcher {
/// A distributed notification, registered by name.
@@ -82,6 +73,15 @@ pub(crate) struct MacosSource {
_signal: Option<ReapplySignal>,
}
impl ThemeObserver {
fn new(reapply: async_channel::Sender<()>) -> Retained<Self> {
let this = Self::alloc().set_ivars(reapply);
// SAFETY: `this` is freshly allocated with ivars set and not yet initialized,
// which is exactly the receiver `init` requires.
unsafe { msg_send![super(this), init] }
}
}
impl MacosSource {
fn color_to_hsla(color: &NSColor) -> Option<gpui::Hsla> {
let srgb = NSColorSpace::sRGBColorSpace();
+19 -19
View File
@@ -55,25 +55,6 @@ pub(crate) struct WindowsSource {
_signal: Option<ReapplySignal>,
}
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
// SAFETY: WinRT activation requires COM on this thread; the STA matches
// the UI thread's message pump, and RPC_E_CHANGED_MODE means COM is
// already initialized in another apartment.
let initialized = unsafe { CoInitializeEx(None, COINIT_APARTMENTTHREADED) };
if initialized.is_err() && initialized != RPC_E_CHANGED_MODE {
log::error!("theme: COM initialization failed: {initialized:?}");
}
match WindowsSource::new() {
Some(source) => Box::new(source),
None => {
log::warn!("theme: Windows system theme unavailable; using fallback");
Box::new(super::fallback::FallbackSource)
}
}
}
impl WindowsSource {
fn new() -> Option<Self> {
let ui_settings = match UISettings::new() {
@@ -206,3 +187,22 @@ impl ThemeSource for WindowsSource {
SourceKind::Windows.label()
}
}
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
// SAFETY: WinRT activation requires COM on this thread,
// the STA matches the UI thread's message pump,
// and RPC_E_CHANGED_MODE means COM is already initialized in another apartment.
let initialized = unsafe { CoInitializeEx(None, COINIT_APARTMENTTHREADED) };
if initialized.is_err() && initialized != RPC_E_CHANGED_MODE {
log::error!("theme: COM initialization failed: {initialized:?}");
}
match WindowsSource::new() {
Some(source) => Box::new(source),
None => {
log::warn!("theme: Windows system theme unavailable; using fallback");
Box::new(super::fallback::FallbackSource)
}
}
}