From 860d2384b434cd1576d9029f20db62b583895cf4 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 27 Apr 2018 17:30:45 +0100 Subject: [PATCH 1/2] Update for swaywm/wlroots#923 --- sway/input/cursor.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 944ad8eb..64b95e7d 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -1,4 +1,5 @@ #define _XOPEN_SOURCE 700 +#include #ifdef __linux__ #include #elif __FreeBSD__ @@ -262,18 +263,11 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { } static double apply_mapping_from_coord(double low, double high, double value) { - if (value == -1) { + if (isnan(value)) { return value; } - value = (value - low) / (high - low); - if (value < 0) { - return 0; - } else if (value > 1) { - return 1; - } else { - return value; - } + return (value - low) / (high - low); } static void apply_mapping_from_region(struct wlr_input_device *device, @@ -300,7 +294,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) { struct wlr_event_tablet_tool_axis *event = data; struct sway_input_device *input_device = event->device->data; - double x = -1, y = -1; + double x = NAN, y = NAN; if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) { x = event->x; } From 3fd8897abe94c34b6457da3209f978b55719a7e2 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 28 Apr 2018 20:44:42 +0100 Subject: [PATCH 2/2] Don't call view_set_fullscreen on unmapped xwayland views --- sway/desktop/xdg_shell_v6.c | 9 +++++---- sway/desktop/xwayland.c | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index fdfb9346..2aaedd6c 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -228,13 +228,15 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) struct sway_xdg_shell_v6_view *xdg_shell_v6_view = wl_container_of(listener, xdg_shell_v6_view, request_fullscreen); struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; + struct wlr_xdg_surface_v6 *xdg_surface = + xdg_shell_v6_view->view.wlr_xdg_surface_v6; - if (!sway_assert(xdg_shell_v6_view->view.wlr_xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL, + if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL, "xdg_shell_v6 requested fullscreen of surface with role %i", - xdg_shell_v6_view->view.wlr_xdg_surface_v6->role)) { + xdg_surface->role)) { return; } - if (!xdg_shell_v6_view->view.wlr_xdg_surface_v6->mapped) { + if (!xdg_surface->mapped) { return; } @@ -267,7 +269,6 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { // TODO: // - Look up pid and open on appropriate workspace - // - Criteria xdg_shell_v6_view->map.notify = handle_map; wl_signal_add(&xdg_surface->events.map, &xdg_shell_v6_view->map); diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 63d9c66e..aa9e1797 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -280,6 +280,9 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) wl_container_of(listener, xwayland_view, request_fullscreen); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; + if (!xsurface->mapped) { + return; + } view_set_fullscreen(view, xsurface->fullscreen); } @@ -309,7 +312,6 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { // TODO: // - Look up pid and open on appropriate workspace - // - Criteria wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); xwayland_view->destroy.notify = handle_destroy;