chore: more cosmic-comp stuff to new compositor module

Signed-off-by: Ryan Brue <ryanbrue@gmail.com>
ryanabx · Aug 11, 2024 · d847cc1 · d847cc1
1 parent 4a48573
commit d847cc1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
diff --git a/src/app_tray/mod.rs b/src/app_tray/mod.rs
@@ -1,2 +1 @@
-pub mod cosmic_comp;
 pub mod desktop_entry;
diff --git a/src/app_tray/cosmic_comp.rs → src/compositor/cosmic_comp.rs b/src/app_tray/cosmic_comp.rs → src/compositor/cosmic_comp.rs
@@ -66,10 +66,12 @@ impl OutputHandler for WaylandData {
         output: cctk::wayland_client::protocol::wl_output::WlOutput,
     ) {
         if let Some(info) = self.output_state.info(&output) {
-            let _ = self.tx.unbounded_send(WaylandMessage::Output(OutputUpdate::Add(
-                output.clone(),
-                info.clone(),
-            )));
+            let _ = self
+                .tx
+                .unbounded_send(WaylandMessage::Output(OutputUpdate::Add(
+                    output.clone(),
+                    info.clone(),
+                )));
         }
     }
 
@@ -80,10 +82,12 @@ impl OutputHandler for WaylandData {
         output: cctk::wayland_client::protocol::wl_output::WlOutput,
     ) {
         if let Some(info) = self.output_state.info(&output) {
-            let _ = self.tx.unbounded_send(WaylandMessage::Output(OutputUpdate::Update(
-                output.clone(),
-                info.clone(),
-            )));
+            let _ = self
+                .tx
+                .unbounded_send(WaylandMessage::Output(OutputUpdate::Update(
+                    output.clone(),
+                    info.clone(),
+                )));
         }
     }
 
@@ -237,10 +241,12 @@ impl ToplevelInfoHandler for WaylandData {
         toplevel: &cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
     ) {
         if let Some(info) = self.toplevel_info_state.info(toplevel) {
-            let _ = self.tx.unbounded_send(WaylandMessage::Toplevel(ToplevelUpdate::Add(
-                toplevel.clone(),
-                info.clone(),
-            )));
+            let _ = self
+                .tx
+                .unbounded_send(WaylandMessage::Toplevel(ToplevelUpdate::Add(
+                    toplevel.clone(),
+                    info.clone(),
+                )));
         } else {
             println!("WTF");
         }

diff --git a/src/compositor/mod.rs b/src/compositor/mod.rs
@@ -0,0 +1 @@
+pub mod cosmic_comp;
diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,5 @@
-use app_tray::cosmic_comp::{WaylandMessage, WaylandRequest};
 use cctk::{sctk::reexports::calloop::channel::Sender, wayland_client::protocol::wl_seat::WlSeat};
+use compositor::cosmic_comp::{WaylandMessage, WaylandRequest};
 use config::PanelConfig;
 use iced::{
     application::{
@@ -16,6 +16,7 @@ use iced::{
 };
 
 mod app_tray;
+mod compositor;
 mod config;
 
 fn main() -> Result<(), iced::Error> {
@@ -123,7 +124,7 @@ impl<'a> Application for Panel<'a> {
 
     fn subscription(&self) -> iced::Subscription<Self::Message> {
         Subscription::batch(vec![
-            app_tray::cosmic_comp::wayland_subscription().map(Message::Wayland),
+            compositor::cosmic_comp::wayland_subscription().map(Message::Wayland),
             listen_with(|e, _, _| match e {
                 iced::Event::PlatformSpecific(event::PlatformSpecific::Wayland(
                     event::wayland::Event::Seat(e, seat),