leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xwm: Set xcursor variables in Xresources db

Browse source
This commit is contained in:
Victoria Brekenfeld 2026-01-09 18:34:51 +01:00 • committed by Victoria Brekenfeld
parent 612ff2f523
commit e6a3a3a9c9
4 changed files with 97 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/config/mod.rs
View file

@ -180,8 +180,10 @@ impl Config {
let cosmic_comp_config =
CosmicCompConfig::get_entry(&config).unwrap_or_else(|(errs, c)| {
for err in errs {
error!(?err, "");
if cfg!(debug_assertions) {
for err in errs {
warn!(?err, "");
}
}
c
});
@ -189,6 +191,11 @@ impl Config {
// Listen for updates to the toolkit config
if let Ok(tk_config) = cosmic_config::Config::new("com.system76.CosmicTk", 1) {
fn handle_new_toolkit_config(config: CosmicTk, state: &mut State) {
if cosmic::icon_theme::default() != config.icon_theme {
cosmic::icon_theme::set_default(config.icon_theme.clone());
state.common.update_xwayland_settings();
}
let mut workspace_guard = state.common.workspace_state.update();
state.common.shell.write().update_toolkit(
config,
@ -197,19 +204,32 @@ impl Config {
);
}
if let Ok(config) = CosmicTk::get_entry(&tk_config) {
let _ = loop_handle.insert_idle(move |state| {
handle_new_toolkit_config(config, state);
});
}
let config = CosmicTk::get_entry(&tk_config).unwrap_or_else(|(errs, c)| {
if cfg!(debug_assertions) {
for err in errs {
warn!(?err, "");
}
}
c
});
let _ = loop_handle.insert_idle(move |state| {
handle_new_toolkit_config(config, state);
});
match cosmic_config::calloop::ConfigWatchSource::new(&tk_config) {
Ok(source) => {
if let Err(err) =
loop_handle.insert_source(source, |(config, _keys), (), state| {
if let Ok(config) = CosmicTk::get_entry(&config) {
handle_new_toolkit_config(config, state);
}
let config =
CosmicTk::get_entry(&config).unwrap_or_else(|(errs, c)| {
if cfg!(debug_assertions) {
for err in errs {
warn!(?err, "");
}
}
c
});
handle_new_toolkit_config(config, state);
})
{
warn!(?err, "Failed to watch com.system76.CosmicTk config");
@ -879,7 +899,7 @@ fn config_changed(config: cosmic_config::Config, keys: Vec<String>, state: &mut
let new = get_config::<XwaylandDescaling>(&config, "descale_xwayland");
if new != state.common.config.cosmic_conf.descale_xwayland {
state.common.config.cosmic_conf.descale_xwayland = new;
state.common.update_xwayland_scale();
state.common.update_xwayland_settings();
}
}
"xwayland_eavesdropping" => {