diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-12-22 08:51:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 08:51:08 -0500 |
| commit | b6b1bf94900fca760a839796794161a2160a9f89 (patch) | |
| tree | 42d51b82268e882dd10407dcb9a816abeb917c95 /backend | |
| parent | 82d36025e1b84a317b5e48d6f622eb9583ce6f2d (diff) | |
| parent | 9af0c5338f4f999299406530b21217bbf0aae449 (diff) | |
Merge pull request #1441 from Timidger/box-parameter-standardize
Standardize the wlr_box input paramaters
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 7 | ||||
| -rw-r--r-- | backend/wayland/output.c | 4 |
2 files changed, 6 insertions, 5 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/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; |