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

xwayland: Add input handling for override redirect windows

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-01-23 20:32:37 +01:00
parent 0af8d5eb2d
commit 5dfefedb02
4 changed files with 76 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shell/element/window.rs
View file

@ -272,7 +272,6 @@ impl SpaceElement for CosmicWindow {
self.0.with_program(|p| {
let mut bbox = SpaceElement::bbox(&p.window);
if p.has_ssd() {
bbox.loc.y -= SSD_HEIGHT;
bbox.size.h += SSD_HEIGHT;
}
bbox
@ -310,7 +309,6 @@ impl SpaceElement for CosmicWindow {
self.0.with_program(|p| {
let mut geo = SpaceElement::geometry(&p.window);
if p.has_ssd() {
geo.loc.y -= SSD_HEIGHT;
geo.size.h += SSD_HEIGHT;
}
geo

20
src/shell/focus/target.rs
View file

@ -17,6 +17,7 @@ use smithay::{
reexports::wayland_server::{backend::ObjectId, protocol::wl_surface::WlSurface, Resource},
utils::{IsAlive, Serial},
wayland::seat::WaylandFocus,
xwayland::X11Surface,
};
#[derive(Debug, Clone, PartialEq)]
@ -25,6 +26,7 @@ pub enum PointerFocusTarget {
Fullscreen(CosmicSurface),
LayerSurface(LayerSurface),
Popup(PopupKind),
OverrideRedirect(X11Surface),
}
#[derive(Debug, Clone, PartialEq)]
@ -70,6 +72,7 @@ impl IsAlive for PointerFocusTarget {
PointerFocusTarget::Fullscreen(f) => f.alive(),
PointerFocusTarget::LayerSurface(l) => l.alive(),
PointerFocusTarget::Popup(p) => p.alive(),
PointerFocusTarget::OverrideRedirect(s) => s.alive(),
}
}
}
@ -93,6 +96,7 @@ impl PointerTarget<State> for PointerFocusTarget {
PointerFocusTarget::Fullscreen(w) => PointerTarget::enter(w, seat, data, event),
PointerFocusTarget::LayerSurface(l) => PointerTarget::enter(l, seat, data, event),
PointerFocusTarget::Popup(p) => PointerTarget::enter(p.wl_surface(), seat, data, event),
PointerFocusTarget::OverrideRedirect(s) => PointerTarget::enter(s, seat, data, event),
}
}
fn motion(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) {
@ -103,6 +107,7 @@ impl PointerTarget<State> for PointerFocusTarget {
PointerFocusTarget::Popup(p) => {
PointerTarget::motion(p.wl_surface(), seat, data, event)
}
PointerFocusTarget::OverrideRedirect(s) => PointerTarget::enter(s, seat, data, event),
}
}
fn button(&self, seat: &Seat<State>, data: &mut State, event: &ButtonEvent) {
@ -113,6 +118,7 @@ impl PointerTarget<State> for PointerFocusTarget {
PointerFocusTarget::Popup(p) => {
PointerTarget::button(p.wl_surface(), seat, data, event)
}
PointerFocusTarget::OverrideRedirect(s) => PointerTarget::button(s, seat, data, event),
}
}
fn axis(&self, seat: &Seat<State>, data: &mut State, frame: AxisFrame) {
@ -121,6 +127,7 @@ impl PointerTarget<State> for PointerFocusTarget {
PointerFocusTarget::Fullscreen(w) => PointerTarget::axis(w, seat, data, frame),
PointerFocusTarget::LayerSurface(l) => PointerTarget::axis(l, seat, data, frame),
PointerFocusTarget::Popup(p) => PointerTarget::axis(p.wl_surface(), seat, data, frame),
PointerFocusTarget::OverrideRedirect(s) => PointerTarget::axis(s, seat, data, frame),
}
}
fn leave(&self, seat: &Seat<State>, data: &mut State, serial: Serial, time: u32) {
@ -133,6 +140,9 @@ impl PointerTarget<State> for PointerFocusTarget {
PointerFocusTarget::Popup(p) => {
PointerTarget::leave(p.wl_surface(), seat, data, serial, time)
}
PointerFocusTarget::OverrideRedirect(s) => {
PointerTarget::leave(s, seat, data, serial, time)
}
}
}
}
@ -248,6 +258,9 @@ impl WaylandFocus for PointerFocusTarget {
PointerFocusTarget::Fullscreen(w) => WaylandFocus::wl_surface(w)?,
PointerFocusTarget::LayerSurface(l) => l.wl_surface().clone(),
PointerFocusTarget::Popup(p) => p.wl_surface().clone(),
PointerFocusTarget::OverrideRedirect(s) => {
return s.wl_surface();
}
})
}
fn same_client_as(&self, object_id: &ObjectId) -> bool {
@ -256,6 +269,7 @@ impl WaylandFocus for PointerFocusTarget {
PointerFocusTarget::Fullscreen(w) => WaylandFocus::same_client_as(w, object_id),
PointerFocusTarget::LayerSurface(l) => l.wl_surface().id().same_client_as(object_id),
PointerFocusTarget::Popup(p) => p.wl_surface().id().same_client_as(object_id),
PointerFocusTarget::OverrideRedirect(s) => WaylandFocus::same_client_as(s, object_id),
}
}
}
@ -284,6 +298,12 @@ impl From<PopupKind> for PointerFocusTarget {
}
}
impl From<X11Surface> for PointerFocusTarget {
fn from(s: X11Surface) -> Self {
PointerFocusTarget::OverrideRedirect(s)
}
}
impl From<CosmicMapped> for KeyboardFocusTarget {
fn from(w: CosmicMapped) -> Self {
KeyboardFocusTarget::Element(w)

2
src/shell/layout/floating/mod.rs
View file

@ -209,7 +209,7 @@ impl FloatingLayout {
}
pub fn mapped(&self) -> impl Iterator<Item = &CosmicMapped> {
self.space.elements()
self.space.elements().rev()
}
pub fn windows(&self) -> impl Iterator<Item = CosmicSurface> + '_ {