feat: add subscriber for wayland

Cargo.toml

@@ -6,7 +6,7 @@ members = [
   "iced_layershell_macros",
   "iced_sessionlock",
   "iced_sessionlock_macros",
-  "starcolorkeyboard",
+  "iced_wayland_subscriber",
   "sessionlockev",
   "waycrate_xkbkeycode",
   "iced_examples/*",
@@ -28,6 +28,7 @@ readme = "README.md"
 [workspace.dependencies]
 layershellev = { version = "0.9.7", path = "./layershellev" }
 sessionlockev = { version = "0.9.7", path = "./sessionlockev" }
+iced_wayland_subscriber = { version = "0.9.7", path = "./iced_wayland_subscriber" }
 
 iced_layershell = { version = "0.9.7", path = "./iced_layershell" }
 iced_layershell_macros = { version = "0.9.7", path = "./iced_layershell_macros" }
@@ -79,7 +80,7 @@ bitflags = "2.6.0"
 log = "0.4.22"
 
 xkbcommon-dl = "0.4.2"
-smol_str = "0.2.2" #NOTE: follow iced
+smol_str = "0.2.2"     #NOTE: follow iced
 memmap2 = "0.9.5"
 
 tracing = "0.1.40"

iced_examples/counter_muti/Cargo.toml

@@ -15,3 +15,5 @@ readme.workspace = true
 iced.workspace = true
 iced_runtime.workspace = true
 iced_layershell.workspace = true
+
+iced_wayland_subscriber.workspace = true

iced_examples/counter_muti/src/main.rs

@@ -7,11 +7,15 @@ use iced_layershell::actions::{IcedNewMenuSettings, MenuDirection};
 use iced_runtime::window::Action as WindowAction;
 use iced_runtime::{task, Action};
 
-use iced_layershell::reexport::{Anchor, KeyboardInteractivity, Layer, NewLayerShellSettings};
+use iced_layershell::reexport::{
+    Anchor, KeyboardInteractivity, Layer, LayerOutputSetting, NewLayerShellSettings,
+};
 use iced_layershell::settings::{LayerShellSettings, Settings, StartMode};
 use iced_layershell::to_layer_message;
 use iced_layershell::MultiApplication;
 
+use iced_wayland_subscriber::WaylandEvents;
+
 pub fn main() -> Result<(), iced_layershell::Error> {
     Counter::run(Settings {
         layer_settings: LayerShellSettings {
@@ -36,6 +40,7 @@ enum WindowInfo {
     Left,
     Right,
     PopUp,
+    TopBar,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -57,6 +62,7 @@ enum Message {
     TextInput(String),
     Direction(WindowDirection),
     IcedEvent(Event),
+    Wayland(WaylandEvents),
 }
 
 impl Counter {
@@ -105,7 +111,10 @@ impl MultiApplication for Counter {
     }
 
     fn subscription(&self) -> iced::Subscription<Self::Message> {
-        event::listen().map(Message::IcedEvent)
+        iced::Subscription::batch([
+            event::listen().map(Message::IcedEvent),
+            iced_wayland_subscriber::listen().map(Message::Wayland),
+        ])
     }
 
     fn update(&mut self, message: Message) -> Command<Message> {
@@ -180,7 +189,7 @@ impl MultiApplication for Counter {
                     layer: Layer::Top,
                     margin: None,
                     keyboard_interactivity: KeyboardInteractivity::Exclusive,
-                    use_last_output: false,
+                    output_setting: LayerOutputSetting::None,
                     ..Default::default()
                 },
                 info: WindowInfo::Left,
@@ -193,12 +202,27 @@ impl MultiApplication for Counter {
                     layer: Layer::Top,
                     margin: None,
                     keyboard_interactivity: KeyboardInteractivity::Exclusive,
-                    use_last_output: false,
+                    output_setting: LayerOutputSetting::None,
                     ..Default::default()
                 },
                 info: WindowInfo::Right,
             }),
             Message::Close(id) => task::effect(Action::Window(WindowAction::Close(id))),
+            Message::Wayland(WaylandEvents::OutputInsert(output)) => {
+                Command::done(Message::NewLayerShell {
+                    settings: NewLayerShellSettings {
+                        size: Some((0, 20)),
+                        exclusive_zone: Some(20),
+                        anchor: Anchor::Top | Anchor::Right | Anchor::Left,
+                        layer: Layer::Top,
+                        margin: None,
+                        keyboard_interactivity: KeyboardInteractivity::None,
+                        output_setting: LayerOutputSetting::ChosenOutput(output),
+                        ..Default::default()
+                    },
+                    info: WindowInfo::TopBar,
+                })
+            }
             _ => unreachable!(),
         }
     }
@@ -210,6 +234,9 @@ impl MultiApplication for Counter {
         if let Some(WindowInfo::Right) = self.id_info(id) {
             return button("close right").on_press(Message::Close(id)).into();
         }
+        if let Some(WindowInfo::TopBar) = self.id_info(id) {
+            return text("hello here is topbar").into();
+        }
         if let Some(WindowInfo::PopUp) = self.id_info(id) {
             return container(button("close PopUp").on_press(Message::Close(id)))
                 .center_x(Length::Fill)

iced_examples/zbus_invoked_widget/src/main.rs

@@ -8,7 +8,9 @@ use iced_layershell::actions::{
 use iced_runtime::window::Action as WindowAction;
 use iced_runtime::Action;
 
-use iced_layershell::reexport::{Anchor, KeyboardInteractivity, Layer, NewLayerShellSettings};
+use iced_layershell::reexport::{
+    Anchor, KeyboardInteractivity, Layer, LayerOutputSetting, NewLayerShellSettings,
+};
 use iced_layershell::settings::{LayerShellSettings, Settings, StartMode};
 use iced_layershell::MultiApplication;
 use zbus::{connection, interface};
@@ -53,7 +55,7 @@ impl TryInto<LaLaShellIdAction> for Message {
                         layer: Layer::Top,
                         margin: Some((100, 100, 100, 100)),
                         keyboard_interactivity: KeyboardInteractivity::OnDemand,
-                        use_last_output: false,
+                        output_setting: LayerOutputSetting::None,
                         ..Default::default()
                     },
                     (),

iced_layershell/src/actions.rs

@@ -34,7 +34,7 @@ pub struct IcedNewMenuSettings {
     pub direction: MenuDirection,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub enum LayershellCustomActionsWithInfo<INFO: Clone> {
     AnchorChange(Anchor),
     LayerChange(Layer),
@@ -55,7 +55,7 @@ pub enum LayershellCustomActionsWithInfo<INFO: Clone> {
 
 pub type LayershellCustomActions = LayershellCustomActionsWithInfo<()>;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub struct LayershellCustomActionsWithIdAndInfo<INFO: Clone>(
     pub Option<IcedId>,
     pub LayershellCustomActionsWithInfo<INFO>,
@@ -70,7 +70,7 @@ impl<INFO: Clone> LayershellCustomActionsWithIdAndInfo<INFO> {
 pub type LayershellCustomActionsWithId = LayershellCustomActionsWithIdAndInfo<()>;
 
 // first one means
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub(crate) struct LayershellCustomActionsWithIdInner<INFO: Clone>(
     pub Option<LayerId>,                       // come from
     pub Option<LayerId>,                       // target if has one

iced_layershell/src/lib.rs

@@ -16,6 +16,7 @@ pub mod reexport {
     pub use layershellev::reexport::Anchor;
     pub use layershellev::reexport::KeyboardInteractivity;
     pub use layershellev::reexport::Layer;
+    pub use layershellev::LayerOutputSetting;
     pub use layershellev::NewLayerShellSettings;
 }
 

iced_wayland_subscriber/.gitignore

@@ -0,0 +1 @@
+/target