aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-27 17:44:58 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-27 17:44:58 +0000
commit8c534d0520fd2fa2a505a86c8f2ec6e290e079f7 (patch)
tree03685280f128d0a2332fe2f013bb4a7ecfd88f10 /main.c
parentwayland: change all wayland callbacks to take a wayland pointer (diff)
input: input_repeat() takes a 'struct wayland' pointer
Diffstat (limited to 'main.c')
-rw-r--r--main.c12
1 files changed, 6 insertions, 6 deletions
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);