1 files changed, 124 insertions, 29 deletions

diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 02592b5f..7e58b528 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -155,7 +155,7 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
         is specified, the view will be fullscreen across all outputs.
 
 *gaps* inner|outer|horizontal|vertical|top|right|bottom|left all|current
-set|plus|minus <amount>
+set|plus|minus|toggle <amount>
         Changes the _inner_ or _outer_ gaps for either _all_ workspaces or the
         _current_ workspace. _outer_ gaps can be altered per side with _top_,
         _right_, _bottom_, and _left_ or per direction with _horizontal_ and
@@ -176,6 +176,12 @@ set|plus|minus <amount>
 *layout* default|splith|splitv|stacking|tabbed
         Sets the layout mode of the focused container.
 
+        When using the _stacking_ layout, only the focused window in the container is
+        displayed, with the opened windows' list on the top of the container.
+
+        The _tabbed_ layout is similar to _stacking_, but the windows’ list is vertically
+        split.
+
 *layout* toggle [split|all]
         Cycles the layout mode of the focused container though a preset list of
         layouts. If no argument is given, then it cycles through stacking, tabbed
@@ -210,15 +216,14 @@ set|plus|minus <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|ptt]
+*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
@@ -319,8 +324,10 @@ set|plus|minus <amount>
         established by the *seat* subcommand of the same name. See
         *sway-input*(5) for more ways to affect inhibitors.
 
-*split* vertical|v|horizontal|h|toggle|t
-        Splits the current container, vertically or horizontally. When _toggle_ is
+*split* vertical|v|horizontal|h|none|n|toggle|t
+        Splits the current container, vertically or horizontally. When _none_ is
+        specified, the effect of a previous split is undone if the current
+        container is the only child of a split parent. When _toggle_ is
         specified, the current container is split opposite to the parent
         container's layout.
 
@@ -382,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
@@ -404,7 +411,7 @@ runtime.
         a keyboard shortcuts inhibitor is active for the currently focused
         window. Such inhibitors are usually requested by remote desktop and
         virtualization software to enable the user to send keyboard shortcuts
-        to the remote or virtual session. The _--inhibited_ flag allows to
+        to the remote or virtual session. The _--inhibited_ flag allows one to
         define bindings which will be exempt from pass-through to such
         software. The same preference logic as for _--locked_ applies.
 
@@ -447,7 +454,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>
@@ -480,6 +488,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.
 
@@ -497,6 +561,12 @@ runtime.
         *client.focused_inactive*
                 The most recently focused view within a container which is not focused.
 
+        *client.focused_tab_title*
+                A view that has focused descendant container.
+                Tab or stack container title that is the parent of the focused container
+                but is not directly focused. Defaults to focused_inactive if not
+                specified and does not use the indicator and child_border colors.
+
         *client.placeholder*
                 Ignored (present for i3 compatibility).
 
@@ -552,6 +622,12 @@ The default colors are:
 :  #ffffff
 :  #484e50
 :  #5f676a
+|  *focused_tab_title*
+:  #333333
+:  #5f676a
+:  #ffffff
+:  n/a
+:  n/a
 |  *unfocused*
 :  #333333
 :  #222222
@@ -573,7 +649,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
@@ -606,11 +683,11 @@ The default colors are:
         after switching between workspaces.
 
 *focus_on_window_activation* smart|urgent|focus|none
-        This option determines what to do when an xwayland client requests
-        window activation. If set to _urgent_, the urgent state will be set
-        for that window. If set to _focus_, the window will become focused.
-        If set to _smart_, the window will become focused only if it is already
-        visible, otherwise the urgent state will be set. Default is _urgent_.
+        This option determines what to do when a client requests window activation.
+        If set to _urgent_, the urgent state will be set for that window. If set to
+        _focus_, the window will become focused. If set to _smart_, the window will
+        become focused only if it is already visible, otherwise the urgent state
+        will be set. Default is _urgent_.
 
 *focus_wrapping* yes|no|force|workspace
         This option determines what to do when attempting to focus over the edge
@@ -630,14 +707,14 @@ The default colors are:
         should be used instead. Regardless of whether pango markup is enabled,
         _font_ should be specified as a pango font description. For more
         information on pango font descriptions, see
-        https://developer.gnome.org/pango/stable/pango-Fonts.html#pango-font-description-from-string
+        https://docs.gtk.org/Pango/type_func.FontDescription.from_string.html#description
 
 *force_display_urgency_hint* <timeout> [ms]
         If an application on another workspace sets an urgency hint, switching to this
         workspace may lead to immediate focus of the application, which also means the
-        window decoration color would be immediately resetted to *client.focused*. This
+        window decoration color would be immediately reset to *client.focused*. This
         may make it unnecessarily hard to tell which window originally raised the
-        event. This option allows to set a _timeout_ in ms to delay the urgency hint reset.
+        event. This option allows one to set a _timeout_ in ms to delay the urgency hint reset.
 
 *titlebar_border_thickness* <thickness>
         Thickness of the titlebar border in pixels
@@ -690,9 +767,10 @@ The default colors are:
         borders will only be enabled if the workspace has more than one visible
         child and gaps equal to zero.
 
-*smart_gaps* on|off
+*smart_gaps* on|off|toggle|inverse_outer
         If smart_gaps are _on_ gaps will only be enabled if a workspace has more
-        than one child.
+        than one child. If smart_gaps are _inverse_outer_ outer gaps will only
+        be enabled if a workspace has exactly one child.
 
 *mark* --add|--replace [--toggle] <identifier>
         Marks are arbitrary labels that can be used to identify certain windows and
@@ -731,6 +809,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
@@ -771,6 +853,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
@@ -876,6 +963,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
@@ -884,7 +974,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
@@ -898,12 +989,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.
@@ -928,12 +1021,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