diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-14 11:44:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 11:44:18 -0500 |
| commit | 15cd8b6a86295a445a1037afd0028b1226a14c82 (patch) | |
| tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/input/events.c | |
| parent | 64ef9366733d6d332a24897f72eba90ba2adca1e (diff) | |
| parent | 2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (diff) | |
| download | sway-15cd8b6a86295a445a1037afd0028b1226a14c82.tar.xz | |
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/input/events.c')
| -rw-r--r-- | sway/commands/input/events.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index 69f46269..2c6505d8 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c @@ -71,8 +71,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { } struct input_config *ic = config->handler_context.input_config; if (!ic) { - return cmd_results_new(CMD_FAILURE, "events", - "No input device defined."); + return cmd_results_new(CMD_FAILURE, "No input device defined."); } if (strcasecmp(argv[0], "enabled") == 0) { @@ -83,7 +82,7 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { ic->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE; } else if (config->reading) { - return cmd_results_new(CMD_INVALID, "events", + return cmd_results_new(CMD_INVALID, "Expected 'events <enabled|disabled|disabled_on_external_mouse>'"); } else if (strcasecmp(argv[0], "toggle") == 0) { if (strcmp(ic->identifier, "*") == 0) { @@ -97,10 +96,10 @@ struct cmd_results *input_cmd_events(int argc, char **argv) { toggle_send_events(ic); } } else { - return cmd_results_new(CMD_INVALID, "events", + return cmd_results_new(CMD_INVALID, "Expected 'events <enabled|disabled|disabled_on_external_mouse|" "toggle>'"); } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); + return cmd_results_new(CMD_SUCCESS, NULL); } |