From 6f978aee0bbd8e1ac78f0ef36698d45a0a2d24fc Mon Sep 17 00:00:00 2001 From: MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org> Date: Sat, 27 Jan 2024 12:17:05 +0100 Subject: [PATCH] Improve layouts of us-terminal-keyboards This change makes entering paths, URLs, options and pipes easier. Part-of: --- data/keyboards/terminal/us+dvorak.yaml | 28 +++++++------ data/keyboards/terminal/us.yaml | 57 ++++++++++++++++++-------- data/keyboards/terminal/us_wide.yaml | 31 ++++++++++---- 3 files changed, 79 insertions(+), 37 deletions(-) diff --git a/data/keyboards/terminal/us+dvorak.yaml b/data/keyboards/terminal/us+dvorak.yaml index 582b3955..76c67111 100644 --- a/data/keyboards/terminal/us+dvorak.yaml +++ b/data/keyboards/terminal/us+dvorak.yaml @@ -1,40 +1,40 @@ --- outlines: - default: { width: 35.33, height: 46 } - action: { width: 59, height: 46 } - altline: { width: 52.67, height: 46 } - wide: { width: 59, height: 46 } - spaceline: { width: 140, height: 46 } - special: { width: 44, height: 46 } - small: { width: 59, height: 22 } + default: { width: 35.33, height: 46 } + action: { width: 59, height: 46 } + altline: { width: 52.67, height: 46 } + wide: { width: 59, height: 46 } + spaceline: { width: 140, height: 46 } + special: { width: 44, height: 46 } + small: { width: 50.47, height: 22 } views: base: - - "Ctrl Alt ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "Shift_L p y f g c r l BackSpace" - "a o e u i d h t n s" - ", q j k x b m w v z" - "show_numbers preferences space show_actions Return" upper: - - "Ctrl Alt PgUp PgDn Home End" + - "TabSmall Ctrl Alt PgUp PgDn Home End" - "Shift_L P Y F G C R L BackSpace" - "A O E U I D H T N S" - ", Q J K X B M W V Z" - "show_numbers preferences space show_actions Return" numbers: - - "Ctrl Alt ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "show_symbols , \" ' colon ; ! ? BackSpace" - "* # $ / & - _ + ( )" - "1 2 3 4 5 6 7 8 9 0" - "show_letters preferences space period Return" symbols: - - "Ctrl Alt ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" - "© ® £ € ¥ ^ ° @ { }" - "~ ` | · √ π τ ÷ × ¶" - "show_letters preferences space period Return" actions: - - "Ctrl Alt PgUp PgDn Home End" + - "TabSmall Ctrl Alt PgUp PgDn Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" @@ -135,6 +135,10 @@ buttons: Tab: outline: "action" keysym: "Tab" + TabSmall: + outline: "small" + keysym: "Tab" + label: "Tab" Del: outline: "action" keysym: "Delete" diff --git a/data/keyboards/terminal/us.yaml b/data/keyboards/terminal/us.yaml index 34972594..3a67c874 100644 --- a/data/keyboards/terminal/us.yaml +++ b/data/keyboards/terminal/us.yaml @@ -1,40 +1,41 @@ --- outlines: - default: { width: 35.33, height: 46 } - action: { width: 59, height: 46 } - altline: { width: 52.67, height: 46 } - wide: { width: 59, height: 46 } - spaceline: { width: 140, height: 46 } - special: { width: 44, height: 46 } - small: { width: 59, height: 22 } + default: { width: 35.33, height: 46 } + action: { width: 59, height: 46 } + altline: { width: 52.67, height: 46 } + wide: { width: 59, height: 46 } + spaceline: { width: 140, height: 46 } + special: { width: 44, height: 46 } + small: { width: 50.57, height: 22 } + halfwidth: { width: 17.665, height: 46 } views: base: - - "Ctrl Alt ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "q w e r t y u i o p" - - "a s d f g h j k l" + - "PeriodSmall a s d f g h j k l MinusSmall" - "Shift_L z x c v b n m BackSpace" - "show_numbers preferences space show_actions Return" upper: - - "Ctrl Alt PgUp PgDn Home End" + - "TabSmall 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" + - "SlashSmall A S D F G H J K L PipeSmall" - "Shift_L Z X C V B N M BackSpace" - "show_numbers preferences space show_actions Return" numbers: - - "Ctrl Alt ↑ ↓ ← →" + - "TabSmall 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 ↑ ↓ ← →" - - "~ ` | · √ π τ ÷ × ¶" - - "© ® £ € ¥ ^ ° @ { }" - - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" + - "TabSmall Ctrl Alt ↑ ↓ ← →" + - "~ ` · √ π τ ÷ × ¶ @" + - "© ® £ € ¥ ^ ° { }" + - "show_numbers_from_symbols % | < > = [ ] BackSpace" - "show_letters preferences space period Return" actions: - - "Ctrl Alt PgUp PgDn Home End" + - "TabSmall Ctrl Alt PgUp PgDn Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" @@ -135,6 +136,10 @@ buttons: Tab: outline: "action" keysym: "Tab" + TabSmall: + outline: "small" + keysym: "Tab" + label: "Tab" Del: outline: "action" keysym: "Delete" @@ -198,3 +203,19 @@ buttons: modifier: "Alt" outline: "small" label: "Alt" + MinusSmall: + outline: "halfwidth" + text: "-" + SlashSmall: + outline: "halfwidth" + text: "/" + PipeSmall: + outline: "halfwidth" + text: "|" + PeriodSmall: + outline: "halfwidth" + text: "." + "\\": + outline: "halfwidth" + _: + outline: "halfwidth" diff --git a/data/keyboards/terminal/us_wide.yaml b/data/keyboards/terminal/us_wide.yaml index 7f7cbf0a..0e4f5b51 100644 --- a/data/keyboards/terminal/us_wide.yaml +++ b/data/keyboards/terminal/us_wide.yaml @@ -7,31 +7,32 @@ outlines: spaceline: { width: 225, height: 37 } special: { width: 54, height: 37 } small: { width: 67.4, height: 22 } + halfwidth: { width: 27, height: 37 } views: base: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "q w e r t y u i o p" - - "a s d f g h j k l" + - "PeriodSmall a s d f g h j k l MinusSmall" - "Shift_L z x c v b n m BackSpace" - "show_numbers preferences space show_actions Return" upper: - "EscSmall TabSmall 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" + - "SlashSmall A S D F G H J K L PipeSmall" - "Shift_L Z X C V B N M BackSpace" - "show_numbers preferences space show_actions Return" numbers: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - - "* # $ / & - _ + ( )" + - "\\ * # $ / & - + ( ) _" - "show_symbols , \" ' colon ; ! ? BackSpace" - "show_letters preferences space period Return" symbols: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - - "~ ` | · √ π τ ÷ × ¶" - - "© ® £ € ¥ ^ ° @ { }" - - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" + - "~ ` · √ π τ ÷ × ¶ @" + - "© ® £ € ¥ ^ ° { }" + - "show_numbers_from_symbols % | < > = [ ] BackSpace" - "show_letters preferences space period Return" actions: - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End" @@ -205,4 +206,20 @@ buttons: Alt: modifier: "Alt" outline: "small" - label: "Alt" \ No newline at end of file + label: "Alt" + MinusSmall: + outline: "halfwidth" + text: "-" + SlashSmall: + outline: "halfwidth" + text: "/" + PipeSmall: + outline: "halfwidth" + text: "|" + PeriodSmall: + outline: "halfwidth" + text: "." + "\\": + outline: "halfwidth" + _: + outline: "halfwidth"