From 938d3c335e520c93a1ef93fd6d3d1905e4666b01 Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Sat, 10 Oct 2020 01:37:57 +0200 Subject: [PATCH 1/3] keyboards: add wide French layout This is a copy of the `fr` layout with modified key dimensions to fit a wide arrangement. --- data/keyboards/fr_wide.yaml | 89 +++++++++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 2 +- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 data/keyboards/fr_wide.yaml diff --git a/data/keyboards/fr_wide.yaml b/data/keyboards/fr_wide.yaml new file mode 100644 index 00000000..f8858954 --- /dev/null +++ b/data/keyboards/fr_wide.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 100, height: 42 } + spaceline: { width: 205, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "a z e r t y u i o p" + - "q s d f g h j k l m" + - "Shift_L w x c v b n . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "A Z E R T Y U I O P" + - "Q S D F G H J K L M" + - "Shift_L W X C V B N , BackSpace" + - "show_numbers preferences space show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + 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" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/src/resources.rs b/src/resources.rs index ed446e55..efcb8a17 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -23,6 +23,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[ ("es", include_str!("../data/keyboards/es.yaml")), ("fi", include_str!("../data/keyboards/fi.yaml")), ("fr", include_str!("../data/keyboards/fr.yaml")), + ("fr_wide", include_str!("../data/keyboards/fr_wide.yaml")), ("gr", include_str!("../data/keyboards/gr.yaml")), ("it", include_str!("../data/keyboards/it.yaml")), ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 66e00128..1c431bd2 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -55,7 +55,7 @@ foreach layout : [ 'dk', 'es', 'fi', - 'fr', + 'fr', 'fr_wide', 'gr', 'it', 'jp+kana','jp+kana_wide', From 192824be39efe049e76a8f40d2ef4a4e7b515fba Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Sat, 10 Oct 2020 01:38:54 +0200 Subject: [PATCH 2/3] keyboards: add wide Belgian layout This is a copy of the `be` layout with modified key dimensions to fit a wide arrangement. --- data/keyboards/be_wide.yaml | 89 +++++++++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 2 +- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 data/keyboards/be_wide.yaml diff --git a/data/keyboards/be_wide.yaml b/data/keyboards/be_wide.yaml new file mode 100644 index 00000000..f8858954 --- /dev/null +++ b/data/keyboards/be_wide.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 54, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 100, height: 42 } + spaceline: { width: 205, height: 42 } + special: { width: 54, height: 42 } + +views: + base: + - "a z e r t y u i o p" + - "q s d f g h j k l m" + - "Shift_L w x c v b n . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "A Z E R T Y U I O P" + - "Q S D F G H J K L M" + - "Shift_L W X C V B N , BackSpace" + - "show_numbers preferences space show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + 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" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/src/resources.rs b/src/resources.rs index efcb8a17..a66b135e 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -18,6 +18,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[ ("br", include_str!("../data/keyboards/br.yaml")), ("de", include_str!("../data/keyboards/de.yaml")), ("be", include_str!("../data/keyboards/be.yaml")), + ("be_wide", include_str!("../data/keyboards/be_wide.yaml")), ("de_wide", include_str!("../data/keyboards/de_wide.yaml")), ("dk", include_str!("../data/keyboards/dk.yaml")), ("es", include_str!("../data/keyboards/es.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 1c431bd2..a0cfd8d0 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -50,7 +50,7 @@ endforeach foreach layout : [ 'us', 'us_wide', 'br', - 'be', + 'be', 'be_wide', 'de', 'de_wide', 'dk', 'es', From 6871452c7b840ca16e0aef80dafdea372abe041a Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Sat, 10 Oct 2020 01:40:12 +0200 Subject: [PATCH 3/3] keyboards: add wide terminal layout This is a copy of the `terminal` layout with modified key dimensions to fit a wide arrangement. --- data/keyboards/terminal_wide.yaml | 211 ++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 4 +- 3 files changed, 214 insertions(+), 2 deletions(-) create mode 100644 data/keyboards/terminal_wide.yaml diff --git a/data/keyboards/terminal_wide.yaml b/data/keyboards/terminal_wide.yaml new file mode 100644 index 00000000..fab1abe0 --- /dev/null +++ b/data/keyboards/terminal_wide.yaml @@ -0,0 +1,211 @@ +--- +outlines: + default: { width: 54, height: 37 } + action: { width: 90, height: 37 } + altline: { width: 81, height: 37 } + wide: { width: 90, height: 37 } + spaceline: { width: 225, height: 37 } + special: { width: 54, height: 37 } + small: { width: 67.4, height: 22 } + +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" + - "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" + - "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_letters preferences space period Return" + actions: + - "EscSmall 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" + - "show_letters Menu Break Left Down Right" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + icon: "key-shift" + BackSpace: + outline: "altline" + icon: "edit-clear-symbolic" + action: erase + 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" + label: "ABC" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "τ=\\" + show_actions: + action: + set_view: "actions" + outline: "altline" + label: ">_" + period: + outline: "altline" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + F1: + outline: "action" + keysym: "F1" + F2: + outline: "action" + keysym: "F2" + F3: + outline: "action" + keysym: "F3" + F4: + outline: "action" + keysym: "F4" + F5: + outline: "action" + keysym: "F5" + F6: + outline: "action" + keysym: "F6" + F7: + outline: "action" + keysym: "F7" + F8: + outline: "action" + keysym: "F8" + F9: + outline: "action" + keysym: "F9" + F10: + outline: "action" + keysym: "F10" + F11: + outline: "action" + keysym: "F11" + F12: + outline: "action" + keysym: "F12" + Esc: + outline: "action" + keysym: "Escape" + EscSmall: + outline: "small" + keysym: "Escape" + label: "Esc" + Tab: + outline: "action" + keysym: "Tab" + TabSmall: + outline: "small" + keysym: "Tab" + label: "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: "small" + keysym: "Down" + "←": + 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" diff --git a/src/resources.rs b/src/resources.rs index a66b135e..3f1fd7b0 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -38,6 +38,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[ ("ua", include_str!("../data/keyboards/ua.yaml")), // layout+overlay ("terminal", include_str!("../data/keyboards/terminal.yaml")), + ("terminal_wide", include_str!("../data/keyboards/terminal_wide.yaml")), // Overlays ("emoji", include_str!("../data/keyboards/emoji.yaml")), ]; diff --git a/tests/meson.build b/tests/meson.build index a0cfd8d0..c696ec6b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -65,8 +65,8 @@ foreach layout : [ 'ru', 'se', 'ua', - 'terminal', - + 'terminal', 'terminal_wide', + 'emoji', ] test(