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

sinowealth: handle errors in sinowealth_button_set_key_action

Browse Source
This commit is contained in:
Yaroslav Chvanov
2023-09-25 18:58:09 +03:00
parent e5ebce50ff
commit 4c68f71616
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver-sinowealth.c
View File

@@ -1382,9 +1382,15 @@ sinowealth_update_profile_from_buttons(struct ratbag_profile *profile)
/* @return 0 on success or a negative errno. */
static int
sinowealth_button_set_key_action(struct ratbag_device *device, const struct ratbag_button *button, struct sinowealth_button_data *button_data)
sinowealth_button_set_key_action(const struct ratbag_button *button, struct sinowealth_button_data *button_data)
{
assert(button->action.type == RATBAG_BUTTON_ACTION_TYPE_KEY);
struct ratbag_device *device = button->profile->device;
if (button->action.type != RATBAG_BUTTON_ACTION_TYPE_KEY) {
log_bug_libratbag(device->ratbag, "button %u: action must be a key",
button->index);
return -EINVAL;
}
const unsigned int key = button->action.action.key.key;
// libratbag doesn't support modifiers in `key` actions.
@@ -1392,7 +1398,8 @@ sinowealth_button_set_key_action(struct ratbag_device *device, const struct ratb
const uint8_t raw_key = ratbag_hidraw_get_keyboard_usage_from_keycode(device, key);
if (raw_key == 0) {
log_debug(device->ratbag, "Could not set unsupported key %#x to button %u\n", key, button->index);
log_error(device->ratbag, "button %u: couldn't assign unsupported key %#x\n",
button->index, key);
return -EINVAL;
}
@@ -1427,7 +1434,10 @@ sinowealth_update_buttons_from_profile(struct ratbag_profile *profile)
switch (action->type) {
case RATBAG_BUTTON_ACTION_TYPE_KEY:
sinowealth_button_set_key_action(device, button, button_data);
rc = sinowealth_button_set_key_action(button, button_data);
if (rc < 0) {
return rc;
}
break;
case RATBAG_BUTTON_ACTION_TYPE_MACRO: {
/* Make the button activate a macro.