From c422fdab0fd19f61ee5ad73a46312d4284641f3c Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sun, 24 Sep 2023 11:04:30 +0400
Subject: Update Smithay

---
 src/input.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/input.rs')

diff --git a/src/input.rs b/src/input.rs
index 3cc13a5f..888bf785 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -43,7 +43,7 @@ fn action(
 
     // Handle hardcoded binds.
     #[allow(non_upper_case_globals)] // wat
-    match keysym.modified_sym() {
+    match keysym.modified_sym().raw() {
         modified @ KEY_XF86Switch_VT_1..=KEY_XF86Switch_VT_12 => {
             let vt = (modified - KEY_XF86Switch_VT_1 + 1) as i32;
             return Action::ChangeVt(vt);
@@ -383,6 +383,8 @@ impl State {
                     },
                 );
 
+                pointer.frame(self);
+
                 // Redraw to update the cursor position.
                 // FIXME: redraw only outputs overlapping the cursor.
                 self.niri.queue_redraw_all();
@@ -412,6 +414,8 @@ impl State {
                     },
                 );
 
+                pointer.frame(self);
+
                 // Redraw to update the cursor position.
                 // FIXME: redraw only outputs overlapping the cursor.
                 self.niri.queue_redraw_all();
@@ -479,7 +483,9 @@ impl State {
                     }
                 }
 
-                self.niri.seat.get_pointer().unwrap().axis(self, frame);
+                let pointer = &self.niri.seat.get_pointer().unwrap();
+                pointer.axis(self, frame);
+                pointer.frame(self);
             }
             InputEvent::TabletToolAxis { event, .. } => {
                 // FIXME: allow mapping tablet to different outputs.
@@ -506,6 +512,7 @@ impl State {
                         time: event.time_msec(),
                     },
                 );
+                pointer.frame(self);
 
                 let tablet_seat = self.niri.seat.tablet_seat();
                 let tablet = tablet_seat.get_tablet(&TabletDescriptor::from(&event.device()));
@@ -593,6 +600,7 @@ impl State {
                         time: event.time_msec(),
                     },
                 );
+                pointer.frame(self);
 
                 let tablet_seat = self.niri.seat.tablet_seat();
                 let tool = tablet_seat.add_tool::<Self>(&self.niri.display_handle, &event.tool());
-- 
cgit