mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-03 09:01:40 -05:00
Merge pull request #453 from emersion/surface-transform
Add surface transforms support
This commit is contained in:
commit
23fb663ea4
11 changed files with 114 additions and 75 deletions
|
|
@ -565,8 +565,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
|||
enum wl_output_transform transform =
|
||||
wlr_output_transform_invert(output->transform);
|
||||
struct wlr_box transformed_hotspot;
|
||||
wlr_output_transform_apply_to_box(transform, &hotspot,
|
||||
&transformed_hotspot);
|
||||
wlr_box_transform(&hotspot, transform, &transformed_hotspot);
|
||||
plane->cursor_hotspot_x = transformed_hotspot.x;
|
||||
plane->cursor_hotspot_y = transformed_hotspot.y;
|
||||
|
||||
|
|
@ -628,7 +627,7 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
|
|||
enum wl_output_transform transform =
|
||||
wlr_output_transform_invert(output->transform);
|
||||
struct wlr_box transformed_box;
|
||||
wlr_output_transform_apply_to_box(transform, &box, &transformed_box);
|
||||
wlr_box_transform(&box, transform, &transformed_box);
|
||||
|
||||
if (plane != NULL) {
|
||||
transformed_box.x -= plane->cursor_hotspot_x;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
|
|||
box.x = wl_fixed_to_int(surface_x);
|
||||
box.y = wl_fixed_to_int(surface_y);
|
||||
struct wlr_box transformed;
|
||||
wlr_output_transform_apply_to_box(wlr_output->transform, &box, &transformed);
|
||||
|
||||
wlr_box_transform(&box, wlr_output->transform, &transformed);
|
||||
box.x /= wlr_output->scale;
|
||||
box.y /= wlr_output->scale;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue