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

Load images from cosmic-bg state

Browse source
This commit is contained in:
Jeremy Soller 2023-10-09 12:31:13 -06:00
parent 1cc3ad191e
commit 1aa618e653
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
2 changed files with 116 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -733,7 +733,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-bg-config" name = "cosmic-bg-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-bg?branch=master_jammy#749f3ea139519fffaa2641f80b6fba1379b3ad63" source = "git+https://github.com/pop-os/cosmic-bg?branch=master_jammy#1e0d51cf6c95d913763cefc60714406236a8a0de"
dependencies = [ dependencies = [
"colorgrad", "colorgrad",
"cosmic-config", "cosmic-config",

183
src/locker.rs
View file

@ -3,6 +3,7 @@
use cosmic::app::{message, Command, Core, Settings}; use cosmic::app::{message, Command, Core, Settings};
use cosmic::{ use cosmic::{
cosmic_config::CosmicConfigEntry,
executor, executor,
iced::{ iced::{
self, alignment, self, alignment,
@ -45,34 +46,25 @@ pub fn main(current_user: pwd::Passwd) -> Result<(), Box<dyn std::error::Error>>
None None
}; };
//TODO: remove statically configured background let mut wallpapers = Vec::new();
let mut background = match cosmic_bg_config::state::State::state() {
widget::image::Handle::from_memory(include_bytes!("../res/background.png")); Ok(helper) => match cosmic_bg_config::state::State::get_entry(&helper) {
Ok(state) => {
match cosmic_bg_config::Config::helper() { wallpapers = state.wallpapers;
Ok(helper) => match cosmic_bg_config::Config::load(&helper) {
Ok(config) => {
log::info!("config: {:#?}", config);
match config.default_background.source {
cosmic_bg_config::Source::Path(path) if path.is_file() => {
background = widget::image::Handle::from_path(path);
}
_ => {}
}
} }
Err(err) => { Err(err) => {
log::error!("failed to load cosmic-bg config: {:?}", err); log::error!("failed to load cosmic-bg state: {:?}", err);
} }
}, },
Err(err) => { Err(err) => {
log::error!("failed to create cosmic-bg config helper: {:?}", err); log::error!("failed to create cosmic-bg state helper: {:?}", err);
} }
} }
let flags = Flags { let flags = Flags {
current_user, current_user,
icon_opt, icon_opt,
background, wallpapers,
}; };
let settings = Settings::default() let settings = Settings::default()
@ -205,7 +197,7 @@ impl pam_client::ConversationHandler for Conversation {
pub struct Flags { pub struct Flags {
current_user: pwd::Passwd, current_user: pwd::Passwd,
icon_opt: Option<widget::image::Handle>, icon_opt: Option<widget::image::Handle>,
background: widget::image::Handle, wallpapers: Vec<(String, cosmic_bg_config::Source)>,
} }
/// Messages that are used specifically by our [`App`]. /// Messages that are used specifically by our [`App`].
@ -228,6 +220,7 @@ pub struct App {
next_surface_id: SurfaceId, next_surface_id: SurfaceId,
surface_ids: HashMap<WlOutput, SurfaceId>, surface_ids: HashMap<WlOutput, SurfaceId>,
active_surface_id_opt: Option<SurfaceId>, active_surface_id_opt: Option<SurfaceId>,
surface_images: HashMap<SurfaceId, widget::image::Handle>,
value_tx_opt: Option<mpsc::Sender<String>>, value_tx_opt: Option<mpsc::Sender<String>>,
prompt_opt: Option<(String, bool, Option<String>)>, prompt_opt: Option<(String, bool, Option<String>)>,
error_opt: Option<String>, error_opt: Option<String>,
@ -272,6 +265,7 @@ impl cosmic::Application for App {
next_surface_id: SurfaceId(1), next_surface_id: SurfaceId(1),
surface_ids: HashMap::new(), surface_ids: HashMap::new(),
active_surface_id_opt: None, active_surface_id_opt: None,
surface_images: HashMap::new(),
value_tx_opt: None, value_tx_opt: None,
prompt_opt: None, prompt_opt: None,
error_opt: None, error_opt: None,
@ -285,62 +279,110 @@ impl cosmic::Application for App {
fn update(&mut self, message: Self::Message) -> Command<Self::Message> { fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
match message { match message {
Message::None => {} Message::None => {}
Message::OutputEvent(output_event, output) => match output_event { Message::OutputEvent(output_event, output) => {
OutputEvent::Created(_output_info_opt) => { match output_event {
log::info!("output {}: created", output.id()); OutputEvent::Created(output_info_opt) => {
log::info!("output {}: created", output.id());
let surface_id = self.next_surface_id; let surface_id = self.next_surface_id;
self.next_surface_id.0 += 1; self.next_surface_id.0 += 1;
match self.surface_ids.insert(output.clone(), surface_id) { match self.surface_ids.insert(output.clone(), surface_id) {
Some(old_surface_id) => { Some(old_surface_id) => {
//TODO: remove old surface? //TODO: remove old surface?
log::warn!( log::warn!(
"output {}: already had surface ID {}", "output {}: already had surface ID {}",
output.id(), output.id(),
old_surface_id.0 old_surface_id.0
); );
}
None => {}
} }
None => {}
match output_info_opt {
Some(output_info) => {
match output_info.name {
Some(output_name) => {
for (wallpaper_output_name, wallpaper_source) in
self.flags.wallpapers.iter()
{
if wallpaper_output_name == &output_name {
match wallpaper_source {
cosmic_bg_config::Source::Path(path) => {
match fs::read(path) {
Ok(bytes) => {
let image = widget::image::Handle::from_memory(bytes);
self.surface_images
.insert(surface_id, image);
//TODO: what to do about duplicates?
break;
}
Err(err) => {
log::warn!("output {}: failed to load wallpaper {:?}: {:?}", output.id(), path, err);
}
}
}
cosmic_bg_config::Source::Color(color) => {
//TODO: support color sources
log::warn!(
"output {}: unsupported source {:?}",
output.id(),
color
);
}
}
}
}
}
None => {
log::warn!("output {}: no output name", output.id());
}
}
}
None => {
log::warn!("output {}: no output info", output.id());
}
}
return Command::batch([
get_layer_surface(SctkLayerSurfaceSettings {
id: surface_id,
layer: Layer::Overlay,
keyboard_interactivity: KeyboardInteractivity::Exclusive,
pointer_interactivity: true,
anchor: Anchor::TOP | Anchor::BOTTOM | Anchor::LEFT | Anchor::RIGHT,
output: IcedOutput::Output(output),
namespace: "cosmic-locker".into(),
size: Some((None, None)),
margin: IcedMargin {
top: 0,
bottom: 0,
left: 0,
right: 0,
},
exclusive_zone: -1,
size_limits: iced::Limits::NONE.min_width(1.0).min_height(1.0),
}),
widget::text_input::focus(text_input_id(surface_id)),
]);
} }
OutputEvent::Removed => {
return Command::batch([ log::info!("output {}: removed", output.id());
get_layer_surface(SctkLayerSurfaceSettings { match self.surface_ids.remove(&output) {
id: surface_id, Some(surface_id) => {
layer: Layer::Overlay, self.surface_images.remove(&surface_id);
keyboard_interactivity: KeyboardInteractivity::Exclusive, return destroy_layer_surface(surface_id);
pointer_interactivity: true, }
anchor: Anchor::TOP | Anchor::BOTTOM | Anchor::LEFT | Anchor::RIGHT, None => {
output: IcedOutput::Output(output), log::warn!("output {}: no surface found", output.id());
namespace: "cosmic-locker".into(), }
size: Some((None, None)),
margin: IcedMargin {
top: 0,
bottom: 0,
left: 0,
right: 0,
},
exclusive_zone: -1,
size_limits: iced::Limits::NONE.min_width(1.0).min_height(1.0),
}),
widget::text_input::focus(text_input_id(surface_id)),
]);
}
OutputEvent::Removed => {
log::info!("output {}: removed", output.id());
match self.surface_ids.remove(&output) {
Some(surface_id) => {
return destroy_layer_surface(surface_id);
}
None => {
log::warn!("output {}: no surface found", output.id());
} }
} }
OutputEvent::InfoUpdate(output_info) => {
log::info!("output {}: info update {:#?}", output.id(), output_info);
}
} }
OutputEvent::InfoUpdate(output_info) => { }
log::info!("output {}: info update {:#?}", output.id(), output_info);
}
},
Message::LayerEvent(layer_event, surface_id) => match layer_event { Message::LayerEvent(layer_event, surface_id) => match layer_event {
LayerEvent::Focused => { LayerEvent::Focused => {
log::info!("focus surface {}", surface_id.0); log::info!("focus surface {}", surface_id.0);
@ -392,6 +434,7 @@ impl cosmic::Application for App {
let mut commands = Vec::new(); let mut commands = Vec::new();
for (_output, surface_id) in self.surface_ids.drain() { for (_output, surface_id) in self.surface_ids.drain() {
self.surface_images.remove(&surface_id);
commands.push(destroy_layer_surface(surface_id)); commands.push(destroy_layer_surface(surface_id));
} }
//TODO: cleaner method to exit? //TODO: cleaner method to exit?
@ -567,7 +610,11 @@ impl cosmic::Application for App {
.align_y(alignment::Vertical::Top) .align_y(alignment::Vertical::Top)
.style(cosmic::theme::Container::Transparent), .style(cosmic::theme::Container::Transparent),
) )
.image(self.flags.background.clone()) .image(match self.surface_images.get(&surface_id) {
Some(some) => some.clone(),
//TODO: default image
None => widget::image::Handle::from_pixels(1, 1, vec![0x00, 0x00, 0x00, 0xFF]),
})
.content_fit(iced::ContentFit::Cover) .content_fit(iced::ContentFit::Cover)
.into() .into()
} }