mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-04 01:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: input_repeat() takes a 'struct wayland' pointer

Browse source
This commit is contained in:
Daniel Eklöf 2019-10-27 18:44:58 +01:00
parent 9f0b1f94c2
commit 8c534d0520
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
input.c
View file

@ -376,9 +376,9 @@ const struct wl_keyboard_listener keyboard_listener = {
}; };
void 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 static void

4
input.h
View file

@ -2,9 +2,9 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "terminal.h" #include "wayland.h"
extern const struct wl_keyboard_listener keyboard_listener; extern const struct wl_keyboard_listener keyboard_listener;
extern const struct wl_pointer_listener pointer_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);

12
main.c
View file

@ -497,10 +497,10 @@ fdm_repeat(struct fdm *fdm, int fd, int events, void *data)
if (events & EPOLLHUP) if (events & EPOLLHUP)
return false; return false;
struct terminal *term = data; struct wayland *wayl = data;
uint64_t expiration_count; uint64_t expiration_count;
ssize_t ret = read( 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 (ret < 0) {
if (errno == EAGAIN) if (errno == EAGAIN)
@ -510,10 +510,10 @@ fdm_repeat(struct fdm *fdm, int fd, int events, void *data)
return false; 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++) for (size_t i = 0; i < expiration_count; i++)
input_repeat(term, term->wl.kbd.repeat.key); input_repeat(wayl, wayl->kbd.repeat.key);
term->wl.kbd.repeat.dont_re_repeat = false; wayl->kbd.repeat.dont_re_repeat = false;
return true; 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, 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.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.flash.fd, EPOLLIN, &fdm_flash, &term);
fdm_add(fdm, term.blink.fd, EPOLLIN, &fdm_blink, &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); fdm_add(fdm, term.delayed_render_timer.lower_fd, EPOLLIN, &fdm_delayed_render, &term);