Add key repetition (#16)

Smithay · Jul 24, 2018 · 1691329 · 1691329
1 parent c55ba39
commit 1691329
Show file tree

Hide file tree

Showing 4 changed files with 344 additions and 84 deletions.
diff --git a/examples/kbd_input.rs b/examples/kbd_input.rs
@@ -7,7 +7,7 @@ use std::sync::{Arc, Mutex};
 
 use byteorder::{NativeEndian, WriteBytesExt};
 
-use sctk::keyboard::{map_keyboard_auto, Event as KbEvent};
+use sctk::keyboard::{map_keyboard_auto_with_repeat, Event as KbEvent, KeyRepeatKind, KeyRepeatEvent};
 use sctk::reexports::client::protocol::wl_buffer::RequestsTrait as BufferRequests;
 use sctk::reexports::client::protocol::wl_compositor::RequestsTrait as CompositorRequests;
 use sctk::reexports::client::protocol::wl_display::RequestsTrait as DisplayRequests;
@@ -80,41 +80,50 @@ fn main() {
 
     window.new_seat(&seat);
 
-    let _keyboard = map_keyboard_auto(seat.get_keyboard().unwrap(), move |event: KbEvent, _| {
-        match event {
-            KbEvent::Enter {
-                modifiers, keysyms, ..
-            } => {
-                println!(
-                    "Gained focus while {} keys pressed and modifiers are {:?}.",
-                    keysyms.len(),
-                    modifiers
-                );
-            }
-            KbEvent::Leave { .. } => {
-                println!("Lost focus.");
-            }
-            KbEvent::Key {
-                keysym,
-                state,
-                utf8,
-                modifiers,
-                ..
-            } => {
-                println!("Key {:?}: {:x}.", state, keysym);
-                println!(" -> Modifers are {:?}", modifiers);
-                if let Some(txt) = utf8 {
-                    println!(" -> Received text \"{}\".", txt,);
+    let _keyboard = map_keyboard_auto_with_repeat(seat.get_keyboard().unwrap(), KeyRepeatKind::System, 
+            move |event: KbEvent, _| {
+                match event {
+                    KbEvent::Enter {
+                        modifiers, keysyms, ..
+                    } => {
+                        println!(
+                            "Gained focus while {} keys pressed and modifiers are {:?}.",
+                            keysyms.len(),
+                            modifiers
+                        );
+                    }
+                    KbEvent::Leave { .. } => {
+                        println!("Lost focus.");
+                    }
+                    KbEvent::Key {
+                        keysym,
+                        state,
+                        utf8,
+                        modifiers,
+                        ..
+                    } => {
+                        println!("Key {:?}: {:x}.", state, keysym);
+                        println!(" -> Modifers are {:?}", modifiers);
+                        if let Some(txt) = utf8 {
+                            println!(" -> Received text \"{}\".", txt);
+                        }
+                    }
+                    KbEvent::RepeatInfo { rate, delay } => {
+                        println!(
+                        "Received repeat info: start repeating every {}ms after an initial delay of {}ms",
+                        rate, delay
+                    );
+                    }
+                }
+            },
+            move |repeat_event: KeyRepeatEvent, _| {
+                println!("Repeated key {:x}.", repeat_event.keysym);
+                println!(" -> Modifers are {:?}", repeat_event.modifiers);
+                if let Some(txt) = repeat_event.utf8 {
+                    println!(" -> Received text \"{}\".", txt);
                 }
             }
-            KbEvent::RepeatInfo { rate, delay } => {
-                println!(
-                "Received repeat info: start repeating every {}ms after an initial delay of {}ms",
-                rate, delay
-            );
-            }
-        }
-    });
+    );
 
     if !env.shell.needs_configure() {
         // initial draw to bootstrap on wl_shell

diff --git a/examples/selection.rs b/examples/selection.rs
@@ -7,7 +7,7 @@ use std::sync::{Arc, Mutex};
 use byteorder::{NativeEndian, WriteBytesExt};
 
 use sctk::data_device::{DataDevice, DndEvent, ReadPipe};
-use sctk::keyboard::{map_keyboard_auto, Event as KbEvent};
+use sctk::keyboard::{map_keyboard_auto, Event as KbEvent, KeyState};
 use sctk::utils::{DoubleMemPool, MemPool};
 use sctk::window::{BasicFrame, Event as WEvent, Window};
 use sctk::Environment;
@@ -87,9 +87,10 @@ fn main() {
     let _keyboard = map_keyboard_auto(seat.get_keyboard().unwrap(), move |event: KbEvent, _| {
         match event {
             KbEvent::Key {
+                state,
                 utf8: Some(text), ..
             } => {
-                if text == "p" {
+                if text == "p" && state == KeyState::Pressed {
                     // pressed the 'p' key, try to read contents !
                     device.with_selection(|offer| {
                         if let Some(offer) = offer {
@@ -133,8 +134,8 @@ fn main() {
             Some(WEvent::Refresh) => {
                 window.refresh();
                 window.surface().commit();
-            },
-            Some(WEvent::Configure { new_size, states }) => {
+            }
+            Some(WEvent::Configure { new_size, .. }) => {
                 if let Some((w, h)) = new_size {
                     window.resize(w, h);
                     dimensions = (w, h)
@@ -176,7 +177,7 @@ fn redraw(
     let _ = pool.seek(SeekFrom::Start(0));
     {
         let mut writer = BufWriter::new(&mut *pool);
-        for i in 0..(buf_x * buf_y) {
+        for _ in 0..(buf_x * buf_y) {
             let _ = writer.write_u32::<NativeEndian>(0xFF000000);
         }
         let _ = writer.flush();

diff --git a/src/keyboard/ffi.rs b/src/keyboard/ffi.rs
@@ -213,6 +213,7 @@ functions:
     fn xkb_keymap_ref(*mut xkb_keymap) -> *mut xkb_keymap,
     fn xkb_keymap_unref(*mut xkb_keymap) -> (),
     fn xkb_keymap_get_as_string(*mut xkb_keymap, xkb_keymap_format) -> *const c_char,
+    fn xkb_keymap_key_repeats(*mut xkb_keymap, xkb_keycode_t) -> c_int,
 
     fn xkb_state_new(*mut xkb_keymap) -> *mut xkb_state,
     fn xkb_state_ref(*mut xkb_state) -> *mut xkb_state,