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

misc keyboard fixes

This commit is contained in:
Tony Crisci 2017-12-18 09:59:59 -05:00
parent f3769a4b1f
commit 37c83d5c6d
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
types/wlr_keyboard.c
View File

@ -133,7 +133,11 @@ void wlr_keyboard_led_update(struct wlr_keyboard *kb, uint32_t leds) {
void wlr_keyboard_set_keymap(struct wlr_keyboard *kb, void wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
struct xkb_keymap *keymap) { struct xkb_keymap *keymap) {
wlr_log(L_DEBUG, "Keymap set"); wlr_log(L_DEBUG, "Keymap set");
if (kb->keymap) {
xkb_keymap_unref(kb->keymap);
}
kb->keymap = keymap; kb->keymap = keymap;
xkb_keymap_ref(keymap);
assert(kb->xkb_state = xkb_state_new(kb->keymap)); assert(kb->xkb_state = xkb_state_new(kb->keymap));
const char *led_names[WLR_LED_COUNT] = { const char *led_names[WLR_LED_COUNT] = {
@ -163,9 +167,18 @@ void wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
char *keymap_str = xkb_keymap_get_as_string(kb->keymap, char *keymap_str = xkb_keymap_get_as_string(kb->keymap,
XKB_KEYMAP_FORMAT_TEXT_V1); XKB_KEYMAP_FORMAT_TEXT_V1);
kb->keymap_size = strlen(keymap_str) + 1; kb->keymap_size = strlen(keymap_str) + 1;
if (kb->keymap_fd) {
close(kb->keymap_fd);
}
kb->keymap_fd = os_create_anonymous_file(kb->keymap_size); kb->keymap_fd = os_create_anonymous_file(kb->keymap_size);
if (kb->keymap_fd < 0) {
wlr_log(L_ERROR, "creating a keymap file for %lu bytes failed", kb->keymap_size);
}
void *ptr = mmap(NULL, kb->keymap_size, void *ptr = mmap(NULL, kb->keymap_size,
PROT_READ | PROT_WRITE, MAP_SHARED, kb->keymap_fd, 0); PROT_READ | PROT_WRITE, MAP_SHARED, kb->keymap_fd, 0);
if (ptr == (void*)-1) {
wlr_log(L_ERROR, "failed to mmap() %lu bytes", kb->keymap_size);
}
strcpy(ptr, keymap_str); strcpy(ptr, keymap_str);
free(keymap_str); free(keymap_str);

11
types/wlr_seat.c
View File

@ -710,9 +710,12 @@ static void handle_keyboard_keymap(struct wl_listener *listener, void *data) {
struct wlr_seat_keyboard_state *state = struct wlr_seat_keyboard_state *state =
wl_container_of(listener, state, keyboard_keymap); wl_container_of(listener, state, keyboard_keymap);
struct wlr_seat_client *client; struct wlr_seat_client *client;
struct wlr_keyboard *keyboard = data;
if (keyboard == state->keyboard) {
wl_list_for_each(client, &state->seat->clients, link) { wl_list_for_each(client, &state->seat->clients, link) {
seat_client_send_keymap(client, state->keyboard); seat_client_send_keymap(client, state->keyboard);
} }
}
} }
static void handle_keyboard_repeat_info(struct wl_listener *listener, static void handle_keyboard_repeat_info(struct wl_listener *listener,
@ -736,7 +739,8 @@ void wlr_seat_set_keyboard(struct wlr_seat *seat,
// TODO call this on device key event before the event reaches the // TODO call this on device key event before the event reaches the
// compositor and set a pending keyboard and then send the new keyboard // compositor and set a pending keyboard and then send the new keyboard
// state on the next keyboard notify event. // state on the next keyboard notify event.
if (seat->keyboard_state.keyboard == device->keyboard) { struct wlr_keyboard *keyboard = (device ? device->keyboard : NULL);
if (seat->keyboard_state.keyboard == keyboard) {
return; return;
} }
@ -747,7 +751,7 @@ void wlr_seat_set_keyboard(struct wlr_seat *seat,
seat->keyboard_state.keyboard = NULL; seat->keyboard_state.keyboard = NULL;
} }
if (device) { if (keyboard) {
assert(device->type == WLR_INPUT_DEVICE_KEYBOARD); assert(device->type == WLR_INPUT_DEVICE_KEYBOARD);
wl_signal_add(&device->events.destroy, wl_signal_add(&device->events.destroy,
@ -767,8 +771,9 @@ void wlr_seat_set_keyboard(struct wlr_seat *seat,
seat_client_send_repeat_info(client, device->keyboard); seat_client_send_repeat_info(client, device->keyboard);
} }
seat->keyboard_state.keyboard = device->keyboard;
} }
seat->keyboard_state.keyboard = keyboard;
} }
void wlr_seat_keyboard_start_grab(struct wlr_seat *wlr_seat, void wlr_seat_keyboard_start_grab(struct wlr_seat *wlr_seat,