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

works in review comments

This commit is contained in:
Markus Ongyerth 2017-11-07 16:50:34 +01:00
parent 8ca76ff7f2
commit 23991861a4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rootston/keyboard.c
View File

@ -121,7 +121,7 @@ static void keyboard_keysym_release(struct roots_keyboard *keyboard,
} }
} }
/** /*
* Process keypresses from the keyboard as if modifiers didn't change keysyms. * Process keypresses from the keyboard as if modifiers didn't change keysyms.
* *
* This avoids the xkb keysym translation based on modifiers considered pressed * This avoids the xkb keysym translation based on modifiers considered pressed
@ -130,8 +130,7 @@ static void keyboard_keysym_release(struct roots_keyboard *keyboard,
* This will trigger the keybind: [Alt]+[Shift]+2 * This will trigger the keybind: [Alt]+[Shift]+2
*/ */
static bool keyboard_keysyms_simple(struct roots_keyboard *keyboard, static bool keyboard_keysyms_simple(struct roots_keyboard *keyboard,
uint32_t keycode, enum wlr_key_state state) uint32_t keycode, enum wlr_key_state state) {
{
uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard); uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard);
const xkb_keysym_t *syms; const xkb_keysym_t *syms;
xkb_layout_index_t layout_index = xkb_state_key_get_layout( xkb_layout_index_t layout_index = xkb_state_key_get_layout(
@ -153,7 +152,7 @@ static bool keyboard_keysyms_simple(struct roots_keyboard *keyboard,
return handled; return handled;
} }
/** /*
* Process keypresses from the keyboard as xkb sees them. * Process keypresses from the keyboard as xkb sees them.
* *
* This uses the xkb keysyms translation based on pressed modifiers and clears * This uses the xkb keysyms translation based on pressed modifiers and clears
@ -163,8 +162,7 @@ static bool keyboard_keysyms_simple(struct roots_keyboard *keyboard,
* (On US layout) this will trigger: [Alt]+[at] * (On US layout) this will trigger: [Alt]+[at]
*/ */
static bool keyboard_keysyms_xkb(struct roots_keyboard *keyboard, static bool keyboard_keysyms_xkb(struct roots_keyboard *keyboard,
uint32_t keycode, enum wlr_key_state state) uint32_t keycode, enum wlr_key_state state) {
{
uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard); uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard);
const xkb_keysym_t *syms; const xkb_keysym_t *syms;
int syms_len = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state, int syms_len = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state,
@ -196,8 +194,10 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
bool handled = keyboard_keysyms_xkb(keyboard, keycode, event->state); bool handled = keyboard_keysyms_xkb(keyboard, keycode, event->state);
if (!handled) if (!handled) {
handled |= keyboard_keysyms_simple(keyboard, keycode, event->state); bool key_handled = keyboard_keysyms_simple(keyboard, keycode, event->state);
handled = handled || key_handled;
}
if (!handled) { if (!handled) {
wlr_seat_set_keyboard(keyboard->input->wl_seat, keyboard->device); wlr_seat_set_keyboard(keyboard->input->wl_seat, keyboard->device);