autocommit 2022-01-08 16:57:40 CET

src/backend.rs

@@ -1,6 +1,5 @@
 use crate::fixed::Fixed;
 use std::rc::Rc;
-use crate::xkbcommon::XkbKeymapStr;
 
 linear_ids!(OutputIds, OutputId);
 linear_ids!(SeatIds, SeatId);
@@ -25,10 +24,23 @@ pub enum BackendEvent {
     NewSeat(Rc<dyn Seat>),
 }
 
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub enum KeyState {
+    Released,
+    Pressed,
+}
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub enum ScrollAxis {
+    Horizontal,
+    Vertical,
+}
+
 #[derive(Debug)]
 pub enum SeatEvent {
-    Motion(OutputId, Fixed, Fixed),
-    Key(u32),
-    Keymap(XkbKeymapStr),
-    Modifiers(u32, u32, u32, u32)
+    OutputPosition(OutputId, Fixed, Fixed),
+    Motion(Fixed, Fixed),
+    Button(u32, KeyState),
+    Scroll(i32, ScrollAxis),
+    Key(u32, KeyState),
 }