mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: re-implement set_image with set_buffer

Browse source 
Avoids having two code-paths doing the same thing.
This commit is contained in:
Simon Ser 2022-05-27 18:32:50 +02:00 • committed by Isaac Freund
parent 459a642e83
commit 1ab3e582ac
1 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
types/output/cursor.c
View file

@ -8,6 +8,7 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "render/allocator/allocator.h" #include "render/allocator/allocator.h"
#include "render/swapchain.h" #include "render/swapchain.h"
#include "types/wlr_buffer.h"
#include "types/wlr_output.h" #include "types/wlr_output.h"
#include "util/signal.h" #include "util/signal.h"
@ -375,40 +376,16 @@ static bool output_cursor_attempt_hardware(struct wlr_output_cursor *cursor) {
bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor, bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height, const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height,
int32_t hotspot_x, int32_t hotspot_y) { int32_t hotspot_x, int32_t hotspot_y) {
struct wlr_renderer *renderer = cursor->output->renderer; struct wlr_readonly_data_buffer *buffer =
if (!renderer) { readonly_data_buffer_create(DRM_FORMAT_ARGB8888, stride, width, height,
pixels);
if (buffer == NULL) {
return false; return false;
} }
bool ok = wlr_output_cursor_set_buffer(cursor, &buffer->base,
output_cursor_reset(cursor); hotspot_x, hotspot_y);
wlr_buffer_drop(&buffer->base);
cursor->width = width; return ok;
cursor->height = height;
cursor->hotspot_x = hotspot_x;
cursor->hotspot_y = hotspot_y;
output_cursor_update_visible(cursor);
wlr_texture_destroy(cursor->texture);
cursor->texture = NULL;
cursor->enabled = false;
if (pixels != NULL) {
cursor->texture = wlr_texture_from_pixels(renderer,
DRM_FORMAT_ARGB8888, stride, width, height, pixels);
if (cursor->texture == NULL) {
return false;
}
cursor->enabled = true;
}
if (output_cursor_attempt_hardware(cursor)) {
return true;
}
wlr_log(WLR_DEBUG, "Falling back to software cursor on output '%s'",
cursor->output->name);
output_cursor_damage_whole(cursor);
return true;
} }
bool wlr_output_cursor_set_buffer(struct wlr_output_cursor *cursor, bool wlr_output_cursor_set_buffer(struct wlr_output_cursor *cursor,