Merge pull request #648 from mahkoh/jorth/compositor-side-repeat

seat: implement key repeat

Author: mahkoh

docs/features.md

@@ -170,7 +170,7 @@ Jay supports the following wayland protocols:
 | wl_drm                                               | 2               |               |
 | wl_fixes                                             | 1               |               |
 | wl_output                                            | 4               |               |
-| wl_seat                                              | 9               |               |
+| wl_seat                                              | 10              |               |
 | wl_shm                                               | 2               |               |
 | wl_subcompositor                                     | 1               |               |
 | wp_alpha_modifier_v1                                 | 1               |               |

src/backend.rs

@@ -315,6 +315,13 @@ pub enum BackendEvent {
 pub enum KeyState {
     Released,
     Pressed,
+    Repeated,
+}
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub enum ButtonState {
+    Released,
+    Pressed,
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Linearize)]
@@ -369,7 +376,7 @@ pub enum InputEvent {
     Button {
         time_usec: u64,
         button: u32,
-        state: KeyState,
+        state: ButtonState,
     },
 
     AxisPx {

src/backends/metal.rs

@@ -8,7 +8,7 @@ use {
     crate::{
         async_engine::SpawnedFuture,
         backend::{
-            Backend, InputDevice, InputDeviceAccelProfile, InputDeviceCapability,
+            Backend, ButtonState, InputDevice, InputDeviceAccelProfile, InputDeviceCapability,
             InputDeviceClickMethod, InputDeviceGroupId, InputDeviceId, InputEvent, KeyState, Leds,
             TransformMatrix, transaction::BackendConnectorTransactionError,
         },
@@ -598,7 +598,7 @@ impl MetalInputDevice {
             self.event(InputEvent::Button {
                 time_usec,
                 button,
-                state: KeyState::Released,
+                state: ButtonState::Released,
             });
         }
     }

src/backends/metal/input.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        backend::{AxisSource, InputEvent, KeyState, ScrollAxis},
+        backend::{AxisSource, ButtonState, InputEvent, KeyState, ScrollAxis},
         backends::metal::MetalBackend,
         fixed::Fixed,
         ifs::wl_seat::tablet::{
@@ -216,12 +216,12 @@ impl MetalBackend {
             if dev.pressed_buttons.insert(event.button(), ()).is_some() {
                 return;
             }
-            KeyState::Pressed
+            ButtonState::Pressed
         } else {
             if dev.pressed_buttons.remove(&event.button()).is_none() {
                 return;
             }
-            KeyState::Released
+            ButtonState::Released
         };
         dev.event(InputEvent::Button {
             time_usec: event.time_usec(),

src/backends/x.rs

@@ -4,9 +4,10 @@ use {
         async_engine::{Phase, SpawnedFuture},
         backend::{
             AXIS_120, AxisSource, Backend, BackendConnectorState, BackendDrmDevice, BackendEvent,
-            Connector, ConnectorEvent, ConnectorId, ConnectorKernelId, DrmDeviceId, DrmEvent,
-            InputDevice, InputDeviceAccelProfile, InputDeviceCapability, InputDeviceClickMethod,
-            InputDeviceId, InputEvent, KeyState, Mode, MonitorInfo, ScrollAxis, TransformMatrix,
+            ButtonState, Connector, ConnectorEvent, ConnectorId, ConnectorKernelId, DrmDeviceId,
+            DrmEvent, InputDevice, InputDeviceAccelProfile, InputDeviceCapability,
+            InputDeviceClickMethod, InputDeviceId, InputEvent, KeyState, Mode, MonitorInfo,
+            ScrollAxis, TransformMatrix,
             transaction::{
                 BackendAppliedConnectorTransaction, BackendConnectorTransaction,
                 BackendConnectorTransactionError, BackendConnectorTransactionType,
@@ -817,8 +818,8 @@ impl XBackend {
         match event.code() {
             XiMotion::OPCODE => self.handle_input_motion(event),
             XiEnter::OPCODE => self.handle_input_enter(event),
-            XiButtonPress::OPCODE => self.handle_input_button_press(event, KeyState::Pressed),
-            XiButtonRelease::OPCODE => self.handle_input_button_press(event, KeyState::Released),
+            XiButtonPress::OPCODE => self.handle_input_button_press(event, ButtonState::Pressed),
+            XiButtonRelease::OPCODE => self.handle_input_button_press(event, ButtonState::Released),
             XiKeyPress::OPCODE => self.handle_input_key_press(event, KeyState::Pressed),
             XiKeyRelease::OPCODE => self.handle_input_key_press(event, KeyState::Released),
             XiHierarchy::OPCODE => self.handle_input_hierarchy(event).await,
@@ -829,14 +830,14 @@ impl XBackend {
     fn handle_input_button_press(
         self: &Rc<Self>,
         event: &Event,
-        state: KeyState,
+        state: ButtonState,
     ) -> Result<(), XBackendError> {
         let event: XiButtonPress = event.parse()?;
         if let Some(seat) = self.mouse_seats.get(&event.deviceid) {
             let button = event.detail;
             // let button = seat.button_map.get(&event.detail).unwrap_or(event.detail);
             if matches!(button, 4..=7) {
-                if state == KeyState::Pressed {
+                if state == ButtonState::Pressed {
                     let (axis, val) = match button {
                         4 => (ScrollAxis::Vertical, -1),
                         5 => (ScrollAxis::Vertical, 1),

src/ei/ei_ifs/ei_button.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        backend::KeyState,
+        backend::ButtonState,
         ei::{
             ei_client::{EiClient, EiClientError},
             ei_ifs::ei_device::{EiDevice, EiDeviceInterface},
@@ -27,7 +27,7 @@ pub struct EiButton {
 ei_device_interface!(EiButton, ei_button, button);
 
 impl EiButton {
-    pub fn send_button(&self, button: u32, state: KeyState) {
+    pub fn send_button(&self, button: u32, state: ButtonState) {
         self.client.event(ServerButton {
             self_id: self.id,
             button,
@@ -46,8 +46,8 @@ impl EiButtonRequestHandler for EiButton {
 
     fn client_button(&self, req: ClientButton, _slf: &Rc<Self>) -> Result<(), Self::Error> {
         let pressed = match req.state {
-            0 => KeyState::Released,
-            1 => KeyState::Pressed,
+            0 => ButtonState::Released,
+            1 => ButtonState::Pressed,
             _ => return Err(EiButtonError::InvalidButtonState(req.state)),
         };
         self.device.button_changes.push((req.button, pressed));

src/ei/ei_ifs/ei_device.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        backend::{KeyState, ScrollAxis},
+        backend::{ButtonState, KeyState, ScrollAxis},
         ei::{
             ei_client::{EiClient, EiClientError},
             ei_ifs::{ei_seat::EiSeat, ei_touchscreen::TouchChange},
@@ -40,7 +40,7 @@ pub struct EiDevice {
     pub version: EiVersion,
     pub seat: Rc<EiSeat>,
 
-    pub button_changes: SyncQueue<(u32, KeyState)>,
+    pub button_changes: SyncQueue<(u32, ButtonState)>,
     pub touch_changes: CopyHashMap<u32, TouchChange>,
     pub scroll_px: [Cell<Option<f32>>; 2],
     pub scroll_v120: [Cell<Option<i32>>; 2],

src/ei/ei_ifs/ei_keyboard.rs

@@ -59,6 +59,7 @@ impl EiKeyboard {
             state: match state {
                 KeyState::Released => 0,
                 KeyState::Pressed => 1,
+                KeyState::Repeated => return,
             },
         });
     }

src/ei/ei_ifs/ei_seat.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        backend::KeyState,
+        backend::{ButtonState, KeyState},
         ei::{
             EiContext,
             ei_client::{EiClient, EiClientError},
@@ -150,7 +150,7 @@ impl EiSeat {
         }
     }
 
-    pub fn handle_button(&self, time_usec: u64, button: u32, state: KeyState) {
+    pub fn handle_button(&self, time_usec: u64, button: u32, state: ButtonState) {
         if self.is_sender() {
             return;
         }

src/ifs/jay_seat_events.rs

@@ -1,6 +1,6 @@
 use {
     crate::{
-        backend::{InputDeviceId, KeyState, ScrollAxis},
+        backend::{ButtonState, InputDeviceId, KeyState, ScrollAxis},
         client::Client,
         fixed::Fixed,
         ifs::wl_seat::{
@@ -79,7 +79,7 @@ impl JaySeatEvents {
         });
     }
 
-    pub fn send_button(&self, seat: SeatId, time_usec: u64, button: u32, state: KeyState) {
+    pub fn send_button(&self, seat: SeatId, time_usec: u64, button: u32, state: ButtonState) {
         self.client.event(Button {
             self_id: self.id,
             seat: seat.raw(),