aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2017-10-12 09:40:51 +0200
committeremersion <contact@emersion.fr>2017-10-12 09:40:51 +0200
commit92daa790bb4ac1b15eedd91e02ab65b340e8f2a5 (patch)
tree8c41f9f6610ce2b7d183efd787579e4970c2197e /backend
parent5c6a93389023f8f31e81d34cad618137b0483487 (diff)
Allow to update the cursor hotspot without its pixels
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c10
-rw-r--r--backend/wayland/output.c9
2 files changed, 16 insertions, 3 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 9e5346a1..ff4dc7f6 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -470,7 +470,7 @@ static void wlr_drm_connector_transform(struct wlr_output *output,
static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
const uint8_t *buf, 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, bool update_pixels) {
struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
struct wlr_drm_backend *drm = conn->drm;
struct wlr_drm_renderer *renderer = &drm->renderer;
@@ -478,7 +478,8 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
struct wlr_drm_crtc *crtc = conn->crtc;
struct wlr_drm_plane *plane = crtc->cursor;
- if (!buf) {
+ if (!buf && update_pixels) {
+ // Hide the cursor
return drm->iface->crtc_set_cursor(drm, crtc, NULL);
}
@@ -566,6 +567,11 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
break;
}
+ if (!update_pixels) {
+ // Only update the cursor hotspot
+ return true;
+ }
+
struct gbm_bo *bo = plane->cursor_bo;
uint32_t bo_width = gbm_bo_get_width(bo);
uint32_t bo_height = gbm_bo_get_height(bo);
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 03b43b35..2616b347 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -54,11 +54,18 @@ static void wlr_wl_output_transform(struct wlr_output *_output,
static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
const uint8_t *buf, 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, bool update_pixels) {
struct wlr_wl_backend_output *output = (struct wlr_wl_backend_output *)_output;
struct wlr_wl_backend *backend = output->backend;
+ if (!update_pixels) {
+ // Update hotspot without changing cursor image
+ wlr_wl_output_update_cursor(output, output->enter_serial, hotspot_x,
+ hotspot_y);
+ return true;
+ }
if (!buf) {
+ // Hide cursor
wl_pointer_set_cursor(output->backend->pointer, output->enter_serial,
NULL, 0, 0);
return true;