autocommit 2022-03-29 14:11:25 CEST

src/ifs/ipc.rs

@@ -3,8 +3,8 @@ use crate::ifs::wl_seat::WlSeatGlobal;
 use crate::object::ObjectId;
 use crate::utils::bitflags::BitflagsExt;
 use crate::utils::clonecell::CloneCell;
+use crate::utils::numcell::NumCell;
 use crate::utils::smallmap::SmallMap;
-use crate::NumCell;
 use ahash::AHashSet;
 use std::cell::{Cell, RefCell};
 use std::ops::Deref;

src/ifs/wl_buffer.rs

@@ -1,16 +1,15 @@
 use crate::client::{Client, ClientError};
-use crate::clientmem::{ClientMem, ClientMemOffset};
+use crate::clientmem::{ClientMem, ClientMemError, ClientMemOffset};
 use crate::format::Format;
 use crate::leaks::Tracker;
 use crate::object::Object;
 use crate::rect::Rect;
-use crate::render::{Image, Texture};
+use crate::render::{Image, RenderError, Texture};
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::wire::wl_buffer::*;
 use crate::wire::WlBufferId;
-use crate::{ClientMemError, RenderError};
 use std::cell::Cell;
 use std::rc::Rc;
 use thiserror::Error;

src/ifs/wl_drm.rs

@@ -5,11 +5,11 @@ use crate::globals::{Global, GlobalName};
 use crate::ifs::wl_buffer::WlBuffer;
 use crate::leaks::Tracker;
 use crate::object::Object;
+use crate::render::RenderError;
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::wire::wl_drm::*;
 use crate::wire::WlDrmId;
-use crate::RenderError;
 use bstr::ByteSlice;
 use std::ffi::CString;
 use std::rc::Rc;

src/ifs/wl_output.rs

@@ -8,10 +8,10 @@ use crate::rect::Rect;
 use crate::tree::OutputNode;
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
+use crate::utils::clonecell::CloneCell;
 use crate::utils::copyhashmap::CopyHashMap;
 use crate::wire::wl_output::*;
 use crate::wire::{WlOutputId, ZxdgOutputV1Id};
-use crate::CloneCell;
 use ahash::AHashMap;
 use std::cell::{Cell, RefCell};
 use std::collections::hash_map::Entry;

src/ifs/wl_seat.rs

@@ -25,6 +25,7 @@ use crate::ifs::wl_seat::wl_touch::WlTouch;
 use crate::ifs::wl_surface::WlSurface;
 use crate::leaks::Tracker;
 use crate::object::{Object, ObjectId};
+use crate::state::State;
 use crate::tree::toplevel::ToplevelNode;
 use crate::tree::{ContainerSplit, FloatNode, FoundNode, Node};
 use crate::utils::asyncevent::AsyncEvent;
@@ -32,13 +33,14 @@ use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::utils::copyhashmap::CopyHashMap;
+use crate::utils::errorfmt::ErrorFmt;
 use crate::utils::linkedlist::{LinkedList, LinkedNode};
+use crate::utils::numcell::NumCell;
 use crate::wire::wl_seat::*;
 use crate::wire::{
     WlDataDeviceId, WlKeyboardId, WlPointerId, WlSeatId, ZwpPrimarySelectionDeviceV1Id,
 };
 use crate::xkbcommon::{XkbKeymap, XkbState};
-use crate::{ErrorFmt, NumCell, State};
 use ahash::{AHashMap, AHashSet};
 pub use event_handling::NodeSeatState;
 use jay_config::keyboard::mods::Modifiers;

src/ifs/wl_seat/kb_owner.rs

@@ -1,6 +1,6 @@
 use crate::ifs::wl_seat::WlSeatGlobal;
 use crate::tree::Node;
-use crate::CloneCell;
+use crate::utils::clonecell::CloneCell;
 use std::rc::Rc;
 
 pub struct KbOwnerHolder {

src/ifs/wl_shm_pool.rs

@@ -1,5 +1,5 @@
 use crate::client::{Client, ClientError};
-use crate::clientmem::ClientMem;
+use crate::clientmem::{ClientMem, ClientMemError};
 use crate::format::{formats, map_wayland_format_id};
 use crate::ifs::wl_buffer::{WlBuffer, WlBufferError};
 use crate::leaks::Tracker;
@@ -9,7 +9,6 @@ use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::wire::wl_shm_pool::*;
 use crate::wire::WlShmPoolId;
-use crate::ClientMemError;
 use std::rc::Rc;
 use thiserror::Error;
 use uapi::OwnedFd;

src/ifs/wl_surface.rs

@@ -12,23 +12,24 @@ use crate::ifs::wl_callback::WlCallback;
 use crate::ifs::wl_seat::{Dnd, NodeSeatState, SeatId, WlSeatGlobal};
 use crate::ifs::wl_surface::cursor::CursorSurface;
 use crate::ifs::wl_surface::wl_subsurface::WlSubsurface;
-use crate::ifs::wl_surface::xdg_surface::{XdgSurfaceError};
+use crate::ifs::wl_surface::xdg_surface::XdgSurfaceError;
 use crate::ifs::wl_surface::zwlr_layer_surface_v1::ZwlrLayerSurfaceV1Error;
 use crate::leaks::Tracker;
 use crate::object::Object;
 use crate::pixman::Region;
 use crate::rect::Rect;
 use crate::render::Renderer;
+use crate::tree::toplevel::ToplevelNode;
 use crate::tree::walker::NodeVisitor;
 use crate::tree::{ContainerNode, ContainerSplit, Node, NodeId};
 use crate::utils::buffd::{MsgParser, MsgParserError};
 use crate::utils::clonecell::CloneCell;
 use crate::utils::linkedlist::LinkedList;
+use crate::utils::numcell::NumCell;
 use crate::utils::smallmap::SmallMap;
 use crate::wire::wl_surface::*;
 use crate::wire::{WlOutputId, WlSurfaceId};
 use crate::xkbcommon::ModifierState;
-use crate::NumCell;
 use ahash::AHashMap;
 use jay_config::Direction;
 use std::cell::{Cell, RefCell};
@@ -37,7 +38,6 @@ use std::mem;
 use std::ops::{Deref, DerefMut};
 use std::rc::Rc;
 use thiserror::Error;
-use crate::tree::toplevel::ToplevelNode;
 
 #[allow(dead_code)]
 const INVALID_SCALE: u32 = 0;
@@ -644,13 +644,15 @@ impl Node for WlSurface {
     }
 
     fn get_parent_mono(&self) -> Option<bool> {
-        self.toplevel.get()
+        self.toplevel
+            .get()
             .and_then(|t| t.parent())
             .and_then(|p| p.get_mono())
     }
 
     fn get_parent_split(&self) -> Option<ContainerSplit> {
-        self.toplevel.get()
+        self.toplevel
+            .get()
             .and_then(|t| t.parent())
             .and_then(|p| p.get_split())
     }

src/ifs/wl_surface/wl_subsurface.rs

@@ -9,9 +9,9 @@ use crate::rect::Rect;
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::utils::linkedlist::LinkedNode;
+use crate::utils::numcell::NumCell;
 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;

src/ifs/wl_surface/xdg_surface.rs

@@ -2,7 +2,7 @@ pub mod xdg_popup;
 pub mod xdg_toplevel;
 
 use crate::client::ClientError;
-use crate::ifs::wl_seat::{NodeSeatState};
+use crate::ifs::wl_seat::NodeSeatState;
 use crate::ifs::wl_surface::xdg_surface::xdg_popup::{XdgPopup, XdgPopupError};
 use crate::ifs::wl_surface::xdg_surface::xdg_toplevel::XdgToplevel;
 use crate::ifs::wl_surface::{
@@ -17,9 +17,9 @@ use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::utils::copyhashmap::CopyHashMap;
+use crate::utils::numcell::NumCell;
 use crate::wire::xdg_surface::*;
 use crate::wire::{WlSurfaceId, XdgPopupId, XdgSurfaceId};
-use crate::NumCell;
 use std::cell::Cell;
 use std::fmt::Debug;
 use std::rc::Rc;

src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs

@@ -1,22 +1,24 @@
+use crate::bugs;
 use crate::bugs::Bugs;
 use crate::client::{Client, ClientError};
 use crate::cursor::KnownCursor;
 use crate::fixed::Fixed;
 use crate::ifs::wl_seat::{NodeSeatState, WlSeatGlobal};
 use crate::ifs::wl_surface::xdg_surface::{XdgSurface, XdgSurfaceError, XdgSurfaceExt};
+use crate::ifs::wl_surface::WlSurface;
 use crate::leaks::Tracker;
 use crate::object::Object;
 use crate::rect::Rect;
 use crate::render::Renderer;
+use crate::tree::toplevel::{ToplevelData, ToplevelNode};
 use crate::tree::walker::NodeVisitor;
-use crate::tree::{FindTreeResult};
+use crate::tree::FindTreeResult;
 use crate::tree::{FoundNode, Node, NodeId, ToplevelNodeId, WorkspaceNode};
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::utils::clonecell::CloneCell;
 use crate::wire::xdg_toplevel::*;
 use crate::wire::XdgToplevelId;
-use crate::{bugs};
 use ahash::{AHashMap, AHashSet};
 use jay_config::Direction;
 use num_derive::FromPrimitive;
@@ -25,8 +27,6 @@ use std::fmt::{Debug, Formatter};
 use std::mem;
 use std::ops::Deref;
 use std::rc::Rc;
-use crate::ifs::wl_surface::WlSurface;
-use crate::tree::toplevel::{ToplevelData, ToplevelNode};
 use thiserror::Error;
 
 #[derive(Copy, Clone, Debug, FromPrimitive)]

src/ifs/wl_surface/xwindow.rs

@@ -5,16 +5,18 @@ use crate::ifs::wl_seat::{NodeSeatState, SeatId, WlSeatGlobal};
 use crate::ifs::wl_surface::{SurfaceExt, SurfaceRole, WlSurface, WlSurfaceError};
 use crate::rect::Rect;
 use crate::render::Renderer;
+use crate::state::State;
 use crate::tree::toplevel::{ToplevelData, ToplevelNode};
 use crate::tree::walker::NodeVisitor;
 use crate::tree::{FindTreeResult, FoundNode, Node, NodeId, WorkspaceNode};
+use crate::utils::clonecell::CloneCell;
 use crate::utils::copyhashmap::CopyHashMap;
 use crate::utils::linkedlist::LinkedNode;
+use crate::utils::queue::AsyncQueue;
 use crate::utils::smallmap::SmallMap;
 use crate::wire::WlSurfaceId;
 use crate::wire_xcon::CreateNotify;
 use crate::xwayland::XWaylandEvent;
-use crate::{AsyncQueue, CloneCell,  State};
 use bstr::BString;
 use jay_config::Direction;
 use std::cell::{Cell, RefCell};
@@ -266,21 +268,37 @@ impl Xwindow {
             Change::None => {}
             Change::Unmap => self.destroy_node(true),
             Change::Map if self.data.info.override_redirect.get() => {
-                *self.display_link.borrow_mut() = Some(self.data.state.root.stacked.add_last(self.clone()));
-                *self.display_xlink.borrow_mut() = Some(self.data.state.root.xstacked.add_last(self.clone()));
+                *self.display_link.borrow_mut() =
+                    Some(self.data.state.root.stacked.add_last(self.clone()));
+                *self.display_xlink.borrow_mut() =
+                    Some(self.data.state.root.xstacked.add_last(self.clone()));
                 self.data.state.tree_changed();
             }
             Change::Map if self.data.info.wants_floating.get() => {
-                let ws = self.data.state.root.outputs.lock().iter().next().unwrap().1.workspace.get().unwrap();
+                let ws = self
+                    .data
+                    .state
+                    .root
+                    .outputs
+                    .lock()
+                    .iter()
+                    .next()
+                    .unwrap()
+                    .1
+                    .workspace
+                    .get()
+                    .unwrap();
                 // todo
                 let ext = self.data.info.extents.get();
-                self.data.state.map_floating(self.clone(), ext.width(), ext.height(), &ws);
+                self.data
+                    .state
+                    .map_floating(self.clone(), ext.width(), ext.height(), &ws);
                 self.data.title_changed();
-            },
+            }
             Change::Map => {
                 self.data.state.map_tiled(self.clone());
                 self.data.title_changed();
-            },
+            }
         }
     }
 }
@@ -442,7 +460,20 @@ impl ToplevelNode for Xwindow {
     }
 
     fn toggle_floating(self: Rc<Self>) {
-        todo!()
+        let parent = match self.parent_node.get() {
+            Some(p) => p,
+            _ => return,
+        };
+        if parent.is_float() {
+            parent.remove_child(&*self);
+            self.data.state.map_tiled(self.clone());
+        } else if let Some(ws) = self.workspace.get() {
+            parent.remove_child(&*self);
+            let extents = self.data.info.extents.get();
+            self.data
+                .state
+                .map_floating(self.clone(), extents.width(), extents.height(), &ws);
+        }
     }
 }
 

src/ifs/wl_surface/zwlr_layer_surface_v1.rs

@@ -14,9 +14,9 @@ use crate::utils::bitflags::BitflagsExt;
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
 use crate::utils::linkedlist::LinkedNode;
+use crate::utils::numcell::NumCell;
 use crate::wire::zwlr_layer_surface_v1::*;
 use crate::wire::{WlSurfaceId, ZwlrLayerSurfaceV1Id};
-use crate::NumCell;
 use std::cell::Cell;
 use std::ops::Deref;
 use std::rc::Rc;

src/ifs/zwp_linux_buffer_params_v1.rs

@@ -5,11 +5,12 @@ use crate::ifs::wl_buffer::WlBuffer;
 use crate::ifs::zwp_linux_dmabuf_v1::ZwpLinuxDmabufV1;
 use crate::leaks::Tracker;
 use crate::object::Object;
+use crate::render::RenderError;
 use crate::utils::buffd::MsgParser;
 use crate::utils::buffd::MsgParserError;
+use crate::utils::errorfmt::ErrorFmt;
 use crate::wire::zwp_linux_buffer_params_v1::*;
 use crate::wire::{WlBufferId, ZwpLinuxBufferParamsV1Id};
-use crate::{ErrorFmt, RenderError};
 use ahash::AHashMap;
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;