mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-15 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

types/wlr_keyboard: uniformize events name

Browse source
This commit is contained in:
Simon Zeni 2022-03-09 15:05:12 -05:00 • committed by Kirill Primak
parent bd6c000d14
commit 9a17200446
18 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types/wlr_keyboard.c
View file

@ -61,7 +61,7 @@ bool keyboard_modifier_update(struct wlr_keyboard *keyboard) {
}
void keyboard_key_update(struct wlr_keyboard *keyboard,
struct wlr_event_keyboard_key *event) {
struct wlr_keyboard_key_event *event) {
if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
set_add(keyboard->keycodes, &keyboard->num_keycodes,
WLR_KEYBOARD_KEYS_CAP, event->keycode);
@ -92,7 +92,7 @@ void wlr_keyboard_notify_modifiers(struct wlr_keyboard *keyboard,
}
void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
struct wlr_event_keyboard_key *event) {
struct wlr_keyboard_key_event *event) {
keyboard_key_update(keyboard, event);
wlr_signal_emit_safe(&keyboard->events.key, event);
@ -137,7 +137,7 @@ void wlr_keyboard_finish(struct wlr_keyboard *kb) {
size_t orig_num_keycodes = kb->num_keycodes;
for (size_t i = 0; i < orig_num_keycodes; ++i) {
assert(kb->num_keycodes == orig_num_keycodes - i);
struct wlr_event_keyboard_key event = {
struct wlr_keyboard_key_event event = {
.time_msec = get_current_time_msec(),
.keycode = kb->keycodes[orig_num_keycodes - i - 1],
.update_state = false,

4
types/wlr_keyboard_group.c
View file

@ -69,7 +69,7 @@ struct wlr_keyboard_group *wlr_keyboard_group_from_wlr_keyboard(
}
static bool process_key(struct keyboard_group_device *group_device,
struct wlr_event_keyboard_key *event) {
struct wlr_keyboard_key_event *event) {
struct wlr_keyboard_group *group = group_device->keyboard->group;
struct keyboard_group_key *key, *tmp;
@ -188,7 +188,7 @@ static void refresh_state(struct keyboard_group_device *device,
for (size_t i = 0; i < device->keyboard->num_keycodes; i++) {
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
struct wlr_event_keyboard_key event = {
struct wlr_keyboard_key_event event = {
.time_msec = (int64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000,
.keycode = device->keyboard->keycodes[i],
.update_state = true,

2
types/wlr_virtual_keyboard_v1.c
View file

@ -78,7 +78,7 @@ static void virtual_keyboard_key(struct wl_client *client,
"Cannot send a keypress before defining a keymap");
return;
}
struct wlr_event_keyboard_key event = {
struct wlr_keyboard_key_event event = {
.time_msec = time,
.keycode = key,
.update_state = false,