Merge branch 'master' into fullscreen

This commit is contained in:
Drew DeVault 2018-04-19 08:56:03 -04:00 committed by GitHub
commit 21eb63cc9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 94 additions and 1 deletions

View file

@ -55,6 +55,10 @@ struct cmd_results *cmd_input(int argc, char **argv) {
res = input_cmd_natural_scroll(argc_new, argv_new);
} else if (strcasecmp("pointer_accel", argv[1]) == 0) {
res = input_cmd_pointer_accel(argc_new, argv_new);
} else if (strcasecmp("repeat_delay", argv[1]) == 0) {
res = input_cmd_repeat_delay(argc_new, argv_new);
} else if (strcasecmp("repeat_rate", argv[1]) == 0) {
res = input_cmd_repeat_rate(argc_new, argv_new);
} else if (strcasecmp("scroll_method", argv[1]) == 0) {
res = input_cmd_scroll_method(argc_new, argv_new);
} else if (strcasecmp("tap", argv[1]) == 0) {

View file

@ -0,0 +1,30 @@
#include <stdlib.h>
#include <string.h>
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
struct cmd_results *input_cmd_repeat_delay(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "repeat_delay", EXPECTED_EQUAL_TO, 1))) {
return error;
}
struct input_config *current_input_config =
config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE,
"repeat_delay", "No input device defined.");
}
struct input_config *new_config =
new_input_config(current_input_config->identifier);
int repeat_delay = atoi(argv[0]);
if (repeat_delay < 0) {
return cmd_results_new(CMD_INVALID, "repeat_delay",
"Repeat delay cannot be negative");
}
new_config->repeat_delay = repeat_delay;
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

View file

@ -0,0 +1,30 @@
#include <stdlib.h>
#include <string.h>
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
struct cmd_results *input_cmd_repeat_rate(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "repeat_rate", EXPECTED_EQUAL_TO, 1))) {
return error;
}
struct input_config *current_input_config =
config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE,
"repeat_rate", "No input device defined.");
}
struct input_config *new_config =
new_input_config(current_input_config->identifier);
int repeat_rate = atoi(argv[0]);
if (repeat_rate < 0) {
return cmd_results_new(CMD_INVALID, "repeat_rate",
"Repeat rate cannot be negative");
}
new_config->repeat_rate = repeat_rate;
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}