autocommit 2022-02-06 23:54:46 CET

src/ifs/wl_surface/wl_subsurface.rs

@@ -1,4 +1,4 @@
-
+use crate::client::ClientError;
 use crate::ifs::wl_surface::{
     CommitAction, CommitContext, StackElement, SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError,
     WlSurfaceId,
@@ -6,16 +6,15 @@ use crate::ifs::wl_surface::{
 use crate::object::Object;
 use crate::rect::Rect;
 use crate::utils::buffd::MsgParser;
+use crate::utils::buffd::MsgParserError;
 use crate::utils::linkedlist::LinkedNode;
+use crate::wire::wl_subsurface::*;
+use crate::wire::WlSubsurfaceId;
 use crate::NumCell;
 use std::cell::{Cell, RefCell};
 use std::ops::Deref;
 use std::rc::Rc;
 use thiserror::Error;
-use crate::client::ClientError;
-use crate::wire::wl_subsurface::*;
-use crate::utils::buffd::MsgParserError;
-use crate::wire::WlSubsurfaceId;
 
 #[allow(dead_code)]
 const BAD_SURFACE: u32 = 0;

src/ifs/wl_surface/xdg_surface.rs

@@ -2,7 +2,7 @@ pub mod xdg_popup;
 pub mod xdg_toplevel;
 
 use crate::backend::SeatId;
-use crate::client::{ClientError};
+use crate::client::ClientError;
 use crate::ifs::wl_seat::{NodeSeatState, WlSeatGlobal};
 use crate::ifs::wl_surface::xdg_surface::xdg_popup::{XdgPopup, XdgPopupError};
 use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::XdgToplevel;
@@ -14,16 +14,16 @@ use crate::object::Object;
 use crate::rect::Rect;
 use crate::tree::{FindTreeResult, FoundNode, Node, WorkspaceNode};
 use crate::utils::buffd::MsgParser;
+use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::utils::copyhashmap::CopyHashMap;
 use crate::utils::smallmap::SmallMap;
+use crate::wire::xdg_surface::*;
+use crate::wire::{WlSurfaceId, XdgPopupId, XdgSurfaceId};
 use crate::NumCell;
 use std::cell::Cell;
 use std::rc::Rc;
 use thiserror::Error;
-use crate::wire::xdg_surface::*;
-use crate::utils::buffd::MsgParserError;
-use crate::wire::{WlSurfaceId, XdgPopupId, XdgSurfaceId};
 
 #[allow(dead_code)]
 const NOT_CONSTRUCTED: u32 = 1;

src/ifs/wl_surface/xdg_surface/xdg_popup.rs

@@ -1,4 +1,3 @@
-
 use crate::client::{Client, ClientError};
 use crate::cursor::KnownCursor;
 use crate::fixed::Fixed;
@@ -10,14 +9,14 @@ use crate::rect::Rect;
 use crate::render::Renderer;
 use crate::tree::{FindTreeResult, FoundNode, Node, NodeId, WorkspaceNode};
 use crate::utils::buffd::MsgParser;
+use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::utils::linkedlist::LinkedNode;
+use crate::wire::xdg_popup::*;
+use crate::wire::XdgPopupId;
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;
 use thiserror::Error;
-use crate::wire::xdg_popup::*;
-use crate::utils::buffd::MsgParserError;
-use crate::wire::XdgPopupId;
 
 #[allow(dead_code)]
 const INVALID_GRAB: u32 = 1;
@@ -76,7 +75,10 @@ impl XdgPopup {
     }
 
     fn send_popup_done(&self) {
-        self.xdg.surface.client.event(PopupDone { self_id: self.id })
+        self.xdg
+            .surface
+            .client
+            .event(PopupDone { self_id: self.id })
     }
 
     fn update_position(&self, parent: &XdgSurface) -> Result<(), XdgPopupError> {
@@ -206,12 +208,7 @@ impl XdgPopup {
             self.update_position(&parent)?;
             let rel = self.relative_position.get();
             self.send_repositioned(req.token);
-            self.send_configure(
-                rel.x1(),
-                rel.y1(),
-                rel.width(),
-                rel.height(),
-            );
+            self.send_configure(rel.x1(), rel.y1(), rel.width(), rel.height());
             self.xdg.do_send_configure();
         }
         Ok(())
@@ -303,12 +300,7 @@ impl XdgSurfaceExt for XdgPopup {
         if let Some(parent) = self.parent.get() {
             self.update_position(&parent)?;
             let rel = self.relative_position.get();
-            self.send_configure(
-                rel.x1(),
-                rel.y1(),
-                rel.width(),
-                rel.height(),
-            );
+            self.send_configure(rel.x1(), rel.y1(), rel.width(), rel.height());
         }
         Ok(())
     }

src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs

@@ -1,4 +1,3 @@
-
 use crate::backend::SeatId;
 use crate::bugs::Bugs;
 use crate::client::{Client, ClientError};
@@ -12,9 +11,12 @@ use crate::render::Renderer;
 use crate::tree::{ContainerNode, FindTreeResult};
 use crate::tree::{FloatNode, FoundNode, Node, NodeId, ToplevelNodeId, WorkspaceNode};
 use crate::utils::buffd::MsgParser;
+use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::utils::linkedlist::LinkedNode;
 use crate::utils::smallmap::SmallMap;
+use crate::wire::xdg_toplevel::*;
+use crate::wire::XdgToplevelId;
 use crate::{bugs, NumCell};
 use ahash::{AHashMap, AHashSet};
 use num_derive::FromPrimitive;
@@ -22,9 +24,6 @@ use std::cell::{Cell, RefCell};
 use std::mem;
 use std::rc::Rc;
 use thiserror::Error;
-use crate::wire::xdg_toplevel::*;
-use crate::utils::buffd::MsgParserError;
-use crate::wire::XdgToplevelId;
 
 #[derive(Copy, Clone, Debug, FromPrimitive)]
 pub enum ResizeEdge {