mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add scroll factor config option.

Browse source
This commit is contained in:
Spencer Michaels 2018-11-17 14:31:33 -05:00
parent b87250425f
commit 70bc4c3ab6
11 changed files with 80 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/commands/input.c
View file

@ -22,6 +22,7 @@ static struct cmd_handler input_handlers[] = {
{ "repeat_delay", input_cmd_repeat_delay },
{ "repeat_rate", input_cmd_repeat_rate },
{ "scroll_button", input_cmd_scroll_button },
{ "scroll_factor", input_cmd_scroll_factor },
{ "scroll_method", input_cmd_scroll_method },
{ "tap", input_cmd_tap },
{ "tap_button_map", input_cmd_tap_button_map },

9
sway/commands/input/pointer_accel.c
View file

@ -1,8 +1,10 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -15,8 +17,11 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
"pointer_accel", "No input device defined.");
}
float pointer_accel = atof(argv[0]);
if (pointer_accel < -1 || pointer_accel > 1) {
float pointer_accel = parse_float(argv[0]);
if (isnan(pointer_accel)) {
return cmd_results_new(CMD_INVALID, "pointer_accel",
"Invalid pointer accel; expected float.");
} if (pointer_accel < -1 || pointer_accel > 1) {
return cmd_results_new(CMD_INVALID, "pointer_accel",
"Input out of range [-1, 1]");
}

32
sway/commands/input/scroll_factor.c Normal file
View file

@ -0,0 +1,32 @@
#include <errno.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_scroll_factor(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "scroll_factor", EXPECTED_AT_LEAST, 1))) {
return error;
}
struct input_config *ic = config->handler_context.input_config;
if (!ic) {
return cmd_results_new(CMD_FAILURE,
"scroll_factor", "No input device defined.");
}
float scroll_factor = parse_float(argv[0]);
if (isnan(scroll_factor)) {
return cmd_results_new(CMD_INVALID, "scroll_factor",
"Invalid scroll factor; expected float.");
} else if (scroll_factor < 0) {
return cmd_results_new(CMD_INVALID, "scroll_factor",
"Scroll factor cannot be negative.");
}
ic->scroll_factor = scroll_factor;
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}