diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 7 | ||||
| -rw-r--r-- | backend/drm/util.c | 3 | ||||
| -rw-r--r-- | backend/wayland/output.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 332abfe5..735b7c29 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -637,8 +637,9 @@ static bool drm_connector_set_cursor(struct wlr_output *output, plane->surf.height, output->transform); struct wlr_box hotspot = { .x = hotspot_x, .y = hotspot_y }; - wlr_box_transform(&hotspot, wlr_output_transform_invert(output->transform), - plane->surf.width, plane->surf.height, &hotspot); + wlr_box_transform(&hotspot, &hotspot, + wlr_output_transform_invert(output->transform), + plane->surf.width, plane->surf.height); if (plane->cursor_hotspot_x != hotspot.x || plane->cursor_hotspot_y != hotspot.y) { @@ -737,7 +738,7 @@ static bool drm_connector_move_cursor(struct wlr_output *output, enum wl_output_transform transform = wlr_output_transform_invert(output->transform); - wlr_box_transform(&box, transform, width, height, &box); + wlr_box_transform(&box, &box, transform, width, height); if (plane != NULL) { box.x -= plane->cursor_hotspot_x; diff --git a/backend/drm/util.c b/backend/drm/util.c index 6a8b346a..6f2dd5be 100644 --- a/backend/drm/util.c +++ b/backend/drm/util.c @@ -118,9 +118,6 @@ void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *d uint32_t serial = data[12] | (data[13] << 8) | (data[14] << 8) | (data[15] << 8); snprintf(output->serial, sizeof(output->serial), "0x%08X", serial); - output->phys_width = ((data[68] & 0xf0) << 4) | data[66]; - output->phys_height = ((data[68] & 0x0f) << 8) | data[67]; - for (size_t i = 72; i <= 108; i += 18) { uint16_t flag = (data[i] << 8) | data[i + 1]; if (flag == 0 && data[i + 3] == 0xFC) { diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 03322678..89d5b5c9 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -93,9 +93,9 @@ static bool output_set_cursor(struct wlr_output *wlr_output, struct wlr_wl_backend *backend = output->backend; struct wlr_box hotspot = { .x = hotspot_x, .y = hotspot_y }; - wlr_box_transform(&hotspot, + wlr_box_transform(&hotspot, &hotspot, wlr_output_transform_invert(wlr_output->transform), - output->cursor.width, output->cursor.height, &hotspot); + output->cursor.width, output->cursor.height); // TODO: use output->wlr_output.transform to transform pixels and hotpot output->cursor.hotspot_x = hotspot.x; |