mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-04 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Copy all keysyms from wlr_keyboard.

Browse source
This commit is contained in:
Scott Leggett 2018-05-29 21:22:12 +10:00
parent 0f8d284e18
commit 0687b98a7c
1 changed files with 46 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

124
sway/input/keyboard.c
View file

@ -45,48 +45,18 @@ static ssize_t pressed_keysyms_index(xkb_keysym_t *pressed_keysyms,
return -1; return -1;
} }
static void pressed_keysyms_add(xkb_keysym_t *pressed_keysyms,
xkb_keysym_t keysym) {
ssize_t i = pressed_keysyms_index(pressed_keysyms, keysym);
if (i < 0) {
i = pressed_keysyms_index(pressed_keysyms, XKB_KEY_NoSymbol);
if (i >= 0) {
pressed_keysyms[i] = keysym;
}
}
}
static void pressed_keysyms_remove(xkb_keysym_t *pressed_keysyms,
xkb_keysym_t keysym) {
ssize_t i = pressed_keysyms_index(pressed_keysyms, keysym);
if (i >= 0) {
pressed_keysyms[i] = XKB_KEY_NoSymbol;
}
}
static void pressed_keysyms_update(xkb_keysym_t *pressed_keysyms, static void pressed_keysyms_update(xkb_keysym_t *pressed_keysyms,
const xkb_keysym_t *keysyms, size_t keysyms_len, const xkb_keysym_t *keysyms, size_t keysyms_len) {
enum wlr_key_state state, bool mod_release_invalidate) { size_t keysym_count = 0;
// copy the translated keysyms
for (size_t i = 0; i < keysyms_len; ++i) { for (size_t i = 0; i < keysyms_len; ++i) {
if (state == WLR_KEY_PRESSED) { if (keysym_is_modifier(keysyms[i])) {
if (keysym_is_modifier(keysyms[i])) { continue;
continue;
}
pressed_keysyms_add(pressed_keysyms, keysyms[i]);
} else { // WLR_KEY_RELEASED
if (keysym_is_modifier(keysyms[i])) {
if (mod_release_invalidate) {
// clear the translated keysyms since they are no longer valid
for (size_t j = 0; j < SWAY_KEYBOARD_PRESSED_KEYSYMS_CAP; ++j) {
pressed_keysyms[j] = XKB_KEY_NoSymbol;
return;
}
} else {
continue;
}
}
pressed_keysyms_remove(pressed_keysyms, keysyms[i]);
} }
pressed_keysyms[keysym_count++] = keysyms[i];
}
for (size_t i = keysym_count; i < SWAY_KEYBOARD_PRESSED_KEYSYMS_CAP; i++) {
pressed_keysyms[i] = XKB_KEY_NoSymbol;
} }
} }
@ -346,66 +316,64 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat; struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
struct wlr_input_device *wlr_device = struct wlr_input_device *wlr_device =
keyboard->seat_device->input_device->wlr_device; keyboard->seat_device->input_device->wlr_device;
wlr_idle_notify_activity(keyboard->seat_device->sway_seat->input->server->idle, wlr_seat);
struct wlr_event_keyboard_key *event = data; struct wlr_event_keyboard_key *event = data;
bool input_inhibited = keyboard->seat_device->sway_seat->exclusive_client != NULL; bool input_inhibited =
keyboard->seat_device->sway_seat->exclusive_client != NULL;
wlr_idle_notify_activity(
keyboard->seat_device->sway_seat->input->server->idle, wlr_seat);
xkb_keycode_t keycode = event->keycode + 8; xkb_keycode_t keycode = event->keycode + 8;
bool handled = false;
// handle keycodes // update translated keysyms
handled = keyboard_execute_bindcode(keyboard, event, input_inhibited);
// handle translated keysyms
if (!handled && event->state == WLR_KEY_RELEASED) {
handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_translated,
keyboard->modifiers_translated,
event->state, input_inhibited);
}
const xkb_keysym_t *translated_keysyms; const xkb_keysym_t *translated_keysyms;
size_t translated_keysyms_len = size_t translated_keysyms_len =
keyboard_keysyms_translated(keyboard, keycode, &translated_keysyms, keyboard_keysyms_translated(keyboard, keycode, &translated_keysyms,
&keyboard->modifiers_translated); &keyboard->modifiers_translated);
pressed_keysyms_update(keyboard->pressed_keysyms_translated, pressed_keysyms_update(keyboard->pressed_keysyms_translated,
translated_keysyms, translated_keysyms_len, event->state, true); translated_keysyms, translated_keysyms_len);
if (!handled && event->state == WLR_KEY_PRESSED) {
// update raw keysyms
const xkb_keysym_t *raw_keysyms;
size_t raw_keysyms_len =
keyboard_keysyms_raw(keyboard, keycode, &raw_keysyms, &keyboard->modifiers_raw);
pressed_keysyms_update(keyboard->pressed_keysyms_raw, raw_keysyms,
raw_keysyms_len);
// handle keycodes
bool handled = keyboard_execute_bindcode(keyboard, event, input_inhibited);
// handle translated keysyms
if (!handled) {
handled = keyboard_execute_bindsym(keyboard, handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_translated, keyboard->pressed_keysyms_translated,
keyboard->modifiers_translated, keyboard->modifiers_translated,
event->state, input_inhibited); event->state, input_inhibited);
} }
// Handle raw keysyms // handle raw keysyms
if (!handled && event->state == WLR_KEY_RELEASED) { if (!handled) {
handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_raw, keyboard->modifiers_raw,
event->state, input_inhibited);
}
const xkb_keysym_t *raw_keysyms;
size_t raw_keysyms_len =
keyboard_keysyms_raw(keyboard, keycode, &raw_keysyms, &keyboard->modifiers_raw);
pressed_keysyms_update(keyboard->pressed_keysyms_raw, raw_keysyms,
raw_keysyms_len, event->state, false);
if (!handled && event->state == WLR_KEY_PRESSED) {
handled = keyboard_execute_bindsym(keyboard, handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_raw, keyboard->modifiers_raw, keyboard->pressed_keysyms_raw, keyboard->modifiers_raw,
event->state, input_inhibited); event->state, input_inhibited);
} }
// Compositor bindings // Compositor bindings
if (!handled && event->state == WLR_KEY_PRESSED) { if (event->state == WLR_KEY_PRESSED) {
handled = if (!handled) {
keyboard_execute_compositor_binding(keyboard, handled =
keyboard->pressed_keysyms_translated, keyboard_execute_compositor_binding(keyboard,
keyboard->modifiers_translated, keyboard->pressed_keysyms_translated,
translated_keysyms_len); keyboard->modifiers_translated,
} translated_keysyms_len);
if (!handled && event->state == WLR_KEY_PRESSED) { }
handled = if (!handled) {
keyboard_execute_compositor_binding(keyboard, handled =
keyboard->pressed_keysyms_raw, keyboard->modifiers_raw, keyboard_execute_compositor_binding(keyboard,
raw_keysyms_len); keyboard->pressed_keysyms_raw,
keyboard->modifiers_raw,
raw_keysyms_len);
}
} }
if (!handled || event->state == WLR_KEY_RELEASED) { if (!handled || event->state == WLR_KEY_RELEASED) {