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

device: switch the capabilities to an enum

Browse Source 
Strings can suffer from locale issues, the official recommendation for DBus
APIs is to use enums here.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2016-03-15 11:21:09 +10:00
parent 0ebbccc6cf
commit ca2f32ea58
4 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/ratbagd-device.c
View File

@@ -47,14 +47,6 @@ struct ratbagd_device {
sd_bus_slot *profile_enum_slot;
unsigned int n_profiles;
struct ratbagd_profile **profiles;
struct {
bool switchable_resolution;
bool switchable_profile;
bool button_keys;
bool button_macros;
bool default_profile;
} capabilities;
};
#define ratbagd_device_from_node(_ptr) \
@@ -272,24 +264,59 @@ static int ratbagd_device_get_profile_by_index(sd_bus_message *m,
ratbagd_profile_get_path(profile));
}
static int
ratbagd_device_get_capabilities(sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error)
{
struct ratbagd_device *device = userdata;
struct ratbag_device *lib_device = device->lib_device;
enum ratbag_device_capability cap;
int r;
r = sd_bus_message_open_container(reply, 'a', "u");
if (r < 0)
return r;
cap = RATBAG_DEVICE_CAP_SWITCHABLE_RESOLUTION;
if (ratbag_device_has_capability(lib_device, cap)) {
r = sd_bus_message_append(reply, "u", cap);
if (r < 0)
return r;
}
cap = RATBAG_DEVICE_CAP_SWITCHABLE_PROFILE;
if (ratbag_device_has_capability(lib_device, cap)) {
r = sd_bus_message_append(reply, "u", cap);
if (r < 0)
return r;
}
cap = RATBAG_DEVICE_CAP_BUTTON_MACROS;
if (ratbag_device_has_capability(lib_device, cap)) {
r = sd_bus_message_append(reply, "u", cap);
if (r < 0)
return r;
}
cap = RATBAG_DEVICE_CAP_DEFAULT_PROFILE;
if (ratbag_device_has_capability(lib_device, cap)) {
r = sd_bus_message_append(reply, "u", cap);
if (r < 0)
return r;
}
return sd_bus_message_close_container(reply);
}
const sd_bus_vtable ratbagd_device_vtable[] = {
SD_BUS_VTABLE_START(0),
SD_BUS_PROPERTY("Id", "s", NULL, offsetof(struct ratbagd_device, name), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("CapSwitchableResolution", "b", NULL,
offsetof(struct ratbagd_device, capabilities.switchable_resolution),
SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("CapSwitchableProfile", "b", NULL,
offsetof(struct ratbagd_device, capabilities.switchable_profile),
SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("CapButtonKeys", "b", NULL,
offsetof(struct ratbagd_device, capabilities.button_keys),
SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("CapButtonMacros", "b", NULL,
offsetof(struct ratbagd_device, capabilities.button_macros),
SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("CapDefaultProfile", "b", NULL,
offsetof(struct ratbagd_device, capabilities.default_profile),
SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Capabilities", "au", ratbagd_device_get_capabilities, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Description", "s", ratbagd_device_get_description, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Svg", "s", ratbagd_device_get_svg, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("SvgPath", "s", ratbagd_device_get_svg_path, 0, SD_BUS_VTABLE_PROPERTY_CONST),
@@ -358,23 +385,6 @@ int ratbagd_device_new(struct ratbagd_device **out,
}
}
device->capabilities.switchable_resolution =
ratbag_device_has_capability(lib_device,
RATBAG_DEVICE_CAP_SWITCHABLE_RESOLUTION);
device->capabilities.switchable_profile =
ratbag_device_has_capability(lib_device,
RATBAG_DEVICE_CAP_SWITCHABLE_PROFILE);
device->capabilities.button_keys =
ratbag_device_has_capability(lib_device,
RATBAG_DEVICE_CAP_BUTTON_MACROS);
device->capabilities.button_macros =
ratbag_device_has_capability(lib_device,
RATBAG_DEVICE_CAP_BUTTON_MACROS);
device->capabilities.default_profile =
ratbag_device_has_capability(lib_device,
RATBAG_DEVICE_CAP_DEFAULT_PROFILE);
*out = device;
device = NULL;
return 0;