mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-17 06:46:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_cursor_set_surface: Use wlr_raster to generate texture from surface

Browse source 
Since wlr_raster supports wlr_compositor usage with and without a renderer,
use it for wlr_curosr so cursors support running on a surface without
a renderer.
This commit is contained in:
Alexander Orzechowski 2024-09-14 18:42:40 -04:00
parent ce09ecedfd
commit 17cdf9b4eb
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
types/wlr_cursor.c
View file

@ -14,6 +14,7 @@
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_tool.h>
#include <wlr/types/wlr_touch.h> #include <wlr/types/wlr_touch.h>
#include <wlr/types/wlr_raster.h>
#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/util/box.h> #include <wlr/util/box.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
@ -539,7 +540,12 @@ static void cursor_output_cursor_update(struct wlr_cursor_output_cursor *output_
} else if (cur->state->surface != NULL) { } else if (cur->state->surface != NULL) {
struct wlr_surface *surface = cur->state->surface; struct wlr_surface *surface = cur->state->surface;
struct wlr_texture *texture = wlr_surface_get_texture(surface); struct wlr_texture *texture = NULL;
struct wlr_raster *raster = wlr_raster_from_surface(surface);
if (raster) {
texture = wlr_raster_obtain_texture(raster, output_cursor->output_cursor->output->renderer);
}
int32_t hotspot_x = cur->state->surface_hotspot.x; int32_t hotspot_x = cur->state->surface_hotspot.x;
int32_t hotspot_y = cur->state->surface_hotspot.y; int32_t hotspot_y = cur->state->surface_hotspot.y;
@ -561,12 +567,14 @@ static void cursor_output_cursor_update(struct wlr_cursor_output_cursor *output_
&src_box, dst_width, dst_height, surface->current.transform, &src_box, dst_width, dst_height, surface->current.transform,
hotspot_x, hotspot_y, wait_timeline, wait_point); hotspot_x, hotspot_y, wait_timeline, wait_point);
if (syncobj_surface_state != NULL && surface->buffer != NULL && if (syncobj_surface_state != NULL && raster && raster->buffer != NULL &&
(surface->current.committed & WLR_SURFACE_STATE_BUFFER)) { (surface->current.committed & WLR_SURFACE_STATE_BUFFER)) {
wlr_linux_drm_syncobj_v1_state_signal_release_with_buffer(syncobj_surface_state, wlr_linux_drm_syncobj_v1_state_signal_release_with_buffer(syncobj_surface_state,
&surface->buffer->base); raster->buffer);
} }
wlr_raster_unlock(raster);
if (output_cursor->output_cursor->visible) { if (output_cursor->output_cursor->visible) {
wlr_surface_send_enter(surface, output); wlr_surface_send_enter(surface, output);
} else { } else {