From 3cff4268059d6a5329b2bf8364a096a7a6b9d62b Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Tue, 26 Mar 2024 13:55:18 +0100 Subject: [PATCH] focus: Fix screencopy --- src/input/mod.rs | 38 +++++- src/shell/element/stack.rs | 102 ++------------- src/shell/element/window.rs | 9 +- src/shell/focus/target.rs | 255 +++++++++++++++++++++++++----------- 4 files changed, 226 insertions(+), 178 deletions(-) diff --git a/src/input/mod.rs b/src/input/mod.rs index bcb43a56..c7e61687 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -732,7 +732,7 @@ impl State { ptr.frame(self); return; } - if let PointerFocusTarget::WlSurface(surface) = surface { + if let PointerFocusTarget::WlSurface { surface, .. } = surface { if under_from_surface_tree( surface, position.as_logical() - surface_loc.to_f64(), @@ -2296,7 +2296,10 @@ impl State { if let Some(session_lock) = session_lock { return session_lock.surfaces.get(output).map(|surface| { ( - PointerFocusTarget::WlSurface(surface.wl_surface().clone()), + PointerFocusTarget::WlSurface { + surface: surface.wl_surface().clone(), + toplevel: None, + }, output_geo.loc, ) }); @@ -2311,7 +2314,10 @@ impl State { WindowSurfaceType::ALL, ) { return Some(( - wl_surface.into(), + PointerFocusTarget::WlSurface { + surface: wl_surface, + toplevel: None, + }, output_geo.loc + layer_loc.as_global() + surface_loc.as_global(), )); } @@ -2329,7 +2335,13 @@ impl State { .map(|surface| (surface, X11Surface::geometry(or).loc.as_global())) }) { - return Some((surface.into(), geo)); + return Some(( + PointerFocusTarget::WlSurface { + surface, + toplevel: None, + }, + geo, + )); } PointerFocusTarget::under_surface(window, relative_pos.as_logical()) .map(|(target, surface_loc)| (target, output_geo.loc + surface_loc.as_global())) @@ -2346,7 +2358,10 @@ impl State { WindowSurfaceType::ALL, ) { return Some(( - wl_surface.into(), + PointerFocusTarget::WlSurface { + surface: wl_surface, + toplevel: None, + }, output_geo.loc + layer_loc.as_global() + surface_loc.as_global(), )); } @@ -2365,7 +2380,13 @@ impl State { .map(|surface| (surface, X11Surface::geometry(or).loc.as_global())) }) { - return Some((surface.into(), geo)); + return Some(( + PointerFocusTarget::WlSurface { + surface, + toplevel: None, + }, + geo, + )); } if let Some((target, loc)) = shell.surface_under(global_pos, output) { return Some((target, loc)); @@ -2382,7 +2403,10 @@ impl State { WindowSurfaceType::ALL, ) { return Some(( - wl_surface.into(), + PointerFocusTarget::WlSurface { + surface: wl_surface, + toplevel: None, + }, output_geo.loc + layer_loc.as_global() + surface_loc.as_global(), )); } diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs index e3d9bc50..532972af 100644 --- a/src/shell/element/stack.rs +++ b/src/shell/element/stack.rs @@ -12,7 +12,6 @@ use crate::{ iced::{IcedElement, Program}, prelude::*, }, - wayland::handlers::screencopy::SessionHolder, }; use calloop::LoopHandle; use cosmic::{ @@ -47,7 +46,7 @@ use smithay::{ }, output::Output, render_elements, - utils::{Buffer, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size, Transform}, + utils::{Buffer, IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial, Size}, wayland::seat::WaylandFocus, }; use std::{ @@ -58,7 +57,6 @@ use std::{ atomic::{AtomicBool, AtomicU8, AtomicUsize, Ordering}, Arc, Mutex, }, - time::Duration, }; mod tab; @@ -97,7 +95,6 @@ pub struct CosmicStackInternal { potential_drag: Arc>>, override_alive: Arc, last_seat: Arc, Serial)>>>, - last_location: Arc, Serial, u32)>>>, geometry: Arc>>>, mask: Arc>>, } @@ -169,7 +166,6 @@ impl CosmicStack { potential_drag: Arc::new(Mutex::new(None)), override_alive: Arc::new(AtomicBool::new(true)), last_seat: Arc::new(Mutex::new(None)), - last_location: Arc::new(Mutex::new(None)), geometry: Arc::new(Mutex::new(None)), mask: Arc::new(Mutex::new(None)), }, @@ -458,7 +454,10 @@ impl CosmicStack { .surface_under(relative_pos, WindowSurfaceType::ALL) .map(|(surface, surface_offset)| { ( - PointerFocusTarget::WlSurface(surface), + PointerFocusTarget::WlSurface { + surface, + toplevel: Some(active_window.clone().into()), + }, surface_offset + Point::from((0, TAB_HEIGHT)), ) }) @@ -524,59 +523,6 @@ impl CosmicStack { }) } - fn pointer_leave_if_previous( - &self, - seat: &Seat, - data: &mut State, - serial: Serial, - time: u32, - location: Point, - ) -> usize { - self.0.with_program(|p| { - let active = p.active.load(Ordering::SeqCst); - let previous = p.previous_pointer.swap(active, Ordering::SeqCst); - if previous != active { - let windows = p.windows.lock().unwrap(); - if let Some(previous) = windows.get(previous) { - for session in previous.cursor_sessions() { - session.set_cursor_pos(None); - } - PointerTarget::leave(previous, seat, data, serial, time); - } - - for session in windows[active].cursor_sessions() { - session.set_cursor_pos(Some( - location - .to_buffer( - 1.0, - Transform::Normal, - &windows[active].geometry().size.to_f64(), - ) - .to_i32_round(), - )); - if let Some((_, hotspot)) = - seat.cursor_geometry((0.0, 0.0), Duration::from_millis(time as u64).into()) - { - session.set_cursor_hotspot(hotspot); - } else { - session.set_cursor_hotspot((0, 0)); - } - } - PointerTarget::enter( - &windows[active], - seat, - data, - &MotionEvent { - location, - serial, - time, - }, - ); - } - active - }) - } - pub(in super::super) fn focus_stack(&self) { self.0 .with_program(|p| p.group_focused.store(true, Ordering::SeqCst)); @@ -1208,10 +1154,8 @@ impl PointerTarget for CosmicStack { fn motion(&self, seat: &Seat, data: &mut State, event: &MotionEvent) { let mut event = event.clone(); - let active = - self.pointer_leave_if_previous(seat, data, event.serial, event.time, event.location); - self.0.with_program(|p| { + let active = p.active.load(Ordering::SeqCst); let active_window = &p.windows.lock().unwrap()[active]; let geo = active_window.geometry(); let loc = event.location.to_i32_round::(); @@ -1250,9 +1194,9 @@ impl PointerTarget for CosmicStack { *cursor_status.borrow_mut() = CursorImageStatus::default_named(); }); - let active_window_geo = self - .0 - .with_program(|p| p.windows.lock().unwrap()[active].geometry()); + let active_window_geo = self.0.with_program(|p| { + p.windows.lock().unwrap()[p.active.load(Ordering::SeqCst)].geometry() + }); event.location -= active_window_geo.loc.to_f64(); PointerTarget::motion(&self.0, seat, data, &event); @@ -1298,13 +1242,6 @@ impl PointerTarget for CosmicStack { } fn button(&self, seat: &Seat, data: &mut State, event: &ButtonEvent) { - if let Some((location, _serial, _time)) = self - .0 - .with_program(|p| p.last_location.lock().unwrap().clone()) - { - self.pointer_leave_if_previous(seat, data, event.serial, event.time, location); - } - match self.0.with_program(|p| p.current_focus()) { Focus::Header => { self.0.with_program(|p| { @@ -1346,13 +1283,6 @@ impl PointerTarget for CosmicStack { } fn axis(&self, seat: &Seat, data: &mut State, frame: AxisFrame) { - if let Some((location, serial, time)) = self - .0 - .with_program(|p| p.last_location.lock().unwrap().clone()) - { - self.pointer_leave_if_previous(seat, data, serial, time, location); - } - match self.0.with_program(|p| p.current_focus()) { Focus::Header => PointerTarget::axis(&self.0, seat, data, frame), _ => {} @@ -1360,13 +1290,6 @@ impl PointerTarget for CosmicStack { } fn frame(&self, seat: &Seat, data: &mut State) { - if let Some((location, serial, time)) = self - .0 - .with_program(|p| p.last_location.lock().unwrap().clone()) - { - self.pointer_leave_if_previous(seat, data, serial, time, location); - } - match self.0.with_program(|p| p.current_focus()) { Focus::Header => PointerTarget::frame(&self.0, seat, data), _ => {} @@ -1374,13 +1297,6 @@ impl PointerTarget for CosmicStack { } fn leave(&self, seat: &Seat, data: &mut State, serial: Serial, time: u32) { - if let Some((location, serial, time)) = self - .0 - .with_program(|p| p.last_location.lock().unwrap().clone()) - { - self.pointer_leave_if_previous(seat, data, serial, time, location); - } - self.0.with_program(|p| { let cursor_state = seat.user_data().get::().unwrap(); cursor_state.set_shape(CursorShape::Default); diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs index 9e2ab499..95310541 100644 --- a/src/shell/element/window.rs +++ b/src/shell/element/window.rs @@ -10,7 +10,6 @@ use crate::{ iced::{IcedElement, Program}, prelude::*, }, - wayland::handlers::screencopy::SessionHolder, }; use calloop::LoopHandle; use cosmic::{iced::Command, widget::mouse_area, Apply}; @@ -39,7 +38,7 @@ use smithay::{ output::Output, reexports::wayland_server::protocol::wl_surface::WlSurface, render_elements, - utils::{Buffer as BufferCoords, IsAlive, Logical, Point, Rectangle, Serial, Size, Transform}, + utils::{Buffer as BufferCoords, IsAlive, Logical, Point, Rectangle, Serial, Size}, wayland::seat::WaylandFocus, }; use std::{ @@ -50,7 +49,6 @@ use std::{ atomic::{AtomicBool, AtomicU8, Ordering}, Arc, Mutex, }, - time::Duration, }; use wayland_backend::server::ObjectId; @@ -221,7 +219,10 @@ impl CosmicWindow { .surface_under(relative_pos, WindowSurfaceType::ALL) .map(|(surface, surface_offset)| { ( - PointerFocusTarget::WlSurface(surface), + PointerFocusTarget::WlSurface { + surface, + toplevel: Some(p.window.clone().into()), + }, offset + surface_offset, ) }) diff --git a/src/shell/focus/target.rs b/src/shell/focus/target.rs index d4bf7bc7..d4efe527 100644 --- a/src/shell/focus/target.rs +++ b/src/shell/focus/target.rs @@ -1,4 +1,4 @@ -use std::sync::Weak; +use std::{sync::Weak, time::Duration}; use crate::{ shell::{ @@ -7,12 +7,12 @@ use crate::{ CosmicSurface, }, utils::prelude::*, - wayland::handlers::xdg_shell::popup::get_popup_toplevel, + wayland::handlers::{screencopy::SessionHolder, xdg_shell::popup::get_popup_toplevel}, }; use id_tree::NodeId; use smithay::{ backend::input::KeyState, - desktop::{LayerSurface, PopupKind, WindowSurface, WindowSurfaceType}, + desktop::{space::SpaceElement, LayerSurface, PopupKind, WindowSurface, WindowSurfaceType}, input::{ keyboard::{KeyboardTarget, KeysymHandle, ModifiersState}, pointer::{ @@ -24,19 +24,39 @@ use smithay::{ Seat, }, reexports::wayland_server::{backend::ObjectId, protocol::wl_surface::WlSurface, Resource}, - utils::{IsAlive, Logical, Point, Serial}, + utils::{IsAlive, Logical, Point, Serial, Transform}, wayland::{seat::WaylandFocus, session_lock::LockSurface}, }; -// discuss: should contain WlSurface, IcedElement #[derive(Debug, Clone, PartialEq)] pub enum PointerFocusTarget { - WlSurface(WlSurface), + WlSurface { + surface: WlSurface, + toplevel: Option, + }, StackUI(CosmicStack), WindowUI(CosmicWindow), ResizeFork(ResizeForkTarget), } +#[derive(Debug, Clone, PartialEq)] +pub enum PointerFocusToplevel { + Surface(CosmicSurface), + Popup(PopupKind), +} + +impl From for PointerFocusToplevel { + fn from(value: CosmicSurface) -> Self { + PointerFocusToplevel::Surface(value) + } +} + +impl From for PointerFocusToplevel { + fn from(value: PopupKind) -> Self { + PointerFocusToplevel::Popup(value) + } +} + #[derive(Debug, Clone, PartialEq)] pub enum KeyboardFocusTarget { Element(CosmicMapped), @@ -52,41 +72,34 @@ impl From for PointerFocusTarget { fn from(target: KeyboardFocusTarget) -> Self { match target { KeyboardFocusTarget::Element(elem) => { - PointerFocusTarget::WlSurface(elem.active_window().wl_surface().unwrap()) - } - KeyboardFocusTarget::Fullscreen(elem) => { - PointerFocusTarget::WlSurface(elem.wl_surface().unwrap()) - } - KeyboardFocusTarget::LayerSurface(layer) => { - PointerFocusTarget::WlSurface(layer.wl_surface().clone()) - } - KeyboardFocusTarget::Popup(popup) => { - PointerFocusTarget::WlSurface(popup.wl_surface().clone()) - } - KeyboardFocusTarget::LockSurface(lock) => { - PointerFocusTarget::WlSurface(lock.wl_surface().clone()) + let window = elem.active_window(); + let surface = window.wl_surface().unwrap(); + PointerFocusTarget::WlSurface { + surface, + toplevel: Some(window.into()), + } } + KeyboardFocusTarget::Fullscreen(elem) => PointerFocusTarget::WlSurface { + surface: elem.wl_surface().unwrap(), + toplevel: Some(elem.into()), + }, + KeyboardFocusTarget::LayerSurface(layer) => PointerFocusTarget::WlSurface { + surface: layer.wl_surface().clone(), + toplevel: None, + }, + KeyboardFocusTarget::Popup(popup) => PointerFocusTarget::WlSurface { + surface: popup.wl_surface().clone(), + toplevel: Some(popup.into()), + }, + KeyboardFocusTarget::LockSurface(lock) => PointerFocusTarget::WlSurface { + surface: lock.wl_surface().clone(), + toplevel: None, + }, _ => unreachable!("A group cannot start a popup grab"), } } } -/* -impl TryFrom for KeyboardFocusTarget { - type Error = (); - fn try_from(target: PointerFocusTarget) -> Result { - match target { - PointerFocusTarget::Element(mapped) => Ok(KeyboardFocusTarget::Element(mapped)), - PointerFocusTarget::Fullscreen(surf) => Ok(KeyboardFocusTarget::Fullscreen(surf)), - PointerFocusTarget::LayerSurface(layer) => Ok(KeyboardFocusTarget::LayerSurface(layer)), - PointerFocusTarget::Popup(popup) => Ok(KeyboardFocusTarget::Popup(popup)), - PointerFocusTarget::LockSurface(lock) => Ok(KeyboardFocusTarget::LockSurface(lock)), - _ => Err(()), - } - } -} -*/ - impl PointerFocusTarget { pub fn under_surface>>( surface: &CosmicSurface, @@ -96,10 +109,49 @@ impl PointerFocusTarget { WindowSurface::Wayland(_toplevel) => surface .0 .surface_under(point, WindowSurfaceType::ALL) - .map(|(wl_surface, point)| (Self::WlSurface(wl_surface), point)), - WindowSurface::X11(surface) => { - Some((Self::WlSurface(surface.wl_surface()?), Point::default())) - } + .map(|(wl_surface, point)| { + ( + Self::WlSurface { + surface: wl_surface, + toplevel: Some(surface.clone().into()), + }, + point, + ) + }), + WindowSurface::X11(x11_surface) => Some(( + Self::WlSurface { + surface: x11_surface.wl_surface()?, + toplevel: Some(surface.clone().into()), + }, + Point::default(), + )), + } + } + + pub fn toplevel(&self, data: &mut State) -> Option { + match &self { + PointerFocusTarget::WlSurface { + toplevel: Some(PointerFocusToplevel::Surface(surface)), + .. + } => Some(surface.clone()), + PointerFocusTarget::WlSurface { + toplevel: Some(PointerFocusToplevel::Popup(PopupKind::Xdg(popup))), + .. + } => get_popup_toplevel(popup) + .and_then(|s| { + data.common + .shell + .element_for_surface(&s) + .map(|mapped| (mapped, s)) + }) + .and_then(|(m, s)| { + m.windows() + .find(|(w, _)| w.wl_surface().map(|s2| s == s2).unwrap_or(false)) + .map(|(s, _)| s) + }), + PointerFocusTarget::StackUI(stack) => Some(stack.active()), + PointerFocusTarget::WindowUI(window) => Some(window.surface()), + _ => None, } } } @@ -131,7 +183,7 @@ impl IsAlive for PointerFocusTarget { fn alive(&self) -> bool { match self { // XXX? does this change anything - PointerFocusTarget::WlSurface(s) => s.alive(), + PointerFocusTarget::WlSurface { surface, .. } => surface.alive(), PointerFocusTarget::StackUI(e) => e.alive(), PointerFocusTarget::WindowUI(e) => e.alive(), PointerFocusTarget::ResizeFork(f) => f.alive(), @@ -154,16 +206,56 @@ impl IsAlive for KeyboardFocusTarget { impl PointerTarget for PointerFocusTarget { fn enter(&self, seat: &Seat, data: &mut State, event: &MotionEvent) { + if let Some(element) = self.toplevel(data) { + for session in element.cursor_sessions() { + session.set_cursor_pos(Some( + event + .location + .to_buffer(1.0, Transform::Normal, &element.geometry().size.to_f64()) + .to_i32_round(), + )); + if let Some((_, hotspot)) = seat + .cursor_geometry((0.0, 0.0), Duration::from_millis(event.time as u64).into()) + { + session.set_cursor_hotspot(hotspot); + } else { + session.set_cursor_hotspot((0, 0)); + } + } + } + match self { - PointerFocusTarget::WlSurface(s) => PointerTarget::enter(s, seat, data, event), + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::enter(surface, seat, data, event) + } PointerFocusTarget::StackUI(u) => PointerTarget::enter(u, seat, data, event), PointerFocusTarget::WindowUI(u) => PointerTarget::enter(u, seat, data, event), PointerFocusTarget::ResizeFork(f) => PointerTarget::enter(f, seat, data, event), } } fn motion(&self, seat: &Seat, data: &mut State, event: &MotionEvent) { + if let Some(element) = self.toplevel(data) { + for session in element.cursor_sessions() { + session.set_cursor_pos(Some( + event + .location + .to_buffer(1.0, Transform::Normal, &element.geometry().size.to_f64()) + .to_i32_round(), + )); + if let Some((_, hotspot)) = seat + .cursor_geometry((0.0, 0.0), Duration::from_millis(event.time as u64).into()) + { + session.set_cursor_hotspot(hotspot); + } else { + session.set_cursor_hotspot((0, 0)); + } + } + } + match self { - PointerFocusTarget::WlSurface(s) => PointerTarget::motion(s, seat, data, event), + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::motion(surface, seat, data, event) + } PointerFocusTarget::StackUI(u) => PointerTarget::motion(u, seat, data, event), PointerFocusTarget::WindowUI(u) => PointerTarget::motion(u, seat, data, event), PointerFocusTarget::ResizeFork(f) => PointerTarget::motion(f, seat, data, event), @@ -171,8 +263,8 @@ impl PointerTarget for PointerFocusTarget { } fn relative_motion(&self, seat: &Seat, data: &mut State, event: &RelativeMotionEvent) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::relative_motion(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::relative_motion(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => PointerTarget::relative_motion(u, seat, data, event), PointerFocusTarget::WindowUI(u) => PointerTarget::relative_motion(u, seat, data, event), @@ -183,7 +275,9 @@ impl PointerTarget for PointerFocusTarget { } fn button(&self, seat: &Seat, data: &mut State, event: &ButtonEvent) { match self { - PointerFocusTarget::WlSurface(s) => PointerTarget::button(s, seat, data, event), + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::button(surface, seat, data, event) + } PointerFocusTarget::StackUI(u) => PointerTarget::button(u, seat, data, event), PointerFocusTarget::WindowUI(u) => PointerTarget::button(u, seat, data, event), PointerFocusTarget::ResizeFork(f) => PointerTarget::button(f, seat, data, event), @@ -191,7 +285,9 @@ impl PointerTarget for PointerFocusTarget { } fn axis(&self, seat: &Seat, data: &mut State, frame: AxisFrame) { match self { - PointerFocusTarget::WlSurface(s) => PointerTarget::axis(s, seat, data, frame), + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::axis(surface, seat, data, frame) + } PointerFocusTarget::StackUI(u) => PointerTarget::axis(u, seat, data, frame), PointerFocusTarget::WindowUI(u) => PointerTarget::axis(u, seat, data, frame), PointerFocusTarget::ResizeFork(f) => PointerTarget::axis(f, seat, data, frame), @@ -199,15 +295,26 @@ impl PointerTarget for PointerFocusTarget { } fn frame(&self, seat: &Seat, data: &mut State) { match self { - PointerFocusTarget::WlSurface(s) => PointerTarget::frame(s, seat, data), + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::frame(surface, seat, data) + } PointerFocusTarget::StackUI(u) => PointerTarget::frame(u, seat, data), PointerFocusTarget::WindowUI(u) => PointerTarget::frame(u, seat, data), PointerFocusTarget::ResizeFork(f) => PointerTarget::frame(f, seat, data), } } fn leave(&self, seat: &Seat, data: &mut State, serial: Serial, time: u32) { + if let Some(element) = self.toplevel(data) { + for session in element.cursor_sessions() { + session.set_cursor_pos(None); + session.set_cursor_hotspot((0, 0)); + } + } + match self { - PointerFocusTarget::WlSurface(s) => PointerTarget::leave(s, seat, data, serial, time), + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::leave(surface, seat, data, serial, time) + } PointerFocusTarget::StackUI(u) => PointerTarget::leave(u, seat, data, serial, time), PointerFocusTarget::WindowUI(u) => PointerTarget::leave(u, seat, data, serial, time), PointerFocusTarget::ResizeFork(f) => PointerTarget::leave(f, seat, data, serial, time), @@ -220,8 +327,8 @@ impl PointerTarget for PointerFocusTarget { event: &GestureSwipeBeginEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_swipe_begin(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_swipe_begin(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_swipe_begin(u, seat, data, event) @@ -241,8 +348,8 @@ impl PointerTarget for PointerFocusTarget { event: &GestureSwipeUpdateEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_swipe_update(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_swipe_update(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_swipe_update(u, seat, data, event) @@ -262,8 +369,8 @@ impl PointerTarget for PointerFocusTarget { event: &GestureSwipeEndEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_swipe_end(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_swipe_end(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_swipe_end(u, seat, data, event) @@ -283,8 +390,8 @@ impl PointerTarget for PointerFocusTarget { event: &GesturePinchBeginEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_pinch_begin(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_pinch_begin(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_pinch_begin(u, seat, data, event) @@ -304,8 +411,8 @@ impl PointerTarget for PointerFocusTarget { event: &GesturePinchUpdateEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_pinch_update(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_pinch_update(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_pinch_update(u, seat, data, event) @@ -325,8 +432,8 @@ impl PointerTarget for PointerFocusTarget { event: &GesturePinchEndEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_pinch_end(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_pinch_end(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_pinch_end(u, seat, data, event) @@ -346,8 +453,8 @@ impl PointerTarget for PointerFocusTarget { event: &GestureHoldBeginEvent, ) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_hold_begin(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_hold_begin(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => { PointerTarget::gesture_hold_begin(u, seat, data, event) @@ -362,8 +469,8 @@ impl PointerTarget for PointerFocusTarget { } fn gesture_hold_end(&self, seat: &Seat, data: &mut State, event: &GestureHoldEndEvent) { match self { - PointerFocusTarget::WlSurface(s) => { - PointerTarget::gesture_hold_end(s, seat, data, event) + PointerFocusTarget::WlSurface { surface, .. } => { + PointerTarget::gesture_hold_end(surface, seat, data, event) } PointerFocusTarget::StackUI(u) => PointerTarget::gesture_hold_end(u, seat, data, event), PointerFocusTarget::WindowUI(u) => { @@ -497,7 +604,7 @@ impl WaylandFocus for KeyboardFocusTarget { impl WaylandFocus for PointerFocusTarget { fn wl_surface(&self) -> Option { Some(match self { - PointerFocusTarget::WlSurface(s) => s.clone(), + PointerFocusTarget::WlSurface { surface, .. } => surface.clone(), PointerFocusTarget::ResizeFork(_) | PointerFocusTarget::StackUI(_) | PointerFocusTarget::WindowUI(_) => { @@ -507,7 +614,7 @@ impl WaylandFocus for PointerFocusTarget { } fn same_client_as(&self, object_id: &ObjectId) -> bool { match self { - PointerFocusTarget::WlSurface(s) => s.id().same_client_as(object_id), + PointerFocusTarget::WlSurface { surface, .. } => surface.id().same_client_as(object_id), PointerFocusTarget::StackUI(stack) => stack .active() .wl_surface() @@ -522,15 +629,12 @@ impl WaylandFocus for PointerFocusTarget { } } -impl From for PointerFocusTarget { - fn from(s: WlSurface) -> Self { - PointerFocusTarget::WlSurface(s) - } -} - impl From for PointerFocusTarget { fn from(p: PopupKind) -> Self { - PointerFocusTarget::WlSurface(p.wl_surface().clone()) + PointerFocusTarget::WlSurface { + surface: p.wl_surface().clone(), + toplevel: None, + } } } @@ -542,7 +646,10 @@ impl From for PointerFocusTarget { impl From for PointerFocusTarget { fn from(l: LockSurface) -> Self { - PointerFocusTarget::WlSurface(l.wl_surface().clone()) + PointerFocusTarget::WlSurface { + surface: l.wl_surface().clone(), + toplevel: None, + } } }