Merge branch 'master' into destroy-output-destroy-empty-workspaces

1 files changed, 11 insertions, 0 deletions

diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd
index cf7a6385..b6391431 100644
--- a/sway/sway-input.5.scd
+++ b/sway/sway-input.5.scd
@@ -92,9 +92,20 @@ For more information on these xkb configuration options, see
 *input* <identifier> scroll\_method none|two\_finger|edge|on\_button\_down
         Changes the scroll method for the specified input device.
 
+*input* <identifier> scroll\_button <button\_identifier>
+        Sets button used for scroll\_method on\_button\_down. The button identifier
+        can be obtained from `libinput debug-events`.
+        If set to 0, it disables the scroll\_button on\_button\_down.
+
 *input* <identifier> tap enabled|disabled
         Enables or disables tap for specified input device.
 
+*input* <identifier> tap_button_map lrm|lmr
+        Specifies which button mapping to use for tapping. _lrm_ treats 1 finger as
+        left click, 2 fingers as right click, and 3 fingers as middle click. _lmr_
+        treats 1 finger as left click, 2 fingers as middle click, and 3 fingers as
+        right click.
+
 ## SEAT CONFIGURATION
 
 Configure options for multiseat mode. sway-seat commands must be used inside a