[mutter] monitor-manager/xrandr: Fix crtc variable naming
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] monitor-manager/xrandr: Fix crtc variable naming
- Date: Fri, 6 Oct 2017 18:22:40 +0000 (UTC)
commit 1db937826ca6fde75652a36b107ce71e4475ed1c
Author: Jonas Ådahl <jadahl gmail com>
Date: Fri Mar 24 18:36:28 2017 +0800
monitor-manager/xrandr: Fix crtc variable naming
The variable name of the local type (MetaCrtc) should not be prefixed,
while the external one should be.
https://bugzilla.gnome.org/show_bug.cgi?id=785381
src/backends/x11/meta-monitor-manager-xrandr.c | 33 +++++++++++++-----------
1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index 98b1f4d..1300d5b 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -815,32 +815,35 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
for (i = 0; i < (unsigned)resources->ncrtc; i++)
{
- XRRCrtcInfo *crtc;
- MetaCrtc *meta_crtc;
+ XRRCrtcInfo *xrandr_crtc;
+ MetaCrtc *crtc;
- crtc = XRRGetCrtcInfo (manager_xrandr->xdisplay, resources, resources->crtcs[i]);
+ xrandr_crtc = XRRGetCrtcInfo (manager_xrandr->xdisplay, resources,
+ resources->crtcs[i]);
- meta_crtc = &manager->crtcs[i];
+ crtc = &manager->crtcs[i];
- meta_crtc->crtc_id = resources->crtcs[i];
- meta_crtc->rect.x = crtc->x;
- meta_crtc->rect.y = crtc->y;
- meta_crtc->rect.width = crtc->width;
- meta_crtc->rect.height = crtc->height;
- meta_crtc->is_dirty = FALSE;
- meta_crtc->transform = meta_monitor_transform_from_xrandr (crtc->rotation);
- meta_crtc->all_transforms = meta_monitor_transform_from_xrandr_all (crtc->rotations);
+ crtc->crtc_id = resources->crtcs[i];
+ crtc->rect.x = xrandr_crtc->x;
+ crtc->rect.y = xrandr_crtc->y;
+ crtc->rect.width = xrandr_crtc->width;
+ crtc->rect.height = xrandr_crtc->height;
+ crtc->is_dirty = FALSE;
+ crtc->transform =
+ meta_monitor_transform_from_xrandr (xrandr_crtc->rotation);
+ crtc->all_transforms =
+ meta_monitor_transform_from_xrandr_all (xrandr_crtc->rotations);
for (j = 0; j < (unsigned)resources->nmode; j++)
{
- if (resources->modes[j].id == crtc->mode)
+ if (resources->modes[j].id == xrandr_crtc->mode)
{
- meta_crtc->current_mode = &manager->modes[j];
+ crtc->current_mode = &manager->modes[j];
break;
}
}
- XRRFreeCrtcInfo (crtc);
+ XRRFreeCrtcInfo (xrandr_crtc);
}
primary_output = XRRGetOutputPrimary (manager_xrandr->xdisplay,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]