Merge branch 'master' into next

[i3/i3] / i3.config.keycodes

diff --git a/i3.config.keycodes b/i3.config.keycodes
index 89811dbb74c4a306b5c61a9e3d3e10941cf7c462..e360fff9c2a2987ba9dcfb2a8a538eba9dee6c98 100644 (file)
--- a/i3.config.keycodes
+++ b/i3.config.keycodes
@@ -88,16 +88,16 @@ bindcode $mod+18 workspace 9
 bindcode $mod+19 workspace 10
 
 # move focused container to workspace
-bindcode $mod+Shift+10 move workspace 1
-bindcode $mod+Shift+11 move workspace 2
-bindcode $mod+Shift+12 move workspace 3
-bindcode $mod+Shift+13 move workspace 4
-bindcode $mod+Shift+14 move workspace 5
-bindcode $mod+Shift+15 move workspace 6
-bindcode $mod+Shift+16 move workspace 7
-bindcode $mod+Shift+17 move workspace 8
-bindcode $mod+Shift+18 move workspace 9
-bindcode $mod+Shift+19 move workspace 10
+bindcode $mod+Shift+10 move container to workspace 1
+bindcode $mod+Shift+11 move container to workspace 2
+bindcode $mod+Shift+12 move container to workspace 3
+bindcode $mod+Shift+13 move container to workspace 4
+bindcode $mod+Shift+14 move container to workspace 5
+bindcode $mod+Shift+15 move container to workspace 6
+bindcode $mod+Shift+16 move container to workspace 7
+bindcode $mod+Shift+17 move container to workspace 8
+bindcode $mod+Shift+18 move container to workspace 9
+bindcode $mod+Shift+19 move container to workspace 10
 
 # reload the configuration file
 bindcode $mod+Shift+54 reload
@@ -110,34 +110,20 @@ bindcode $mod+Shift+26 exit
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
 
-        # They resize the border in the direction you pressed, e.g.
-        # when pressing left, the window is resized so that it has
-        # more space on its left
-
-        bindcode 44 resize shrink left 10 px or 10 ppt
-        bindcode Shift+44 resize grow   left 10 px or 10 ppt
-
-        bindcode 45 resize shrink down 10 px or 10 ppt
-        bindcode Shift+45 resize grow   down 10 px or 10 ppt
-
-        bindcode 46 resize shrink up 10 px or 10 ppt
-        bindcode Shift+46 resize grow   up 10 px or 10 ppt
-
-        bindcode 47 resize shrink right 10 px or 10 ppt
-        bindcode Shift+47 resize grow   right 10 px or 10 ppt
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindcode 44 resize shrink width 10 px or 10 ppt
+        bindcode 45 resize grow height 10 px or 10 ppt
+        bindcode 46 resize shrink height 10 px or 10 ppt
+        bindcode 47 resize grow width 10 px or 10 ppt
 
         # same bindings, but for the arrow keys
-        bindcode 113 resize shrink left 10 px or 10 ppt
-        bindcode Shift+113 resize grow   left 10 px or 10 ppt
-
-        bindcode 116 resize shrink down 10 px or 10 ppt
-        bindcode Shift+116 resize grow   down 10 px or 10 ppt
-
-        bindcode 111 resize shrink up 10 px or 10 ppt
-        bindcode Shift+111 resize grow   up 10 px or 10 ppt
-
-        bindcode 114 resize shrink right 10 px or 10 ppt
-        bindcode Shift+114 resize grow   right 10 px or 10 ppt
+        bindcode 113 resize shrink width 10 px or 10 ppt
+        bindcode 116 resize grow height 10 px or 10 ppt
+        bindcode 111 resize shrink height 10 px or 10 ppt
+        bindcode 114 resize grow width 10 px or 10 ppt
 
         # back to normal: Enter or Escape
         bindcode 36 mode "default"
@@ -149,5 +135,5 @@ bindcode $mod+27 mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-       status_line i3status
+        status_command i3status
 }