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

Don't set the resolution if it's not in our DPI list

Browse Source 
Fixes #121

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2019-02-19 15:53:14 +10:00
committed by Benjamin Tissoires
parent 29fb0f855f
commit 222dda17a6
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libratbag.c
View File

@@ -1099,12 +1099,27 @@ ratbag_resolution_has_capability(struct ratbag_resolution *resolution,
return !!(resolution->capabilities & (1 << cap));
}
static inline bool
resolution_has_dpi(struct ratbag_resolution *resolution,
unsigned int dpi)
{
for (size_t i = 0; i < resolution->ndpis; i++) {
if (dpi == resolution->dpis[i])
return true;
}
return false;
}
LIBRATBAG_EXPORT enum ratbag_error_code
ratbag_resolution_set_dpi(struct ratbag_resolution *resolution,
unsigned int dpi)
{
struct ratbag_profile *profile = resolution->profile;
if (!resolution_has_dpi(resolution, dpi))
return RATBAG_ERROR_VALUE;
if (resolution->dpi_x != dpi || resolution->dpi_y != dpi) {
resolution->dpi_x = dpi;
resolution->dpi_y = dpi;
@@ -1128,6 +1143,9 @@ ratbag_resolution_set_dpi_xy(struct ratbag_resolution *resolution,
if ((x == 0 && y != 0) || (x != 0 && y == 0))
return RATBAG_ERROR_VALUE;
if (!resolution_has_dpi(resolution, x) || !resolution_has_dpi(resolution, y))
return RATBAG_ERROR_VALUE;
if (resolution->dpi_x != x || resolution->dpi_y != y) {
resolution->dpi_x = x;
resolution->dpi_y = y;