DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

ratbagd: call the correct set_resolution based on the capabilities

Browse Source 
ratbagd unconditionally called set_resolution_xy while libratbag expects
the caller to check on the capabilities. Instead of letting this burden
to the dbus user, have ratbagd handle this for us.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2017-07-05 11:14:27 +02:00
parent fe3169182c
commit 251b602323
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ratbagd/ratbagd-resolution.c
View File

@@ -74,6 +74,8 @@ static int ratbagd_resolution_set_resolution(sd_bus_message *m,
sd_bus_error *error)
{
struct ratbagd_resolution *resolution = userdata;
struct ratbag_resolution *lib_resolution = resolution->lib_resolution;
const enum ratbag_device_capability cap = RATBAG_RESOLUTION_CAP_SEPARATE_XY_RESOLUTION;
unsigned int xres, yres;
int r;
@@ -81,8 +83,13 @@ static int ratbagd_resolution_set_resolution(sd_bus_message *m,
if (r < 0)
return r;
r = ratbag_resolution_set_dpi_xy(resolution->lib_resolution,
xres, yres);
if (!ratbag_resolution_has_capability(lib_resolution, cap)) {
yres = xres;
r = ratbag_resolution_set_dpi(resolution->lib_resolution, xres);
} else {
r = ratbag_resolution_set_dpi_xy(resolution->lib_resolution,
xres, yres);
}
if (r == 0) {
resolution->xres = xres;
resolution->yres = yres;