diff options
| -rw-r--r-- | include/wlr/types/wlr_data_device.h | 2 | ||||
| -rw-r--r-- | types/wlr_linux_dmabuf.c | 3 | ||||
| -rw-r--r-- | types/wlr_surface.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h index 80d4bc8b..5581373d 100644 --- a/include/wlr/types/wlr_data_device.h +++ b/include/wlr/types/wlr_data_device.h @@ -94,6 +94,8 @@ struct wlr_drag_icon { struct wl_listener surface_destroy; struct wl_listener seat_client_destroy; + + void *data; }; struct wlr_drag { diff --git a/types/wlr_linux_dmabuf.c b/types/wlr_linux_dmabuf.c index 6e716986..3b4fc78b 100644 --- a/types/wlr_linux_dmabuf.c +++ b/types/wlr_linux_dmabuf.c @@ -101,7 +101,8 @@ static void params_add(struct wl_client *client, if (buffer->has_modifier && modifier != buffer->attributes.modifier) { wl_resource_post_error(params_resource, ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_FORMAT, - "sent modifier %lu for plane %u, expected modifier %lu like other planes", + "sent modifier %" PRIu64 " for plane %u, expected" + " modifier %" PRIu64 " like other planes", modifier, plane_idx, buffer->attributes.modifier); close(fd); return; diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 22026af8..46a39a39 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -956,7 +956,7 @@ struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface) { while (wlr_surface_is_subsurface(surface)) { struct wlr_subsurface *subsurface = wlr_subsurface_from_surface(surface); - surface = subsurface->surface; + surface = subsurface->parent; } return surface; } |