Skip to content

Commit

Permalink
WIP Use get_unconstrained_geometry function for popup position
Browse files Browse the repository at this point in the history
  • Loading branch information
@ids1024
ids1024 committed Jan 8, 2025
1 parent c9f7402 commit 160c0b0
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 310 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,5 @@ inherits = "release"
lto = "fat"

[patch."https://github.com/Smithay/smithay.git"]
smithay = { git = "https://github.com/smithay//smithay", rev = "9fbc9fb" }
# smithay = { git = "https://github.com/smithay//smithay", rev = "9fbc9fb" }
smithay = { git = "https://github.com/ids1024/smithay", branch = "unconstained_geometry" }
336 changes: 28 additions & 308 deletions src/wayland/handlers/xdg_shell/popup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,24 @@
use crate::{shell::Shell, utils::prelude::*};
use smithay::{
desktop::{
layer_map_for_output, space::SpaceElement, LayerSurface, PopupKind, PopupManager,
WindowSurfaceType,
get_popup_toplevel_coords, layer_map_for_output, space::SpaceElement, LayerSurface,
PopupKind, PopupManager, WindowSurfaceType,
},
output::Output,
reexports::{
wayland_protocols::xdg::shell::server::xdg_positioner::{
Anchor, ConstraintAdjustment, Gravity,
},
wayland_protocols::xdg::shell::server::xdg_positioner::Anchor,
wayland_server::protocol::wl_surface::WlSurface,
},
utils::{Logical, Point, Rectangle},
wayland::{
compositor::{get_role, with_states},
seat::WaylandFocus,
shell::xdg::{
PopupSurface, PositionerState, SurfaceCachedState, ToplevelSurface,
XdgPopupSurfaceData, XDG_POPUP_ROLE,
PopupSurface, PositionerState, ToplevelSurface, XdgPopupSurfaceData, XDG_POPUP_ROLE,
},
},
};
use tracing::{trace, warn};
use tracing::warn;

impl Shell {
pub fn unconstrain_popup(&self, surface: &PopupSurface) {
Expand Down Expand Up @@ -123,20 +120,14 @@ pub fn update_reactive_popups<'a>(
}
}

fn unconstrain_xdg_popup_tile(surface: &PopupSurface, rect: Rectangle<i32, Logical>) -> bool {
let toplevel_offset = get_popup_toplevel_coords(surface);
let mut geometry = surface.with_pending_state(|state| state.positioner.get_geometry());
geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, rect);

if offset.x != 0 || offset.y != 0 {
trace!(?surface, "Unconstraining popup to tile.");
if !unconstrain_flip(&surface, rect) {
return unconstrain_slide(&surface, rect);
// don't try to resize for fitting to a tile
}
}
true
fn unconstrain_xdg_popup_tile(surface: &PopupSurface, mut rect: Rectangle<i32, Logical>) -> bool {
rect.loc -= get_popup_toplevel_coords(&PopupKind::Xdg(surface.clone()));
let geometry = surface
.with_pending_state(|state| state.positioner.get_unconstrained_geometry(rect, false));
surface.with_pending_state(|state| {
state.geometry = geometry;
});
rect.contains_rect(geometry)
}

fn unconstrain_xdg_popup(
Expand All @@ -145,20 +136,15 @@ fn unconstrain_xdg_popup(
mut rect: Rectangle<i32, Global>,
) {
rect.loc -= window_loc;
let relative = rect.as_logical();
let toplevel_offset = get_popup_toplevel_coords(surface);
let mut geometry = surface.with_pending_state(|state| state.positioner.get_geometry());
geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, relative);

if offset.x != 0 || offset.y != 0 {
trace!(?surface, "Unconstraining popup.");
if !unconstrain_flip(&surface, relative) {
if !unconstrain_slide(&surface, relative) {
unconstrain_resize(&surface, relative);
}
}
}
rect.loc -= get_popup_toplevel_coords(&PopupKind::Xdg(surface.clone())).as_global();
let geometry = surface.with_pending_state(|state| {
state
.positioner
.get_unconstrained_geometry(rect.as_logical(), true)
});
surface.with_pending_state(|state| {
state.geometry = geometry;
});
}

fn unconstrain_layer_popup(surface: &PopupSurface, output: &Output, layer_surface: &LayerSurface) {
Expand All @@ -168,188 +154,12 @@ fn unconstrain_layer_popup(surface: &PopupSurface, output: &Output, layer_surfac
// the output_rect represented relative to the parents coordinate system
let mut relative = Rectangle::from_size(output.geometry().size).as_logical();
relative.loc -= layer_geo.loc;
let toplevel_offset = get_popup_toplevel_coords(surface);
let mut geometry = surface.with_pending_state(|state| state.positioner.get_geometry());
geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, relative);

if offset.x != 0 || offset.y != 0 {
trace!(?surface, "Unconstraining popup.");
if !unconstrain_flip(&surface, relative) {
if !unconstrain_slide(&surface, relative) {
unconstrain_resize(&surface, relative);
}
}
}
}

fn unconstrain_flip(popup: &PopupSurface, toplevel_box: Rectangle<i32, Logical>) -> bool {
let toplevel_offset = get_popup_toplevel_coords(popup);
let positioner = popup.with_pending_state(|state| state.positioner.clone());
let mut geometry = positioner.get_geometry();
geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, toplevel_box);
if offset.x == 0 && offset.y == 0 {
return true;
}

let mut positioner = positioner.clone();

let flip_x = offset.x != 0
&& positioner
.constraint_adjustment
.contains(ConstraintAdjustment::FlipX);
let flip_y = offset.y != 0
&& positioner
.constraint_adjustment
.contains(ConstraintAdjustment::FlipY);

if flip_x {
let old_positioner = positioner.clone();
positioner.anchor_edges = invert_anchor_x(positioner.anchor_edges);
positioner.gravity = invert_gravity_x(positioner.gravity);
geometry = positioner.get_geometry();
geometry.loc += toplevel_offset;
let new_offset = check_constrained(geometry, toplevel_box);
if !(new_offset.x.abs() < offset.x.abs()) {
positioner = old_positioner;
}
}
if flip_y {
let old_positioner = positioner.clone();
positioner.anchor_edges = invert_anchor_y(positioner.anchor_edges);
positioner.gravity = invert_gravity_y(positioner.gravity);
geometry = positioner.get_geometry();
geometry.loc += toplevel_offset;
let new_offset = check_constrained(geometry, toplevel_box);
if !(new_offset.y.abs() < offset.y.abs()) {
positioner = old_positioner;
}
}

geometry = positioner.get_geometry();
geometry.loc += toplevel_offset;
let new_offset = check_constrained(geometry, toplevel_box);
if new_offset.x.abs() < offset.x.abs() || new_offset.y.abs() < offset.y.abs() {
popup.with_pending_state(|state| {
state.geometry = positioner.get_geometry();
state.positioner = positioner;
});
}

new_offset.x == 0 && new_offset.y == 0
}

fn unconstrain_slide(popup: &PopupSurface, toplevel_box: Rectangle<i32, Logical>) -> bool {
let toplevel_offset = get_popup_toplevel_coords(popup);
let positioner = popup.with_pending_state(|state| state.positioner.clone());
let mut geometry = positioner.get_geometry();
geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, toplevel_box);
if offset.x == 0 && offset.y == 0 {
return true;
}

let slide_x = offset.x != 0
&& positioner
.constraint_adjustment
.contains(ConstraintAdjustment::SlideX);
let slide_y = offset.y != 0
&& positioner
.constraint_adjustment
.contains(ConstraintAdjustment::SlideY);

let mut geometry = positioner.get_geometry();
if slide_x {
geometry.loc.x += offset.x.abs().min(geometry.size.w) * offset.x.signum();
}
if slide_y {
geometry.loc.y += offset.y.abs().min(geometry.size.h) * offset.y.signum();
}

let toplevel = get_popup_toplevel_coords(popup);
if slide_x && toplevel.x < toplevel_box.loc.x {
geometry.loc.x += toplevel_box.loc.x - toplevel.x;
}
if slide_y && toplevel.y < toplevel_box.loc.y {
geometry.loc.y += toplevel_box.loc.y - toplevel.y;
}

let mut check_geometry = geometry.clone();
check_geometry.loc += toplevel;
let new_offset = check_constrained(check_geometry, toplevel_box);
if new_offset.x.abs() < offset.x.abs() || new_offset.y.abs() < offset.y.abs() {
popup.with_pending_state(|state| {
state.geometry = geometry;
});
}

new_offset.x == 0 && new_offset.y == 0
}

fn unconstrain_resize(popup: &PopupSurface, toplevel_box: Rectangle<i32, Logical>) -> bool {
let toplevel_offset = get_popup_toplevel_coords(popup);
let positioner = popup.with_pending_state(|state| state.positioner.clone());
let mut geometry = positioner.get_geometry();
geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, toplevel_box);
if offset.x == 0 && offset.y == 0 {
return true;
}

let resize_x = offset.x != 0
&& positioner
.constraint_adjustment
.contains(ConstraintAdjustment::ResizeX);
let resize_y = offset.y != 0
&& positioner
.constraint_adjustment
.contains(ConstraintAdjustment::ResizeY);

let mut geometry = positioner.get_geometry();
if resize_x {
geometry.size.w -= offset.x;
}
if resize_y {
geometry.size.h -= offset.y;
}

let mut check_geometry = geometry.clone();
check_geometry.loc += toplevel_offset;
let offset = check_constrained(geometry, toplevel_box);
if offset.x == 0 && offset.y == 0 {
// no longer constrained
popup.with_pending_state(|state| {
state.geometry = geometry;
});
true
} else {
false
}
}

fn check_constrained(
geometry: Rectangle<i32, Logical>,
toplevel_box: Rectangle<i32, Logical>,
) -> Point<i32, Logical> {
let mut offset = (0, 0).into();
if toplevel_box.contains_rect(geometry) {
return offset;
}

if geometry.loc.x < toplevel_box.loc.x {
offset.x = toplevel_box.loc.x - geometry.loc.x;
} else if geometry.loc.x + geometry.size.w > toplevel_box.loc.x + toplevel_box.size.w {
offset.x = toplevel_box.loc.x + toplevel_box.size.w - (geometry.loc.x + geometry.size.w);
}

if geometry.loc.y < toplevel_box.loc.y {
offset.y = toplevel_box.loc.y - geometry.loc.y;
} else if geometry.loc.y + geometry.size.h > toplevel_box.loc.y + toplevel_box.size.h {
offset.y = toplevel_box.loc.y + toplevel_box.size.h - (geometry.loc.y + geometry.size.h);
}

offset
relative.loc -= get_popup_toplevel_coords(&PopupKind::Xdg(surface.clone()));
let geometry = surface
.with_pending_state(|state| state.positioner.get_unconstrained_geometry(relative, true));
surface.with_pending_state(|state| {
state.geometry = geometry;
});
}

fn get_anchor_point(positioner: &PositionerState) -> Point<i32, Logical> {
Expand Down Expand Up @@ -389,93 +199,3 @@ pub fn get_popup_toplevel(popup: &PopupSurface) -> Option<WlSurface> {
}
Some(parent)
}

fn get_popup_toplevel_coords(popup: &PopupSurface) -> Point<i32, Logical> {
let mut parent = match popup.get_parent_surface() {
Some(parent) => parent,
None => return (0, 0).into(),
};

let mut offset = (0, 0).into();
while get_role(&parent) == Some(XDG_POPUP_ROLE) {
offset += with_states(&parent, |states| {
states
.data_map
.get::<XdgPopupSurfaceData>()
.unwrap()
.lock()
.unwrap()
.current
.geometry
.loc
});
parent = with_states(&parent, |states| {
states
.data_map
.get::<XdgPopupSurfaceData>()
.unwrap()
.lock()
.unwrap()
.parent
.as_ref()
.cloned()
.unwrap()
});
}
offset += with_states(&parent, |states| {
states
.cached_state
.get::<SurfaceCachedState>()
.current()
.geometry
.map(|x| x.loc)
.unwrap_or_else(|| (0, 0).into())
});

offset
}

fn invert_anchor_x(anchor: Anchor) -> Anchor {
match anchor {
Anchor::Left => Anchor::Right,
Anchor::Right => Anchor::Left,
Anchor::TopLeft => Anchor::TopRight,
Anchor::TopRight => Anchor::TopLeft,
Anchor::BottomLeft => Anchor::BottomRight,
Anchor::BottomRight => Anchor::BottomLeft,
x => x,
}
}
fn invert_anchor_y(anchor: Anchor) -> Anchor {
match anchor {
Anchor::Top => Anchor::Bottom,
Anchor::Bottom => Anchor::Top,
Anchor::TopLeft => Anchor::BottomLeft,
Anchor::TopRight => Anchor::BottomRight,
Anchor::BottomLeft => Anchor::TopLeft,
Anchor::BottomRight => Anchor::TopRight,
x => x,
}
}
fn invert_gravity_x(gravity: Gravity) -> Gravity {
match gravity {
Gravity::Left => Gravity::Right,
Gravity::Right => Gravity::Left,
Gravity::TopLeft => Gravity::TopRight,
Gravity::TopRight => Gravity::TopLeft,
Gravity::BottomLeft => Gravity::BottomRight,
Gravity::BottomRight => Gravity::BottomLeft,
x => x,
}
}
fn invert_gravity_y(gravity: Gravity) -> Gravity {
match gravity {
Gravity::Top => Gravity::Bottom,
Gravity::Bottom => Gravity::Top,
Gravity::TopLeft => Gravity::BottomLeft,
Gravity::TopRight => Gravity::BottomRight,
Gravity::BottomLeft => Gravity::TopLeft,
Gravity::BottomRight => Gravity::TopRight,
x => x,
}
}

0 comments on commit 160c0b0

Please sign in to comment.