aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop/xwayland.c
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-07-22 22:14:36 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-07-22 23:10:19 +1000
commit5ba2ae9c6a4372cbf6f8867b711bb55ef6937cb4 (patch)
treed2a4d15c12f19fb7ef26a40b3701870fca9ab773 /sway/desktop/xwayland.c
parent3faceadffe9c9b334d22cad3a348b82078b542b5 (diff)
Implement request_move and request_resize for xwayland views
I discovered we have to send a click event when ending the move or resize operation to make xwayland's requests work correctly.
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r--sway/desktop/xwayland.c41
1 files changed, 41 insertions, 0 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index bce0a37b..2546168b 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -305,6 +305,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&xwayland_view->destroy.link);
wl_list_remove(&xwayland_view->request_configure.link);
wl_list_remove(&xwayland_view->request_fullscreen.link);
+ wl_list_remove(&xwayland_view->request_move.link);
+ wl_list_remove(&xwayland_view->request_resize.link);
wl_list_remove(&xwayland_view->set_title.link);
wl_list_remove(&xwayland_view->set_class.link);
wl_list_remove(&xwayland_view->set_window_type.link);
@@ -400,6 +402,37 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
transaction_commit_dirty();
}
+static void handle_request_move(struct wl_listener *listener, void *data) {
+ struct sway_xwayland_view *xwayland_view =
+ wl_container_of(listener, xwayland_view, request_move);
+ struct sway_view *view = &xwayland_view->view;
+ struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+ if (!xsurface->mapped) {
+ return;
+ }
+ if (!container_is_floating(view->swayc)) {
+ return;
+ }
+ struct sway_seat *seat = input_manager_current_seat(input_manager);
+ seat_begin_move(seat, view->swayc, seat->last_button);
+}
+
+static void handle_request_resize(struct wl_listener *listener, void *data) {
+ struct sway_xwayland_view *xwayland_view =
+ wl_container_of(listener, xwayland_view, request_resize);
+ struct sway_view *view = &xwayland_view->view;
+ struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+ if (!xsurface->mapped) {
+ return;
+ }
+ if (!container_is_floating(view->swayc)) {
+ return;
+ }
+ struct wlr_xwayland_resize_event *e = data;
+ struct sway_seat *seat = input_manager_current_seat(input_manager);
+ seat_begin_resize(seat, view->swayc, seat->last_button, e->edges);
+}
+
static void handle_set_title(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_title);
@@ -495,6 +528,14 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
&xwayland_view->request_fullscreen);
xwayland_view->request_fullscreen.notify = handle_request_fullscreen;
+ wl_signal_add(&xsurface->events.request_move,
+ &xwayland_view->request_move);
+ xwayland_view->request_move.notify = handle_request_move;
+
+ wl_signal_add(&xsurface->events.request_resize,
+ &xwayland_view->request_resize);
+ xwayland_view->request_resize.notify = handle_request_resize;
+
wl_signal_add(&xsurface->events.set_title, &xwayland_view->set_title);
xwayland_view->set_title.notify = handle_set_title;