From a1f2cc61980626d06aab24a7bb5fb38f65c187f2 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Wed, 30 Oct 2024 12:04:46 -0700
Subject: [PATCH] Update `reis` to 0.4, with more concise API

The API `reis` provides could still be improved, but it's a bit
simpler to use.
---
 Cargo.toml                   |  2 +-
 src/desktop/input_capture.rs | 31 ++++---------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ef375c1a1..83b660de8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,7 +59,7 @@ zbus = { version = "5.0", default-features = false, features = ["url"] }
 
 [dev-dependencies]
 serde_json = "1.0"
-reis = { version = "0.2.0", features = [ "tokio" ] }
+reis = { version = "0.4.0", features = [ "tokio" ] }
 
 [package.metadata.docs.rs]
 features = ["gtk4", "raw_handle"]
diff --git a/src/desktop/input_capture.rs b/src/desktop/input_capture.rs
index 91ccb8ae1..e31c9baa0 100644
--- a/src/desktop/input_capture.rs
+++ b/src/desktop/input_capture.rs
@@ -148,7 +148,6 @@
 //! use reis::{
 //!     ei::{self, keyboard::KeyState},
 //!     event::{DeviceCapability, EiEvent, KeyboardKey},
-//!     tokio::{EiConvertEventStream, EiEventStream},
 //! };
 //!
 //! #[allow(unused)]
@@ -182,32 +181,10 @@
 //!     let context = ei::Context::new(stream)?;
 //!     context.flush().unwrap();
 //!
-//!     let mut event_stream = EiEventStream::new(context.clone())?;
-//!     let interfaces = INTERFACES.get_or_init(|| {
-//!         HashMap::from([
-//!             ("ei_connection", 1),
-//!             ("ei_callback", 1),
-//!             ("ei_pingpong", 1),
-//!             ("ei_seat", 1),
-//!             ("ei_device", 2),
-//!             ("ei_pointer", 1),
-//!             ("ei_pointer_absolute", 1),
-//!             ("ei_scroll", 1),
-//!             ("ei_button", 1),
-//!             ("ei_keyboard", 1),
-//!             ("ei_touchscreen", 1),
-//!         ])
-//!     });
-//!     let response = reis::tokio::ei_handshake(
-//!         &mut event_stream,
-//!         "ashpd-mre",
-//!         ei::handshake::ContextType::Receiver,
-//!         interfaces,
-//!     )
-//!     .await
-//!     .expect("ei handshake failed");
-//!
-//!     let mut event_stream = EiConvertEventStream::new(event_stream, response.serial);
+//!     let (_connection, mut event_stream) = context
+//!         .handshake_tokio("ashpd-mre", ei::handshake::ContextType::Receiver)
+//!         .await
+//!         .expect("ei handshake failed");
 //!
 //!     let pos = Position::Left;
 //!     let zones = input_capture.zones(&session).await?.response()?;