1 files changed, 94 insertions, 14 deletions

diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 2780370f..9f823947 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -216,15 +216,14 @@ set|plus|minus|toggle <amount>
         further details.
 
 *move* left|right|up|down [<px> px]
-        Moves the focused container in the direction specified. If the container,
-        the optional _px_ argument specifies how many pixels to move the container.
-        If unspecified, the default is 10 pixels. Pixels are ignored when moving
-        tiled containers.
+        Moves the focused container in the direction specified. The optional _px_
+        argument specifies how many pixels to move the container. If unspecified,
+        the default is 10 pixels. Pixels are ignored when moving tiled containers.
 
 *move* [absolute] position <pos_x> [px|ppt] <pos_y> [px|ppt]
         Moves the focused container to the specified position in the workspace.
         The position can be specified in pixels or percentage points, omitting
-        the unit defaults to pixels. If _absolute_ is used, the position is
+        the unit defaults to pixels. If _absolute_ is used, the position is
         relative to all outputs. _absolute_ can not be used with percentage points.
 
 *move* [absolute] position center
@@ -390,8 +389,8 @@ runtime.
                 for_window <criteria> move container to output <output>
 
 *bindsym* [--whole-window] [--border] [--exclude-titlebar] [--release] [--locked] \
-[--to-code] [--input-device=<device>] [--no-warn] [--no-repeat] [Group<1-4>+]<key combo> \
-<command>
+[--to-code] [--input-device=<device>] [--no-warn] [--no-repeat] [--inhibited] \
+[Group<1-4>+]<key combo> <command>
         Binds _key combo_ to execute the sway command _command_ when pressed. You
         may use XKB key names here (*wev*(1) is a good tool for discovering these).
         With the flag _--release_, the command is executed when the key combo is
@@ -401,6 +400,12 @@ runtime.
         only be available for that group. By default, if you overwrite a binding,
         swaynag will give you a warning. To silence this, use the _--no-warn_ flag.
 
+        For specifying modifier keys, you can use the XKB modifier names _Shift_,
+        _Lock_ (for Caps Lock), _Control_, _Mod1_ (for Alt), _Mod2_ (for Num Lock),
+        _Mod3_ (for XKB modifier Mod3), _Mod4_ (for the Logo key), and _Mod5_ (for
+        AltGr). In addition, you can use the aliases  _Ctrl_ (for Control), _Alt_
+        (for Alt), and _Super_ (for the Logo key).
+
         Unless the flag _--locked_ is set, the command will not be run when a
         screen locking program is active. If there is a matching binding with
         and without _--locked_, the one with will be preferred when locked and the
@@ -455,7 +460,8 @@ runtime.
 ```
 
         *bindcode* [--whole-window] [--border] [--exclude-titlebar] [--release] \
-[--locked] [--input-device=<device>] [--no-warn] [Group<1-4>+]<code> <command>
+[--locked] [--input-device=<device>] [--no-warn] [--no-repeat] [--inhibited] \
+[Group<1-4>+]<code> <command>
         is also available for binding with key/button codes instead of key/button names.
 
 *bindswitch* [--locked] [--no-warn] [--reload] <switch>:<state> <command>
@@ -488,6 +494,62 @@ runtime.
                 bindswitch lid:toggle exec echo "Lid moved"
 ```
 
+*bindgesture* [--exact] [--input-device=<device>] [--no-warn] \
+<gesture>[:<fingers>][:directions] <command>
+        Binds _gesture_ to execute the sway command _command_ when detected.
+        Currently supports the _hold_, _pinch_ or _swipe_ gesture. Optionally
+        can be limited to bind to a certain number of _fingers_ or, for a
+        _pinch_ or _swipe_ gesture, to certain _directions_.
+
+[[ *type*
+:[ *fingers*
+:< *direction*
+|  hold
+:- 1 - 5
+:  none
+|  swipe
+:  3 - 5
+:  up, down, left, right
+|  pinch
+:  2 - 5
+:  all above + inward, outward, clockwise, counterclockwise
+
+        The _fingers_ can be limited to any sensible number or left empty to accept
+        any finger counts.
+        Valid directions are _up_, _down_, _left_ and _right_, as well as _inward_,
+        _outward_, _clockwise_, _counterclockwise_ for the _pinch_ gesture.
+        Multiple directions can be combined by a plus.
+
+        If a _input-device_ is given, the binding will only be executed for
+        that input device and will be executed instead of any binding that is
+        generic to all devices. By default, if you overwrite a binding,
+        swaynag will give you a warning. To silence this, use the _--no-warn_ flag.
+
+        The _--exact_ flag can be used to ensure a binding only matches when exactly
+        all specified directions are matched and nothing more. If there is matching
+        binding with _--exact_, it will be preferred.
+
+        The priority for matching bindings is as follows: input device, then
+        exact matches followed by matches with the highest number of matching
+        directions.
+
+        Gestures executed while the pointer is above a bar are not handled by sway.
+        See the respective documentation, e.g. *bindgesture* in *sway-bar*(5).
+
+        Example:
+```
+                # Allow switching between workspaces with left and right swipes
+                bindgesture swipe:right workspace prev
+                bindgesture swipe:left workspace next
+
+                # Allow container movements by pinching them
+                bindgesture pinch:inward+up move up
+                bindgesture pinch:inward+down move down
+                bindgesture pinch:inward+left move left
+                bindgesture pinch:inward+right move right
+
+```
+
 *client.background* <color>
         This command is ignored and is only present for i3 compatibility.
 
@@ -593,7 +655,8 @@ The default colors are:
 
 
 *default_border* normal|none|pixel [<n>]
-        Set default border style for new tiled windows.
+        Set default border style for new tiled windows. Config reload won't affect
+        existing windows, only newly created ones after the reload.
 
 *default_floating_border* normal|none|pixel [<n>]
         Set default border style for new floating windows. This only applies to
@@ -752,6 +815,10 @@ The default colors are:
         dialog will not be rendered. If _leave_fullscreen_, the view will exit
         fullscreen mode and the dialog will be rendered.
 
+*primary_selection* enabled|disabled
+        Enable or disable the primary selection clipboard. May only be configured
+        at launch. Default is _enabled_.
+
 *set* $<name> <value>
         Sets variable $_name_ to _value_. You can use the new variable in the
         arguments of future commands. When the variable is used, it can be escaped
@@ -792,6 +859,11 @@ The default colors are:
 *unbindswitch* <switch>:<state>
         Removes a binding for when <switch> changes to <state>.
 
+*unbindgesture* [--exact] [--input-device=<device>] \
+<gesture>[:<fingers>][:directions]
+        Removes a binding for the specified _gesture_, _fingers_
+        and _directions_ combination.
+
 *unbindsym* [--whole-window] [--border] [--exclude-titlebar] [--release] [--locked] \
 [--to-code] [--input-device=<device>] <key combo>
         Removes the binding for _key combo_ that was previously bound with the
@@ -897,6 +969,9 @@ properties in practice for your applications.
 
 The following attributes may be matched with:
 
+*all*
+        Matches all windows.
+
 *app_id*
         Compare value against the app id. Can be a regular expression. If value is
         \_\_focused\_\_, then the app id must be the same as that of the currently
@@ -905,7 +980,8 @@ The following attributes may be matched with:
 *class*
         Compare value against the window class. Can be a regular expression. If
         value is \_\_focused\_\_, then the window class must be the same as that of
-        the currently focused window. _class_ are specific to X11 applications.
+        the currently focused window. _class_ are specific to X11 applications and
+        require XWayland.
 
 *con_id*
         Compare against the internal container ID, which you can find via IPC. If
@@ -919,12 +995,14 @@ The following attributes may be matched with:
         Matches floating windows.
 
 *id*
-        Compare value against the X11 window ID. Must be numeric.
+        Compare value against the X11 window ID. Must be numeric. id is specific to
+        X11 applications and requires XWayland.
 
 *instance*
         Compare value against the window instance. Can be a regular expression. If
         value is \_\_focused\_\_, then the window instance must be the same as that
-        of the currently focused window.
+        of the currently focused window. instance is specific to X11 applications and
+        requires XWayland.
 
 *pid*
         Compare value against the window's process ID. Must be numeric.
@@ -949,12 +1027,14 @@ The following attributes may be matched with:
 *window_role*
         Compare against the window role (WM_WINDOW_ROLE). Can be a regular
         expression. If value is \_\_focused\_\_, then the window role must be the
-        same as that of the currently focused window.
+        same as that of the currently focused window. window_role is specific to X11
+        applications and requires XWayland.
 
 *window_type*
         Compare against the window type (\_NET_WM_WINDOW_TYPE). Possible values
         are normal, dialog, utility, toolbar, splash, menu, dropdown_menu,
-        popup_menu, tooltip and notification.
+        popup_menu, tooltip and notification. window_type is specific to X11
+        applications and requires XWayland.
 
 *workspace*
         Compare against the workspace name for this view. Can be a regular