brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xrandr: Use specified output property name for backlight control

Browse Source 
Backlight controls are set using the "BACKLIGHT" XRANDR output property.
This should be "Backlight" according to the XRANDR spec [1].

Some drivers (Intel) export both properties and some only the specified property (nvidia).
Users of drivers that only export the specified property cannot change their backlight using XRANDR.

[1] http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt section 9.1

https://bugzilla.gnome.org/show_bug.cgi?id=723606
This commit is contained in:
Robert Ancell 2014-02-04 12:36:11 +00:00 committed by Jasper St. Pierre
parent 42f267bb50
commit f68d65a5ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ output_get_backlight_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
XRRGetOutputProperty (manager_xrandr->xdisplay, XRRGetOutputProperty (manager_xrandr->xdisplay,
(XID)output->output_id, (XID)output->output_id,
display->atom_BACKLIGHT, display->atom_Backlight,
0, G_MAXLONG, False, False, XA_INTEGER, 0, G_MAXLONG, False, False, XA_INTEGER,
&actual_type, &actual_format, &actual_type, &actual_format,
&nitems, &bytes_after, &buffer); &nitems, &bytes_after, &buffer);
@ -211,7 +211,7 @@ output_get_backlight_limits_xrandr (MetaMonitorManagerXrandr *manager_xrandr,
meta_error_trap_push (display); meta_error_trap_push (display);
info = XRRQueryOutputProperty (manager_xrandr->xdisplay, info = XRRQueryOutputProperty (manager_xrandr->xdisplay,
(XID)output->output_id, (XID)output->output_id,
display->atom_BACKLIGHT); display->atom_Backlight);
meta_error_trap_pop (display); meta_error_trap_pop (display);
if (info == NULL) if (info == NULL)
@ -947,7 +947,7 @@ meta_monitor_manager_xrandr_change_backlight (MetaMonitorManager *manager,
meta_error_trap_push (display); meta_error_trap_push (display);
XRRChangeOutputProperty (manager_xrandr->xdisplay, XRRChangeOutputProperty (manager_xrandr->xdisplay,
(XID)output->output_id, (XID)output->output_id,
display->atom_BACKLIGHT, display->atom_Backlight,
XA_INTEGER, 32, PropModeReplace, XA_INTEGER, 32, PropModeReplace,
(unsigned char *) &hw_value, 1); (unsigned char *) &hw_value, 1);
meta_error_trap_pop (display); meta_error_trap_pop (display);

2
src/meta/atomnames.h
View File

@ -78,7 +78,7 @@ item(MULTIPLE)
item(TIMESTAMP) item(TIMESTAMP)
item(VERSION) item(VERSION)
item(ATOM_PAIR) item(ATOM_PAIR)
item(BACKLIGHT) item(Backlight)
item(_XKB_RULES_NAMES) item(_XKB_RULES_NAMES)
item(hotplug_mode_update) item(hotplug_mode_update)
item(WL_SURFACE_ID) item(WL_SURFACE_ID)