mirror of
https://github.com/swaywm/sway.git
synced 2025-11-23 06:59:48 -05:00
basic configuration
This commit is contained in:
parent
c173d30b92
commit
92fef27eaa
15 changed files with 543 additions and 174 deletions
|
|
@ -5,32 +5,46 @@
|
|||
static void handle_keyboard_key(struct wl_listener *listener, void *data) {
|
||||
struct sway_keyboard *keyboard =
|
||||
wl_container_of(listener, keyboard, keyboard_key);
|
||||
struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
|
||||
struct wlr_input_device *wlr_device =
|
||||
keyboard->seat_device->input_device->wlr_device;
|
||||
struct wlr_event_keyboard_key *event = data;
|
||||
wlr_seat_set_keyboard(keyboard->seat->seat, keyboard->device->wlr_device);
|
||||
wlr_seat_keyboard_notify_key(keyboard->seat->seat, event->time_msec,
|
||||
event->keycode, event->state);
|
||||
wlr_keyboard_set_keymap(wlr_device->keyboard, keyboard->keymap);
|
||||
wlr_seat_set_keyboard(wlr_seat, wlr_device);
|
||||
wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,event->keycode,
|
||||
event->state);
|
||||
}
|
||||
|
||||
static void handle_keyboard_modifiers(struct wl_listener *listener,
|
||||
void *data) {
|
||||
struct sway_keyboard *keyboard =
|
||||
wl_container_of(listener, keyboard, keyboard_modifiers);
|
||||
wlr_seat_set_keyboard(keyboard->seat->seat, keyboard->device->wlr_device);
|
||||
wlr_seat_keyboard_notify_modifiers(keyboard->seat->seat);
|
||||
struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
|
||||
struct wlr_input_device *wlr_device =
|
||||
keyboard->seat_device->input_device->wlr_device;
|
||||
wlr_keyboard_set_keymap(wlr_device->keyboard, keyboard->keymap);
|
||||
wlr_seat_set_keyboard(wlr_seat, wlr_device);
|
||||
wlr_seat_keyboard_notify_modifiers(wlr_seat);
|
||||
}
|
||||
|
||||
struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
|
||||
struct sway_input_device *device) {
|
||||
struct sway_seat_device *device) {
|
||||
struct sway_keyboard *keyboard =
|
||||
calloc(1, sizeof(struct sway_keyboard));
|
||||
if (!sway_assert(keyboard, "could not allocate sway keyboard")) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
keyboard->device = device;
|
||||
keyboard->seat = seat;
|
||||
keyboard->seat_device = device;
|
||||
device->keyboard = keyboard;
|
||||
|
||||
// TODO keyboard config
|
||||
wl_list_init(&keyboard->keyboard_key.link);
|
||||
wl_list_init(&keyboard->keyboard_modifiers.link);
|
||||
|
||||
return keyboard;
|
||||
}
|
||||
|
||||
void sway_keyboard_configure(struct sway_keyboard *keyboard) {
|
||||
struct xkb_rule_names rules;
|
||||
memset(&rules, 0, sizeof(rules));
|
||||
rules.rules = getenv("XKB_DEFAULT_RULES");
|
||||
|
|
@ -38,27 +52,32 @@ struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
|
|||
rules.layout = getenv("XKB_DEFAULT_LAYOUT");
|
||||
rules.variant = getenv("XKB_DEFAULT_VARIANT");
|
||||
rules.options = getenv("XKB_DEFAULT_OPTIONS");
|
||||
|
||||
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||
if (!sway_assert(context, "cannot create XKB context")) {
|
||||
return NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
wlr_keyboard_set_keymap(device->wlr_device->keyboard,
|
||||
xkb_map_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS));
|
||||
keyboard->keymap =
|
||||
xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||
wlr_keyboard_set_keymap(keyboard->seat_device->input_device->wlr_device->keyboard, keyboard->keymap);
|
||||
xkb_context_unref(context);
|
||||
|
||||
wl_signal_add(&device->wlr_device->keyboard->events.key,
|
||||
wl_list_remove(&keyboard->keyboard_key.link);
|
||||
wl_signal_add(
|
||||
&keyboard->seat_device->input_device->wlr_device->keyboard->events.key,
|
||||
&keyboard->keyboard_key);
|
||||
keyboard->keyboard_key.notify = handle_keyboard_key;
|
||||
|
||||
wl_signal_add(&device->wlr_device->keyboard->events.modifiers,
|
||||
wl_list_remove(&keyboard->keyboard_modifiers.link);
|
||||
wl_signal_add(
|
||||
&keyboard->seat_device->input_device->wlr_device->keyboard->events.modifiers,
|
||||
&keyboard->keyboard_modifiers);
|
||||
keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers;
|
||||
|
||||
return keyboard;
|
||||
}
|
||||
|
||||
void sway_keyboard_destroy(struct sway_keyboard *keyboard) {
|
||||
xkb_keymap_unref(keyboard->keymap);
|
||||
wl_list_remove(&keyboard->keyboard_key.link);
|
||||
wl_list_remove(&keyboard->keyboard_modifiers.link);
|
||||
wl_list_remove(&keyboard->link);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue