Change workspace assignments to use the RandR output name instead of <screen>

[i3/i3] / docs / userguide

diff --git a/docs/userguide b/docs/userguide
index 529478bada72a6f33edef371b6cc4497d6d17273..7f47acce23956665953698d522a94a0394a6a7ea 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -1,7 +1,7 @@
 i3 User’s Guide
 ===============
 Michael Stapelberg <michael+i3@stapelberg.de>
-August 2009
+March 2010
 
 This document contains all information you need to configuring and using the i3
 window manager. If it does not, please contact me on IRC, Jabber or E-Mail and
@@ -367,25 +367,17 @@ default it will use 1 for the first screen, 2 for the second screen and so on).
 
 *Syntax*:
 ----------------------------------
-workspace <number> screen <screen>
+workspace <number> output <output>
 ----------------------------------
 
-Screen can be either a number (starting at 0 for the first screen) or a
-position. When using numbers, it is not guaranteed that your screens always
-get the same number. Though, unless you upgrade your X server or drivers, the
-order usually stays the same. When using positions, you have to specify the
-exact pixel where the screen *starts*, not a pixel which is contained by the
-screen. Thus, if your first screen has the dimensions 1280x800, you can match
-the second screen right of it by specifying 1280. You cannot use 1281.
+The output is the name of the RandR output you attach your screen to. On a
+laptop, you might have VGA1 and LVDS1 as output names. You can see the
+available outputs by running +xrandr --current+.
 
 *Examples*:
 ---------------------------
-workspace 1 screen 0
-workspace 5 screen 1
-
-workspace 1 screen 1280
-workspace 2 screen x800
-workspace 3 screen 1280x800
+workspace 1 output LVDS1
+workspace 5 output VGA1
 ---------------------------
 
 === Named workspaces
@@ -396,10 +388,10 @@ them names (of course UTF-8 is supported):
 *Syntax*:
 ---------------------------------------
 workspace <number> <name>
-workspace <number> screen <screen> name
+workspace <number> output <output> name
 ---------------------------------------
 
-For more details about the screen-part of this command, see above.
+For more details about the output-part of this command, see above.
 
 *Examples*:
 --------------------------
@@ -462,6 +454,24 @@ ipc-socket /tmp/i3-ipc.sock
 You can then use the i3-msg command to perform any command listed in the next
 section.
 
+=== Disable focus follows mouse
+
+If you have a setup where your mouse usually is in your way (like a touchpad
+on your laptop which you do not want to disable completely), you might want
+to disable focus follows mouse and control focus only by using your keyboard.
+The mouse will still be useful inside the currently active window (for example
+to click on links in your browser window).
+
+*Syntax*:
+----------------------------
+focus_follows_mouse <yes|no>
+----------------------------
+
+*Examples*:
+----------------------
+focus_follows_mouse no
+----------------------
+
 == List of commands
 
 === Manipulating layout
@@ -546,8 +556,8 @@ bindsym Mod1+p pw
 === Resizing columns/rows
 
 If you want to resize columns/rows using your keyboard, you can use the
-+resize+ command, I recommend using it a +mode+ (you need to use the new
-lexer/parser for that, so pass +-l+ to i3 when starting):
++resize+ command, I recommend using it inside a so called +mode+ (you need to
+use the new lexer/parser for that, so pass +-l+ to i3 when starting):
 
 .Example: Configuration file, defining a mode for resizing
 ----------------------------------------------------------------------
@@ -572,6 +582,9 @@ mode "resize" {
 
         bind 36 mode default
 }
+
+# Enter resize mode
+bindsym Mod1+r mode resize
 ----------------------------------------------------------------------
 
 === Jumping to specific windows