ltunify: make fkeyswap default action status

This commit is contained in:
Peter Wu
2013-04-26 00:35:45 +02:00
parent 7f870c0ca5
commit 0b12a96aa7

View File

@@ -881,9 +881,9 @@ static void print_usage(const char *program_name) {
" unpair idx - Unpair device\n" " unpair idx - Unpair device\n"
" info idx - Show more detailed information for a device\n" " info idx - Show more detailed information for a device\n"
" receiver-info - Show information about the receiver\n" " receiver-info - Show information about the receiver\n"
" fkeyswap action [nidx] - Control the F key state of a keyboard. Valid\n" " fkeyswap [action] [nidx] - Control the F key state of a keyboard. Valid\n"
" actions are: on off status. nidx is an optional numeric\n" " actions are: on off status (defualt). nidx is an\n"
" device index for a keyboard.\n" " optional numeric device index for a keyboard.\n"
"\n" "\n"
"In the above lines, \"idx\" refers to the device number shown in the\n" "In the above lines, \"idx\" refers to the device number shown in the\n"
" first column of the list command (between 1 and 6). Alternatively, you\n" " first column of the list command (between 1 and 6). Alternatively, you\n"
@@ -964,11 +964,7 @@ static int validate_args(int argc, char **argv, char ***argsp, char **hidraw_pat
return -1; return -1;
} }
} else if (!strcmp(cmd, "fkeyswap")) { } else if (!strcmp(cmd, "fkeyswap")) {
if (args_count < 1) { if (args_count >= 1 && strcmp(args[1], "status") && strcmp(args[1], "on") && strcmp(args[1], "off")) {
fprintf(stderr, "Missing action, must be one of: on off status\n");
return -1;
}
if (strcmp(args[1], "status") && strcmp(args[1], "on") && strcmp(args[1], "off")) {
fprintf(stderr, "Invalid action, must be one of: on off status\n"); fprintf(stderr, "Invalid action, must be one of: on off status\n");
return -1; return -1;
} }
@@ -1185,7 +1181,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "Unable to check fkey status\n"); fprintf(stderr, "Unable to check fkey status\n");
} else { } else {
memcpy(&cval, msg.msg_short.value, sizeof cval); memcpy(&cval, msg.msg_short.value, sizeof cval);
if (!strcmp(args[1], "status")) { if (args_count == 0 || !strcmp(args[1], "status")) {
printf("F key functions are %sswapped\n", cval.flags & FKEY_SWAP ? "" : "not "); printf("F key functions are %sswapped\n", cval.flags & FKEY_SWAP ? "" : "not ");
} else { } else {
bool is_swap = !strcmp(args[1], "on"); bool is_swap = !strcmp(args[1], "on");