tree: add Transform

src/ifs/ext_image_copy/ext_image_copy_capture_frame_v1.rs

@@ -14,8 +14,8 @@ use {
         leaks::Tracker,
         object::Object,
         rect::Region,
-        tree::{Node, OutputNode},
-        utils::{cell_ext::CellExt, errorfmt::ErrorFmt, transform_ext::TransformExt},
+        tree::{self, Node, OutputNode},
+        utils::{cell_ext::CellExt, errorfmt::ErrorFmt},
         wire::{ExtImageCopyCaptureFrameV1Id, ext_image_copy_capture_frame_v1::*},
     },
     std::rc::Rc,
@@ -216,7 +216,7 @@ impl ExtImageCopyCaptureFrameV1 {
                 &fb,
                 aq,
                 re,
-                jay_config::video::Transform::None,
+                tree::Transform::None,
                 self.client.state.color_manager.srgb_gamma22(),
                 on.global.pos.get(),
                 render_hardware_cursors,
@@ -244,7 +244,7 @@ impl ExtImageCopyCaptureFrameV1 {
                 true,
                 true,
                 false,
-                jay_config::video::Transform::None,
+                tree::Transform::None,
                 None,
                 self.client.state.color_manager.srgb_linear(),
             )

src/ifs/head_management.rs

@@ -13,11 +13,11 @@ use {
         },
         scale::Scale,
         state::OutputData,
-        tree::OutputNode,
+        tree::{OutputNode, Transform},
         utils::{copyhashmap::CopyHashMap, hash_map_ext::HashMapExt, rc_eq::RcEq},
         wire::JayHeadManagerSessionV1Id,
     },
-    jay_config::video::{TearingMode, Transform, VrrMode},
+    jay_config::video::{TearingMode, VrrMode},
     std::{
         cell::{Cell, RefCell},
         rc::Rc,

src/ifs/head_management/jay_head_ext/jay_head_ext_compositor_space_info_v1.rs

@@ -1,7 +1,6 @@
 use {
     crate::{
         ifs::head_management::HeadState,
-        utils::transform_ext::TransformExt,
         wire::{
             jay_head_ext_compositor_space_info_v1::{
                 Disabled, Enabled, Inside, JayHeadExtCompositorSpaceInfoV1RequestHandler, Outside,

src/ifs/head_management/jay_head_ext/jay_head_ext_compositor_space_transformer_v1.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         ifs::head_management::{HeadOp, HeadState},
-        utils::transform_ext::TransformExt,
+        tree::Transform,
         wire::{
             jay_head_ext_compositor_space_transformer_v1::{
                 JayHeadExtCompositorSpaceTransformerV1RequestHandler, SetTransform,
@@ -10,7 +10,6 @@ use {
             jay_head_manager_ext_compositor_space_transformer_v1::JayHeadManagerExtCompositorSpaceTransformerV1RequestHandler,
         },
     },
-    jay_config::video::Transform,
     std::rc::Rc,
 };
 

src/ifs/jay_randr.rs

@@ -10,11 +10,11 @@ use {
         object::{Object, Version},
         scale::Scale,
         state::{ConnectorData, DrmDevData, OutputData, State},
-        tree::{OutputNode, TearingMode, VrrMode},
-        utils::{errorfmt::ErrorFmt, transform_ext::TransformExt},
+        tree::{OutputNode, TearingMode, Transform, VrrMode},
+        utils::errorfmt::ErrorFmt,
         wire::{JayRandrId, jay_randr::*},
     },
-    jay_config::video::{TearingMode as ConfigTearingMode, Transform, VrrMode as ConfigVrrMode},
+    jay_config::video::{TearingMode as ConfigTearingMode, VrrMode as ConfigVrrMode},
     linearize::LinearizeExt,
     std::rc::Rc,
     thiserror::Error,

src/ifs/jay_screencast.rs

@@ -12,7 +12,9 @@ use {
         object::{Object, Version},
         scale::Scale,
         state::State,
-        tree::{LatchListener, OutputNode, ToplevelNode, WorkspaceNode, WorkspaceNodeId},
+        tree::{
+            LatchListener, OutputNode, ToplevelNode, Transform, WorkspaceNode, WorkspaceNodeId,
+        },
         utils::{
             clonecell::{CloneCell, UnsafeCellCloneSafe},
             errorfmt::ErrorFmt,
@@ -24,7 +26,6 @@ use {
         wire::{JayScreencastId, jay_screencast::*},
     },
     ahash::AHashSet,
-    jay_config::video::Transform,
     std::{
         cell::{Cell, RefCell},
         ops::DerefMut,

src/ifs/wl_output.rs

@@ -21,15 +21,14 @@ use {
         object::{Object, Version},
         rect::Rect,
         state::{ConnectorData, State},
-        tree::{OutputNode, TearingMode, VrrMode, calculate_logical_size},
+        tree::{OutputNode, TearingMode, Transform, VrrMode, calculate_logical_size},
         utils::{
             cell_ext::CellExt, clonecell::CloneCell, copyhashmap::CopyHashMap, ordered_float::F64,
-            rc_eq::rc_eq, transform_ext::TransformExt,
+            rc_eq::rc_eq,
         },
         wire::{WlOutputId, WpColorManagementOutputV1Id, ZxdgOutputV1Id, wl_output::*},
     },
     ahash::AHashMap,
-    jay_config::video::Transform,
     linearize::Linearize,
     std::{
         cell::{Cell, RefCell},

src/ifs/wl_surface.rs

@@ -79,13 +79,13 @@ use {
         tree::{
             BeforeLatchListener, BeforeLatchResult, ContainerNode, FindTreeResult, FoundNode,
             LatchListener, Node, NodeId, NodeLayerLink, NodeLocation, NodeVisitor, NodeVisitorBase,
-            OutputNode, PlaceholderNode, PresentationListener, ToplevelNode, VblankListener,
+            OutputNode, PlaceholderNode, PresentationListener, ToplevelNode, Transform,
+            VblankListener,
         },
         utils::{
             cell_ext::CellExt, clonecell::CloneCell, copyhashmap::CopyHashMap,
             double_buffered::DoubleBuffered, errorfmt::ErrorFmt, event_listener::EventListener,
             linkedlist::LinkedList, numcell::NumCell, smallmap::SmallMap,
-            transform_ext::TransformExt,
         },
         video::{
             dmabuf::DMA_BUF_SYNC_READ,
@@ -99,7 +99,6 @@ use {
     },
     ahash::AHashMap,
     isnt::std_1::{primitive::IsntSliceExt, vec::IsntVecExt},
-    jay_config::video::Transform,
     std::{
         cell::{Cell, RefCell},
         collections::hash_map::{Entry, OccupiedEntry},

src/ifs/wlr_output_manager/zwlr_output_configuration_head.rs

@@ -9,11 +9,9 @@ use {
         leaks::Tracker,
         object::{Object, Version},
         scale::Scale,
-        tree::VrrMode,
-        utils::transform_ext::TransformExt,
+        tree::{Transform, VrrMode},
         wire::{ZwlrOutputConfigurationHeadV1Id, zwlr_output_configuration_head_v1::*},
     },
-    jay_config::video::Transform,
     std::{cell::RefCell, rc::Rc},
     thiserror::Error,
 };

src/ifs/wlr_output_manager/zwlr_output_head_v1.rs

@@ -11,12 +11,10 @@ use {
         object::{Object, Version},
         scale,
         state::OutputData,
-        tree::VrrMode,
-        utils::transform_ext::TransformExt,
+        tree::{self, VrrMode},
         wire::{ZwlrOutputHeadV1Id, zwlr_output_head_v1::*},
     },
     ahash::AHashMap,
-    jay_config::video,
     std::rc::Rc,
     thiserror::Error,
 };
@@ -111,7 +109,7 @@ impl ZwlrOutputHeadV1 {
         });
     }
 
-    pub fn send_transform(&self, transform: video::Transform) {
+    pub fn send_transform(&self, transform: tree::Transform) {
         self.client.event(Transform {
             self_id: self.id,
             transform: transform.to_wl(),
@@ -173,7 +171,7 @@ impl ZwlrOutputHeadV1 {
         }
     }
 
-    pub fn hande_transform_change(&self, transform: video::Transform) {
+    pub fn hande_transform_change(&self, transform: tree::Transform) {
         self.send_transform(transform);
         self.manager.schedule_done();
     }