Merge branch 'terminal' into 'master'

Terminal layout: another approach

See merge request Librem5/squeekboard!368

data/keyboards/terminal.yaml

@@ -1,42 +1,44 @@
 ---
 outlines:
-    default: { width: 50, height: 50 }
+    default: { width: 35.33, height: 46 }
-    menu: { width: 100, height: 50 }
+    action:  { width: 59,    height: 46 }
-    altline: { width: 70, height: 50 }
+    altline: { width: 52.67, height: 46 }
-    spaceline: { width: 160, height: 50 }
+    wide: { width: 59, height: 46 }
-    special: { width: 35.33, height: 50 }
+    spaceline: { width: 140, height: 46 }
-    action: { width: 85, height: 35 }
+    special: { width: 44, height: 46 }
-    fkey: { width: 42, height: 50 }
+    small: { width: 59, height: 22 }
 
 views:
     base:
-        - "1 2 3 4 5 6 7 8 9 0"
+        - "Ctrl Alt ↑ ↓ ← →"
         - "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_symbols show_eschars preferences         space        , . Return"
+        - "show_numbers preferences      space        show_actions Return"
-        - "Ctrl Tab ↑ ↓ ← →"
     upper:
-        - "! @ # $ % ^ & * ( )"
+        - "Ctrl Alt PgUp PgDn Home End"
         - "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_symbols show_eschars preferences         space        Menu Return"
+        - "show_numbers preferences      space        show_actions Return"
-        - "Alt Esc PgUp PgDn Home End"
+    numbers:
+        - "Ctrl Alt ↑ ↓ ← →"
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "* # $ / & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        period Return"
     symbols:
-        - "~ ` ´ - _ + = ° © ®"
+        - "Ctrl Alt ↑ ↓ ← →"
-        - "[ ] { } \\ | ÷ × √"
+        - "~ ` | · √ π τ ÷ × ¶"
-        - "; : ' \" · € £ ¥"
+        - "© ® £ € ¥ ^ ° @ { }"
-        - "Del / ? § π τ µ ¶ BackSpace"
+        - "show_numbers_from_symbols   \\ % < > = [ ]  BackSpace"
-        - "show_letters show_eschars preferences         space        < > Return"
+        - "show_letters preferences         space        period Return"
-        - "Ctrl Tab ↑ ↓ ← →"
+    actions:
-    eschars:
+        - "Ctrl Alt PgUp PgDn Home End"
-        - "F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12"
+        - "F1  F2  F3  F4  F5  F6"
-        - "ä è é ö ü Ä È É Ö Ü"
+        - "F7  F8  F9  F10 F11 F12"
-        - "à â ê î ô À Â Ê Î Ô"
+        - "Esc Tab Pause Insert Up Del"
-        - "Del  « » ç Ç æ œ ß  BackSpace"
+        - "show_letters Menu Break Left Down Right"
-        - "show_symbols show_eschars preferences         space        „ “ Return"
-        - "Alt Esc PgUp PgDn Home End"
 
 buttons:
     Shift_L:
@@ -46,116 +48,157 @@ 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: "altline"
+        outline: "wide"
-        label: "abc"
+        label: "ABC"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "altline"
-        label: "[{/"
+        label: "τ=\\"
-    show_eschars:
+    show_actions:
         action:
-            locking:
+            set_view: "actions"
-                lock_view: "eschars"
-                unlock_view: "base"
         outline: "altline"
-        label: "func"
+        label: ">_"
+    period:
+        outline: "altline"
+        text: "."
     space:
         outline: "spaceline"
-        label: " "
         text: " "
     Return:
-        outline: "altline"
+        outline: "wide"
         icon: "key-enter"
         keysym: "Return"
+    colon:
+        text: ":"
     F1:
-        outline: "fkey"
+        outline: "action"
         keysym: "F1"
     F2:
-        outline: "fkey"
+        outline: "action"
         keysym: "F2"
     F3:
-        outline: "fkey"
+        outline: "action"
         keysym: "F3"
     F4:
-        outline: "fkey"
+        outline: "action"
         keysym: "F4"
     F5:
-        outline: "fkey"
+        outline: "action"
         keysym: "F5"
     F6:
-        outline: "fkey"
+        outline: "action"
         keysym: "F6"
     F7:
-        outline: "fkey"
+        outline: "action"
         keysym: "F7"
     F8:
-        outline: "fkey"
+        outline: "action"
         keysym: "F8"
     F9:
-        outline: "fkey"
+        outline: "action"
         keysym: "F9"
     F10:
-        outline: "fkey"
+        outline: "action"
         keysym: "F10"
     F11:
-        outline: "fkey"
+        outline: "action"
         keysym: "F11"
     F12:
-        outline: "fkey"
+        outline: "action"
         keysym: "F12"
     Esc:
         outline: "action"
         keysym: "Escape"
-    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"
-    "↑":
+    Del:
         outline: "action"
+        keysym: "Delete"
+    Insert:
+        outline: "action"
+        keysym: "Insert"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Pause:
+        outline: "action"
+        keysym: "Pause"
+    Menu:
+        outline: "action"
+        keysym: "Menu"
+    Break:
+        outline: "action"
+        keysym: "Break"
+    Home:
+        outline: "small"
+        keysym: "Home"
+    End:
+        outline: "small"
+        keysym: "End"
+    PgUp:
+        outline: "small"
+        keysym: "Page_Up"
+    PgDn:
+        outline: "small"
+        keysym: "Page_Down"
+    "↑":
+        outline: "small"
         keysym: "Up"
     "↓":
-        outline: "action"
+        outline: "small"
         keysym: "Down"
     "←":
-        outline: "action"
+        outline: "small"
         keysym: "Left"
     "→":
+        outline: "small"
+        keysym: "Right"
+    Up:
+        label: "↑"
+        outline: "action"
+        keysym: "Up"
+    Left:
+        label: "←"
+        outline: "action"
+        keysym: "Left"
+    Down:
+        label: "↓"
+        outline: "action"
+        keysym: "Down"
+    Right:
+        label: "→"
         outline: "action"
         keysym: "Right"
+    Ctrl:
+        modifier: "Control"
+        outline: "small"
+        label: "Ctrl"
+    Alt:
+        modifier: "Alt"
+        outline: "small"
+        label: "Alt"
+

data/style-Adwaita:dark.css

@@ -40,6 +40,10 @@ sq_button.action {
     font-size: 0.75em;
 }
 
+sq_button.small {
+    font-size: 0.5em;
+}
+
 #Return {
     background: #1c71d8;
     border-color: #1a5fb4;

data/style.css

@@ -43,6 +43,10 @@ sq_button.action {
     font-size: 0.75em;
 }
 
+sq_button.small {
+    font-size: 0.5em;
+}
+
 #Return {
     background: @theme_selected_bg_color; /* #1c71d8; */
     border-color: @borders; /*#1a5fb4;*/