isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-01 16:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

xrandr: Don't use RRQueryOutputProperty to fetch hotplug_mode_update

Browse Source 
If the property doesn't exist, a BadName error will be generated. This
is a terrible API, but it's what we're stuck with. Use
RRGetOutputProperty instead.
This commit is contained in:
Jasper St. Pierre 2014-08-18 17:57:33 -04:00
parent a7b1b1da80
commit 2dded1e510
1 changed files with 12 additions and 21 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

@ -139,8 +139,8 @@ meta_monitor_transform_from_xrandr_all (Rotation rotation)
} }
static gboolean static gboolean
output_get_presentation_xrandr (MetaMonitorManagerXrandr *manager_xrandr, output_get_boolean_property (MetaMonitorManagerXrandr *manager_xrandr,
MetaOutput *output) MetaOutput *output, const char *propname)
{ {
gboolean value; gboolean value;
Atom atom, actual_type; Atom atom, actual_type;
@ -148,7 +148,7 @@ output_get_presentation_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
unsigned long nitems, bytes_after; unsigned long nitems, bytes_after;
unsigned char *buffer; unsigned char *buffer;
atom = XInternAtom (manager_xrandr->xdisplay, "_MUTTER_PRESENTATION_OUTPUT", False); atom = XInternAtom (manager_xrandr->xdisplay, propname, False);
XRRGetOutputProperty (manager_xrandr->xdisplay, XRRGetOutputProperty (manager_xrandr->xdisplay,
(XID)output->winsys_id, (XID)output->winsys_id,
atom, atom,
@ -166,6 +166,13 @@ output_get_presentation_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
return value; return value;
} }
static gboolean
output_get_presentation_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
MetaOutput *output)
{
return output_get_boolean_property (manager_xrandr, output, "_MUTTER_PRESENTATION_OUTPUT");
}
static int static int
normalize_backlight (MetaOutput *output, normalize_backlight (MetaOutput *output,
int hw_value) int hw_value)
@ -314,24 +321,9 @@ static gboolean
output_get_hotplug_mode_update (MetaMonitorManagerXrandr *manager_xrandr, output_get_hotplug_mode_update (MetaMonitorManagerXrandr *manager_xrandr,
XID winsys_id) XID winsys_id)
{ {
Atom atom; return output_get_boolean_property (manager_xrandr, output, "hotplug_mode_update");
XRRPropertyInfo *info;
gboolean result = FALSE;
atom = XInternAtom (manager_xrandr->xdisplay, "hotplug_mode_update", False);
info = XRRQueryOutputProperty (manager_xrandr->xdisplay, winsys_id,
atom);
if (info)
{
result = TRUE;
XFree (info);
}
return result;
} }
static void static void
meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager) meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
{ {
@ -503,8 +495,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
meta_output->width_mm = output->mm_width; meta_output->width_mm = output->mm_width;
meta_output->height_mm = output->mm_height; meta_output->height_mm = output->mm_height;
meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN; meta_output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
meta_output->hotplug_mode_update = meta_output->hotplug_mode_update = output_get_hotplug_mode_update (manager_xrandr, meta_output);
output_get_hotplug_mode_update (manager_xrandr, meta_output->winsys_id);
meta_output->n_modes = output->nmode; meta_output->n_modes = output->nmode;
meta_output->modes = g_new0 (MetaMonitorMode *, meta_output->n_modes); meta_output->modes = g_new0 (MetaMonitorMode *, meta_output->n_modes);