leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove SurfaceMessageHandler

Browse source
This commit is contained in:
Ashley Wulber 2025-02-24 14:14:17 -05:00
parent 2b232065ff
commit 9352c0241e
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
7 changed files with 131 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/applet/src/window.rs
View file

@ -5,7 +5,7 @@ use cosmic::iced::{self, Length, Limits, Task};
use cosmic::iced_runtime::core::window; use cosmic::iced_runtime::core::window;
use cosmic::iced_runtime::platform_specific::wayland::popup::SctkPopupSettings; use cosmic::iced_runtime::platform_specific::wayland::popup::SctkPopupSettings;
use cosmic::iced_runtime::platform_specific::wayland::subsurface; use cosmic::iced_runtime::platform_specific::wayland::subsurface;
use cosmic::surface_message::{SurfaceMessage, SurfaceMessageHandler}; use cosmic::surface_message::{MessageWrapper, SurfaceMessage};
use cosmic::widget::dropdown::DropdownView; use cosmic::widget::dropdown::DropdownView;
use cosmic::widget::{autosize, dropdown, layer_container, list_column, settings, toggler}; use cosmic::widget::{autosize, dropdown, layer_container, list_column, settings, toggler};
use cosmic::{iced_core, Element}; use cosmic::{iced_core, Element};
@ -63,11 +63,11 @@ impl std::fmt::Debug for Message {
} }
} }
impl SurfaceMessageHandler for Message { impl From<Message> for MessageWrapper<Message> {
fn to_surface_message(self) -> cosmic::surface_message::MessageWrapper<Self> { fn from(value: Message) -> Self {
match self { match value {
Message::Surface(msg) => cosmic::surface_message::MessageWrapper::Surface(msg), Message::Surface(s) => MessageWrapper::Surface(s),
msg => cosmic::surface_message::MessageWrapper::Message(msg), m => MessageWrapper::Message(m),
} }
} }
} }

14
examples/application/src/main.rs
View file

@ -11,7 +11,7 @@ use cosmic::iced::alignment::{Horizontal, Vertical};
use cosmic::iced::widget::column; use cosmic::iced::widget::column;
use cosmic::iced::Length; use cosmic::iced::Length;
use cosmic::iced_core::Size; use cosmic::iced_core::Size;
use cosmic::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; use cosmic::surface_message::{MessageWrapper, SurfaceMessage};
use cosmic::widget::icon::{from_name, Handle}; use cosmic::widget::icon::{from_name, Handle};
use cosmic::widget::menu::KeyBind; use cosmic::widget::menu::KeyBind;
use cosmic::widget::{button, text}; use cosmic::widget::{button, text};
@ -89,17 +89,15 @@ pub enum Message {
Hi, Hi,
} }
#[cfg(feature = "wayland")] impl From<Message> for MessageWrapper<Message> {
impl SurfaceMessageHandler for Message { fn from(value: Message) -> Self {
fn to_surface_message(self) -> MessageWrapper<Self> { match value {
match self { Message::Surface(s) => MessageWrapper::Surface(s),
Message::Surface(msg) => MessageWrapper::Surface(msg), m => MessageWrapper::Message(m),
msg => MessageWrapper::Message(msg),
} }
} }
} }
#[cfg(feature = "wayland")]
impl From<SurfaceMessage> for Message { impl From<SurfaceMessage> for Message {
fn from(value: SurfaceMessage) -> Self { fn from(value: SurfaceMessage) -> Self {
Message::Surface(value) Message::Surface(value)

4
src/app/core.rs
View file

@ -19,7 +19,7 @@ use iced_core::{window::Id, Element};
use palette::Srgba; use palette::Srgba;
use slotmap::Key; use slotmap::Key;
use crate::{surface_message::SurfaceMessageHandler, Theme}; use crate::Theme;
use super::{Renderer, Task}; use super::{Renderer, Task};
@ -396,7 +396,7 @@ impl Core {
'a, 'a,
Message: Clone Message: Clone
+ From<crate::surface_message::SurfaceMessage> + From<crate::surface_message::SurfaceMessage>
+ crate::surface_message::SurfaceMessageHandler + Into<crate::surface_message::MessageWrapper<Message>>
+ 'static, + 'static,
A: menu::Action<Message = Message>, A: menu::Action<Message = Message>,
>( >(

195
src/app/cosmic.rs
View file

@ -7,7 +7,7 @@ use std::sync::Arc;
use super::{Application, ApplicationExt, Core, Subscription}; use super::{Application, ApplicationExt, Core, Subscription};
use crate::config::CosmicTk; use crate::config::CosmicTk;
use crate::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; use crate::surface_message::{MessageWrapper, SurfaceMessage};
use crate::theme::{Theme, ThemeType, THEME}; use crate::theme::{Theme, ThemeType, THEME};
use crate::widget::nav_bar; use crate::widget::nav_bar;
use crate::{keyboard_nav, Element}; use crate::{keyboard_nav, Element};
@ -94,7 +94,7 @@ pub struct Cosmic<App: Application> {
impl<T: Application> Cosmic<T> impl<T: Application> Cosmic<T>
where where
T::Message: Send + 'static + crate::surface_message::SurfaceMessageHandler, T::Message: Send + 'static + Into<crate::surface_message::MessageWrapper<T::Message>>,
{ {
pub fn init( pub fn init(
(mut core, flags): (Core, T::Flags), (mut core, flags): (Core, T::Flags),
@ -125,135 +125,128 @@ where
message: super::Message<T::Message>, message: super::Message<T::Message>,
) -> iced::Task<super::Message<T::Message>> { ) -> iced::Task<super::Message<T::Message>> {
let message = match message { let message = match message {
super::Message::App(message) => { super::Message::App(message) => match Into::<MessageWrapper<T::Message>>::into(message)
match SurfaceMessageHandler::to_surface_message(message) { {
MessageWrapper::Surface(surface_message) => { MessageWrapper::Surface(surface_message) => {
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
match surface_message { match surface_message {
SurfaceMessage::Subsurface(settings, view) => { SurfaceMessage::Subsurface(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings) let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
.and_then(|s| s.downcast::<Box<dyn Fn(&mut T) -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync>>().ok()) else { .and_then(|s| s.downcast::<Box<dyn Fn(&mut T) -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync>>().ok()) else {
tracing::error!("Invalid settings for subsurface"); tracing::error!("Invalid settings for subsurface");
return Task::none(); return Task::none();
}; };
if let Some(view) = view.and_then(|view| { if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast::<Box< match std::sync::Arc::try_unwrap(view).ok()?.downcast::<Box<
dyn for<'a> Fn( dyn for<'a> Fn(&'a T) -> Element<'a, super::Message<T::Message>>
&'a T, + Send
) + Sync,
-> Element<'a, super::Message<T::Message>> >>(
+ Send ) {
+ Sync, Ok(v) => Some(v),
>>( Err(err) => {
) { tracing::error!(
Ok(v) => Some(v), "Invalid view for subsurface view: {err:?}"
Err(err) => { );
tracing::error!( None
"Invalid view for subsurface view: {err:?}"
);
None
}
} }
}) {
let settings = settings(&mut self.app);
self.get_subsurface(settings, *view)
} else {
iced_winit::commands::subsurface::get_subsurface(settings(
&mut self.app,
))
} }
}) {
let settings = settings(&mut self.app);
self.get_subsurface(settings, *view)
} else {
iced_winit::commands::subsurface::get_subsurface(settings(
&mut self.app,
))
} }
SurfaceMessage::AppPopup(settings, view) => { }
let Some(settings) = std::sync::Arc::try_unwrap(settings) SurfaceMessage::AppPopup(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
.and_then(|s| s.downcast::<Box<dyn Fn(&mut T) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings + Send + Sync>>().ok()) else { .and_then(|s| s.downcast::<Box<dyn Fn(&mut T) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings + Send + Sync>>().ok()) else {
tracing::error!("Invalid settings for popup"); tracing::error!("Invalid settings for popup");
return Task::none(); return Task::none();
}; };
if let Some(view) = view.and_then(|view| { if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast::<Box< match std::sync::Arc::try_unwrap(view).ok()?.downcast::<Box<
dyn for<'a> Fn( dyn for<'a> Fn(&'a T) -> Element<'a, super::Message<T::Message>>
&'a T, + Send
) + Sync,
-> Element<'a, super::Message<T::Message>> >>(
+ Send ) {
+ Sync, Ok(v) => Some(v),
>>( Err(err) => {
) { tracing::error!(
Ok(v) => Some(v), "Invalid view for subsurface view: {err:?}"
Err(err) => { );
tracing::error!( None
"Invalid view for subsurface view: {err:?}"
);
None
}
} }
}) {
let settings = settings(&mut self.app);
self.get_popup(settings, *view)
} else {
iced_winit::commands::popup::get_popup(settings(&mut self.app))
} }
}) {
let settings = settings(&mut self.app);
self.get_popup(settings, *view)
} else {
iced_winit::commands::popup::get_popup(settings(&mut self.app))
} }
#[cfg(feature = "wayland")] }
SurfaceMessage::DestroyPopup(id) => { #[cfg(feature = "wayland")]
iced_winit::commands::popup::destroy_popup(id) SurfaceMessage::DestroyPopup(id) => {
} iced_winit::commands::popup::destroy_popup(id)
#[cfg(feature = "wayland")] }
SurfaceMessage::DestroySubsurface(id) => { #[cfg(feature = "wayland")]
iced_winit::commands::subsurface::destroy_subsurface(id) SurfaceMessage::DestroySubsurface(id) => {
} iced_winit::commands::subsurface::destroy_subsurface(id)
SurfaceMessage::ResponsiveMenuBar { }
menu_bar, SurfaceMessage::ResponsiveMenuBar {
limits, menu_bar,
size, limits,
} => { size,
let core = self.app.core_mut(); } => {
core.menu_bars.insert(menu_bar, (limits, size)); let core = self.app.core_mut();
iced::Task::none() core.menu_bars.insert(menu_bar, (limits, size));
} iced::Task::none()
SurfaceMessage::Popup(settings, view) => { }
let Some(settings) = std::sync::Arc::try_unwrap(settings) SurfaceMessage::Popup(settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok() .ok()
.and_then(|s| s.downcast::<Box<dyn Fn() -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings + Send + Sync>>().ok()) else { .and_then(|s| s.downcast::<Box<dyn Fn() -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings + Send + Sync>>().ok()) else {
tracing::error!("Invalid settings for popup"); tracing::error!("Invalid settings for popup");
return Task::none(); return Task::none();
}; };
if let Some(view) = view.and_then(|view| { if let Some(view) = view.and_then(|view| {
match std::sync::Arc::try_unwrap(view).ok()?.downcast::<Box< match std::sync::Arc::try_unwrap(view).ok()?.downcast::<Box<
dyn Fn() -> Element<'static, super::Message<T::Message>> dyn Fn() -> Element<'static, super::Message<T::Message>>
+ Send + Send
+ Sync, + Sync,
>>( >>(
) { ) {
Ok(v) => Some(v), Ok(v) => Some(v),
Err(err) => { Err(err) => {
tracing::error!( tracing::error!(
"Invalid view for subsurface view: {err:?}" "Invalid view for subsurface view: {err:?}"
); );
None None
}
} }
}) {
let settings = settings();
self.get_popup(settings, Box::new(move |_| view()))
} else {
iced_winit::commands::popup::get_popup(settings())
} }
}) {
let settings = settings();
self.get_popup(settings, Box::new(move |_| view()))
} else {
iced_winit::commands::popup::get_popup(settings())
} }
} }
#[cfg(not(feature = "wayland"))]
iced::Task::none()
} }
MessageWrapper::Message(message) => self.app.update(message), #[cfg(not(feature = "wayland"))]
iced::Task::none()
} }
} MessageWrapper::Message(message) => self.app.update(message),
},
super::Message::Cosmic(message) => self.cosmic_update(message), super::Message::Cosmic(message) => self.cosmic_update(message),
super::Message::None => iced::Task::none(), super::Message::None => iced::Task::none(),
#[cfg(feature = "single-instance")] #[cfg(feature = "single-instance")]

48
src/app/mod.rs
View file

@ -6,7 +6,7 @@
//! Check out our [application](https://github.com/pop-os/libcosmic/tree/master/examples/application) //! Check out our [application](https://github.com/pop-os/libcosmic/tree/master/examples/application)
//! example in our repository. //! example in our repository.
use crate::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; use crate::surface_message::{MessageWrapper, SurfaceMessage};
pub mod command; pub mod command;
pub mod context_drawer; pub mod context_drawer;
@ -17,7 +17,7 @@ pub(crate) mod multi_window;
pub mod settings; pub mod settings;
pub mod message { pub mod message {
use crate::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; use crate::surface_message::{MessageWrapper, SurfaceMessage};
use iced::{Limits, Size}; use iced::{Limits, Size};
@ -50,7 +50,8 @@ pub mod message {
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
pub fn destroy_popup<App: super::Application>(id: iced_core::window::Id) -> App::Message pub fn destroy_popup<App: super::Application>(id: iced_core::window::Id) -> App::Message
where where
App::Message: SurfaceMessageHandler + From<SurfaceMessage>, App::Message:
Into<crate::surface_message::MessageWrapper<App::Message>> + From<SurfaceMessage>,
{ {
let surface_msg = SurfaceMessage::DestroyPopup(id); let surface_msg = SurfaceMessage::DestroyPopup(id);
App::Message::from(surface_msg) App::Message::from(surface_msg)
@ -60,7 +61,8 @@ pub mod message {
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
pub fn destroy_popup_simple<Message>(id: iced_core::window::Id) -> Message pub fn destroy_popup_simple<Message>(id: iced_core::window::Id) -> Message
where where
Message: SurfaceMessageHandler + From<SurfaceMessage> + 'static, Message:
Into<crate::surface_message::MessageWrapper<Message>> + From<SurfaceMessage> + 'static,
{ {
Message::from(SurfaceMessage::DestroyPopup(id)) Message::from(SurfaceMessage::DestroyPopup(id))
} }
@ -68,7 +70,8 @@ pub mod message {
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
pub fn destroy_subsurface<App: super::Application>(id: iced_core::window::Id) -> App::Message pub fn destroy_subsurface<App: super::Application>(id: iced_core::window::Id) -> App::Message
where where
App::Message: SurfaceMessageHandler + From<SurfaceMessage>, App::Message:
Into<crate::surface_message::MessageWrapper<App::Message>> + From<SurfaceMessage>,
{ {
let surface_msg = SurfaceMessage::DestroySubsurface(id); let surface_msg = SurfaceMessage::DestroySubsurface(id);
App::Message::from(surface_msg) App::Message::from(surface_msg)
@ -90,11 +93,12 @@ pub mod message {
>, >,
) -> App::Message ) -> App::Message
where where
App::Message: SurfaceMessageHandler + From<SurfaceMessage>, App::Message:
Into<crate::surface_message::MessageWrapper<App::Message>> + From<SurfaceMessage>,
{ {
use std::{any::Any, sync::Arc}; use std::{any::Any, sync::Arc};
use crate::surface_message::{SurfaceMessage, SurfaceMessageHandler}; use crate::surface_message::SurfaceMessage;
let boxed: Box< let boxed: Box<
dyn Fn(&mut App) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings dyn Fn(&mut App) -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
+ Send + Send
@ -124,12 +128,13 @@ pub mod message {
>, >,
) -> Message ) -> Message
where where
Message: SurfaceMessageHandler + From<SurfaceMessage> + 'static, Message:
Into<crate::surface_message::MessageWrapper<Message>> + From<SurfaceMessage> + 'static,
V:, V:,
{ {
use std::{any::Any, sync::Arc}; use std::{any::Any, sync::Arc};
use crate::surface_message::{SurfaceMessage, SurfaceMessageHandler}; use crate::surface_message::SurfaceMessage;
let boxed: Box< let boxed: Box<
dyn Fn() -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings dyn Fn() -> iced_runtime::platform_specific::wayland::popup::SctkPopupSettings
+ Send + Send
@ -153,20 +158,6 @@ pub mod message {
)) ))
} }
// TODO could this somehow be used by widgets? It is the wrong message type though.
// #[cfg(feature = "wayland")]
// pub fn get_simple_popup<App: super::Application>(
// settings: iced_runtime::platform_specific::wayland::popup::SctkPopupSettings,
// view: Option<
// impl Fn() -> crate::Element<'static, super::Message<App::Message>> + Send + Sync + 'static,
// >,
// ) -> App::Message
// where
// App::Message: SurfaceMessageHandler + From<SurfaceMessage>,
// {
// todo!()
// }
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
pub fn subsurface<App: super::Application>( pub fn subsurface<App: super::Application>(
settings: impl Fn(&mut App) -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync + 'static, settings: impl Fn(&mut App) -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync + 'static,
@ -181,7 +172,8 @@ pub mod message {
>, >,
) -> App::Message ) -> App::Message
where where
App::Message: SurfaceMessageHandler + From<SurfaceMessage>, App::Message:
Into<crate::surface_message::MessageWrapper<App::Message>> + From<SurfaceMessage>,
{ {
use crate::surface_message::SurfaceMessage; use crate::surface_message::SurfaceMessage;
use std::{any::Any, sync::Arc}; use std::{any::Any, sync::Arc};
@ -303,7 +295,7 @@ pub(crate) fn iced_settings<App: Application>(
/// Returns error on application failure. /// Returns error on application failure.
pub fn run<App: Application>(settings: Settings, flags: App::Flags) -> iced::Result pub fn run<App: Application>(settings: Settings, flags: App::Flags) -> iced::Result
where where
App::Message: SurfaceMessageHandler, App::Message: Into<crate::surface_message::MessageWrapper<App::Message>>,
{ {
#[cfg(target_env = "gnu")] #[cfg(target_env = "gnu")]
if let Some(threshold) = settings.default_mmap_threshold { if let Some(threshold) = settings.default_mmap_threshold {
@ -492,7 +484,11 @@ impl DbusActivation {
pub fn run_single_instance<App: Application>(settings: Settings, flags: App::Flags) -> iced::Result pub fn run_single_instance<App: Application>(settings: Settings, flags: App::Flags) -> iced::Result
where where
App::Flags: CosmicFlags, App::Flags: CosmicFlags,
App::Message: Clone + std::fmt::Debug + Send + SurfaceMessageHandler + 'static, App::Message: Clone
+ std::fmt::Debug
+ Send
+ Into<crate::surface_message::MessageWrapper<App::Message>>
+ 'static,
{ {
let activation_token = std::env::var("XDG_ACTIVATION_TOKEN").ok(); let activation_token = std::env::var("XDG_ACTIVATION_TOKEN").ok();

3
src/applet/mod.rs
View file

@ -11,7 +11,6 @@ use crate::{
window, Color, Length, Limits, Rectangle, window, Color, Length, Limits, Rectangle,
}, },
iced_widget, iced_widget,
surface_message::SurfaceMessageHandler,
theme::{self, system_dark, system_light, Button, THEME}, theme::{self, system_dark, system_light, Button, THEME},
widget::{ widget::{
self, self,
@ -380,7 +379,7 @@ impl Context {
/// Returns error on application failure. /// Returns error on application failure.
pub fn run<App: Application>(flags: App::Flags) -> iced::Result pub fn run<App: Application>(flags: App::Flags) -> iced::Result
where where
App::Message: SurfaceMessageHandler, App::Message: Into<crate::surface_message::MessageWrapper<App::Message>>,
{ {
let helper = Context::default(); let helper = Context::default();

11
src/surface_message.rs
View file

@ -7,17 +7,6 @@ pub enum MessageWrapper<M> {
Message(M), Message(M),
} }
pub trait SurfaceMessageHandler: Sized {
fn to_surface_message(self) -> MessageWrapper<Self>;
}
#[cfg(not(feature = "wayland"))]
impl<M> SurfaceMessageHandler for M {
fn to_surface_message(self) -> MessageWrapper<Self> {
MessageWrapper::Message(self)
}
}
/// Ignore this message in your application. It will be intercepted. /// Ignore this message in your application. It will be intercepted.
#[derive(Clone)] #[derive(Clone)]
pub enum SurfaceMessage { pub enum SurfaceMessage {