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

Sanity-check the list of dpi values and report rates

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2017-10-16 17:49:56 +10:00
committed by Benjamin Tissoires
parent ec7bb2f63a
commit bacdab2596
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ratbagd/ratbagd-test.c
View File

@@ -64,7 +64,9 @@ static const struct ratbag_test_device ratbagd_test_device_descr = {
}
},
.resolutions = {
{ .xres = 100, .yres = 200, .hz = 1000, .dpi_min = 50, .dpi_max = 5000 },
{ .xres = 100, .yres = 200, .hz = 1000,
.dpi_min = 50, .dpi_max = 5000,
.report_rates = { 500, 1000 } },
{ .xres = 200, .yres = 300, .hz = 1000, .active = true, .dflt = true },
{ .xres = 300, .yres = 400, .hz = 1000 },
},

26
src/libratbag.c
View File

@@ -247,6 +247,8 @@ ratbag_sanity_check_device(struct ratbag_device *device)
}
ratbag_device_for_each_profile(device, profile) {
struct ratbag_resolution *resolution;
/* Allow max 1 active profile */
if (profile->is_active) {
if (has_active) {
@@ -266,6 +268,30 @@ ratbag_sanity_check_device(struct ratbag_device *device)
nres);
goto out;
}
ratbag_profile_for_each_resolution(profile, resolution) {
unsigned int vals[300];
unsigned int nvals = ARRAY_LENGTH(vals);
if (!ratbag_device_has_capability(device, RATBAG_DEVICE_CAP_RESOLUTION))
break;
nvals = ratbag_resolution_get_dpi_list(resolution, vals, nvals);
if (nvals == 0) {
log_bug_libratbag(ratbag,
"%s: invalid dpi list\n",
device->name);
goto out;
}
nvals = ratbag_resolution_get_report_rate_list(resolution, vals, nvals);
if (nvals == 0) {
log_bug_libratbag(ratbag,
"%s: invalid report rate list\n",
device->name);
goto out;
}
}
}
/* Require 1 active profile */

8
test/test-device.c
View File

@@ -59,7 +59,9 @@ const struct ratbag_test_device sane_device = {
.profiles = {
{
.resolutions = {
{ .xres = 100, .yres = 200, .hz = 1000 },
{ .xres = 100, .yres = 200, .hz = 1000,
.dpi_min = 100, .dpi_max = 5000,
.report_rates = { 500, 1000 } },
{ .xres = 200, .yres = 300, .hz = 1000 },
{ .xres = 300, .yres = 400, .hz = 1000 },
},
@@ -354,7 +356,9 @@ START_TEST(device_resolutions)
.profiles = {
{
.resolutions = {
{ .xres = 100, .yres = 200, .hz = 1000, .dpi_min = 50, .dpi_max = 5000},
{ .xres = 100, .yres = 200, .hz = 1000,
.dpi_min = 50, .dpi_max = 5000,
.report_rates = { 500, 1000 } },
{ .xres = 200, .yres = 300, .hz = 1000, .active = true },
{ .xres = 300, .yres = 400, .hz = 1000 },
},