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

input-sources: Do not store full CosmicCompConfig

Browse source 
`update_xkb()` was previously never called before the subscription first
returns a config value, so not getting an initial value of `comp_config`
at start before the subscription does not change behavior.
This commit is contained in:
Ian Douglas Scott 2026-07-01 14:15:14 -07:00 • committed by Ian Douglas Scott
parent 9acfd8d8c1
commit d86c5631ed
1 changed files with 3 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cosmic-applet-input-sources/src/lib.rs
View file

@ -11,7 +11,6 @@ use cosmic::{
app, app,
app::Core, app::Core,
applet::{self}, applet::{self},
cosmic_config::{self, CosmicConfigEntry},
cosmic_theme::Spacing, cosmic_theme::Spacing,
iced::Subscription, iced::Subscription,
iced::core::window, iced::core::window,
@ -28,7 +27,7 @@ use cosmic::{
rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription}, rectangle_tracker::{RectangleTracker, RectangleUpdate, rectangle_tracker_subscription},
}, },
}; };
use cosmic_comp_config::CosmicCompConfig; use cosmic_comp_config::{CosmicCompConfig, XkbConfig};
use std::{ use std::{
os::unix::{ os::unix::{
io::{FromRawFd, RawFd}, io::{FromRawFd, RawFd},
@ -67,27 +66,8 @@ pub fn run() -> cosmic::iced::Result {
} }
}; };
let comp_config =
match cosmic_config::Config::new("com.system76.CosmicComp", CosmicCompConfig::VERSION) {
Ok(config_handler) => {
let config = match CosmicCompConfig::get_entry(&config_handler) {
Ok(ok) => ok,
Err((errs, config)) => {
tracing::error!("errors loading config: {:?}", errs);
config
}
};
config
}
Err(err) => {
tracing::error!("failed to create config handler: {}", err);
CosmicCompConfig::default()
}
};
cosmic::applet::run::<Window>(Flags { cosmic::applet::run::<Window>(Flags {
wayland_connection, wayland_connection,
comp_config,
layouts: layouts.layout_list.layout, layouts: layouts.layout_list.layout,
}) })
} }
@ -102,7 +82,6 @@ pub struct ActiveLayout {
pub struct Window { pub struct Window {
core: Core, core: Core,
popup: Option<Id>, popup: Option<Id>,
comp_config: CosmicCompConfig,
layouts: Vec<KeyboardLayout>, layouts: Vec<KeyboardLayout>,
active_layouts: Vec<ActiveLayout>, active_layouts: Vec<ActiveLayout>,
rectangle_tracker: Option<RectangleTracker<u32>>, rectangle_tracker: Option<RectangleTracker<u32>>,
@ -128,7 +107,6 @@ pub enum Message {
#[derive(Debug)] #[derive(Debug)]
pub struct Flags { pub struct Flags {
wayland_connection: Option<Connection>, wayland_connection: Option<Connection>,
pub comp_config: CosmicCompConfig,
pub layouts: Vec<KeyboardLayout>, pub layouts: Vec<KeyboardLayout>,
} }
@ -152,7 +130,6 @@ impl cosmic::Application for Window {
layouts: flags.layouts, layouts: flags.layouts,
core, core,
popup: None, popup: None,
comp_config: flags.comp_config,
active_layouts: Vec::new(), active_layouts: Vec::new(),
rectangle_tracker: None, rectangle_tracker: None,
rectangle: Rectangle::default(), rectangle: Rectangle::default(),
@ -197,8 +174,7 @@ impl cosmic::Application for Window {
} }
} }
Message::CompConfig(config) => { Message::CompConfig(config) => {
self.comp_config = *config; self.active_layouts = self.update_xkb(&config.xkb_config);
self.active_layouts = self.update_xkb();
} }
Message::KeyboardSettings => { Message::KeyboardSettings => {
let mut cmd = std::process::Command::new("cosmic-settings"); let mut cmd = std::process::Command::new("cosmic-settings");
@ -343,9 +319,8 @@ impl cosmic::Application for Window {
} }
} }
impl Window { impl Window {
fn update_xkb(&self) -> Vec<ActiveLayout> { fn update_xkb(&self, xkb: &XkbConfig) -> Vec<ActiveLayout> {
let mut active_layouts = Vec::new(); let mut active_layouts = Vec::new();
let xkb = &self.comp_config.xkb_config;
let layouts = xkb.layout.split_terminator(','); let layouts = xkb.layout.split_terminator(',');