summaryrefslogtreecommitdiffstats
path: root/sway/input/cursor.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-07-19 21:31:10 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-07-22 23:10:19 +1000
commit1b3b75a09499972f6fdfb43185f0c9f84c16791e (patch)
treeb2e19641a3e88d477c729b023c7b1fa32e4d946d /sway/input/cursor.c
parentUse separate function for choosing edge cursor (diff)
downloadsway-1b3b75a09499972f6fdfb43185f0c9f84c16791e.tar.gz
sway-1b3b75a09499972f6fdfb43185f0c9f84c16791e.tar.zst
sway-1b3b75a09499972f6fdfb43185f0c9f84c16791e.zip
Use wlr_keyboard_get_modifiers
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r--sway/input/cursor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index dfb5603e..8723e2b4 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -480,7 +480,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
480 480
481 struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat); 481 struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->wlr_seat);
482 bool mod_pressed = keyboard && 482 bool mod_pressed = keyboard &&
483 (keyboard->modifiers.depressed & config->floating_mod); 483 (wlr_keyboard_get_modifiers(keyboard) & config->floating_mod);
484 enum resize_edge edge = find_resize_edge(cont, cursor); 484 enum resize_edge edge = find_resize_edge(cont, cursor);
485 bool over_title = edge == RESIZE_EDGE_NONE && !surface; 485 bool over_title = edge == RESIZE_EDGE_NONE && !surface;
486 486
@@ -501,7 +501,7 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
501 seat->operation = OP_RESIZE; 501 seat->operation = OP_RESIZE;
502 seat->op_container = cont; 502 seat->op_container = cont;
503 seat->op_resize_preserve_ratio = keyboard && 503 seat->op_resize_preserve_ratio = keyboard &&
504 (keyboard->modifiers.depressed & WLR_MODIFIER_SHIFT); 504 (wlr_keyboard_get_modifiers(keyboard) & WLR_MODIFIER_SHIFT);
505 seat->op_resize_edge = resizing_via_mod ? 505 seat->op_resize_edge = resizing_via_mod ?
506 RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge; 506 RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge;
507 seat->op_button = button; 507 seat->op_button = button;