drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

ratbagd: make the resolution properties writable

Browse Source 
This also drops the separate x/y properties and instead just returns a tuple
for "Resolution".

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2017-07-20 14:29:47 +10:00
committed by Benjamin Tissoires
parent 7097f1dea6
commit 40bd189cc0
3 changed files with 68 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DBusInterface.md
View File

@@ -176,19 +176,16 @@ Resolutions can only be set to default, but never to not default - at least
one resolution must be default at all times. This property is read-only, use the
`SetDefault()` method to set a resolution as the default resolution.
#### `XResolution`
- type: `u`, read-only, mutable
#### `Resolution`
- type: `uu`, read-only, mutable
uint for the x resolution assigned to this entry
uint for the x and y resolution assigned to this entry, respectively
#### `YResolution`
- type: `u`, read-only, mutable
uint for the y resolution assigned to this entry
#### `ReportRate`
- type: `u`, read-only, mutable
- type: `u`, read-write, mutable
uint for the report rate in Hz assigned to this entry
#### `Maximum`
- type: `u`, read-only, constant
@@ -200,11 +197,6 @@ uint for the minimum possible resolution
### Methods:
#### `SetResolution(u, u) → ()`
x/y resolution to assign
#### `SetReportRate(uint) → ()`
uint for the report rate to assign
#### `SetDefault() → () `
Set this resolution to be the default

121
ratbagd/ratbagd-resolution.c
View File

@@ -44,9 +44,14 @@ struct ratbagd_resolution {
char *path;
};
static int ratbagd_resolution_set_report_rate(sd_bus_message *m,
void *userdata,
sd_bus_error *error)
static int
ratbagd_resolution_set_report_rate(sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *m,
void *userdata,
sd_bus_error *error)
{
struct ratbagd_resolution *resolution = userdata;
unsigned int rate;
@@ -70,40 +75,8 @@ static int ratbagd_resolution_set_report_rate(sd_bus_message *m,
"ReportRate",
NULL);
}
return sd_bus_reply_method_return(m, "u", r);
}
static int ratbagd_resolution_set_resolution(sd_bus_message *m,
void *userdata,
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;
r = sd_bus_message_read(m, "uu", &xres, &yres);
if (r < 0)
return r;
if (!ratbag_resolution_has_capability(lib_resolution, cap)) {
r = ratbag_resolution_set_dpi(resolution->lib_resolution, xres);
} else {
r = ratbag_resolution_set_dpi_xy(resolution->lib_resolution,
xres, yres);
}
if (r == 0) {
sd_bus *bus = sd_bus_message_get_bus(m);
sd_bus_emit_properties_changed(bus,
resolution->path,
RATBAGD_NAME_ROOT ".Resolution",
"XResolution",
"YResolution",
NULL);
}
return sd_bus_reply_method_return(m, "u", r);
return r;
}
static int ratbagd_resolution_default_signal_cb(sd_bus *bus,
@@ -139,7 +112,7 @@ static int ratbagd_resolution_set_default(sd_bus_message *m,
resolution->profile,
ratbagd_resolution_default_signal_cb);
return sd_bus_reply_method_return(m, "u", r);
return r;
}
static int
@@ -214,37 +187,60 @@ ratbagd_resolution_is_default(sd_bus *bus,
}
static int
ratbagd_resolution_get_resolution_x(sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error)
ratbagd_resolution_get_resolution(sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error)
{
struct ratbagd_resolution *resolution = userdata;
struct ratbag_resolution *lib_resolution = resolution->lib_resolution;
int xres;
int xres, yres;
xres = ratbag_resolution_get_dpi_x(lib_resolution);
return sd_bus_message_append(reply, "u", xres);
yres = ratbag_resolution_get_dpi_y(lib_resolution);
return sd_bus_message_append(reply, "(uu)", xres, yres);
}
static int
ratbagd_resolution_get_resolution_y(sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error)
ratbagd_resolution_set_resolution(sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *m,
void *userdata,
sd_bus_error *error)
{
struct ratbagd_resolution *resolution = userdata;
struct ratbag_resolution *lib_resolution = resolution->lib_resolution;
int yres;
const enum ratbag_device_capability cap = RATBAG_RESOLUTION_CAP_SEPARATE_XY_RESOLUTION;
int xres, yres;
int r;
yres = ratbag_resolution_get_dpi_y(lib_resolution);
return sd_bus_message_append(reply, "u", yres);
r = sd_bus_message_read(m, "(uu)", &xres, &yres);
if (r < 0)
return r;
if (!ratbag_resolution_has_capability(lib_resolution, cap)) {
r = ratbag_resolution_set_dpi(resolution->lib_resolution, xres);
} else {
r = ratbag_resolution_set_dpi_xy(resolution->lib_resolution,
xres, yres);
}
if (r == 0) {
sd_bus *bus = sd_bus_message_get_bus(m);
sd_bus_emit_properties_changed(bus,
resolution->path,
RATBAGD_NAME_ROOT ".Resolution",
"Resolution",
NULL);
}
return r;
}
static int
@@ -304,13 +300,16 @@ const sd_bus_vtable ratbagd_resolution_vtable[] = {
SD_BUS_PROPERTY("Capabilities", "au", ratbagd_resolution_get_capabilities, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("IsActive", "b", ratbagd_resolution_is_active, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("IsDefault", "b", ratbagd_resolution_is_default, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("XResolution", "u", ratbagd_resolution_get_resolution_x, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("YResolution", "u", ratbagd_resolution_get_resolution_y, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("ReportRate", "u", ratbagd_resolution_get_rate, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_WRITABLE_PROPERTY("Resolution", "(uu)",
ratbagd_resolution_get_resolution,
ratbagd_resolution_set_resolution, 0,
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_WRITABLE_PROPERTY("ReportRate", "u",
ratbagd_resolution_get_rate,
ratbagd_resolution_set_report_rate, 0,
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
SD_BUS_PROPERTY("Maximum", "u", ratbagd_resolution_get_maximum, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Minimum", "u", ratbagd_resolution_get_minimum, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_METHOD("SetReportRate", "u", "u", ratbagd_resolution_set_report_rate, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("SetResolution", "uu", "u", ratbagd_resolution_set_resolution, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("SetDefault", "", "u", ratbagd_resolution_set_default, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END,
};

9
tools/ratbagd.py
View File

@@ -375,7 +375,7 @@ class RatbagdResolution(_RatbagdDBus):
@GObject.Property
def resolution(self):
"""The tuple (xres, yres) with each resolution in DPI."""
return self._get_dbus_property("XResolution"), self._get_dbus_property("YResolution")
return self._get_dbus_property("Resolution")
@resolution.setter
def resolution(self, res):
@@ -383,8 +383,7 @@ class RatbagdResolution(_RatbagdDBus):
@param res The new resolution, as (int, int)
"""
ret = self._dbus_call("SetResolution", "uu", *res)
self._set_dbus_property("Resolution", "(uu)", res)
ret = self._set_dbus_property("Resolution", "(uu)", res)
return ret
@GObject.Property
@@ -408,9 +407,7 @@ class RatbagdResolution(_RatbagdDBus):
@param rate The new report rate, as int
"""
ret = self._dbus_call("SetReportRate", "u", rate)
self._set_dbus_property("ReportRate", "u", rate)
return ret
return self._set_dbus_property("ReportRate", "u", rate)
@GObject.Property
def is_active(self):