diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-19 08:56:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 08:56:03 -0400 |
| commit | 21eb63cc9ebff4e843595c64e40b5707a158c925 (patch) | |
| tree | 8be54bda3c472f31666e0d2fad5b5647d67c62e6 /sway/input | |
| parent | 9715e38ca82f891afdb824d02b7f19a2587e24c1 (diff) | |
| parent | 2f0120e458cae47f38a3c09af174bae60964151c (diff) | |
| download | sway-21eb63cc9ebff4e843595c64e40b5707a158c925.tar.xz | |
Merge branch 'master' into fullscreen
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/keyboard.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index dbb0c359..dbf2ce01 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -1,4 +1,5 @@ #include <assert.h> +#include <limits.h> #include <wlr/backend/multi.h> #include <wlr/backend/session.h> #include "sway/input/seat.h" @@ -479,7 +480,13 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) { keyboard->keymap = keymap; wlr_keyboard_set_keymap(wlr_device->keyboard, keyboard->keymap); - wlr_keyboard_set_repeat_info(wlr_device->keyboard, 25, 600); + if (input_config && input_config->repeat_delay != INT_MIN + && input_config->repeat_rate != INT_MIN) { + wlr_keyboard_set_repeat_info(wlr_device->keyboard, + input_config->repeat_rate, input_config->repeat_delay); + } else { + wlr_keyboard_set_repeat_info(wlr_device->keyboard, 25, 600); + } xkb_context_unref(context); struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat; wlr_seat_set_keyboard(seat, wlr_device); |