Merge pull request #3040 from jchook/next

$mod+r toggles resize mode

diff --git a/etc/config b/etc/config
index 65e36b808339625f603c51d2f9b3b69df2f97300..5b751d00df55f7f6831e5845697d4ce98c9a8eff 100644 (file)
--- a/etc/config
+++ b/etc/config
@@ -157,6 +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"

diff --git a/etc/config.keycodes b/etc/config.keycodes
index 6d10fad293fdda9a3e83709af64a03873200b460..c07462b4e1cc144c0eef197bb1678398f42cbb09 100644 (file)
--- a/etc/config.keycodes
+++ b/etc/config.keycodes
@@ -144,6 +144,7 @@ mode "resize" {
         # back to normal: Enter or Escape
         bindcode 36 mode "default"
         bindcode 9 mode "default"
+        bindcode $mod+27 mode "default"
 }
 
 bindcode $mod+27 mode "resize"