isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor-manager/xrandr: Fix crtc variable naming

Browse Source 
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
This commit is contained in:
Jonas Ådahl 2017-03-24 18:36:28 +08:00
parent c1fe1c5d6b
commit 1db937826c
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/backends/x11/meta-monitor-manager-xrandr.c
View File

@ -815,32 +815,35 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
for (i = 0; i < (unsigned)resources->ncrtc; i++) for (i = 0; i < (unsigned)resources->ncrtc; i++)
{ {
XRRCrtcInfo *crtc; XRRCrtcInfo *xrandr_crtc;
MetaCrtc *meta_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]; crtc->crtc_id = resources->crtcs[i];
meta_crtc->rect.x = crtc->x; crtc->rect.x = xrandr_crtc->x;
meta_crtc->rect.y = crtc->y; crtc->rect.y = xrandr_crtc->y;
meta_crtc->rect.width = crtc->width; crtc->rect.width = xrandr_crtc->width;
meta_crtc->rect.height = crtc->height; crtc->rect.height = xrandr_crtc->height;
meta_crtc->is_dirty = FALSE; crtc->is_dirty = FALSE;
meta_crtc->transform = meta_monitor_transform_from_xrandr (crtc->rotation); crtc->transform =
meta_crtc->all_transforms = meta_monitor_transform_from_xrandr_all (crtc->rotations); 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++) 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; break;
} }
} }
XRRFreeCrtcInfo (crtc); XRRFreeCrtcInfo (xrandr_crtc);
} }
primary_output = XRRGetOutputPrimary (manager_xrandr->xdisplay, primary_output = XRRGetOutputPrimary (manager_xrandr->xdisplay,