added "toggle" option to "split" command

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index 92348fb5c41b946bb321dc34eea64e9f49066d0a..59833ed5e3535e6adc71a4668ac9204c8216d71f 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -4,8 +4,9 @@ Michael Stapelberg <michael@i3wm.org>
 March 2013
 
 This document contains all the information you need to configure and use the i3
 March 2013
 
 This document contains all the information you need to configure and use the i3

-window manager. If it does not, please check http://faq.i3wm.org/ first, then
-contact us on IRC (preferred) or post your question(s) on the mailing list.
+window manager. If it does not, please check https://www.reddit.com/r/i3wm/
+first, then contact us on IRC (preferred) or post your question(s) on the
+mailing list.

 
 == Default keybindings
 
 
 == Default keybindings
 


@@ -33,15 +34,15 @@ above, just decline i3-config-wizard’s offer and base your config on
 == Using i3
 
 Throughout this guide, the keyword +$mod+ will be used to refer to the
 == Using i3
 
 Throughout this guide, the keyword +$mod+ will be used to refer to the

-configured modifier. This is the Alt key (Mod1) by default, with the Windows
-key (Mod4) being a popular alternative.
+configured modifier. This is the Alt key (+Mod1+) by default, with the Windows
+key (+Mod4+) being a popular alternative.

 
 === Opening terminals and moving around
 
 One very basic operation is opening a new terminal. By default, the keybinding
 
 === Opening terminals and moving around
 
 One very basic operation is opening a new terminal. By default, the keybinding

-for this is $mod+Enter, that is Alt+Enter in the default configuration. By
-pressing $mod+Enter, a new terminal will be opened.  It will fill the whole
-space available on your screen.
+for this is +$mod+Enter+, that is Alt+Enter (+Mod1+Enter+) in the default
+configuration. By pressing +$mod+Enter+, a new terminal will be opened.  It
+will fill the whole space available on your screen.

 
 image:single_terminal.png[Single terminal]
 
 
 image:single_terminal.png[Single terminal]
 


@@ -55,9 +56,9 @@ image:two_terminals.png[Two terminals]
 To move the focus between the two terminals, you can use the direction keys
 which you may know from the editor +vi+. However, in i3, your homerow is used
 for these keys (in +vi+, the keys are shifted to the left by one for
 To move the focus between the two terminals, you can use the direction keys
 which you may know from the editor +vi+. However, in i3, your homerow is used
 for these keys (in +vi+, the keys are shifted to the left by one for

-compatibility with most keyboard layouts). Therefore, +$mod+J+ is left, +$mod+K+
-is down, +$mod+L+ is up and `$mod+;` is right. So, to switch between the
-terminals, use +$mod+K+ or +$mod+L+. Of course, you can also use the arrow keys.
+compatibility with most keyboard layouts). Therefore, +$mod+j+ is left, +$mod+k+
+is down, +$mod+l+ is up and `$mod+;` is right. So, to switch between the
+terminals, use +$mod+k+ or +$mod+l+. Of course, you can also use the arrow keys.

 
 At the moment, your workspace is split (it contains two terminals) in a
 specific direction (horizontal by default). Every window can be split
 
 At the moment, your workspace is split (it contains two terminals) in a
 specific direction (horizontal by default). Every window can be split


@@ -114,7 +115,7 @@ create a keybinding for starting the application directly. See the section
 === Closing windows
 
 If an application does not provide a mechanism for closing (most applications
 === Closing windows
 
 If an application does not provide a mechanism for closing (most applications

-provide a menu, the escape key or a shortcut like +Control+W+ to close), you
+provide a menu, the escape key or a shortcut like +Control+w+ to close), you

 can press +$mod+Shift+q+ to kill a window. For applications which support
 the WM_DELETE protocol, this will correctly close the application (saving
 any modifications or doing other cleanup). If the application doesn’t support
 can press +$mod+Shift+q+ to kill a window. For applications which support
 the WM_DELETE protocol, this will correctly close the application (saving
 any modifications or doing other cleanup). If the application doesn’t support


@@ -205,9 +206,8 @@ like this:
 image::tree-layout2.png["layout2",float="right"]
 image::tree-shot4.png["shot4",title="Two terminals on standard workspace"]
 
 image::tree-layout2.png["layout2",float="right"]
 image::tree-shot4.png["shot4",title="Two terminals on standard workspace"]
 

-=== Orientation and Split Containers
-

 [[OrientationSplit]]
 [[OrientationSplit]]

+=== Orientation and Split Containers

 
 It is only natural to use so-called +Split Containers+ in order to build a
 layout when using a tree as data structure. In i3, every +Container+ has an
 
 It is only natural to use so-called +Split Containers+ in order to build a
 layout when using a tree as data structure. In i3, every +Container+ has an


@@ -291,7 +291,7 @@ with a text editor.
 
 On first start (and on all following starts, unless you have a configuration
 file), i3 will offer you to create a configuration file. You can tell the
 
 On first start (and on all following starts, unless you have a configuration
 file), i3 will offer you to create a configuration file. You can tell the

-wizard to use either Alt (Mod1) or Windows (Mod4) as modifier in the config
+wizard to use either Alt (+Mod1+) or Windows (+Mod4+) as modifier in the config

 file. Also, the created config file will use the key symbols of your current
 keyboard layout. To start the wizard, use the command +i3-config-wizard+.
 Please note that you must not have +~/.i3/config+, otherwise the wizard will
 file. Also, the created config file will use the key symbols of your current
 keyboard layout. To start the wizard, use the command +i3-config-wizard+.
 Please note that you must not have +~/.i3/config+, otherwise the wizard will


@@ -309,7 +309,6 @@ a # and can only be used at the beginning of a line:
 -------------------
 
 [[fonts]]
 -------------------
 
 [[fonts]]

-

 === Fonts
 
 i3 has support for both X core fonts and FreeType fonts (through Pango) to
 === Fonts
 
 i3 has support for both X core fonts and FreeType fonts (through Pango) to


@@ -342,7 +341,6 @@ font pango:Terminus 11px
 --------------------------------------------------------------
 
 [[keybindings]]
 --------------------------------------------------------------
 
 [[keybindings]]

-

 === Keyboard bindings
 
 A keyboard binding makes i3 execute a command (see below) upon pressing a
 === Keyboard bindings
 
 A keyboard binding makes i3 execute a command (see below) upon pressing a


@@ -407,7 +405,6 @@ corresponding group. For backwards compatibility, the group “Mode_switch” is
 alias for Group2.
 
 [[mousebindings]]
 alias for Group2.
 
 [[mousebindings]]

-

 === Mouse bindings
 
 A mouse binding makes i3 execute a command upon pressing a specific mouse
 === Mouse bindings
 
 A mouse binding makes i3 execute a command upon pressing a specific mouse


@@ -445,7 +442,6 @@ bindsym button8 move right
 --------------------------------
 
 [[binding_modes]]
 --------------------------------
 
 [[binding_modes]]

-

 === Binding modes
 
 You can have multiple sets of bindings by using different binding modes. When
 === Binding modes
 
 You can have multiple sets of bindings by using different binding modes. When


@@ -498,7 +494,6 @@ mode "$mode_launcher" {
 ------------------------------------------------------------------------
 
 [[floating_modifier]]
 ------------------------------------------------------------------------
 
 [[floating_modifier]]

-

 === The floating modifier
 
 To move floating windows with your mouse, you can either grab their titlebar
 === The floating modifier
 
 To move floating windows with your mouse, you can either grab their titlebar


@@ -626,9 +621,8 @@ hide_edge_borders none|vertical|horizontal|both
 hide_edge_borders vertical
 ----------------------
 
 hide_edge_borders vertical
 ----------------------
 

-=== Arbitrary commands for specific windows (for_window)
-

 [[for_window]]
 [[for_window]]

+=== Arbitrary commands for specific windows (for_window)

 
 With the +for_window+ command, you can let i3 execute any command when it
 encounters a specific window. This can be used to set windows to floating or to
 
 With the +for_window+ command, you can let i3 execute any command when it
 encounters a specific window. This can be used to set windows to floating or to


@@ -655,9 +649,8 @@ for_window [title="x200: ~/work"] floating enable
 
 The valid criteria are the same as those for commands, see <<command_criteria>>.
 
 
 The valid criteria are the same as those for commands, see <<command_criteria>>.
 

-=== Don't focus window upon opening
-

 [[no_focus]]
 [[no_focus]]

+=== Don't focus window upon opening

 
 When a new window appears, it will be focused. The +no_focus+ directive allows preventing
 this from happening and must be used in combination with <<command_criteria>>.
 
 When a new window appears, it will be focused. The +no_focus+ directive allows preventing
 this from happening and must be used in combination with <<command_criteria>>.


@@ -681,7 +674,6 @@ no_focus [window_role="pop-up"]
 -------------------------------
 
 [[variables]]
 -------------------------------
 
 [[variables]]

-

 === Variables
 
 As you learned in the section about keyboard bindings, you will have
 === Variables
 
 As you learned in the section about keyboard bindings, you will have


@@ -707,9 +699,8 @@ absolutely no plans to change this. If you need a more dynamic configuration
 you should create a little script which generates a configuration file and run
 it before starting i3 (for example in your +~/.xsession+ file).
 
 you should create a little script which generates a configuration file and run
 it before starting i3 (for example in your +~/.xsession+ file).
 

-=== Automatically putting clients on specific workspaces
-

 [[assign_workspace]]
 [[assign_workspace]]

+=== Automatically putting clients on specific workspaces

 
 To automatically make a specific window show up on a specific workspace, you
 can use an *assignment*. You can match windows by using any criteria,
 
 To automatically make a specific window show up on a specific workspace, you
 can use an *assignment*. You can match windows by using any criteria,


@@ -794,7 +785,7 @@ keyword. These commands will be run in order.
 
 See <<command_chaining>> for details on the special meaning of +;+ (semicolon)
 and +,+ (comma): they chain commands together in i3, so you need to use quoted
 
 See <<command_chaining>> for details on the special meaning of +;+ (semicolon)
 and +,+ (comma): they chain commands together in i3, so you need to use quoted

-strings if they appear in your command.
+strings (as shown in <<exec_quoting>>) if they appear in your command.

 
 *Syntax*:
 ---------------------------------------
 
 *Syntax*:
 ---------------------------------------


@@ -814,7 +805,6 @@ exec --no-startup-id urxvt
 The flag --no-startup-id is explained in <<exec>>.
 
 [[workspace_screen]]
 The flag --no-startup-id is explained in <<exec>>.
 
 [[workspace_screen]]

-

 === Automatically putting workspaces on specific screens
 
 If you assign clients to workspaces, it might be handy to put the
 === Automatically putting workspaces on specific screens
 
 If you assign clients to workspaces, it might be handy to put the


@@ -1073,9 +1063,8 @@ force_display_urgency_hint <timeout> ms
 force_display_urgency_hint 500 ms
 ---------------------------------
 
 force_display_urgency_hint 500 ms
 ---------------------------------
 

-=== Focus on window activation
-

 [[focus_on_window_activation]]
 [[focus_on_window_activation]]

+=== Focus on window activation

 
 If a window is activated, e.g., via +google-chrome www.google.com+, it may request
 to take focus. Since this may not preferable, different reactions can be configured.
 
 If a window is activated, e.g., via +google-chrome www.google.com+, it may request
 to take focus. Since this may not preferable, different reactions can be configured.


@@ -1100,6 +1089,7 @@ focus::
 none::
     The window will neither be focused, nor be marked urgent.
 
 none::
     The window will neither be focused, nor be marked urgent.
 

+[[show_marks]]

 === Drawing marks on window decoration
 
 If activated, marks on windows are drawn in their window decoration. However,
 === Drawing marks on window decoration
 
 If activated, marks on windows are drawn in their window decoration. However,


@@ -1119,7 +1109,6 @@ show_marks yes
 --------------
 
 [[line_continuation]]
 --------------
 
 [[line_continuation]]

-

 === Line continuation
 
 Config files support line continuation, meaning when you end a line in a
 === Line continuation
 
 Config files support line continuation, meaning when you end a line in a


@@ -1381,6 +1370,11 @@ NetworkManager, VLC, Pidgin, etc. can place little icons.
 You can configure on which output (monitor) the icons should be displayed or
 you can turn off the functionality entirely.
 
 You can configure on which output (monitor) the icons should be displayed or
 you can turn off the functionality entirely.
 

+You can use mutliple +tray_output+ directives in your config to specify a list
+of outputs on which you want the tray to appear. The first available output in
+that list as defined by the order of the directives will be used for the tray
+output.
+

 *Syntax*:
 ---------------------------------
 tray_output none|primary|<output>
 *Syntax*:
 ---------------------------------
 tray_output none|primary|<output>


@@ -1541,6 +1535,15 @@ statusline::
        Text color to be used for the statusline.
 separator::
        Text color to be used for the separator.
        Text color to be used for the statusline.
 separator::
        Text color to be used for the separator.

+focused_background::
+       Background color of the bar on the currently focused monitor output. If
+       not used, the color will be taken from +background+.
+focused_statusline::
+       Text color to be used for the statusline on the currently focused
+       monitor output. If not used, the color will be taken from +statusline+.
+focused_separator::
+       Text color to be used for the separator on the currently focused
+       monitor output. If not used, the color will be taken from +separator+.

 focused_workspace::
        Border, background and text color for a workspace button when the workspace
        has focus.
 focused_workspace::
        Border, background and text color for a workspace button when the workspace
        has focus.


@@ -1642,25 +1645,25 @@ The criteria which are currently implemented are:
 
 class::
        Compares the window class (the second part of WM_CLASS). Use the
 
 class::
        Compares the window class (the second part of WM_CLASS). Use the

-       special value +__focused__+ to match all windows having the same window
+       special value +\_\_focused__+ to match all windows having the same window

        class as the currently focused window.
 instance::
        Compares the window instance (the first part of WM_CLASS). Use the
        class as the currently focused window.
 instance::
        Compares the window instance (the first part of WM_CLASS). Use the

-       special value +__focused__+ to match all windows having the same window
+       special value +\_\_focused__+ to match all windows having the same window

        instance as the currently focused window.
 window_role::
        Compares the window role (WM_WINDOW_ROLE). Use the special value
        instance as the currently focused window.
 window_role::
        Compares the window role (WM_WINDOW_ROLE). Use the special value

-       +__focused__+ to match all windows having the same window role as the
+       +\_\_focused__+ to match all windows having the same window role as the

        currently focused window.
 window_type::
        Compare the window type (_NET_WM_WINDOW_TYPE). Possible values are
        +normal+, +dialog+, +utility+, +toolbar+, +splash+, +menu+, +dropdown_menu+,
        currently focused window.
 window_type::
        Compare the window type (_NET_WM_WINDOW_TYPE). Possible values are
        +normal+, +dialog+, +utility+, +toolbar+, +splash+, +menu+, +dropdown_menu+,

-       +popup_menu+ and +tooltip+.
+       +popup_menu+, +tooltip+ and +notification+.

 id::
        Compares the X11 window ID, which you can get via +xwininfo+ for example.
 title::
 id::
        Compares the X11 window ID, which you can get via +xwininfo+ for example.
 title::

-       Compares the X11 window title (_NET_WM_NAME or WM_NAME as fallback).
-       Use the special value +__focused__+ to match all windows having the
+       Compares the X11 window title (\_NET_WM_NAME or WM_NAME as fallback).
+       Use the special value +\_\_focused__+ to match all windows having the

        same window title as the currently focused window.
 urgent::
        Compares the urgent state of the window. Can be "latest" or "oldest".
        same window title as the currently focused window.
 urgent::
        Compares the urgent state of the window. Can be "latest" or "oldest".


@@ -1668,20 +1671,22 @@ urgent::
        (The following aliases are also available: newest, last, recent, first)
 workspace::
        Compares the workspace name of the workspace the window belongs to. Use
        (The following aliases are also available: newest, last, recent, first)
 workspace::
        Compares the workspace name of the workspace the window belongs to. Use

-       the special value +__focused__+ to match all windows in the currently
+       the special value +\_\_focused__+ to match all windows in the currently

        focused workspace.
 con_mark::
        focused workspace.
 con_mark::

-       Compares the mark set for this container, see <<vim_like_marks>>.
+        Compares the marks set for this container, see <<vim_like_marks>>. A
+        match is made if any of the container's marks matches the specified
+        mark.

 con_id::
        Compares the i3-internal container ID, which you can get via the IPC
 con_id::
        Compares the i3-internal container ID, which you can get via the IPC

-       interface. Handy for scripting.
+       interface. Handy for scripting. Use the special value +\_\_focused__+
+       to match only the currently focused window.

 
 The criteria +class+, +instance+, +role+, +title+, +workspace+ and +mark+ are
 actually regular expressions (PCRE). See +pcresyntax(3)+ or +perldoc perlre+ for
 information on how to use them.
 
 [[exec]]
 
 The criteria +class+, +instance+, +role+, +title+, +workspace+ and +mark+ are
 actually regular expressions (PCRE). See +pcresyntax(3)+ or +perldoc perlre+ for
 information on how to use them.
 
 [[exec]]

-

 === Executing applications (exec)
 
 What good is a window manager if you can’t actually start any applications?
 === Executing applications (exec)
 
 What good is a window manager if you can’t actually start any applications?


@@ -1691,7 +1696,7 @@ searched in your +$PATH+.
 
 See <<command_chaining>> for details on the special meaning of +;+ (semicolon)
 and +,+ (comma): they chain commands together in i3, so you need to use quoted
 
 See <<command_chaining>> for details on the special meaning of +;+ (semicolon)
 and +,+ (comma): they chain commands together in i3, so you need to use quoted

-strings if they appear in your command.
+strings (as shown in <<exec_quoting>>) if they appear in your command.

 
 *Syntax*:
 --------------------------------
 
 *Syntax*:
 --------------------------------


@@ -1715,6 +1720,27 @@ launching. So, if an application is not startup-notification aware (most GTK
 and Qt using applications seem to be, though), you will end up with a watch
 cursor for 60 seconds.
 
 and Qt using applications seem to be, though), you will end up with a watch
 cursor for 60 seconds.
 

+[[exec_quoting]]
+If the command to be executed contains a +;+ (semicolon) and/or a +,+ (comma),
+the entire command must be quoted. For example, to have a keybinding for the
+shell command +notify-send Hello, i3+, you would add an entry to your
+configuration file like this:
+
+*Example*:
+------------------------------
+# Execute a command with a comma in it
+bindsym $mod+p exec "notify-send Hello, i3"
+------------------------------
+
+If however a command with a comma and/or semicolon itself requires quotes, you
+must escape the internal quotation marks with double backslashes, like this:
+
+*Example*:
+------------------------------
+# Execute a command with a comma, semicolon and internal quotes
+bindsym $mod+p exec "notify-send \\"Hello, i3; from $USER\\""
+------------------------------
+

 === Splitting containers
 
 The split command makes the current window a split container. Split containers
 === Splitting containers
 
 The split command makes the current window a split container. Split containers


@@ -1724,20 +1750,24 @@ get placed below the current one (splitv).
 
 If you apply this command to a split container with the same orientation,
 nothing will happen. If you use a different orientation, the split container’s
 
 If you apply this command to a split container with the same orientation,
 nothing will happen. If you use a different orientation, the split container’s

-orientation will be changed (if it does not have more than one window). Use
-+layout toggle split+ to change the layout of any split container from splitv
-to splith or vice-versa.
+orientation will be changed (if it does not have more than one window).
+The +toggle+ option will toggle the orientation of the split container if it
+contains a single window. Otherwise it makes the current window a split
+container with opposite orientation compared to the parent container.
+Use +layout toggle split+ to change the layout of any split container from
+splitv to splith or vice-versa.

 
 *Syntax*:
 
 *Syntax*:

--------------------------
-split vertical|horizontal
--------------------------
+--------------------------------
+split vertical|horizontal|toggle
+--------------------------------

 
 *Example*:
 
 *Example*:

-------------------------------
+-------------------------------

 bindsym $mod+v split vertical
 bindsym $mod+h split horizontal
 bindsym $mod+v split vertical
 bindsym $mod+h split horizontal

-------------------------------
+bindsym $mod+t split toggle
+-------------------------------

 
 === Manipulating layout
 
 
 === Manipulating layout
 


@@ -1779,7 +1809,6 @@ bindsym $mod+t floating toggle
 --------------
 
 [[_focusing_moving_containers]]
 --------------
 
 [[_focusing_moving_containers]]

-

 === Focusing containers
 
 To change focus, you can use the +focus+ command. The following options are
 === Focusing containers
 
 To change focus, you can use the +focus+ command. The following options are


@@ -1895,8 +1924,11 @@ for_window [instance=notepad] sticky enable
 === Changing (named) workspaces/moving to workspaces
 
 To change to a specific workspace, use the +workspace+ command, followed by the
 === Changing (named) workspaces/moving to workspaces
 
 To change to a specific workspace, use the +workspace+ command, followed by the

-number or name of the workspace. To move containers to specific workspaces, use
-+move container to workspace+.
+number or name of the workspace. Pass the optional flag
++--no-auto-back-and-forth+ to disable <<back_and_forth>> for this specific call
+only.
+
+To move containers to specific workspaces, use +move container to workspace+.

 
 You can also switch to the next and previous workspace with the commands
 +workspace next+ and +workspace prev+, which is handy, for example, if you have
 
 You can also switch to the next and previous workspace with the commands
 +workspace next+ and +workspace prev+, which is handy, for example, if you have


@@ -1924,16 +1956,16 @@ back_and_forth+; likewise, you can move containers to the previously focused
 workspace using +move container to workspace back_and_forth+.
 
 *Syntax*:
 workspace using +move container to workspace back_and_forth+.
 
 *Syntax*:

------------------------------------
+--------------------------------------------------------------------------------

 workspace next|prev|next_on_output|prev_on_output
 workspace back_and_forth
 workspace next|prev|next_on_output|prev_on_output
 workspace back_and_forth

-workspace <name>
-workspace number <name>
+workspace [--no-auto-back-and-forth] <name>
+workspace [--no-auto-back-and-forth] number <name>

 
 

-move [window|container] [to] workspace <name>
-move [window|container] [to] workspace number <name>
+move [--no-auto-back-and-forth] [window|container] [to] workspace <name>
+move [--no-auto-back-and-forth] [window|container] [to] workspace number <name>

 move [window|container] [to] workspace prev|next|current
 move [window|container] [to] workspace prev|next|current

------------------------------------
+--------------------------------------------------------------------------------

 
 *Examples*:
 -------------------------
 
 *Examples*:
 -------------------------


@@ -2015,9 +2047,8 @@ bindsym $mod+r exec i3-input -F 'rename workspace to "%s"' -P 'New name: '
 See <<move_to_outputs>> for how to move a container/workspace to a different
 RandR output.
 
 See <<move_to_outputs>> for how to move a container/workspace to a different
 RandR output.
 

-=== Moving containers/workspaces to RandR outputs
-

 [[move_to_outputs]]
 [[move_to_outputs]]

+=== Moving containers/workspaces to RandR outputs

 
 To move a container to another RandR output (addressed by names like +LVDS1+ or
 +VGA1+) or to a RandR output identified by a specific direction (like +left+,
 
 To move a container to another RandR output (addressed by names like +LVDS1+ or
 +VGA1+) or to a RandR output identified by a specific direction (like +left+,


@@ -2039,7 +2070,7 @@ bindsym $mod+x move workspace to output right
 bindsym $mod+x move container to output VGA1
 --------------------------------------------------------
 
 bindsym $mod+x move container to output VGA1
 --------------------------------------------------------
 

-=== Moving containers/workspaces to marks
+=== Moving containers/windows to marks

 
 To move a container to another container with a specific mark (see <<vim_like_marks>>),
 you can use the following command.
 
 To move a container to another container with a specific mark (see <<vim_like_marks>>),
 you can use the following command.


@@ -2060,7 +2091,6 @@ for_window [instance="tabme"] move window to mark target
 --------------------------------------------------------
 
 [[resizingconfig]]
 --------------------------------------------------------
 
 [[resizingconfig]]

-

 === Resizing containers/windows
 
 If you want to resize containers/windows using your keyboard, you can use the
 === Resizing containers/windows
 
 If you want to resize containers/windows using your keyboard, you can use the


@@ -2112,9 +2142,8 @@ with criteria for that.
 bindsym $mod+a [class="urxvt" title="VIM"] focus
 ------------------------------------------------
 
 bindsym $mod+a [class="urxvt" title="VIM"] focus
 ------------------------------------------------
 

-=== VIM-like marks (mark/goto)
-

 [[vim_like_marks]]
 [[vim_like_marks]]

+=== VIM-like marks (mark/goto)

 
 This feature is like the jump feature: It allows you to directly jump to a
 specific window (this means switching to the appropriate workspace and setting
 
 This feature is like the jump feature: It allows you to directly jump to a
 specific window (this means switching to the appropriate workspace and setting


@@ -2130,24 +2159,36 @@ for this purpose: It lets you input a command and sends the command to i3. It
 can also prefix this command and display a custom prompt for the input dialog.
 
 The additional +--toggle+ option will remove the mark if the window already has
 can also prefix this command and display a custom prompt for the input dialog.
 
 The additional +--toggle+ option will remove the mark if the window already has

-this mark, add it if the window has none or replace the current mark if it has
-another mark.
+this mark or add it otherwise. Note that you may need to use this in
+combination with +--add+ (see below) as any other marks will otherwise be
+removed.

 
 

-Refer to +show_marks+ if you don't want marks to be shown in the window decoration.
+By default, a window can only have one mark. You can use the +--add+ flag to
+put more than one mark on a window.
+
+Refer to <<show_marks>> if you don't want marks to be shown in the window decoration.

 
 *Syntax*:
 
 *Syntax*:

-------------------------------
-mark [--toggle] <identifier>
+----------------------------------------------
+mark [--add|--replace] [--toggle] <identifier>

 [con_mark="identifier"] focus
 unmark <identifier>
 [con_mark="identifier"] focus
 unmark <identifier>

-------------------------------
+----------------------------------------------

 
 *Example (in a terminal)*:
 
 *Example (in a terminal)*:

-------------------------------
-$ i3-msg mark irssi
-$ i3-msg '[con_mark="irssi"] focus'
-$ i3-msg unmark irssi
-------------------------------
+---------------------------------------------------------
+# marks the focused container
+mark irssi
+
+# focus the container with the mark "irssi"
+'[con_mark="irssi"] focus'
+
+# remove the mark "irssi" from whichever container has it
+unmark irssi
+
+# remove all marks on all firefox windows
+[class="(?i)firefox"] unmark
+---------------------------------------------------------

 
 ///////////////////////////////////////////////////////////////////
 TODO: make i3-input replace %s
 
 ///////////////////////////////////////////////////////////////////
 TODO: make i3-input replace %s


@@ -2165,7 +2206,6 @@ seperate bindings for a specific set of labels and then only use those labels.
 ///////////////////////////////////////////////////////////////////
 
 [[pango_markup]]
 ///////////////////////////////////////////////////////////////////
 
 [[pango_markup]]

-

 === Window title format
 
 By default, i3 will simply print the X11 window title. Using +title_format+,
 === Window title format
 
 By default, i3 will simply print the X11 window title. Using +title_format+,


@@ -2231,7 +2271,6 @@ bindsym $mod+u border none
 ----------------------------------------------
 
 [[shmlog]]
 ----------------------------------------------
 
 [[shmlog]]

-

 === Enabling shared memory logging
 
 As described in http://i3wm.org/docs/debugging.html, i3 can log to a shared
 === Enabling shared memory logging
 
 As described in http://i3wm.org/docs/debugging.html, i3 can log to a shared


@@ -2380,7 +2419,6 @@ bindsym $mod+Shift+b bar mode invisible bar-1
 ------------------------------------------------
 
 [[multi_monitor]]
 ------------------------------------------------
 
 [[multi_monitor]]

-

 == Multiple monitors
 
 As you can see in the goal list on the website, i3 was specifically developed
 == Multiple monitors
 
 As you can see in the goal list on the website, i3 was specifically developed


@@ -2510,6 +2548,7 @@ position the window either at the top or at the bottom of the screen, depending
 on which hint the application sets. With i3bar, you can configure its position,
 see <<i3bar_position>>.
 
 on which hint the application sets. With i3bar, you can configure its position,
 see <<i3bar_position>>.
 

+[[presentations]]

 === Giving presentations (multi-monitor)
 
 When giving a presentation, you typically want the audience to see what you see
 === Giving presentations (multi-monitor)
 
 When giving a presentation, you typically want the audience to see what you see


@@ -2518,7 +2557,6 @@ simple). For more complex presentations, you might want to have some notes
 which only you can see on your screen, while the audience can only see the
 slides.
 
 which only you can see on your screen, while the audience can only see the
 slides.
 

-[[presentations]]

 ==== Case 1: everybody gets the same output
 This is the simple case. You connect your computer to the video projector,
 turn on both (computer and video projector) and configure your X server to
 ==== Case 1: everybody gets the same output
 This is the simple case. You connect your computer to the video projector,
 turn on both (computer and video projector) and configure your X server to