From 206493bb354fd56140e8bf00592c6dd683a6a117 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Tue, 19 Dec 2023 20:48:15 +0400
Subject: Update Smithay

---
 Cargo.lock   | 20 +++++---------------
 Cargo.toml   |  1 -
 src/input.rs | 12 ++++++------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7bed2d10..1753797b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1809,7 +1809,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
 dependencies = [
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.39",
@@ -2049,16 +2049,6 @@ dependencies = [
  "toml_edit 0.19.15",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
-dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -2462,7 +2452,7 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay.git#7008321f2e35d5cf19e37c4427d1aaf19dd44d0f"
+source = "git+https://github.com/Smithay/smithay.git#e9b3d477d2f7c83a2a55caaf32a56b27ffecfd62"
 dependencies = [
  "appendlist",
  "bitflags 2.4.1",
@@ -2533,7 +2523,7 @@ dependencies = [
 [[package]]
 name = "smithay-drm-extras"
 version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay.git#7008321f2e35d5cf19e37c4427d1aaf19dd44d0f"
+source = "git+https://github.com/Smithay/smithay.git#e9b3d477d2f7c83a2a55caaf32a56b27ffecfd62"
 dependencies = [
  "drm",
  "edid-rs",
@@ -3664,7 +3654,7 @@ version = "3.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "regex",
@@ -3723,7 +3713,7 @@ version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
diff --git a/Cargo.toml b/Cargo.toml
index b03b8599..30673e2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,6 @@ features = [
     "backend_udev",
     "backend_winit",
     "desktop",
-    "libinput_1_19",
     "renderer_gl",
     "renderer_multi",
     "use_system_lib",
diff --git a/src/input.rs b/src/input.rs
index f84b8465..cb97800e 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -701,24 +701,24 @@ impl State {
 
         let horizontal_amount = event
             .amount(Axis::Horizontal)
-            .unwrap_or_else(|| event.amount_discrete(Axis::Horizontal).unwrap_or(0.0) * 3.0);
+            .unwrap_or_else(|| event.amount_v120(Axis::Horizontal).unwrap_or(0.0) * 3.0 / 120.);
         let vertical_amount = event
             .amount(Axis::Vertical)
-            .unwrap_or_else(|| event.amount_discrete(Axis::Vertical).unwrap_or(0.0) * 3.0);
-        let horizontal_amount_discrete = event.amount_discrete(Axis::Horizontal);
-        let vertical_amount_discrete = event.amount_discrete(Axis::Vertical);
+            .unwrap_or_else(|| event.amount_v120(Axis::Vertical).unwrap_or(0.0) * 3.0 / 120.);
+        let horizontal_amount_discrete = event.amount_v120(Axis::Horizontal);
+        let vertical_amount_discrete = event.amount_v120(Axis::Vertical);
 
         let mut frame = AxisFrame::new(event.time_msec()).source(source);
         if horizontal_amount != 0.0 {
             frame = frame.value(Axis::Horizontal, horizontal_amount);
             if let Some(discrete) = horizontal_amount_discrete {
-                frame = frame.discrete(Axis::Horizontal, discrete as i32);
+                frame = frame.v120(Axis::Horizontal, discrete as i32);
             }
         }
         if vertical_amount != 0.0 {
             frame = frame.value(Axis::Vertical, vertical_amount);
             if let Some(discrete) = vertical_amount_discrete {
-                frame = frame.discrete(Axis::Vertical, discrete as i32);
+                frame = frame.v120(Axis::Vertical, discrete as i32);
             }
         }
 
-- 
cgit