diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2020-02-27 00:08:58 +0100 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-06-10 18:54:51 +0000 |
| commit | 4b37c2e446f0b613927ffc87c44a67ea4bfc7445 (patch) | |
| tree | 6e4ad403bc1f58ae551b445a73c96ab7f4e7e00b /src/backends/native/meta-cursor-renderer-native.c | |
| parent | 980ece9a4b069d14a7f9174cafaac95ae7c2df81 (diff) | |
| download | mutter-4b37c2e446f0b613927ffc87c44a67ea4bfc7445.tar.gz | |
crtc-mode: Move away fields from public MetaCrtcMode struct
The ID and name are just moved into the instance private, while the rest
is moved to a `MetaCrtcModeInfo` struct which is used during
construction and retrieved via a getter. Opens up the possibility to
add actual sub types.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1287
Diffstat (limited to 'src/backends/native/meta-cursor-renderer-native.c')
| -rw-r--r-- | src/backends/native/meta-cursor-renderer-native.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c index 01c847c3a..02bb2aaf0 100644 --- a/src/backends/native/meta-cursor-renderer-native.c +++ b/src/backends/native/meta-cursor-renderer-native.c @@ -402,6 +402,7 @@ update_monitor_crtc_cursor (MetaMonitor *monitor, meta_cursor_renderer_native_get_instance_private (cursor_renderer_native); MetaCrtc *crtc; MetaMonitorTransform transform; + const MetaCrtcModeInfo *crtc_mode_info; graphene_rect_t scaled_crtc_rect; float scale; int crtc_x, crtc_y; @@ -420,15 +421,17 @@ update_monitor_crtc_cursor (MetaMonitor *monitor, transform, &crtc_x, &crtc_y); + crtc_mode_info = meta_crtc_mode_get_info (monitor_crtc_mode->crtc_mode); + if (meta_monitor_transform_is_rotated (transform)) { - crtc_width = monitor_crtc_mode->crtc_mode->height; - crtc_height = monitor_crtc_mode->crtc_mode->width; + crtc_width = crtc_mode_info->height; + crtc_height = crtc_mode_info->width; } else { - crtc_width = monitor_crtc_mode->crtc_mode->width; - crtc_height = monitor_crtc_mode->crtc_mode->height; + crtc_width = crtc_mode_info->width; + crtc_height = crtc_mode_info->height; } scaled_crtc_rect = (graphene_rect_t) { @@ -479,8 +482,8 @@ update_monitor_crtc_cursor (MetaMonitor *monitor, inverted_transform = meta_monitor_transform_invert (transform); meta_rectangle_transform (&cursor_rect, inverted_transform, - monitor_crtc_mode->crtc_mode->width, - monitor_crtc_mode->crtc_mode->height, + crtc_mode_info->width, + crtc_mode_info->height, &cursor_rect); set_crtc_cursor (data->in_cursor_renderer_native, |