Merge branch 'btantau-master-patch-76686' into 'master'

New terminal layout, showing more useful keys at the same time

See merge request Librem5/squeekboard!345

data/keyboards/terminal.yaml

@@ -1,38 +1,42 @@
 ---
 outlines:
-    default: { width: 35.33, height: 52 }
+    default: { width: 50, height: 50 }
-    action:  { width: 59,    height: 52 }
+    menu: { width: 100, height: 50 }
-    altline: { width: 52.67, height: 52 }
+    altline: { width: 70, height: 50 }
-    wide: { width: 59, height: 52 }
+    spaceline: { width: 160, height: 50 }
-    spaceline: { width: 140, height: 52 }
+    special: { width: 35.33, height: 50 }
-    special: { width: 44, height: 52 }
+    action: { width: 85, height: 35 }
+    fkey: { width: 42, height: 50 }
 
 views:
     base:
+        - "1 2 3 4 5 6 7 8 9 0"
         - "q w e r t y u i o p"
         - "a s d f g h j k l"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers preferences      space        show_actions Return"
+        - "show_symbols show_eschars preferences         space        , . Return"
+        - "Ctrl Tab ↑ ↓ ← →"
     upper:
+        - "! @ # $ % ^ & * ( )"
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers preferences      space        show_actions Return"
+        - "show_symbols show_eschars preferences         space        Menu Return"
-    numbers:
+        - "Alt Esc PgUp PgDn Home End"
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "* # $ / & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters preferences         space        period Return"
     symbols:
-        - "~ ` | · √ π τ ÷ × ¶"
+        - "~ ` ´ - _ + = ° © ®"
-        - "© ® £ € ¥ ^ ° @ { }"
+        - "[ ] { } \\ | ÷ × √"
-        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
+        - "; : ' \" · € £ ¥"
-        - "show_letters preferences         space        period Return"
+        - "Del / ? § π τ µ ¶ BackSpace"
-    actions:
+        - "show_letters show_eschars preferences         space        < > Return"
-        - "F1  F2  F3  F4  F5  F6"
+        - "Ctrl Tab ↑ ↓ ← →"
-        - "F7  F8  F9  F10 F11 F12"
+    eschars:
-        - "Esc Tab Del PgUp ↑ PgDn"
+        - "F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12"
-        - "show_letters Home End ← ↓ →"
+        - "ä è é ö ü Ä È É Ö Ü"
+        - "à â ê î ô À Â Ê Î Ô"
+        - "Del  « » ç Ç æ œ ß  BackSpace"
+        - "show_symbols show_eschars preferences         space        „ “ Return"
+        - "Alt Esc PgUp PgDn Home End"
 
 buttons:
     Shift_L:
@@ -42,108 +46,107 @@ buttons:
                 unlock_view: "base"
         outline: "altline"
         icon: "key-shift"
+    Ctrl:
+        modifier: "Control"
+        outline: "action"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "action"
+        label: "Alt"
     BackSpace:
         outline: "altline"
         icon: "edit-clear-symbolic"
-        action: erase
+        action: "erase"
+    Menu:
+        outline: "menu"
+        keysym: "Menu"
     preferences:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
-    show_numbers:
-        action:
-            set_view: "numbers"
-        outline: "wide"
-        label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
     show_letters:
         action:
             set_view: "base"
-        outline: "wide"
+        outline: "altline"
-        label: "ABC"
+        label: "abc"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "altline"
-        label: "τ=\\"
+        label: "[{/"
-    show_actions:
+    show_eschars:
         action:
-            set_view: "actions"
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
         outline: "altline"
-        label: ">_"
+        label: "func"
-    period:
-        outline: "altline"
-        text: "."
     space:
         outline: "spaceline"
+        label: " "
         text: " "
     Return:
-        outline: "wide"
+        outline: "altline"
         icon: "key-enter"
         keysym: "Return"
-    colon:
-        text: ":"
     F1:
-        outline: "action"
+        outline: "fkey"
         keysym: "F1"
     F2:
-        outline: "action"
+        outline: "fkey"
         keysym: "F2"
     F3:
-        outline: "action"
+        outline: "fkey"
         keysym: "F3"
     F4:
-        outline: "action"
+        outline: "fkey"
         keysym: "F4"
     F5:
-        outline: "action"
+        outline: "fkey"
         keysym: "F5"
     F6:
-        outline: "action"
+        outline: "fkey"
         keysym: "F6"
     F7:
-        outline: "action"
+        outline: "fkey"
         keysym: "F7"
     F8:
-        outline: "action"
+        outline: "fkey"
         keysym: "F8"
     F9:
-        outline: "action"
+        outline: "fkey"
         keysym: "F9"
     F10:
-        outline: "action"
+        outline: "fkey"
         keysym: "F10"
     F11:
-        outline: "action"
+        outline: "fkey"
         keysym: "F11"
     F12:
-        outline: "action"
+        outline: "fkey"
         keysym: "F12"
     Esc:
         outline: "action"
         keysym: "Escape"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    Del:
-        outline: "action"
-        keysym: "Delete"
     Home:
         outline: "action"
         keysym: "Home"
     End:
         outline: "action"
         keysym: "End"
+    Del:
+        outline: "altline"
+        keysym: "Delete"
     PgUp:
         outline: "action"
         keysym: "Page_Up"
     PgDn:
         outline: "action"
         keysym: "Page_Down"
+    Tab:
+        outline: "action"
+        keysym: "Tab"
     "↑":
         outline: "action"
         keysym: "Up"
@@ -156,4 +159,3 @@ buttons:
     "→":
         outline: "action"
         keysym: "Right"
-