From 7ef4c56f6629fe3feadb3f0bbf8df73d1a6223ff Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Wed, 22 Jan 2025 09:10:07 -0800
Subject: [PATCH] WIP stack: Update `previous_keyboard` only when `enter()` is
 called

Attempt at fixing https://github.com/pop-os/cosmic-comp/issues/1129.

This does seem to fix that issue with the reproduction steps listed
there, but I still see it if I create a stack with a terminal and
firefox, focus the terminal (element index 0 in the stack) and close it,
then try to type in firefox (now element index 0).

So managing what child has keyboard focus still needs some work. I'm not
sure exactly what conditions apply were I've randomly seen this behavior
in actual use (and if this particular change helps) or if this could
cause problems.
---
 src/shell/element/stack.rs | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs
index e14b8a583..672e6e756 100644
--- a/src/shell/element/stack.rs
+++ b/src/shell/element/stack.rs
@@ -181,7 +181,6 @@ impl CosmicStack {
                 let old_idx = p.active.swap(idx, Ordering::SeqCst);
                 if old_idx == idx {
                     p.reenter.store(true, Ordering::SeqCst);
-                    p.previous_keyboard.store(old_idx, Ordering::SeqCst);
                 }
             } else {
                 let mut windows = p.windows.lock().unwrap();
@@ -261,13 +260,10 @@ impl CosmicStack {
         let result = self.0.with_program(|p| match direction {
             FocusDirection::Left => {
                 if !p.group_focused.load(Ordering::SeqCst) {
-                    if let Ok(old) =
-                        p.active
-                            .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |val| {
-                                val.checked_sub(1)
-                            })
+                    if p.active
+                        .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |val| val.checked_sub(1))
+                        .is_ok()
                     {
-                        p.previous_keyboard.store(old, Ordering::SeqCst);
                         p.scroll_to_focus.store(true, Ordering::SeqCst);
                         true
                     } else {
@@ -280,17 +276,16 @@ impl CosmicStack {
             FocusDirection::Right => {
                 if !p.group_focused.load(Ordering::SeqCst) {
                     let max = p.windows.lock().unwrap().len();
-                    if let Ok(old) =
-                        p.active
-                            .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |val| {
-                                if val < max - 1 {
-                                    Some(val + 1)
-                                } else {
-                                    None
-                                }
-                            })
+                    if p.active
+                        .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |val| {
+                            if val < max - 1 {
+                                Some(val + 1)
+                            } else {
+                                None
+                            }
+                        })
+                        .is_ok()
                     {
-                        p.previous_keyboard.store(old, Ordering::SeqCst);
                         p.scroll_to_focus.store(true, Ordering::SeqCst);
                         true
                     } else {
@@ -353,7 +348,6 @@ impl CosmicStack {
             if let Some(val) = next {
                 let old = p.active.swap(val, Ordering::SeqCst);
                 windows.swap(old, val);
-                p.previous_keyboard.store(old, Ordering::SeqCst);
                 p.scroll_to_focus.store(true, Ordering::SeqCst);
                 MoveResult::Handled
             } else {
@@ -399,8 +393,7 @@ impl CosmicStack {
     pub fn set_active(&self, window: &CosmicSurface) {
         self.0.with_program(|p| {
             if let Some(val) = p.windows.lock().unwrap().iter().position(|w| w == window) {
-                let old = p.active.swap(val, Ordering::SeqCst);
-                p.previous_keyboard.store(old, Ordering::SeqCst);
+                p.active.store(val, Ordering::SeqCst);
             }
         });
         self.0