Store last button and use it when views request to move or resize

1 files changed, 6 insertions, 7 deletions

diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 241bd9b0..4bd6af5e 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -1,9 +1,4 @@
 #define _POSIX_C_SOURCE 199309L
-#ifdef __linux__
-#include <linux/input-event-codes.h>
-#elif __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#endif
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wayland-server.h>
@@ -254,7 +249,9 @@ static void handle_request_move(struct wl_listener *listener, void *data) {
         struct sway_view *view = &xdg_shell_v6_view->view;
         struct wlr_xdg_toplevel_v6_move_event *e = data;
         struct sway_seat *seat = e->seat->seat->data;
-        seat_begin_move(seat, view->swayc);
+        if (e->serial == seat->last_button_serial) {
+                seat_begin_move(seat, view->swayc, seat->last_button);
+        }
 }
 
 static void handle_request_resize(struct wl_listener *listener, void *data) {
@@ -263,7 +260,9 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
         struct sway_view *view = &xdg_shell_v6_view->view;
         struct wlr_xdg_toplevel_v6_resize_event *e = data;
         struct sway_seat *seat = e->seat->seat->data;
-        seat_begin_resize(seat, view->swayc, BTN_LEFT, e->edges);
+        if (e->serial == seat->last_button_serial) {
+                seat_begin_resize(seat, view->swayc, seat->last_button, e->edges);
+        }
 }
 
 static void handle_unmap(struct wl_listener *listener, void *data) {