WIP Input focus update

pop-os · Feb 24, 2024 · e299dc7 · e299dc7
1 parent 3036448
commit e299dc7
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 190 deletions.
diff --git a/src/input/mod.rs b/src/input/mod.rs
@@ -2158,7 +2158,7 @@ impl State {
         if let Some(session_lock) = session_lock {
             return session_lock.surfaces.get(output).map(|surface| {
                 (
-                    PointerFocusTarget::LockSurface(surface.clone()),
+                    PointerFocusTarget::WlSurface(surface.wl_surface().clone()),
                     output_geo.loc,
                 )
             });

diff --git a/src/shell/focus/mod.rs b/src/shell/focus/mod.rs
@@ -11,8 +11,10 @@ use smithay::{
     output::Output,
     utils::{IsAlive, Serial, SERIAL_COUNTER},
     wayland::{
+        compositor::with_states,
         seat::WaylandFocus,
         shell::wlr_layer::{KeyboardInteractivity, Layer},
+        shell::xdg::XdgPopupSurfaceData,
     },
 };
 use std::cell::RefCell;
@@ -253,27 +255,33 @@ impl Common {
                         trace!("Wrong Window, focus fixup");
                     }
                 } else {
-                    if let KeyboardFocusTarget::Popup(_) = target {
+                    if let KeyboardFocusTarget::WlSurface(surface) = target {
                         if let Some(popup_grab) = seat
                             .user_data()
                             .get::<PopupGrabData>()
                             .and_then(|x| x.take())
                         {
-                            if !popup_grab.has_ended() {
-                                if let Some(new) = popup_grab.current_grab() {
-                                    trace!("restore focus to previous popup grab");
-                                    if let Some(keyboard) = seat.get_keyboard() {
-                                        keyboard.set_focus(
-                                            state,
-                                            Some(new.clone()),
-                                            SERIAL_COUNTER.next_serial(),
-                                        );
+                            if with_states(&surface, |states| {
+                                states.data_map.get::<XdgPopupSurfaceData>().is_some()
+                            }) {
+                                if !popup_grab.has_ended() {
+                                    if let Some(new) = popup_grab.current_grab() {
+                                        trace!("restore focus to previous popup grab");
+                                        if let Some(keyboard) = seat.get_keyboard() {
+                                            keyboard.set_focus(
+                                                state,
+                                                Some(new.clone()),
+                                                SERIAL_COUNTER.next_serial(),
+                                            );
+                                        }
+                                        ActiveFocus::set(&seat, Some(new));
+                                        seat.user_data()
+                                            .get_or_insert::<PopupGrabData, _>(
+                                                PopupGrabData::default,
+                                            )
+                                            .set(Some(popup_grab));
+                                        continue;
                                     }
-                                    ActiveFocus::set(&seat, Some(new));
-                                    seat.user_data()
-                                        .get_or_insert::<PopupGrabData, _>(PopupGrabData::default)
-                                        .set(Some(popup_grab));
-                                    continue;
                                 }
                             }
                         }
@@ -326,8 +334,15 @@ fn focus_target_is_valid(
     target: KeyboardFocusTarget,
 ) -> bool {
     // If a session lock is active, only lock surfaces can be focused
-    if state.common.shell.session_lock.is_some() {
-        return matches!(target, KeyboardFocusTarget::LockSurface(_));
+    if let Some(session_lock) = state.common.shell.session_lock.as_ref() {
+        return if let KeyboardFocusTarget::WlSurface(surface) = target {
+            session_lock
+                .surfaces
+                .values()
+                .any(|x| x.wl_surface() == &surface)
+        } else {
+            false
+        };
     }
 
     // If an exclusive layer shell surface exists (on any output), only exclusive
@@ -386,8 +401,8 @@ fn focus_target_is_valid(
                 .unwrap_or(false)
                 && workspace.get_fullscreen().is_some()
         }
-        KeyboardFocusTarget::Popup(_) => true,
-        KeyboardFocusTarget::LockSurface(_) => false,
+        // TODO restrict when it handles all wl surfaces
+        KeyboardFocusTarget::WlSurface(_) => true,
     }
 }