mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-26 08:56:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rootston keyboard, add Xwayland

Browse source
This commit is contained in:
Drew DeVault 2017-09-28 08:54:57 -04:00
parent 7cf4ee128e
commit 906a816abf
15 changed files with 91 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rootston/keyboard.c
View file

@ -10,38 +10,19 @@
#include <xkbcommon/xkbcommon.h>
#include "rootston/input.h"
static void keyboard_led_update(struct roots_keyboard *keyboard) {
uint32_t leds = 0;
for (uint32_t i = 0; i < WLR_LED_LAST; ++i) {
if (xkb_state_led_index_is_active(
keyboard->xkb_state, keyboard->leds[i])) {
leds |= (1 << i);
}
}
wlr_keyboard_led_update(keyboard->device->keyboard, leds);
}
static void keyboard_key_notify(struct wl_listener *listener, void *data) {
struct wlr_event_keyboard_key *event = data;
struct roots_keyboard *keyboard = wl_container_of(listener, keyboard, key);
struct roots_input *input = keyboard->input;
struct roots_server *server = input->server;
uint32_t keycode = event->keycode + 8;
enum wlr_key_state key_state = event->state;
uint32_t keycode = event->keycode + 8;
const xkb_keysym_t *syms;
int nsyms = xkb_state_key_get_syms(keyboard->xkb_state, keycode, &syms);
xkb_state_update_key(keyboard->xkb_state, keycode,
event->state == WLR_KEY_PRESSED ? XKB_KEY_DOWN : XKB_KEY_UP);
keyboard_led_update(keyboard);
int nsyms = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state,
keycode, &syms);
for (int i = 0; i < nsyms; ++i) {
xkb_keysym_t sym = syms[i];
char name[64];
int l = xkb_keysym_get_name(sym, name, sizeof(name));
if (l != -1 && l != sizeof(name)) {
wlr_log(L_DEBUG, "Key event: %s %s", name,
key_state == WLR_KEY_PRESSED ? "pressed" : "released");
}
// TODO: pass key to clients
if (sym == XKB_KEY_Escape) {
// TEMPORARY, probably
wl_display_terminate(server->wl_display);
@ -77,16 +58,9 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) {
rules.options = getenv("XKB_DEFAULT_OPTIONS");
struct xkb_context *context;
assert(context = xkb_context_new(XKB_CONTEXT_NO_FLAGS));
assert(keyboard->keymap = xkb_map_new_from_names(context, &rules,
wlr_keyboard_set_keymap(device->keyboard,
xkb_map_new_from_names(context, &rules,
XKB_KEYMAP_COMPILE_NO_FLAGS));
xkb_context_unref(context);
assert(keyboard->xkb_state = xkb_state_new(keyboard->keymap));
const char *led_names[3] = {
XKB_LED_NAME_NUM,
XKB_LED_NAME_CAPS,
XKB_LED_NAME_SCROLL
};
for (uint32_t i = 0; i < 3; ++i) {
keyboard->leds[i] = xkb_map_led_get_index(keyboard->keymap, led_names[i]);
}
wlr_seat_attach_keyboard(input->wl_seat, device);
}