focus: Track toplevels instead of wl_surfaces

src/shell/focus/target.rs

@@ -0,0 +1,198 @@
+use crate::utils::prelude::*;
+pub use smithay::{
+    backend::input::KeyState,
+    desktop::{LayerSurface, PopupKind, Window},
+    input::{
+        keyboard::{KeyboardTarget, KeysymHandle, ModifiersState},
+        pointer::{AxisFrame, ButtonEvent, MotionEvent, PointerTarget},
+        Seat,
+    },
+    reexports::wayland_server::{backend::ObjectId, protocol::wl_surface::WlSurface, Resource},
+    utils::{IsAlive, Serial},
+    wayland::seat::WaylandFocus,
+};
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum FocusTarget {
+    Window(Window),
+    LayerSurface(LayerSurface),
+    Popup(PopupKind),
+}
+
+impl IsAlive for FocusTarget {
+    fn alive(&self) -> bool {
+        match self {
+            FocusTarget::Window(w) => w.alive(),
+            FocusTarget::LayerSurface(l) => l.alive(),
+            FocusTarget::Popup(p) => p.alive(),
+        }
+    }
+}
+
+impl PointerTarget<State> for FocusTarget {
+    fn enter(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) {
+        match self {
+            FocusTarget::Window(w) => {
+                PointerTarget::enter(w.toplevel().wl_surface(), seat, data, event)
+            }
+            FocusTarget::LayerSurface(l) => PointerTarget::enter(l.wl_surface(), seat, data, event),
+            FocusTarget::Popup(p) => PointerTarget::enter(p.wl_surface(), seat, data, event),
+        }
+    }
+    fn motion(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) {
+        match self {
+            FocusTarget::Window(w) => {
+                PointerTarget::motion(w.toplevel().wl_surface(), seat, data, event)
+            }
+            FocusTarget::LayerSurface(l) => {
+                PointerTarget::motion(l.wl_surface(), seat, data, event)
+            }
+            FocusTarget::Popup(p) => PointerTarget::motion(p.wl_surface(), seat, data, event),
+        }
+    }
+    fn button(&self, seat: &Seat<State>, data: &mut State, event: &ButtonEvent) {
+        match self {
+            FocusTarget::Window(w) => {
+                PointerTarget::button(w.toplevel().wl_surface(), seat, data, event)
+            }
+            FocusTarget::LayerSurface(l) => {
+                PointerTarget::button(l.wl_surface(), seat, data, event)
+            }
+            FocusTarget::Popup(p) => PointerTarget::button(p.wl_surface(), seat, data, event),
+        }
+    }
+    fn axis(&self, seat: &Seat<State>, data: &mut State, frame: AxisFrame) {
+        match self {
+            FocusTarget::Window(w) => {
+                PointerTarget::axis(w.toplevel().wl_surface(), seat, data, frame)
+            }
+            FocusTarget::LayerSurface(l) => PointerTarget::axis(l.wl_surface(), seat, data, frame),
+            FocusTarget::Popup(p) => PointerTarget::axis(p.wl_surface(), seat, data, frame),
+        }
+    }
+    fn leave(&self, seat: &Seat<State>, data: &mut State, serial: Serial, time: u32) {
+        match self {
+            FocusTarget::Window(w) => {
+                PointerTarget::leave(w.toplevel().wl_surface(), seat, data, serial, time)
+            }
+            FocusTarget::LayerSurface(l) => {
+                PointerTarget::leave(l.wl_surface(), seat, data, serial, time)
+            }
+            FocusTarget::Popup(p) => PointerTarget::leave(p.wl_surface(), seat, data, serial, time),
+        }
+    }
+}
+
+impl KeyboardTarget<State> for FocusTarget {
+    fn enter(
+        &self,
+        seat: &Seat<State>,
+        data: &mut State,
+        keys: Vec<KeysymHandle<'_>>,
+        serial: Serial,
+    ) {
+        match self {
+            FocusTarget::Window(w) => {
+                KeyboardTarget::enter(w.toplevel().wl_surface(), seat, data, keys, serial)
+            }
+            FocusTarget::LayerSurface(l) => {
+                KeyboardTarget::enter(l.wl_surface(), seat, data, keys, serial)
+            }
+            FocusTarget::Popup(p) => {
+                KeyboardTarget::enter(p.wl_surface(), seat, data, keys, serial)
+            }
+        }
+    }
+    fn leave(&self, seat: &Seat<State>, data: &mut State, serial: Serial) {
+        match self {
+            FocusTarget::Window(w) => {
+                KeyboardTarget::leave(w.toplevel().wl_surface(), seat, data, serial)
+            }
+            FocusTarget::LayerSurface(l) => {
+                KeyboardTarget::leave(l.wl_surface(), seat, data, serial)
+            }
+            FocusTarget::Popup(p) => KeyboardTarget::leave(p.wl_surface(), seat, data, serial),
+        }
+    }
+    fn key(
+        &self,
+        seat: &Seat<State>,
+        data: &mut State,
+        key: KeysymHandle<'_>,
+        state: KeyState,
+        serial: Serial,
+        time: u32,
+    ) {
+        match self {
+            FocusTarget::Window(w) => KeyboardTarget::key(
+                w.toplevel().wl_surface(),
+                seat,
+                data,
+                key,
+                state,
+                serial,
+                time,
+            ),
+            FocusTarget::LayerSurface(l) => {
+                KeyboardTarget::key(l.wl_surface(), seat, data, key, state, serial, time)
+            }
+            FocusTarget::Popup(p) => {
+                KeyboardTarget::key(p.wl_surface(), seat, data, key, state, serial, time)
+            }
+        }
+    }
+    fn modifiers(
+        &self,
+        seat: &Seat<State>,
+        data: &mut State,
+        modifiers: ModifiersState,
+        serial: Serial,
+    ) {
+        match self {
+            FocusTarget::Window(w) => {
+                KeyboardTarget::modifiers(w.toplevel().wl_surface(), seat, data, modifiers, serial)
+            }
+            FocusTarget::LayerSurface(l) => {
+                KeyboardTarget::modifiers(l.wl_surface(), seat, data, modifiers, serial)
+            }
+            FocusTarget::Popup(p) => {
+                KeyboardTarget::modifiers(p.wl_surface(), seat, data, modifiers, serial)
+            }
+        }
+    }
+}
+
+impl WaylandFocus for FocusTarget {
+    fn wl_surface(&self) -> Option<&WlSurface> {
+        Some(match self {
+            FocusTarget::Window(w) => w.toplevel().wl_surface(),
+            FocusTarget::LayerSurface(l) => l.wl_surface(),
+            FocusTarget::Popup(p) => p.wl_surface(),
+        })
+    }
+    fn same_client_as(&self, object_id: &ObjectId) -> bool {
+        match self {
+            FocusTarget::Window(w) => w.toplevel().wl_surface().id().same_client_as(object_id),
+            FocusTarget::LayerSurface(l) => l.wl_surface().id().same_client_as(object_id),
+            FocusTarget::Popup(p) => p.wl_surface().id().same_client_as(object_id),
+        }
+    }
+}
+
+impl From<Window> for FocusTarget {
+    fn from(w: Window) -> Self {
+        FocusTarget::Window(w)
+    }
+}
+
+impl From<LayerSurface> for FocusTarget {
+    fn from(l: LayerSurface) -> Self {
+        FocusTarget::LayerSurface(l)
+    }
+}
+
+impl From<PopupKind> for FocusTarget {
+    fn from(p: PopupKind) -> Self {
+        FocusTarget::Popup(p)
+    }
+}