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

tools: use the new flags for switch-etekcity and change-button

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2015-09-14 11:16:52 +10:00
parent 87881fd9d5
commit f97a3142d1
1 changed files with 5 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/ratbag-command.c
View File

@@ -376,29 +376,15 @@ ratbag_cmd_switch_etekcity(const struct ratbag_cmd *cmd,
int rc = 1, commit = 0;
unsigned int modifiers[10];
size_t modifiers_sz = 10;
int i;
device = options->device;
profile = options->profile;
if (!ratbag_device_has_capability(device,
RATBAG_DEVICE_CAP_SWITCHABLE_PROFILE)) {
error("Device '%s' has no switchable profiles\n",
ratbag_device_get_name(device));
goto out;
}
for (i = 0; i < ratbag_device_get_num_profiles(device); i++) {
profile = ratbag_device_get_profile_by_index(device, i);
if (ratbag_profile_is_active(profile))
break;
ratbag_profile_unref(profile);
profile = NULL;
}
if (!profile) {
error("Failed to retrieve the active profile\n");
goto out;
return 1;
}
button_6 = ratbag_profile_get_button_by_index(profile, 6);
@@ -419,18 +405,11 @@ ratbag_cmd_switch_etekcity(const struct ratbag_cmd *cmd,
button_6 = ratbag_button_unref(button_6);
button_7 = ratbag_button_unref(button_7);
if (!commit)
goto out;
rc = ratbag_profile_set_active(profile);
if (!rc)
printf("Switched the current profile of '%s' to %sreport the volume keys\n",
ratbag_device_get_name(device),
commit == 1 ? "not " : "");
out:
profile = ratbag_profile_unref(profile);
return rc;
}
@@ -439,7 +418,7 @@ static const struct ratbag_cmd cmd_switch_etekcity = {
.cmd = ratbag_cmd_switch_etekcity,
.args = NULL,
.help = "Switch the Etekcity mouse active profile",
.flags = FLAG_NEED_DEVICE,
.flags = FLAG_NEED_DEVICE | FLAG_NEED_PROFILE,
.subcommands = { NULL },
};
@@ -549,6 +528,7 @@ ratbag_cmd_change_button(const struct ratbag_cmd *cmd,
}
device = options->device;
profile = options->profile;
if (!ratbag_device_has_capability(device,
RATBAG_DEVICE_CAP_BUTTON_KEY)) {
@@ -557,19 +537,6 @@ ratbag_cmd_change_button(const struct ratbag_cmd *cmd,
goto out;
}
for (i = 0; i < ratbag_device_get_num_profiles(device); i++) {
profile = ratbag_device_get_profile_by_index(device, i);
if (ratbag_profile_is_active(profile))
break;
ratbag_profile_unref(profile);
profile = NULL;
}
if (!profile) {
error("Huh hoh, something bad happened, unable to retrieve the active profile\n");
goto out;
}
button = ratbag_profile_get_button_by_index(profile, button_index);
if (!button) {
error("Invalid button number %d\n", button_index);
@@ -622,7 +589,6 @@ ratbag_cmd_change_button(const struct ratbag_cmd *cmd,
out:
button = ratbag_button_unref(button);
profile = ratbag_profile_unref(profile);
return rc;
}
@@ -632,7 +598,7 @@ static const struct ratbag_cmd cmd_change_button = {
.cmd = ratbag_cmd_change_button,
.args = "X <button|key|special|macro> <number|KEY_FOO|special|macro name:KEY_FOO,KEY_BAR,...>",
.help = "Remap button X to the given action in the active profile",
.flags = FLAG_NEED_DEVICE,
.flags = FLAG_NEED_DEVICE | FLAG_NEED_PROFILE,
.subcommands = { NULL },
};