isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 21:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

kms/cursor-manager: Transform cursor movement from view space to CRTC

Browse Source 
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2955,
        https://gitlab.gnome.org/GNOME/mutter/-/issues/2957

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3180>
This commit is contained in:
Daniel van Vugt 2023-08-14 18:21:44 +08:00 committed by Marge Bot
parent ca27dbabd9
commit c4d7265656
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backends/native/meta-kms-cursor-manager.c
View File

@ -263,12 +263,20 @@ calculate_cursor_rect (CrtcStateImpl *crtc_state_impl,
float y, float y,
graphene_rect_t *out_cursor_rect) graphene_rect_t *out_cursor_rect)
{ {
float crtc_x, crtc_y; int crtc_x, crtc_y, crtc_width, crtc_height;
int buffer_width, buffer_height; int buffer_width, buffer_height;
graphene_rect_t cursor_rect; graphene_rect_t cursor_rect;
crtc_x = (x - crtc_state_impl->layout.origin.x) * crtc_state_impl->scale; crtc_x = (x - crtc_state_impl->layout.origin.x) * crtc_state_impl->scale;
crtc_y = (y - crtc_state_impl->layout.origin.y) * crtc_state_impl->scale; crtc_y = (y - crtc_state_impl->layout.origin.y) * crtc_state_impl->scale;
crtc_width = roundf (crtc_state_impl->layout.size.width *
crtc_state_impl->scale);
crtc_height = roundf (crtc_state_impl->layout.size.height *
crtc_state_impl->scale);
meta_monitor_transform_transform_point (crtc_state_impl->transform,
&crtc_width, &crtc_height,
&crtc_x, &crtc_y);
buffer_width = meta_drm_buffer_get_width (buffer); buffer_width = meta_drm_buffer_get_width (buffer);
buffer_height = meta_drm_buffer_get_height (buffer); buffer_height = meta_drm_buffer_get_height (buffer);
@ -285,10 +293,8 @@ calculate_cursor_rect (CrtcStateImpl *crtc_state_impl,
}; };
if (cursor_rect.origin.x + cursor_rect.size.width > 0.0 && if (cursor_rect.origin.x + cursor_rect.size.width > 0.0 &&
cursor_rect.origin.y + cursor_rect.size.height > 0.0 && cursor_rect.origin.y + cursor_rect.size.height > 0.0 &&
cursor_rect.origin.x < (crtc_state_impl->layout.size.width * cursor_rect.origin.x < crtc_width &&
crtc_state_impl->scale) && cursor_rect.origin.y < crtc_height)
cursor_rect.origin.y < (crtc_state_impl->layout.size.height *
crtc_state_impl->scale))
{ {
if (out_cursor_rect) if (out_cursor_rect)
*out_cursor_rect = cursor_rect; *out_cursor_rect = cursor_rect;