leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Smithay, with Window that supports X11 surfaces

Browse source
This commit is contained in:
Ian Douglas Scott 2024-02-21 13:24:56 -08:00 • committed by Victoria Brekenfeld
parent 849882a7db
commit 3036448c19
24 changed files with 482 additions and 619 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/shell/layout/floating/grabs/resize.rs
View file

@ -7,13 +7,12 @@ use crate::{
element::CosmicMapped,
focus::target::PointerFocusTarget,
grabs::{ReleaseMode, ResizeEdge},
CosmicSurface,
},
utils::prelude::*,
};
use smithay::{
backend::input::ButtonState,
desktop::space::SpaceElement,
desktop::{space::SpaceElement, WindowSurface},
input::{
pointer::{
AxisFrame, ButtonEvent, GestureHoldBeginEvent, GestureHoldEndEvent,
@ -118,9 +117,10 @@ impl PointerGrab<State> for ResizeSurfaceGrab {
self.window.set_resizing(true);
self.window.set_geometry(Rectangle::from_loc_and_size(
match self.window.active_window() {
CosmicSurface::X11(s) => s.geometry().loc.as_global(),
_ => (0, 0).into(),
if let Some(s) = self.window.active_window().x11_surface() {
s.geometry().loc.as_global()
} else {
(0, 0).into()
},
self.last_window_size.as_global(),
));
@ -356,20 +356,19 @@ impl ResizeSurfaceGrab {
if let Some(new_location) = new_location {
for (window, offset) in window.windows() {
match window {
CosmicSurface::Wayland(window) => {
match window.0.underlying_surface() {
WindowSurface::Wayland(toplevel) => {
update_reactive_popups(
&window,
toplevel,
new_location + offset.as_global(),
floating_layer.space.outputs(),
);
}
CosmicSurface::X11(surface) => {
WindowSurface::X11(surface) => {
let mut geometry = surface.geometry();
geometry.loc += (location - new_location).as_logical();
let _ = surface.configure(geometry);
}
_ => unreachable!(),
}
}
floating_layer
@ -402,9 +401,10 @@ impl ResizeSurfaceGrab {
self.window.set_resizing(false);
self.window.set_geometry(Rectangle::from_loc_and_size(
match self.window.active_window() {
CosmicSurface::X11(s) => s.geometry().loc.as_global(),
_ => (0, 0).into(),
if let Some(x11_surface) = self.window.active_window().x11_surface() {
x11_surface.geometry().loc.as_global()
} else {
(0, 0).into()
},
self.last_window_size.as_global(),
));

10
src/shell/layout/mod.rs
View file

@ -2,6 +2,7 @@
use regex::RegexSet;
use smithay::{
desktop::WindowSurface,
wayland::{compositor::with_states, shell::xdg::XdgToplevelSurfaceData},
xwayland::xwm::WmWindowType,
};
@ -100,9 +101,9 @@ lazy_static::lazy_static! {
pub fn is_dialog(window: &CosmicSurface) -> bool {
// Check "window type"
match window {
CosmicSurface::Wayland(window) => {
if with_states(window.toplevel().wl_surface(), |states| {
match window.0.underlying_surface() {
WindowSurface::Wayland(toplevel) => {
if with_states(toplevel.wl_surface(), |states| {
let attrs = states
.data_map
.get::<XdgToplevelSurfaceData>()
@ -114,7 +115,7 @@ pub fn is_dialog(window: &CosmicSurface) -> bool {
return true;
}
}
CosmicSurface::X11(surface) => {
WindowSurface::X11(surface) => {
if surface.is_override_redirect()
|| surface.is_popup()
|| !matches!(
@ -125,7 +126,6 @@ pub fn is_dialog(window: &CosmicSurface) -> bool {
return true;
}
}
_ => {}
};
// Check if sizing suggest dialog

12
src/shell/layout/tiling/grabs/swap.rs
View file

@ -58,11 +58,19 @@ impl KeyboardGrab<State> for SwapWindowGrab {
.iter()
.filter(|(_, action)| matches!(action, Action::Focus(_)))
.map(|(pattern, action)| {
let Action::Focus(direction) = action else { unreachable!() };
let Action::Focus(direction) = action else {
unreachable!()
};
(pattern.key, *direction)
})
.collect::<Vec<_>>();
let Some(direction) = syms.iter().find_map(|sym| focus_bindings.iter().find_map(|(key, direction)| (key.is_some() && sym == key.as_ref().unwrap()).then_some(*direction))) else { return };
let Some(direction) = syms.iter().find_map(|sym| {
focus_bindings.iter().find_map(|(key, direction)| {
(key.is_some() && sym == key.as_ref().unwrap()).then_some(*direction)
})
}) else {
return;
};
data.handle_action(
Action::Focus(direction),

84
src/shell/layout/tiling/mod.rs
View file

@ -462,7 +462,9 @@ impl TilingLayout {
pub fn replace_window(&mut self, old: &CosmicMapped, new: &CosmicMapped) {
let gaps = self.gaps();
let Some(old_id) = old.tiling_node_id.lock().unwrap().clone() else { return };
let Some(old_id) = old.tiling_node_id.lock().unwrap().clone() else {
return;
};
let mut tree = self.queue.trees.back().unwrap().0.copy_clone();
if let Ok(node) = tree.get_mut(&old_id) {
@ -501,7 +503,13 @@ impl TilingLayout {
match desc.stack_window {
Some(stack_surface) => {
let node = this_tree.get(&desc.node).ok()?;
let Data::Mapped { mapped: this_mapped, .. } = node.data() else { return None };
let Data::Mapped {
mapped: this_mapped,
..
} = node.data()
else {
return None;
};
let this_stack = this_mapped.stack_ref()?;
this_stack.remove_window(&stack_surface);
if !this_stack.alive() {
@ -698,7 +706,9 @@ impl TilingLayout {
}
}
(None, None) => {
let Some(other_tree) = other_tree.as_mut() else { unreachable!() };
let Some(other_tree) = other_tree.as_mut() else {
unreachable!()
};
let this_node = this_tree.get_mut(&this_desc.node).ok()?;
let other_node = other_tree.get_mut(&other_desc.node).ok()?;
@ -842,7 +852,13 @@ impl TilingLayout {
return None;
}
let this_node = this_tree.get_mut(&this_desc.node).ok()?;
let Data::Mapped { mapped: this_mapped, .. } = this_node.data() else { return None };
let Data::Mapped {
mapped: this_mapped,
..
} = this_node.data()
else {
return None;
};
let this_mapped = this_mapped.clone();
let geometry = *this_node.data().geometry();
assert!(this_mapped.is_stack());
@ -927,7 +943,13 @@ impl TilingLayout {
let other_tree = other_tree.as_mut().unwrap_or(&mut this_tree);
let other_node = other_tree.get_mut(&other_desc.node).ok()?;
let Data::Mapped { mapped: other_mapped, .. } = other_node.data() else { return None };
let Data::Mapped {
mapped: other_mapped,
..
} = other_node.data()
else {
return None;
};
let other_mapped = other_mapped.clone();
let geometry = *other_node.data().geometry();
assert!(other_mapped.is_stack());
@ -1259,9 +1281,7 @@ impl TilingLayout {
let Some(target) = seat.get_keyboard().unwrap().current_focus() else {
return MoveResult::None;
};
let Some((node_id, data)) =
TilingLayout::currently_focused_node(&mut tree, target)
else {
let Some((node_id, data)) = TilingLayout::currently_focused_node(&mut tree, target) else {
return MoveResult::None;
};
@ -1587,14 +1607,10 @@ impl TilingLayout {
let Some(target) = seat.get_keyboard().unwrap().current_focus() else {
return FocusResult::None;
};
let Some(focused) =
TilingLayout::currently_focused_node(tree, target).or_else(
|| {
TilingLayout::last_active_window(tree, focus_stack)
.map(|(id, mapped)| (id, FocusedNodeData::Window(mapped)))
},
)
else {
let Some(focused) = TilingLayout::currently_focused_node(tree, target).or_else(|| {
TilingLayout::last_active_window(tree, focus_stack)
.map(|(id, mapped)| (id, FocusedNodeData::Window(mapped)))
}) else {
return FocusResult::None;
};
@ -2252,21 +2268,23 @@ impl TilingLayout {
let gaps = self.gaps();
let mut tree = self.queue.trees.back().unwrap().0.copy_clone();
let Some(root_id) = tree.root_node_id() else { return false };
let Some(mut node_id) =
(match TilingLayout::currently_focused_node(&tree, focused.clone()) {
Some((_id, FocusedNodeData::Window(mapped))) =>
// we need to make sure the id belongs to this tree..
{
tree.traverse_pre_order_ids(root_id)
.unwrap()
.find(|id| tree.get(id).unwrap().data().is_mapped(Some(&mapped)))
}
Some((id, FocusedNodeData::Group(_, _))) => Some(id), // in this case the workspace handle was already matched, so the id is to be trusted
_ => None,
}) else {
return false
};
let Some(root_id) = tree.root_node_id() else {
return false;
};
let Some(mut node_id) = (match TilingLayout::currently_focused_node(&tree, focused.clone())
{
Some((_id, FocusedNodeData::Window(mapped))) =>
// we need to make sure the id belongs to this tree..
{
tree.traverse_pre_order_ids(root_id)
.unwrap()
.find(|id| tree.get(id).unwrap().data().is_mapped(Some(&mapped)))
}
Some((id, FocusedNodeData::Group(_, _))) => Some(id), // in this case the workspace handle was already matched, so the id is to be trusted
_ => None,
}) else {
return false;
};
while let Some(group_id) = tree.get(&node_id).unwrap().parent().cloned() {
let orientation = tree.get(&group_id).unwrap().data().orientation();
@ -3138,8 +3156,8 @@ impl TilingLayout {
.unwrap()
.position(|node| {
let Some(geo) = geometries.get(node) else {
return false;
};
return false;
};
match orientation {
Orientation::Vertical => location.x < geo.loc.x,
Orientation::Horizontal => location.y < geo.loc.y,