diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2021-10-20 09:25:19 +0200 |
|---|---|---|
| committer | Olivier Fourdan <fourdan@gmail.com> | 2021-10-25 12:05:42 +0000 |
| commit | 672fe9e2442fce3f99030aa0beb5c417b4d24d99 (patch) | |
| tree | d6ea6328a98004426ae96ece782ab058a88ba1f0 /hw | |
| parent | e6401e602500703d26f00b632b0a75681691f2eb (diff) | |
xwayland: Move xwl_cursor_release() to xwayland-cursor.c
It just make more sense to keep xwl_cursor_release() with the rest of
the cursor code.
No functional change.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Carlos Garnacho <carlosg@gnome.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xwayland/xwayland-cursor.c | 8 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-cursor.h | 1 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-input.c | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c index be9fa3b28..27b090442 100644 --- a/hw/xwayland/xwayland-cursor.c +++ b/hw/xwayland/xwayland-cursor.c @@ -264,6 +264,14 @@ xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *xwl_tablet_tool) xwl_cursor_attach_pixmap(xwl_seat, xwl_cursor, pixmap); } +void +xwl_cursor_release(struct xwl_cursor *xwl_cursor) +{ + wl_surface_destroy(xwl_cursor->surface); + if (xwl_cursor->frame_cb) + wl_callback_destroy(xwl_cursor->frame_cb); +} + static void xwl_seat_update_all_cursors(struct xwl_seat *xwl_seat) { diff --git a/hw/xwayland/xwayland-cursor.h b/hw/xwayland/xwayland-cursor.h index 401e814a7..a48ef16e4 100644 --- a/hw/xwayland/xwayland-cursor.h +++ b/hw/xwayland/xwayland-cursor.h @@ -31,6 +31,7 @@ #include <xwayland-types.h> #include <xwayland-input.h> +void xwl_cursor_release(struct xwl_cursor *xwl_cursor); void xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *tool); void xwl_seat_set_cursor(struct xwl_seat *xwl_seat); Bool xwl_screen_init_cursor(struct xwl_screen *xwl_screen); diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index 80000ea9e..3b3378e98 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -1449,14 +1449,6 @@ xwl_cursor_init(struct xwl_cursor *xwl_cursor, struct xwl_screen *xwl_screen, } static void -xwl_cursor_release(struct xwl_cursor *xwl_cursor) -{ - wl_surface_destroy(xwl_cursor->surface); - if (xwl_cursor->frame_cb) - wl_callback_destroy(xwl_cursor->frame_cb); -} - -static void xwl_seat_update_cursor(struct xwl_cursor *xwl_cursor) { struct xwl_seat *xwl_seat = wl_container_of(xwl_cursor, xwl_seat, cursor); |