From 9f28a764a7cac5f9acd16a6cff46d72d0656c87d Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Thu, 28 May 2026 14:53:05 -0700
Subject: [PATCH] chore: update smithay

Includes the fix in https://github.com/Smithay/smithay/pull/2038,
which helps addresses a regression in controller input for Steam games.
---
 Cargo.lock                   | 2 +-
 Cargo.toml                   | 2 +-
 src/shell/element/surface.rs | 4 ++--
 src/shell/focus/order.rs     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 22c0e63c..029590c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4924,7 +4924,7 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 [[package]]
 name = "smithay"
 version = "0.7.0"
-source = "git+https://github.com/smithay/smithay.git?rev=df73da7#df73da7183c365b00eb4558690a48061462053f2"
+source = "git+https://github.com/smithay/smithay.git?rev=85f83ab#85f83ab61711e725aa1f3481df4f4dc5370e925b"
 dependencies = [
  "aliasable",
  "appendlist",
diff --git a/Cargo.toml b/Cargo.toml
index a63e3be0..9e74d6ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -143,4 +143,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
 cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
 
 [patch.crates-io]
-smithay = { git = "https://github.com/smithay/smithay.git", rev = "df73da7" }
+smithay = { git = "https://github.com/smithay/smithay.git", rev = "85f83ab" }
diff --git a/src/shell/element/surface.rs b/src/shell/element/surface.rs
index 769ffbd9..f715bba3 100644
--- a/src/shell/element/surface.rs
+++ b/src/shell/element/surface.rs
@@ -345,7 +345,7 @@ impl CosmicSurface {
                     state.is_some_and(|state| state.states.contains(ToplevelState::Resizing))
                 }))
             }
-            WindowSurface::X11(surface) => surface.pending_geometry().map(|_| true),
+            WindowSurface::X11(surface) => surface.pending_configure().map(|_| true),
         }
     }
 
@@ -591,7 +591,7 @@ impl CosmicSurface {
                     }
                 })
             }
-            WindowSurface::X11(surface) => surface.pending_geometry().is_none(),
+            WindowSurface::X11(surface) => surface.pending_configure().is_none(),
         }
     }
 
diff --git a/src/shell/focus/order.rs b/src/shell/focus/order.rs
index 6a2488fe..8c6dae0b 100644
--- a/src/shell/focus/order.rs
+++ b/src/shell/focus/order.rs
@@ -220,12 +220,12 @@ fn render_input_order_internal<R: 'static>(
             .rev()
             .filter(|or| {
                 (*or)
-                    .geometry()
+                    .last_configure()
                     .as_global()
                     .intersection(output.geometry())
                     .is_some()
             })
-            .map(|or| (or, or.geometry().loc.as_global()))
+            .map(|or| (or, or.last_configure().loc.as_global()))
         {
             callback(Stage::OverrideRedirect { surface, location })?;
         }