blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Send current keyboard state when entering a surface

This commit is contained in:
emersion 2017-11-05 17:09:00 +01:00
parent f678775953
commit 84d5e6bbb4
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wlr/types/wlr_keyboard.h
View File

@ -28,6 +28,8 @@ enum wlr_keyboard_modifier {
WLR_MODIFIER_MOD5 = 128, WLR_MODIFIER_MOD5 = 128,
}; };
#define WLR_KEYBOARD_KEYS_CAP 32
struct wlr_keyboard_impl; struct wlr_keyboard_impl;
struct wlr_keyboard { struct wlr_keyboard {
@ -41,6 +43,7 @@ struct wlr_keyboard {
xkb_led_index_t led_indexes[WLR_LED_COUNT]; xkb_led_index_t led_indexes[WLR_LED_COUNT];
xkb_mod_index_t mod_indexes[WLR_MODIFIER_COUNT]; xkb_mod_index_t mod_indexes[WLR_MODIFIER_COUNT];
uint32_t keycodes[WLR_KEYBOARD_KEYS_CAP];
struct { struct {
xkb_mod_mask_t depressed; xkb_mod_mask_t depressed;
xkb_mod_mask_t latched; xkb_mod_mask_t latched;

25
types/wlr_keyboard.c
View File

@ -45,6 +45,30 @@ static void keyboard_modifier_update(struct wlr_keyboard *keyboard) {
wl_signal_emit(&keyboard->events.modifiers, keyboard); wl_signal_emit(&keyboard->events.modifiers, keyboard);
} }
static void keyboard_key_update(struct wlr_keyboard *keyboard,
struct wlr_event_keyboard_key *event) {
bool found = false;
size_t i = 0;
for (; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
if (keyboard->keycodes[i] == event->keycode) {
found = true;
break;
}
}
if (event->state == WLR_KEY_PRESSED && !found) {
for (size_t i = 0; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
if (keyboard->keycodes[i] == 0) {
keyboard->keycodes[i] = event->keycode;
break;
}
}
}
if (event->state == WLR_KEY_RELEASED && found) {
keyboard->keycodes[i] = 0;
}
}
void wlr_keyboard_notify_modifiers(struct wlr_keyboard *keyboard, void wlr_keyboard_notify_modifiers(struct wlr_keyboard *keyboard,
uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked, uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
uint32_t group) { uint32_t group) {
@ -68,6 +92,7 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
} }
keyboard_led_update(keyboard); keyboard_led_update(keyboard);
keyboard_modifier_update(keyboard); keyboard_modifier_update(keyboard);
keyboard_key_update(keyboard, event);
wl_signal_emit(&keyboard->events.key, event); wl_signal_emit(&keyboard->events.key, event);
} }

17
types/wlr_seat.c
View File

@ -751,13 +751,26 @@ void wlr_seat_keyboard_enter(struct wlr_seat *wlr_seat,
// enter the current surface // enter the current surface
if (client && client->keyboard) { if (client && client->keyboard) {
// TODO: read the currently pressed keys out of the active keyboard and struct wlr_keyboard *keyboard = wlr_seat->keyboard_state.keyboard;
// put them in this array
struct wl_array keys; struct wl_array keys;
wl_array_init(&keys); wl_array_init(&keys);
size_t n = 0;
for (size_t i = 0; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
if (keyboard->keycodes[i] != 0) {
wl_array_add(&keys, sizeof(uint32_t));
((uint32_t *)keys.data)[n] = keyboard->keycodes[i];
n++;
}
}
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_keyboard_send_enter(client->keyboard, serial, wl_keyboard_send_enter(client->keyboard, serial,
surface->resource, &keys); surface->resource, &keys);
wl_array_release(&keys);
wlr_seat_keyboard_send_modifiers(wlr_seat,
keyboard->modifiers.depressed, keyboard->modifiers.latched,
keyboard->modifiers.locked, keyboard->modifiers.group);
wlr_seat_client_send_selection(client); wlr_seat_client_send_selection(client);
} }