aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-02-02 21:01:59 +0100
committeremersion <contact@emersion.fr>2018-02-02 21:01:59 +0100
commitbb4aeb3b2f8d739b042ab8c2f2b9b6d1caf6e26b (patch)
treea69ea4d3c502f037844d822c1a584acb766c4674 /backend
parent5aa642485d8d2e1cc17a105dfcc69dd93b20c9a9 (diff)
backend/drm: support updating cursor when session is paused
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/backend.c2
-rw-r--r--backend/drm/drm.c21
2 files changed, 16 insertions, 7 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index dc6757a5..2b54336f 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -91,6 +91,8 @@ static void session_signal(struct wl_listener *listener, void *data) {
struct wlr_drm_plane *plane = conn->crtc->cursor;
drm->iface->crtc_set_cursor(drm, conn->crtc,
(plane && plane->cursor_enabled) ? plane->cursor_bo : NULL);
+ drm->iface->crtc_move_cursor(drm, conn->crtc, conn->cursor_x,
+ conn->cursor_y);
}
} else {
wlr_log(L_INFO, "DRM fd paused");
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 1b0b9b2b..8d102d8a 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -517,10 +517,6 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
struct wlr_drm_renderer *renderer = &drm->renderer;
- if (!drm->session->active) {
- return false;
- }
-
struct wlr_drm_crtc *crtc = conn->crtc;
if (!crtc) {
return false;
@@ -540,6 +536,9 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
if (!buf && update_pixels) {
// Hide the cursor
plane->cursor_enabled = false;
+ if (!drm->session->active) {
+ return true;
+ }
return drm->iface->crtc_set_cursor(drm, crtc, NULL);
}
plane->cursor_enabled = true;
@@ -637,6 +636,10 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
gbm_bo_unmap(bo, bo_data);
+ if (!drm->session->active) {
+ return true;
+ }
+
bool ok = drm->iface->crtc_set_cursor(drm, crtc, bo);
if (ok) {
wlr_output_update_needs_swap(output);
@@ -648,9 +651,6 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
int x, int y) {
struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
- if (!drm->session->active) {
- return false;
- }
if (!conn->crtc) {
return false;
}
@@ -670,6 +670,13 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
box.y -= plane->cursor_hotspot_y;
}
+ conn->cursor_x = box.x;
+ conn->cursor_y = box.y;
+
+ if (!drm->session->active) {
+ return true;
+ }
+
bool ok = drm->iface->crtc_move_cursor(drm, conn->crtc, box.x, box.y);
if (ok) {
wlr_output_update_needs_swap(output);