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

update libcosmic

Browse source
This commit is contained in:
Ashley Wulber 2025-03-05 23:08:56 -05:00 • committed by Jeremy Soller
parent 4b0e73fca4
commit b84ee1827c
3 changed files with 493 additions and 572 deletions
Download patch file Download diff file Expand all files Collapse all files

978
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

56
src/greeter.rs
View file

@ -3,11 +3,12 @@
mod ipc; mod ipc;
use cosmic::app::{message, Core, Settings, Task}; use cosmic::app::{Core, Settings, Task};
use cosmic::iced::{Point, Size}; use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::Gravity;
use cosmic::iced::{Point, Rectangle, Size};
use cosmic::iced_core::{image, window}; use cosmic::iced_core::{image, window};
use cosmic::iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings; use cosmic::iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings;
use cosmic::surface_message::{MessageWrapper, SurfaceMessage}; use cosmic::surface;
use cosmic::widget::text; use cosmic::widget::text;
use cosmic::{ use cosmic::{
cosmic_config::{self, ConfigSet, CosmicConfigEntry}, cosmic_config::{self, ConfigSet, CosmicConfigEntry},
@ -389,21 +390,6 @@ struct NameIndexPair {
data_idx: Option<usize>, data_idx: Option<usize>,
} }
impl From<Message> for MessageWrapper<Message> {
fn from(value: Message) -> Self {
match value {
Message::Surface(msg) => MessageWrapper::Surface(msg),
msg => MessageWrapper::Message(msg),
}
}
}
impl From<SurfaceMessage> for Message {
fn from(value: SurfaceMessage) -> Self {
Message::Surface(value)
}
}
/// Messages that are used specifically by our [`App`]. /// Messages that are used specifically by our [`App`].
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Message { pub enum Message {
@ -430,7 +416,7 @@ pub enum Message {
Session(String), Session(String),
Shutdown, Shutdown,
Socket(SocketState), Socket(SocketState),
Surface(SurfaceMessage), Surface(surface::Action),
Suspend, Suspend,
Username(String), Username(String),
WindowOpen(SurfaceId), WindowOpen(SurfaceId),
@ -855,7 +841,7 @@ impl App {
let sender = sender.clone(); let sender = sender.clone();
return cosmic::task::future(async move { return cosmic::task::future(async move {
_ = sender.send(request).await; _ = sender.send(request).await;
message::none() cosmic::action::none()
}); });
} }
@ -989,7 +975,7 @@ impl App {
match &user_data.theme_opt { match &user_data.theme_opt {
Some(theme) => { Some(theme) => {
cosmic::app::command::set_theme(cosmic::Theme::custom(Arc::new(theme.clone()))) cosmic::command::set_theme(cosmic::Theme::custom(Arc::new(theme.clone())))
} }
None => Task::none(), None => Task::none(),
} }
@ -1025,7 +1011,7 @@ impl cosmic::Application for App {
} }
/// Creates the application, and optionally emits command on initialize. /// Creates the application, and optionally emits command on initialize.
fn init(mut core: Core, flags: Self::Flags) -> (Self, Task<Self::Message>) { fn init(mut core: Core, flags: Self::Flags) -> (Self, Task<Message>) {
core.window.show_window_menu = false; core.window.show_window_menu = false;
core.window.show_headerbar = false; core.window.show_headerbar = false;
// XXX must be false or define custom style to have transparent bg // XXX must be false or define custom style to have transparent bg
@ -1096,7 +1082,7 @@ impl cosmic::Application for App {
} }
/// Handle application events here. /// Handle application events here.
fn update(&mut self, message: Self::Message) -> Task<Self::Message> { fn update(&mut self, message: Self::Message) -> Task<Message> {
match message { match message {
Message::None => {} Message::None => {}
Message::OutputEvent(output_event, output) => { Message::OutputEvent(output_event, output) => {
@ -1161,7 +1147,8 @@ impl cosmic::Application for App {
surface_id, surface_id,
Size::new(unwrapped_size.0 as f32, unwrapped_size.1 as f32), Size::new(unwrapped_size.0 as f32, unwrapped_size.1 as f32),
); );
let msg = cosmic::app::message::subsurface( dbg!(loc, size);
let msg = cosmic::surface::action::subsurface(
move |_: &mut App| SctkSubsurfaceSettings { move |_: &mut App| SctkSubsurfaceSettings {
parent: surface_id, parent: surface_id,
id: subsurface_id, id: subsurface_id,
@ -1169,9 +1156,12 @@ impl cosmic::Application for App {
size: Some(sub_size), size: Some(sub_size),
z: 10, z: 10,
steal_keyboard_focus: true, steal_keyboard_focus: true,
gravity: Gravity::BottomRight,
offset: (0, 0),
input_zone: None,
}, },
Some(Box::new(move |app: &App| { Some(Box::new(move |app: &App| {
app.menu(subsurface_id).map(cosmic::app::Message::App) app.menu(subsurface_id).map(cosmic::Action::App)
})), })),
); );
return Task::batch([ return Task::batch([
@ -1194,7 +1184,9 @@ impl cosmic::Application for App {
exclusive_zone: -1, exclusive_zone: -1,
size_limits: iced::Limits::NONE.min_width(1.0).min_height(1.0), size_limits: iced::Limits::NONE.min_width(1.0).min_height(1.0),
}), }),
cosmic::task::message(msg), cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(msg),
)),
]); ]);
} }
OutputEvent::Removed => { OutputEvent::Removed => {
@ -1409,7 +1401,7 @@ impl cosmic::Application for App {
log::error!("failed to reboot: {:?}", err); log::error!("failed to reboot: {:?}", err);
} }
} }
message::none() cosmic::action::none()
}); });
} }
Some(DialogPage::Shutdown(_)) => { Some(DialogPage::Shutdown(_)) => {
@ -1421,7 +1413,7 @@ impl cosmic::Application for App {
log::error!("failed to power off: {:?}", err); log::error!("failed to power off: {:?}", err);
} }
} }
message::none() cosmic::action::none()
}); });
} }
None => {} None => {}
@ -1451,7 +1443,7 @@ impl cosmic::Application for App {
log::error!("failed to suspend: {:?}", err); log::error!("failed to suspend: {:?}", err);
} }
} }
message::none() cosmic::action::none()
}); });
} }
Message::Restart => { Message::Restart => {
@ -1484,7 +1476,11 @@ impl cosmic::Application for App {
Message::GreetdChannel(sender) => { Message::GreetdChannel(sender) => {
self.greetd_sender = Some(sender); self.greetd_sender = Some(sender);
} }
Message::Surface(_) => {} Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
}
Message::WindowOpen(id) if self.surface_ids.values().any(|i| *i == id) => { Message::WindowOpen(id) if self.surface_ids.values().any(|i| *i == id) => {
if let Some(text_input_id) = self.surface_names.get(&id).and_then(|id| { if let Some(text_input_id) = self.surface_names.get(&id).and_then(|id| {
if self if self

31
src/locker.rs
View file

@ -1,8 +1,8 @@
// Copyright 2023 System76 <info@system76.com> // Copyright 2023 System76 <info@system76.com>
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use cosmic::app::{message, Core, Settings, Task}; use cosmic::app::{Action, Core, Settings, Task};
use cosmic::surface_message::{MessageWrapper, SurfaceMessage}; use cosmic::surface;
use cosmic::{ use cosmic::{
executor, executor,
iced::{ iced::{
@ -207,21 +207,6 @@ pub struct Flags {
wallpapers: Vec<(String, cosmic_bg_config::Source)>, wallpapers: Vec<(String, cosmic_bg_config::Source)>,
} }
impl From<Message> for MessageWrapper<Message> {
fn from(value: Message) -> Self {
match value {
Message::Surface(msg) => MessageWrapper::Surface(msg),
msg => MessageWrapper::Message(msg),
}
}
}
impl From<SurfaceMessage> for Message {
fn from(value: SurfaceMessage) -> Self {
Message::Surface(value)
}
}
/// Messages that are used specifically by our [`App`]. /// Messages that are used specifically by our [`App`].
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Message { pub enum Message {
@ -235,7 +220,7 @@ pub enum Message {
PowerInfo(Option<(String, f64)>), PowerInfo(Option<(String, f64)>),
Prompt(String, bool, Option<String>), Prompt(String, bool, Option<String>),
Submit, Submit,
Surface(SurfaceMessage), Surface(surface::Action),
Suspend, Suspend,
Error(String), Error(String),
Lock, Lock,
@ -543,10 +528,10 @@ impl cosmic::Application for App {
#[cfg(feature = "logind")] #[cfg(feature = "logind")]
return cosmic::task::future(async move { return cosmic::task::future(async move {
match crate::logind::suspend().await { match crate::logind::suspend().await {
Ok(()) => message::none(), Ok(()) => cosmic::action::none(),
Err(err) => { Err(err) => {
log::error!("failed to suspend: {:?}", err); log::error!("failed to suspend: {:?}", err);
message::app(Message::Error(err.to_string())) cosmic::Action::App(Message::Error(err.to_string()))
} }
} }
}); });
@ -611,7 +596,11 @@ impl cosmic::Application for App {
} }
} }
} }
Message::Surface(_) => {} Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
}
} }
Task::none() Task::none()
} }