aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-11-18 14:05:03 -0500
committerLibravatar GitHub <noreply@github.com>2018-11-18 14:05:03 -0500
commitb2c5248ad36a7a5cf342aa44a21a0956c025c43f (patch)
tree265d4ea923f1329d1e7661c0f92a242337318d58 /include
parentMerge pull request #3147 from emersion/set10 (diff)
parentAdd scroll factor config option. (diff)
downloadsway-b2c5248ad36a7a5cf342aa44a21a0956c025c43f.tar.gz
sway-b2c5248ad36a7a5cf342aa44a21a0956c025c43f.tar.zst
sway-b2c5248ad36a7a5cf342aa44a21a0956c025c43f.zip
Merge pull request #3018 from sxmichaels/add-scroll-factor
Add scroll factor input command.
Diffstat (limited to 'include')
-rw-r--r--include/sway/commands.h1
-rw-r--r--include/sway/config.h1
-rw-r--r--include/util.h6
3 files changed, 8 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 6606775a..2fe8a631 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -229,6 +229,7 @@ sway_cmd input_cmd_map_to_output;
229sway_cmd input_cmd_middle_emulation; 229sway_cmd input_cmd_middle_emulation;
230sway_cmd input_cmd_natural_scroll; 230sway_cmd input_cmd_natural_scroll;
231sway_cmd input_cmd_pointer_accel; 231sway_cmd input_cmd_pointer_accel;
232sway_cmd input_cmd_scroll_factor;
232sway_cmd input_cmd_repeat_delay; 233sway_cmd input_cmd_repeat_delay;
233sway_cmd input_cmd_repeat_rate; 234sway_cmd input_cmd_repeat_rate;
234sway_cmd input_cmd_scroll_button; 235sway_cmd input_cmd_scroll_button;
diff --git a/include/sway/config.h b/include/sway/config.h
index 79c4359b..658b4a01 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -100,6 +100,7 @@ struct input_config {
100 int middle_emulation; 100 int middle_emulation;
101 int natural_scroll; 101 int natural_scroll;
102 float pointer_accel; 102 float pointer_accel;
103 float scroll_factor;
103 int repeat_delay; 104 int repeat_delay;
104 int repeat_rate; 105 int repeat_rate;
105 int scroll_button; 106 int scroll_button;
diff --git a/include/util.h b/include/util.h
index f143d0c0..84318fe7 100644
--- a/include/util.h
+++ b/include/util.h
@@ -59,6 +59,12 @@ uint32_t parse_color(const char *color);
59 */ 59 */
60bool parse_boolean(const char *boolean, bool current); 60bool parse_boolean(const char *boolean, bool current);
61 61
62/**
63 * Given a string that represents a floating point value, return a float.
64 * Returns NAN on error.
65 */
66float parse_float(const char *value);
67
62enum wlr_direction opposite_direction(enum wlr_direction d); 68enum wlr_direction opposite_direction(enum wlr_direction d);
63 69
64#endif 70#endif