aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--input.c4
-rw-r--r--input.h4
-rw-r--r--main.c12
3 files changed, 10 insertions, 10 deletions
diff --git a/input.c b/input.c
index 56da84d9..b91fea2f 100644
--- a/input.c
+++ b/input.c
@@ -376,9 +376,9 @@ const struct wl_keyboard_listener keyboard_listener = {
};
void
-input_repeat(struct terminal *term, uint32_t key)
+input_repeat(struct wayland *wayl, uint32_t key)
{
- keyboard_key(&term->wl, NULL, 0, 0, key, XKB_KEY_DOWN);
+ keyboard_key(wayl, NULL, 0, 0, key, XKB_KEY_DOWN);
}
static void
diff --git a/input.h b/input.h
index 8ffa1c15..2483389a 100644
--- a/input.h
+++ b/input.h
@@ -2,9 +2,9 @@
#include <wayland-client.h>
-#include "terminal.h"
+#include "wayland.h"
extern const struct wl_keyboard_listener keyboard_listener;
extern const struct wl_pointer_listener pointer_listener;
-void input_repeat(struct terminal *term, uint32_t key);
+void input_repeat(struct wayland *wayl, uint32_t key);
diff --git a/main.c b/main.c
index b70b8420..f2fff1e3 100644
--- a/main.c
+++ b/main.c
@@ -497,10 +497,10 @@ fdm_repeat(struct fdm *fdm, int fd, int events, void *data)
if (events & EPOLLHUP)
return false;
- struct terminal *term = data;
+ struct wayland *wayl = data;
uint64_t expiration_count;
ssize_t ret = read(
- term->wl.kbd.repeat.fd, &expiration_count, sizeof(expiration_count));
+ wayl->kbd.repeat.fd, &expiration_count, sizeof(expiration_count));
if (ret < 0) {
if (errno == EAGAIN)
@@ -510,10 +510,10 @@ fdm_repeat(struct fdm *fdm, int fd, int events, void *data)
return false;
}
- term->wl.kbd.repeat.dont_re_repeat = true;
+ wayl->kbd.repeat.dont_re_repeat = true;
for (size_t i = 0; i < expiration_count; i++)
- input_repeat(term, term->wl.kbd.repeat.key);
- term->wl.kbd.repeat.dont_re_repeat = false;
+ input_repeat(wayl, wayl->kbd.repeat.key);
+ wayl->kbd.repeat.dont_re_repeat = false;
return true;
}
@@ -1119,7 +1119,7 @@ main(int argc, char *const *argv)
fdm_add(fdm, wl_display_get_fd(term.wl.display), EPOLLIN, &fdm_wayl, &term.wl);
fdm_add(fdm, term.ptmx, EPOLLIN, &fdm_ptmx, &term);
- fdm_add(fdm, term.wl.kbd.repeat.fd, EPOLLIN, &fdm_repeat, &term);
+ fdm_add(fdm, term.wl.kbd.repeat.fd, EPOLLIN, &fdm_repeat, &term.wl);
fdm_add(fdm, term.flash.fd, EPOLLIN, &fdm_flash, &term);
fdm_add(fdm, term.blink.fd, EPOLLIN, &fdm_blink, &term);
fdm_add(fdm, term.delayed_render_timer.lower_fd, EPOLLIN, &fdm_delayed_render, &term);