Ticket #3134: fix some inconsistencies in "Learn keys" UI.

Reorder keys in "Learn key" window in accordance with the order of keys on regular keyboards. Signed-off-by: Andrew Borodin <[email protected]>
B4nan · Feb 10, 2014 · d8b58c8 · d8b58c8
1 parent a45ba80
commit d8b58c8
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/lib/tty/key.c b/lib/tty/key.c
@@ -100,6 +100,7 @@ gboolean bracketed_pasting_in_progress = FALSE;
  * certain keys that may be missing from the terminal database
  */
 const key_code_name_t key_name_conv_tab[] = {
+    {ESC_CHAR, "escape", N_("Escape"), "Esc"},
     /* KEY_F(0) is not here, since we are mapping it to f10, so there is no reason
        to define f0 as well. Also, it makes Learn keys a bunch of problems :( */
     {KEY_F (1), "f1", N_("Function key 1"), "F1"},
@@ -122,26 +123,25 @@ const key_code_name_t key_name_conv_tab[] = {
     {KEY_F (18), "f18", N_("Function key 18"), "F18"},
     {KEY_F (19), "f19", N_("Function key 19"), "F19"},
     {KEY_F (20), "f20", N_("Function key 20"), "F20"},
-    {KEY_BACKSPACE, "backspace", N_("Backspace key"), "Backspace"},
-    {KEY_END, "end", N_("End key"), "End"},
-    {KEY_UP, "up", N_("Up arrow key"), "Up"},
-    {KEY_DOWN, "down", N_("Down arrow key"), "Down"},
-    {KEY_LEFT, "left", N_("Left arrow key"), "Left"},
-    {KEY_RIGHT, "right", N_("Right arrow key"), "Right"},
-    {KEY_HOME, "home", N_("Home key"), "Home"},
-    {KEY_NPAGE, "pgdn", N_("Page Down key"), "PgDn"},
-    {KEY_PPAGE, "pgup", N_("Page Up key"), "PgUp"},
-    {KEY_IC, "insert", N_("Insert key"), "Ins"},
-    {KEY_DC, "delete", N_("Delete key"), "Del"},
     {ALT ('\t'), "complete", N_("Completion/M-tab"), "Meta-Tab"},
-    {KEY_BTAB, "backtab", N_("Back Tabulation S-tab"), "Shift-Tab"},
-    {KEY_KP_ADD, "kpplus", N_("+ on keypad"), "+"},
-    {KEY_KP_SUBTRACT, "kpminus", N_("- on keypad"), "-"},
-    {(int) '/', "kpslash", N_("Slash on keypad"), "/"},
+    {KEY_BTAB, "backtab", N_("BackTab/S-tab"), "Shift-Tab"},
+    {KEY_BACKSPACE, "backspace", N_("Backspace"), "Backspace"},
+    {KEY_UP, "up", N_("Up arrow"), "Up"},
+    {KEY_DOWN, "down", N_("Down arrow"), "Down"},
+    {KEY_LEFT, "left", N_("Left arrow"), "Left"},
+    {KEY_RIGHT, "right", N_("Right arrow"), "Right"},
+    {KEY_IC, "insert", N_("Insert"), "Ins"},
+    {KEY_DC, "delete", N_("Delete"), "Del"},
+    {KEY_HOME, "home", N_("Home"), "Home"},
+    {KEY_END, "end", N_("End key"), "End"},
+    {KEY_PPAGE, "pgup", N_("Page Up"), "PgUp"},
+    {KEY_NPAGE, "pgdn", N_("Page Down"), "PgDn"},
+    {(int) '/', "kpslash", N_("/ on keypad"), "/"},
     {KEY_KP_MULTIPLY, "kpasterisk", N_("* on keypad"), "*"},
+    {KEY_KP_SUBTRACT, "kpminus", N_("- on keypad"), "-"},
+    {KEY_KP_ADD, "kpplus", N_("+ on keypad"), "+"},
 
     /* From here on, these won't be shown in Learn keys (no space) */
-    {ESC_CHAR, "escape", N_("Escape key"), "Esc"},
     {KEY_LEFT, "kpleft", N_("Left arrow keypad"), "Left"},
     {KEY_RIGHT, "kpright", N_("Right arrow keypad"), "Right"},
     {KEY_UP, "kpup", N_("Up arrow keypad"), "Up"},
@@ -161,13 +161,13 @@ const key_code_name_t key_name_conv_tab[] = {
     {KEY_C1, "c1", N_("C1 key"), "C1"},
 
     /* Alternative label */
-    {ESC_CHAR, "esc", N_("Escape key"), "Esc"},
-    {KEY_BACKSPACE, "bs", N_("Backspace key"), "Bakspace"},
-    {KEY_IC, "ins", N_("Insert key"), "Ins"},
-    {KEY_DC, "del", N_("Delete key"), "Del"},
-    {(int) '+', "plus", N_("Plus"), "+"},
-    {(int) '-', "minus", N_("Minus"), "-"},
+    {ESC_CHAR, "esc", N_("Escape"), "Esc"},
+    {KEY_BACKSPACE, "bs", N_("Backspace"), "Bakspace"},
+    {KEY_IC, "ins", N_("Insert"), "Ins"},
+    {KEY_DC, "del", N_("Delete"), "Del"},
     {(int) '*', "asterisk", N_("Asterisk"), "*"},
+    {(int) '-', "minus", N_("Minus"), "-"},
+    {(int) '+', "plus", N_("Plus"), "+"},
     {(int) '.', "dot", N_("Dot"), "."},
     {(int) '<', "lt", N_("Less than"), "<"},
     {(int) '>', "gt", N_("Great than"), ">"},