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

Merge 6afa4d7bf0 into fd885d5779

Browse source
This commit is contained in:
smlx 2018-06-01 18:37:29 +00:00 • committed by GitHub
commit 2ce2254452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 75 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

148
sway/input/keyboard.c
View file

@ -45,37 +45,18 @@ static ssize_t pressed_keysyms_index(xkb_keysym_t *pressed_keysyms,
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,
const xkb_keysym_t *keysyms, size_t keysyms_len,
enum wlr_key_state state) {
const xkb_keysym_t *keysyms, size_t keysyms_len) {
size_t keysym_count = 0;
// copy the translated keysyms
for (size_t i = 0; i < keysyms_len; ++i) {
if (keysym_is_modifier(keysyms[i])) {
continue;
}
if (state == WLR_KEY_PRESSED) {
pressed_keysyms_add(pressed_keysyms, keysyms[i]);
} else { // WLR_KEY_RELEASED
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;
}
}
@ -317,16 +298,39 @@ static size_t keyboard_keysyms_translated(struct sway_keyboard *keyboard,
* This will trigger keybinds such as Alt+Shift+2.
*/
static size_t keyboard_keysyms_raw(struct sway_keyboard *keyboard,
xkb_keycode_t keycode, const xkb_keysym_t **keysyms,
xkb_keysym_t *keysyms,
uint32_t *modifiers) {
struct wlr_input_device *device =
keyboard->seat_device->input_device->wlr_device;
*modifiers = wlr_keyboard_get_modifiers(device->keyboard);
xkb_layout_index_t layout_index = xkb_state_key_get_layout(
device->keyboard->xkb_state, keycode);
return xkb_keymap_key_get_syms_by_level(device->keyboard->keymap,
keycode, layout_index, 0, keysyms);
size_t num_keysyms = 0, num_keysyms_for_keycode;
const xkb_keysym_t *keysyms_for_keycode;
xkb_keycode_t keycode;
for (size_t i = 0; i < device->keyboard->num_keycodes; i++) {
keycode = device->keyboard->keycodes[i] + 8;
xkb_layout_index_t layout_index =
xkb_state_key_get_layout(device->keyboard->xkb_state, keycode);
num_keysyms_for_keycode =
xkb_keymap_key_get_syms_by_level(device->keyboard->keymap,
keycode,
layout_index,
0,
&keysyms_for_keycode);
for (size_t j = 0, k; j < num_keysyms_for_keycode; j++) {
// search the existing keysyms for the new keysym
for (k = 0; k < num_keysyms; k++) {
if (keysyms[k] == keysyms_for_keycode[j]) {
break;
}
}
if (k == num_keysyms) {
// this is a new keysym, so add to the array
keysyms[num_keysyms++] = keysyms_for_keycode[j];
}
}
}
return num_keysyms;
}
static void handle_keyboard_key(struct wl_listener *listener, void *data) {
@ -335,66 +339,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_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;
bool input_inhibited = keyboard->seat_device->sway_seat->exclusive_client != NULL;
bool input_inhibited =
keyboard->seat_device->sway_seat->exclusive_client != NULL;
xkb_keycode_t keycode = event->keycode + 8;
bool handled = false;
wlr_idle_notify_activity(
keyboard->seat_device->sway_seat->input->server->idle, wlr_seat);
// handle keycodes
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);
}
// update translated keysyms
const xkb_keysym_t *translated_keysyms;
size_t translated_keysyms_len =
keyboard_keysyms_translated(keyboard, keycode, &translated_keysyms,
size_t translated_keysyms_len = keyboard_keysyms_translated(keyboard,
event->keycode + 8,
&translated_keysyms,
&keyboard->modifiers_translated);
pressed_keysyms_update(keyboard->pressed_keysyms_translated,
translated_keysyms, translated_keysyms_len, event->state);
if (!handled && event->state == WLR_KEY_PRESSED) {
translated_keysyms, translated_keysyms_len);
// update raw keysyms
xkb_keysym_t raw_keysyms[SWAY_KEYBOARD_PRESSED_KEYSYMS_CAP] = {0};
size_t raw_keysyms_len = keyboard_keysyms_raw(
keyboard, raw_keysyms, &keyboard->modifiers_raw);
pressed_keysyms_update(keyboard->pressed_keysyms_raw,
(const xkb_keysym_t*)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,
keyboard->pressed_keysyms_translated,
keyboard->modifiers_translated,
event->state, input_inhibited);
}
// Handle raw keysyms
if (!handled && event->state == WLR_KEY_RELEASED) {
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);
if (!handled && event->state == WLR_KEY_PRESSED) {
// handle raw keysyms
if (!handled) {
handled = keyboard_execute_bindsym(keyboard,
keyboard->pressed_keysyms_raw, keyboard->modifiers_raw,
event->state, input_inhibited);
}
// Compositor bindings
if (!handled && event->state == WLR_KEY_PRESSED) {
handled =
keyboard_execute_compositor_binding(keyboard,
keyboard->pressed_keysyms_translated,
keyboard->modifiers_translated,
translated_keysyms_len);
}
if (!handled && event->state == WLR_KEY_PRESSED) {
handled =
keyboard_execute_compositor_binding(keyboard,
keyboard->pressed_keysyms_raw, keyboard->modifiers_raw,
raw_keysyms_len);
if (event->state == WLR_KEY_PRESSED) {
if (!handled) {
handled =
keyboard_execute_compositor_binding(keyboard,
keyboard->pressed_keysyms_translated,
keyboard->modifiers_translated,
translated_keysyms_len);
}
if (!handled) {
handled =
keyboard_execute_compositor_binding(keyboard,
keyboard->pressed_keysyms_raw,
keyboard->modifiers_raw,
raw_keysyms_len);
}
}
if (!handled || event->state == WLR_KEY_RELEASED) {