Merge pull request #3040 from jchook/next

$mod+r toggles resize mode

diff --combined etc/config
index 65e36b808339625f603c51d2f9b3b69df2f97300,f6fd5e7b5a4d71c3bf85c09cbca9c27cabf38482..5b751d00df55f7f6831e5845697d4ce98c9a8eff
--- 1/etc/config
--- 2/etc/config
+++ b/etc/config
@@@ -22,7 -22,7 +22,7 @@@ font pango:monospace 
  # The font above is very space-efficient, that is, it looks good, sharp and
  # clear in small sizes. However, its unicode glyph coverage is limited, the old
  # X core fonts rendering does not support right-to-left and this being a bitmap
 -# font, it doesn’t scale on retina/hidpi displays.
 +# font, it doesn't scale on retina/hidpi displays.
  
  # use these keys for focus, movement, and resize directions when reaching for
  # the arrows is not convenient
@@@ -157,6 -157,7 +157,7 @@@ mode "resize" 
          # back to normal: Enter or Escape
          bindsym Return mode "default"
          bindsym Escape mode "default"
+         bindsym Mod1+r mode "default"
  }
  
  bindsym Mod1+r mode "resize"