feat(config): load cosmic-randr output Lists

src/backend/kms/device.rs

@@ -12,7 +12,7 @@ use crate::{
 };
 
 use anyhow::{Context, Result};
-use cosmic_comp_config::output::{AdaptiveSync, OutputConfig, OutputState};
+use cosmic_comp_config::output::comp::{AdaptiveSync, OutputConfig, OutputState};
 use libc::dev_t;
 use smithay::{
     backend::{

src/backend/kms/mod.rs

@@ -9,7 +9,7 @@ use crate::{
 
 use anyhow::{Context, Result};
 use calloop::LoopSignal;
-use cosmic_comp_config::output::{AdaptiveSync, OutputState};
+use cosmic_comp_config::output::comp::{AdaptiveSync, OutputState};
 use indexmap::IndexMap;
 use render::gles::GbmGlowBackend;
 use smithay::{

src/backend/kms/surface/mod.rs

@@ -23,7 +23,7 @@ use crate::{
 
 use anyhow::{Context, Result};
 use calloop::channel::Channel;
-use cosmic_comp_config::output::AdaptiveSync;
+use cosmic_comp_config::output::comp::AdaptiveSync;
 use smithay::{
     backend::{
         allocator::{

src/backend/winit.rs

@@ -8,7 +8,7 @@ use crate::{
     utils::prelude::*,
 };
 use anyhow::{anyhow, Context, Result};
-use cosmic_comp_config::output::{OutputConfig, TransformDef};
+use cosmic_comp_config::output::comp::{OutputConfig, TransformDef};
 use smithay::{
     backend::{
         drm::NodeType,

src/backend/x11.rs

@@ -8,7 +8,7 @@ use crate::{
     utils::prelude::*,
 };
 use anyhow::{anyhow, Context, Result};
-use cosmic_comp_config::output::OutputConfig;
+use cosmic_comp_config::output::comp::OutputConfig;
 use smithay::{
     backend::{
         allocator::{

src/config/mod.rs

@@ -42,10 +42,12 @@ pub mod key_bindings;
 mod types;
 
 use cosmic::config::CosmicTk;
-pub use cosmic_comp_config::output::EdidProduct;
+pub use cosmic_comp_config::output::comp::EdidProduct;
 use cosmic_comp_config::{
     input::{DeviceState as InputDeviceState, InputConfig, TouchpadOverride},
-    output::{load_outputs, OutputConfig, OutputInfo, OutputState, OutputsConfig, TransformDef},
+    output::comp::{
+        load_outputs, OutputConfig, OutputInfo, OutputState, OutputsConfig, TransformDef,
+    },
     workspace::WorkspaceConfig,
     CosmicCompConfig, KeyboardConfig, TileBehavior, XkbConfig, XwaylandDescaling,
     XwaylandEavesdropping, ZoomConfig,
@@ -141,20 +143,6 @@ impl From<CompTransformDef> for Transform {
     }
 }
 
-#[cfg(feature = "libdisplay-info")]
-impl From<libdisplay_info::edid::VendorProduct> for EdidProduct {
-    fn from(vp: libdisplay_info::edid::VendorProduct) -> Self {
-        Self {
-            manufacturer: vp.manufacturer,
-            product: vp.product,
-            serial: vp.serial,
-            manufacture_week: vp.manufacture_week,
-            manufacture_year: vp.manufacture_year,
-            model_year: vp.model_year,
-        }
-    }
-}
-
 #[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq)]
 pub struct ScreenFilter {
     pub inverted: bool,

src/state.rs

@@ -31,7 +31,7 @@ use crate::{
 };
 use anyhow::Context;
 use calloop::RegistrationToken;
-use cosmic_comp_config::output::{OutputConfig, OutputState};
+use cosmic_comp_config::output::comp::{OutputConfig, OutputState};
 use i18n_embed::{
     fluent::{fluent_language_loader, FluentLanguageLoader},
     DesktopLanguageRequester,

src/utils/prelude.rs

@@ -1,4 +1,4 @@
-use cosmic_comp_config::output::{AdaptiveSync, OutputConfig, OutputState};
+use cosmic_comp_config::output::comp::{AdaptiveSync, OutputConfig, OutputState};
 use smithay::{
     backend::drm::VrrSupport as Support,
     output::{Output, WeakOutput},

src/wayland/handlers/output_configuration.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use cosmic_comp_config::output::{OutputConfig, OutputState, TransformDef};
+use cosmic_comp_config::output::comp::{OutputConfig, OutputState, TransformDef};
 use smithay::{output::Output, utils::Point};
 use tracing::{error, warn};
 

src/wayland/protocols/output_configuration/handlers/cosmic.rs

@@ -14,7 +14,7 @@ use smithay::{
     },
 };
 
-use cosmic_comp_config::output::OutputState as EnabledState;
+use cosmic_comp_config::output::comp::OutputState as EnabledState;
 
 use cosmic_protocols::output_management::v1::server::{
     zcosmic_output_configuration_head_v1::{self, ZcosmicOutputConfigurationHeadV1},

src/wayland/protocols/output_configuration/mod.rs

@@ -4,7 +4,7 @@ use calloop::{
     timer::{TimeoutAction, Timer},
     LoopHandle,
 };
-use cosmic_comp_config::output::AdaptiveSync;
+use cosmic_comp_config::output::comp::AdaptiveSync;
 use cosmic_protocols::output_management::v1::server::{
     zcosmic_output_configuration_head_v1::ZcosmicOutputConfigurationHeadV1,
     zcosmic_output_configuration_v1::ZcosmicOutputConfigurationV1,