diff options
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 68 |
1 files changed, 39 insertions, 29 deletions
@@ -7,6 +7,7 @@ #include <locale.h> #include <sys/mman.h> #include <sys/time.h> +#include <sys/timerfd.h> #include <linux/input-event-codes.h> @@ -65,47 +66,56 @@ keyboard_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, term_focus_in(term); } -static void -keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, - struct wl_surface *surface) +static bool +start_repeater(struct terminal *term, uint32_t key) { - struct terminal *term = data; + if (term->kbd.repeat.dont_re_repeat) + return true; + + struct itimerspec t = { + .it_value = {.tv_sec = 0, .tv_nsec = term->kbd.repeat.delay * 1000000}, + .it_interval = {.tv_sec = 0, .tv_nsec = 1000000000 / term->kbd.repeat.rate}, + }; - mtx_lock(&term->kbd.repeat.mutex); - if (term->kbd.repeat.cmd != REPEAT_EXIT) { - term->kbd.repeat.cmd = REPEAT_STOP; - cnd_signal(&term->kbd.repeat.cond); + if (t.it_value.tv_nsec >= 1000000000) { + t.it_value.tv_sec += t.it_value.tv_nsec / 1000000000; + t.it_value.tv_nsec %= 1000000000; + } + if (t.it_interval.tv_nsec >= 1000000000) { + t.it_interval.tv_sec += t.it_interval.tv_nsec / 1000000000; + t.it_interval.tv_nsec %= 1000000000; + } + if (timerfd_settime(term->kbd.repeat.fd, 0, &t, NULL) < 0) { + LOG_ERRNO("failed to arm keyboard repeat timer"); + return false; } - mtx_unlock(&term->kbd.repeat.mutex); - term_focus_out(term); + term->kbd.repeat.key = key; + return true; } -static void -start_repeater(struct terminal *term, uint32_t key) +static bool +stop_repeater(struct terminal *term, uint32_t key) { - mtx_lock(&term->kbd.repeat.mutex); - if (!term->kbd.repeat.dont_re_repeat) { - if (term->kbd.repeat.cmd != REPEAT_EXIT) { - term->kbd.repeat.cmd = REPEAT_START; - term->kbd.repeat.key = key; - cnd_signal(&term->kbd.repeat.cond); - } + if (key != -1 && key != term->kbd.repeat.key) + return true; + + if (timerfd_settime(term->kbd.repeat.fd, 0, &(struct itimerspec){{0}}, NULL) < 0) { + LOG_ERRNO("failed to disarm keyboard repeat timer"); + return false; } - mtx_unlock(&term->kbd.repeat.mutex); + + return true; } static void -stop_repeater(struct terminal *term, uint32_t key) +keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, + struct wl_surface *surface) { - mtx_lock(&term->kbd.repeat.mutex); - if (term->kbd.repeat.key == key) { - if (term->kbd.repeat.cmd != REPEAT_EXIT) { - term->kbd.repeat.cmd = REPEAT_STOP; - cnd_signal(&term->kbd.repeat.cond); - } - } - mtx_unlock(&term->kbd.repeat.mutex); + struct terminal *term = data; + + stop_repeater(term, -1); + term_focus_out(term); } static void |
