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

Per-keyboard configuration

Browse source
This commit is contained in:
emersion 2017-10-26 19:59:32 +02:00
parent 92b41bb51f
commit 4e5d23daa9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
5 changed files with 118 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rootston/cursor.c
View file

@ -215,8 +215,14 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
event->orientation, event->delta);
}
static bool is_meta_pressed(struct roots_input *input) {
uint32_t meta_key = input->server->config->keyboard.meta_key;
static bool is_meta_pressed(struct roots_input *input,
struct wlr_input_device *device) {
struct keyboard_config *config = config_get_keyboard(input->server->config,
device);
uint32_t meta_key = 0;
if (config != NULL) {
meta_key = config->meta_key;
}
if (meta_key == 0) {
return false;
}
@ -241,7 +247,7 @@ static void do_cursor_button_press(struct roots_input *input,
struct roots_view *view = view_at(desktop,
input->cursor->x, input->cursor->y, &surface, &sx, &sy);
if (state == WLR_BUTTON_PRESSED && view && is_meta_pressed(input)) {
if (state == WLR_BUTTON_PRESSED && view && is_meta_pressed(input, device)) {
set_view_focus(input, desktop, view);
switch (button) {