kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: add (Clone)Cell::is_some and is_none

Browse source
This commit is contained in:
Julian Orth 2024-03-02 18:09:40 +01:00
parent 7a67784502
commit 54d93f84da
32 changed files with 98 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ifs/ext_session_lock_v1.rs
View file

@ -63,7 +63,7 @@ impl ExtSessionLockV1 {
self.client.add_client_obj(&new)?;
if !output.global.destroyed.get() && !self.finished.get() {
if let Some(node) = output.global.node.get() {
if node.lock_surface.get().is_some() {
if node.lock_surface.is_some() {
return Err(ExtSessionLockV1Error::OutputAlreadyLocked);
}
node.lock_surface.set(Some(new.clone()));

7
src/ifs/ipc.rs
View file

@ -3,7 +3,8 @@ use {
client::{Client, ClientError, ClientId, WaylandObject},
ifs::wl_seat::{WlSeatError, WlSeatGlobal},
utils::{
bitflags::BitflagsExt, clonecell::CloneCell, numcell::NumCell, smallmap::SmallMap,
bitflags::BitflagsExt, cell_ext::CellExt, clonecell::CloneCell, numcell::NumCell,
smallmap::SmallMap,
},
},
ahash::AHashSet,
@ -164,11 +165,11 @@ pub fn attach_seat<T: IpcVtable>(
}
state |= SOURCE_STATE_USED;
if role == Role::Dnd {
if data.actions.get().is_none() {
if data.actions.is_none() {
return Err(IpcError::ActionsNotSet);
}
} else {
if data.actions.get().is_some() {
if data.actions.is_some() {
return Err(IpcError::ActionsSet);
}
}

3
src/ifs/ipc/wl_data_source.rs
View file

@ -13,6 +13,7 @@ use {
utils::{
bitflags::BitflagsExt,
buffd::{MsgParser, MsgParserError},
cell_ext::CellExt,
},
wire::{wl_data_source::*, WlDataSourceId},
xwayland::XWaylandEvent,
@ -186,7 +187,7 @@ impl WlDataSource {
fn set_actions(&self, parser: MsgParser<'_, '_>) -> Result<(), WlDataSourceError> {
let req: SetActions = self.data.client.parse(self, parser)?;
if self.data.actions.get().is_some() {
if self.data.actions.is_some() {
return Err(WlDataSourceError::AlreadySet);
}
if req.dnd_actions & !DND_ALL != 0 {

4
src/ifs/wl_buffer.rs
View file

@ -207,7 +207,7 @@ impl WlBuffer {
}
}
WlBufferStorage::Dmabuf(img) => {
if self.texture.get().is_none() {
if self.texture.is_none() {
self.texture.set(Some(img.clone().to_texture()?));
}
}
@ -226,7 +226,7 @@ impl WlBuffer {
// nothing
}
WlBufferStorage::Dmabuf(img) => {
if self.famebuffer.get().is_none() {
if self.famebuffer.is_none() {
self.famebuffer.set(Some(img.clone().to_framebuffer()?));
}
}

5
src/ifs/wl_seat.rs
View file

@ -432,7 +432,7 @@ impl WlSeatGlobal {
}
fn maybe_constrain(&self, surface: &WlSurface, x: Fixed, y: Fixed) {
if self.constraint.get().is_some() {
if self.constraint.is_some() {
return;
}
let candidate = match surface.constraints.get(&self.id) {
@ -543,8 +543,7 @@ impl WlSeatGlobal {
}
pub fn get_mono(&self) -> Option<bool> {
self.kb_parent_container()
.map(|c| c.mono_child.get().is_some())
self.kb_parent_container().map(|c| c.mono_child.is_some())
}
pub fn get_split(&self) -> Option<ContainerSplit> {

5
src/ifs/wl_surface.rs
View file

@ -45,6 +45,7 @@ use {
},
utils::{
buffd::{MsgParser, MsgParserError},
cell_ext::CellExt,
clonecell::CloneCell,
copyhashmap::CopyHashMap,
linkedlist::LinkedList,
@ -677,7 +678,7 @@ impl WlSurface {
}
if viewport_changed {
if let Some(rect) = self.src_rect.get() {
if self.dst_size.get().is_none() {
if self.dst_size.is_none() {
if !rect[2].is_integer() || !rect[3].is_integer() {
return Err(WlSurfaceError::NonIntegerViewportSize);
}
@ -773,7 +774,7 @@ impl WlSurface {
new_size = Some((width, height));
}
if transform_changed || Some(buffer.rect) != old_raw_size {
let (x1, y1, x2, y2) = if self.src_rect.get().is_none() {
let (x1, y1, x2, y2) = if self.src_rect.is_none() {
(0.0, 0.0, 1.0, 1.0)
} else {
let (width, height) =

2
src/ifs/wl_surface/wp_fractional_scale_v1.rs
View file

@ -29,7 +29,7 @@ impl WpFractionalScaleV1 {
}
pub fn install(self: &Rc<Self>) -> Result<(), WpFractionalScaleError> {
if self.surface.fractional_scale.get().is_some() {
if self.surface.fractional_scale.is_some() {
return Err(WpFractionalScaleError::Exists);
}
self.surface.fractional_scale.set(Some(self.clone()));

2
src/ifs/wl_surface/wp_tearing_control_v1.rs
View file

@ -22,7 +22,7 @@ pub struct WpTearingControlV1 {
impl WpTearingControlV1 {
pub fn install(self: &Rc<Self>) -> Result<(), WpTearingControlV1Error> {
if self.surface.tearing_control.get().is_some() {
if self.surface.tearing_control.is_some() {
return Err(WpTearingControlV1Error::AlreadyAttached(self.surface.id));
}
self.surface.tearing_control.set(Some(self.clone()));

2
src/ifs/wl_surface/wp_viewport.rs
View file

@ -29,7 +29,7 @@ impl WpViewport {
}
pub fn install(self: &Rc<Self>) -> Result<(), WpViewportError> {
if self.surface.viewporter.get().is_some() {
if self.surface.viewporter.is_some() {
return Err(WpViewportError::ViewportExists);
}
self.surface.viewporter.set(Some(self.clone()));

2
src/ifs/wl_surface/x_surface.rs
View file

@ -30,7 +30,7 @@ impl SurfaceExt for XSurface {
}
fn on_surface_destroy(&self) -> Result<(), WlSurfaceError> {
if self.xwayland_surface.get().is_some() {
if self.xwayland_surface.is_some() {
return Err(WlSurfaceError::ReloObjectStillExists);
}
self.surface.unset_ext();

7
src/ifs/wl_surface/x_surface/xwayland_surface_v1.rs
View file

@ -4,7 +4,10 @@ use {
ifs::wl_surface::{x_surface::XSurface, WlSurfaceError},
leaks::Tracker,
object::Object,
utils::buffd::{MsgParser, MsgParserError},
utils::{
buffd::{MsgParser, MsgParserError},
cell_ext::CellExt,
},
wire::{xwayland_surface_v1::*, XwaylandSurfaceV1Id},
},
std::rc::Rc,
@ -21,7 +24,7 @@ pub struct XwaylandSurfaceV1 {
impl XwaylandSurfaceV1 {
fn set_serial(&self, parser: MsgParser<'_, '_>) -> Result<(), XwaylandSurfaceV1Error> {
let req: SetSerial = self.client.parse(self, parser)?;
if self.x.surface.xwayland_serial.get().is_some() {
if self.x.surface.xwayland_serial.is_some() {
return Err(XwaylandSurfaceV1Error::SerialAlreadySet);
}
let serial = req.serial_lo as u64 | ((req.serial_hi as u64) << 32);

6
src/ifs/wl_surface/x_surface/xwindow.rs
View file

@ -202,7 +202,7 @@ impl Xwindow {
surface: &Rc<WlSurface>,
) -> Result<Rc<Self>, XWindowError> {
let xsurface = surface.get_xsurface()?;
if xsurface.xwindow.get().is_some() {
if xsurface.xwindow.is_some() {
return Err(XWindowError::AlreadyAttached);
}
let tld = ToplevelData::new(
@ -235,11 +235,11 @@ impl Xwindow {
}
pub fn is_mapped(&self) -> bool {
self.toplevel_data.parent.get().is_some() || self.display_link.borrow_mut().is_some()
self.toplevel_data.parent.is_some() || self.display_link.borrow_mut().is_some()
}
pub fn may_be_mapped(&self) -> bool {
self.x.surface.buffer.get().is_some() && self.data.info.mapped.get()
self.x.surface.buffer.is_some() && self.data.info.mapped.get()
}
fn map_change(&self) -> Change {

6
src/ifs/wl_surface/xdg_surface.rs
View file

@ -184,7 +184,7 @@ impl XdgSurface {
fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), XdgSurfaceError> {
let _req: Destroy = self.surface.client.parse(self, parser)?;
if self.ext.get().is_some() {
if self.ext.is_some() {
return Err(XdgSurfaceError::RoleNotYetDestroyed(self.id));
}
{
@ -202,7 +202,7 @@ impl XdgSurface {
fn get_toplevel(self: &Rc<Self>, parser: MsgParser<'_, '_>) -> Result<(), XdgSurfaceError> {
let req: GetToplevel = self.surface.client.parse(&**self, parser)?;
self.set_role(XdgSurfaceRole::XdgToplevel)?;
if self.ext.get().is_some() {
if self.ext.is_some() {
self.surface.client.protocol_error(
&**self,
ALREADY_CONSTRUCTED,
@ -232,7 +232,7 @@ impl XdgSurface {
parent = Some(self.surface.client.lookup(req.parent)?);
}
let positioner = self.surface.client.lookup(req.positioner)?;
if self.ext.get().is_some() {
if self.ext.is_some() {
self.surface.client.protocol_error(
&**self,
ALREADY_CONSTRUCTED,

2
src/ifs/wl_surface/xdg_surface/xdg_popup.rs
View file

@ -355,7 +355,7 @@ impl XdgSurfaceExt for XdgPopup {
};
let surface = &self.xdg.surface;
let state = &surface.client.state;
if surface.buffer.get().is_some() {
if surface.buffer.is_some() {
if wl.is_none() {
self.xdg.set_workspace(&ws);
*wl = Some(ws.stacked.add_last(self.clone()));

6
src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs
View file

@ -557,8 +557,8 @@ impl XdgSurfaceExt for XdgToplevel {
fn post_commit(self: Rc<Self>) {
let surface = &self.xdg.surface;
if self.toplevel_data.parent.get().is_some() {
if surface.buffer.get().is_none() {
if self.toplevel_data.parent.is_some() {
if surface.buffer.is_none() {
self.tl_destroy();
{
let new_parent = self.parent.get();
@ -569,7 +569,7 @@ impl XdgSurfaceExt for XdgToplevel {
}
self.state.tree_changed();
}
} else if surface.buffer.get().is_some() {
} else if surface.buffer.is_some() {
if let Some(parent) = self.parent.get() {
self.map_child(&parent);
} else {

2
src/ifs/wl_surface/xwayland_shell_v1.rs
View file

@ -56,7 +56,7 @@ impl XwaylandShellV1 {
let req: GetXwaylandSurface = self.client.parse(self, parser)?;
let surface = self.client.lookup(req.surface)?;
let xsurface = surface.get_xsurface()?;
if xsurface.xwayland_surface.get().is_some() {
if xsurface.xwayland_surface.is_some() {
return Err(XwaylandShellV1Error::AlreadyAttached(surface.id));
}
let xws = Rc::new(XwaylandSurfaceV1 {

3
src/ifs/wl_surface/zwlr_layer_surface_v1.rs
View file

@ -16,6 +16,7 @@ use {
utils::{
bitflags::BitflagsExt,
buffd::{MsgParser, MsgParserError},
cell_ext::CellExt,
linkedlist::LinkedNode,
numcell::NumCell,
},
@ -253,7 +254,7 @@ impl ZwlrLayerSurfaceV1 {
}
self.size.set((width, height));
}
if self.acked_serial.get().is_none() {
if self.acked_serial.is_none() {
send_configure = true;
}
if send_configure {