Keybindings for split view menu

The split view keys now have keybindings. The default bindings for
horizontal/vertical were changed to conform to Emacs (3/2).

IssueID #278

16 files changed, 38 insertions, 2 deletions

diff --git a/po/en.po b/po/en.po
index 440d074f..8ea38b94 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1375,6 +1375,30 @@ msgstr "Set view split mode"
 msgid "keys.split.next"
 msgstr "Switch focus to next split"
 
+msgid "keys.split.menu.merge"
+msgstr "Split view menu: Merge tabs"
+
+msgid "keys.split.menu.swap"
+msgstr "Split view menu: Swap sides"
+
+msgid "keys.split.menu.horiz"
+msgstr "Split view menu: Horizontal"
+
+msgid "keys.split.menu.horiz12"
+msgstr "Split view menu: Horizontal 1:2"
+
+msgid "keys.split.menu.horiz21"
+msgstr "Split view menu: Horizontal 2:1"
+
+msgid "keys.split.menu.vert"
+msgstr "Split view menu: Vertical"
+
+msgid "keys.split.menu.vert12"
+msgstr "Split view menu: Vertical 1:2"
+
+msgid "keys.split.menu.vert21"
+msgstr "Split view menu: Vertical 2:1"
+
 msgid "keys.hoverurl"
 msgstr "Toggle show URL on hover"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 59bde344..d42d4cfc 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index a8093411..4b7c1af3 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index c582efdc..815cc7b0 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 1e155087..6d1eaa78 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 1a88c420..c18cbc99 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index c5800ec2..c47e3104 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 0b4d5414..974a1310 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 48f16b05..dd047ff9 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 48a9c7d8..ad2ad465 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 111528b5..9c512c31 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index d06b4356..24378b1c 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 27c269f6..c1a0d4f7 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index e78942bf..adeaceeb 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 42d0d613..8af7867c 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -188,6 +188,7 @@ static void clear_Keys_(iKeys *d) {
 enum iBindFlag {
     argRepeat_BindFlag  = iBit(1),
     argRelease_BindFlag = iBit(2),
+    noDirectTrigger_BindFlag = iBit(3), /* can only be triggered via LabelWidget */
 };
 
 /* TODO: This indirection could be used for localization, although all UI strings
@@ -227,6 +228,14 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 81, { "${keys.tab.next}",             nextTab_KeyShortcut,            "tabs.next"                         }, 0 },
     { 90, { "${keys.split.menu}",           SDLK_j, KMOD_PRIMARY,           "splitmenu.open"                    }, 0 },
     { 91, { "${keys.split.next}",           SDLK_TAB, KMOD_CTRL,            "keyroot.next",                     }, 0 },
+    { 92, { "${keys.split.menu.merge}",     '1', 0,                         "ui.split arg:0",                   }, noDirectTrigger_BindFlag },
+    { 93, { "${keys.split.menu.swap}",      SDLK_x, 0,                      "ui.split swap:1",                  }, noDirectTrigger_BindFlag },
+    { 94, { "${keys.split.menu.horiz}",     '3', 0,                         "ui.split arg:3 axis:0",            }, noDirectTrigger_BindFlag },
+    { 95, { "${keys.split.menu.horiz12}",   SDLK_d, 0,                      "ui.split arg:1 axis:0",            }, noDirectTrigger_BindFlag },
+    { 96, { "${keys.split.menu.horiz21}",   SDLK_e, 0,                      "ui.split arg:2 axis:0",            }, noDirectTrigger_BindFlag },
+    { 97, { "${keys.split.menu.vert}",      '2', 0,                         "ui.split arg:3 axis:1",            }, noDirectTrigger_BindFlag },
+    { 98, { "${keys.split.menu.vert12}",    SDLK_f, 0,                      "ui.split arg:1 axis:1",            }, noDirectTrigger_BindFlag },
+    { 99, { "${keys.split.menu.vert21}",    SDLK_r, 0,                      "ui.split arg:2 axis:1",            }, noDirectTrigger_BindFlag },
     { 100,{ "${keys.hoverurl}",             '/', KMOD_PRIMARY,              "prefs.hoverlink.toggle"            }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
@@ -432,6 +441,9 @@ iBool processEvent_Keys(const SDL_Event *ev) {
     if (ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP) {
         const iBinding *bind = find_Keys_(d, ev->key.keysym.sym, keyMods_Sym(ev->key.keysym.mod));
         if (bind) {
+            if (bind->flags & noDirectTrigger_BindFlag) {
+                return iFalse;
+            }
             if (ev->type == SDL_KEYUP) {
                 if (bind->flags & argRelease_BindFlag) {
                     postCommandf_Root(root, "%s release:1", cstr_String(&bind->command));
diff --git a/src/ui/root.c b/src/ui/root.c
index 9a089992..2a2130d8 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1308,11 +1308,11 @@ void createUserInterface_Root(iRoot *d) {
             { "${menu.split.merge}", '1', 0, "ui.split arg:0" },
             { "${menu.split.swap}", SDLK_x, 0, "ui.split swap:1" },
             { "---", 0, 0, NULL },
-            { "${menu.split.horizontal}", '2', 0, "ui.split arg:3 axis:0" },
+            { "${menu.split.horizontal}", '3', 0, "ui.split arg:3 axis:0" },
             { "${menu.split.horizontal} 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" },
             { "${menu.split.horizontal} 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" },
             { "---", 0, 0, NULL },
-            { "${menu.split.vertical}", '3', 0, "ui.split arg:3 axis:1" },
+            { "${menu.split.vertical}", '2', 0, "ui.split arg:3 axis:1" },
             { "${menu.split.vertical} 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" },
             { "${menu.split.vertical} 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" },
         }, 10);