src/cursor.c: Keep sending motion events for out-of-layer-surface

Previously, motion events for a cursor which had been pressed on a surface
and then moved out of the surface were only sent for XDG and X11 surfaces.

This patch includes layer surfaces as well.

Fixes #483

diff --git a/include/labwc.h b/include/labwc.h
index fab99852c6a91e6ab17d4b63e2fe3bf608a63246..cf62f60f7dcb63dc7e4fc7cd0e8bdfb896e8eada 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -95,8 +95,8 @@ struct seat {
        struct wlr_layer_surface_v1 *focused_layer;
 
        /**
-        * pressed view/surface will usually be NULL and is only set on button
-        * press while the mouse is over a view surface and reset to NULL on
+        * pressed view/surface/node will usually be NULL and is only set on
+        * button press while the mouse is over a surface and reset to NULL on
         * button release.
         * It is used to send cursor motion events to a surface even though
         * the cursor has left the surface in the meantime.
@@ -106,6 +106,7 @@ struct seat {
         */
        struct {
                struct view *view;
+               struct wlr_scene_node *node;
                struct wlr_surface *surface;
        } pressed;
 

diff --git a/src/cursor.c b/src/cursor.c
index d938a4acca87b6da6fb79cb93f5190b3a2fd6455..6d97ae52817a1da46c3813ad95f8560c9457d0b2 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -289,29 +289,36 @@ process_cursor_motion(struct server *server, uint32_t time)
                 * or selecting text even if the cursor moves outside of
                 * the surface.
                 */
+               int lx, ly;
                view = server->seat.pressed.view;
-               if (!view) {
-                       /* Button press originated on a layer surface, just ignore */
+               if (view) {
+                       lx = view->x;
+                       ly = view->y;
+               } else if (wlr_surface_is_layer_surface(server->seat.pressed.surface)) {
+                       wlr_scene_node_coords(server->seat.pressed.node, &lx, &ly);
+               } else {
+                       wlr_log(WLR_ERROR, "Can't detect surface for out-of-surface movement");
                        return;
                }
-               sx = server->seat.cursor->x - view->x;
-               sy = server->seat.cursor->y - view->y;
-               /*
-                * X11 apps expect to be able to receive motion events outside
-                * the window area (this is necessary for client-side move/resize
-                * handles to work properly).  So do not clamp the motion
-                * coordinates for XWayland surfaces.
-                */
-               if (view->type == LAB_XDG_SHELL_VIEW) {
+               sx = server->seat.cursor->x - lx;
+               sy = server->seat.cursor->y - ly;
+
+               if (view && view->type == LAB_XDG_SHELL_VIEW) {
+                       /*
+                        * X11 apps expect to be able to receive motion events outside
+                        * the window area (this is necessary for client-side move/resize
+                        * handles to work properly). So only clamp the motion coordinates
+                        * for XDG surfaces.
+                        */
                        sx = sx < 0 ? 0 : (sx > view->w ? view->w : sx);
                        sy = sy < 0 ? 0 : (sy > view->h ? view->h : sy);
-               }
-               if (view->type == LAB_XDG_SHELL_VIEW && view->xdg_surface) {
                        /* Take into account invisible CSD borders */
-                       struct wlr_box geo;
-                       wlr_xdg_surface_get_geometry(view->xdg_surface, &geo);
-                       sx += geo.x;
-                       sy += geo.y;
+                       if (view->xdg_surface) {
+                               struct wlr_box geo;
+                               wlr_xdg_surface_get_geometry(view->xdg_surface, &geo);
+                               sx += geo.x;
+                               sy += geo.y;
+                       }
                }
                wlr_seat_pointer_notify_motion(server->seat.seat, time, sx, sy);
        } else if (surface && !input_inhibit_blocks_surface(
@@ -367,6 +374,7 @@ start_drag(struct wl_listener *listener, void *data)
        struct seat *seat = wl_container_of(listener, seat, start_drag);
        struct wlr_drag *wlr_drag = data;
        seat->pressed.view = NULL;
+       seat->pressed.node = NULL;
        seat->pressed.surface = NULL;
        seat->drag_icon = wlr_drag->icon;
        if (!seat->drag_icon) {
@@ -715,6 +723,7 @@ cursor_button(struct wl_listener *listener, void *data)
        /* handle _release_ */
        if (event->state == WLR_BUTTON_RELEASED) {
                seat->pressed.view = NULL;
+               seat->pressed.node = NULL;
                if (seat->pressed.surface && seat->pressed.surface != surface) {
                        /*
                         * Button released but originally pressed over a different surface.
@@ -755,8 +764,9 @@ cursor_button(struct wl_listener *listener, void *data)
 
        /* Handle _press */
        if (surface) {
-               server->seat.pressed.view = view;
-               server->seat.pressed.surface = surface;
+               seat->pressed.view = view;
+               seat->pressed.node = node;
+               seat->pressed.surface = surface;
        }
 
        if (server->input_mode == LAB_INPUT_STATE_MENU) {

diff --git a/src/layers.c b/src/layers.c
index 674deaa941f10cac51d7361138a8cb8bf5b24648..b9d05c2d3196cddcc5557ec84da9a315cfd4a053 100644 (file)
--- a/src/layers.c
+++ b/src/layers.c
@@ -145,6 +145,10 @@ unmap(struct lab_layer_surface *layer)
        if (seat->focused_layer == layer->scene_layer_surface->layer_surface) {
                seat_set_focus_layer(seat, NULL);
        }
+       if (seat->pressed.surface == layer->scene_layer_surface->layer_surface->surface) {
+               seat->pressed.node = NULL;
+               seat->pressed.surface = NULL;
+       }
 }
 
 static void