Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions res/values/layouts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
<item>latn_azerty_fr</item>
<item>latn_bepo_fr</item>
<item>latn_bone</item>
<item>latn_dvorak_landscape</item>
<item>latn_dvorak_left</item>
<item>latn_neo2</item>
<item>latn_qwerty_apl</item>
<item>latn_qwerty_az</item>
Expand Down Expand Up @@ -141,6 +143,8 @@
<item>AZERTY (Français)</item>
<item>BEPO (Français)</item>
<item>Bone</item>
<item>Dvorak-Landscape</item>
<item>Dvorak-Left</item>
<item>Neo 2</item>
<item>QWERTY (APL)</item>
<item>QWERTY (Azərbaycanca)</item>
Expand Down Expand Up @@ -235,6 +239,8 @@
<item>@xml/latn_azerty_fr</item>
<item>@xml/latn_bepo_fr</item>
<item>@xml/latn_bone</item>
<item>@xml/latn_dvorak_landscape</item>
<item>@xml/latn_dvorak_left</item>
<item>@xml/latn_neo2</item>
<item>@xml/latn_qwerty_apl</item>
<item>@xml/latn_qwerty_az</item>
Expand Down
82 changes: 49 additions & 33 deletions srcs/layouts/latn_dvorak.xml
Original file line number Diff line number Diff line change
@@ -1,37 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<keyboard name="Dvorak" script="latin">
<row>
<key key0="shift" width="1.5" key2="loc esc" key4="loc tab"/>
<key key0="p" key1="loc accent_ring" key2="." key3="&lt;"/>
<key key0="y" key1="loc accent_grave" key2="," key3="&gt;"/>
<key key0="f" key4="loc €"/>
<key key0="g" key2="\\" key3="|"/>
<key key0="c" key1="loc accent_trema" key2="loc accent_circonflexe" key3="{" key4="}"/>
<key key0="r" key3="[" key4="]"/>
<key key0="l" key2="=" key3="+" key4="loc £"/>
<key key0="backspace" key2="delete" width="1.5"/>
<keyboard name="Dvorak" bottom_row="false" script="latin">
<row scale="10">

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This scale attribute is not needed (you'll need to remove it on the other rows as well).

<key c="'" n="&quot;" se="esc" />
<key c="," sw=":" se=";" />
<key c="." sw="&lt;" se="&gt;" />
<key c="p" s="loc accent_ring" />
<key c="y" se="_" s="loc accent_grave" />
<key c="f" ne="=" se="." n="loc €" />
<key c="g" nw="+" ne="*" sw="-" se="/" />
<key c="c" nw="loc accent_trema" sw="{" se="}" />
<key c="r" sw="[" se="]" />
<key c="l" se="loc £" />
</row>
<row>
<key key0="a" key2="1" key3="loc å" key4="!"/>
<key key0="o" key1="loc accent_macron" key2="2" key3="\@" key4="loc accent_ogonek"/>
<key key0="e" key1="loc accent_caron" key2="3" key3="\#" key4="loc accent_dot_above"/>
<key key0="u" key1="loc æ" key2="4" key3="$" key4="loc accent_double_aigu"/>
<key key0="i" key2="5" key3="%"/>
<key key0="d" key2="6" key3="^"/>
<key key0="h" key2="7" key3="&amp;"/>
<key key0="t" key2="8" key3="*"/>
<key key0="n" key2="9" key3="(" key4=")"/>
<key key0="s" key2="0" key3="loc ß"/>
<row scale="10">
<key c="a" ne="!" e="¡" n="1" sw="loc å" />
<key c="o" ne="\@" n="2" sw="loc accent_ogonek" s="loc ø" />
<key c="e" ne="\#" n="3" sw="loc accent_dot_above" s="loc ə" />
<key c="u" ne="$" s="loc æ" n="4" sw="loc accent_double_aigu" />
<key c="i" ne="%" n="5" s="loc ı" />
<key c="d" ne="^" n="6" s="loc ð" />
<key c="h" ne="&amp;" n="7" s="ȝ" />
<key c="t" ne="*" sw="?" se="¿" n="8" s="loc þ" />
<key c="n" sw="(" se=")" n="9" />
<key c="s" n="0" se="loc ß" />
</row>
<row>
<key key0="q" shift="0.5" key1="loc accent_tilde" key2="`" key3="~"/>
<key key0="j" key1="loc accent_aigu" key2="'" key3="&quot;"/>
<key key0="k" key1="loc ø" key2=";" key3=":"/>
<key key0="x" key1="loc accent_cedille"/>
<key key0="b"/>
<key key0="m" key2="/" key3="\?"/>
<key key0="w"/>
<key key0="v"/>
<key key0="z" key2="-" key3="_"/>
<row scale="10">
<key c="shift" sw="loc accent_tilde" n="~" />
<key c="q" sw="/" se="\\" s="loc shareText" />
<key c="j" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
<key c="k" n="|" />
<key c="x" n="loc accent_cedille"/>
<key c="b" />
<key c="m" n="`" />
<key c="w" />
<key c="v" />
<key c="z" />
</row>
</keyboard>
<row scale="10" height="0.95">

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builtin layouts shouldn't have a different bottom row.

<key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
<key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
<key width="2.2" c="space" n="switch_forward" key5="cursor_left" e="cursor_right"/>
<key width="1.3" c="loc compose" n="up" e="right" key5="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
<key width="2.2" c="space" n="switch_backward" key5="cursor_left" e="cursor_right"/>
<key width="1.3" c="backspace" n="delete"/>
<key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
</row>
<modmap>

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builtin layouts shouldn't have a different modmap. The builtin modmap should work the same on every layouts by default.

<shift a="'" b="&quot;"/>
<shift a="," b="&lt;"/>
<shift a="." b="&gt;"/>
</modmap>
</keyboard>
70 changes: 70 additions & 0 deletions srcs/layouts/latn_dvorak_landscape.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to add any landscape variation for any layout.
In the future, landscape layouts will be automatically derived from the normal layouts. For now, I don't want to more work on the maintenance side.

<keyboard name="Dvorak-Landscape" bottom_row="false" script="latin">
<row scale="16">
<key c="'" n="&quot;" se="esc" />
<key c="," sw=":" se=";" />
<key c="." sw="&lt;" se="&gt;" />
<key c="p" s="loc accent_ring" />
<key c="y" se="_" s="loc accent_grave" />
<key c="7" shift="1.5"/>
<key c="8"/>
<key c="9"/>
<key c="/"/>
<key shift="0.5" c="f" ne="=" se="." n="loc €" />
<key c="g" nw="+" ne="*" sw="-" se="/" />
<key c="c" nw="loc accent_trema" sw="{" se="}" />
<key c="r" sw="[" se="]" />
<key c="l" se="loc £" />
</row>
<row scale="16">
<key c="a" ne="!" e="¡" n="1" sw="loc å" />
<key c="o" ne="\@" n="2" sw="loc accent_ogonek" s="loc ø" />
<key c="e" ne="\#" n="3" sw="loc accent_dot_above" s="loc ə" />
<key c="u" ne="$" s="loc æ" n="4" sw="loc accent_double_aigu" />
<key c="i" ne="%" n="5" s="loc ı" />
<key c="4" shift="1.5" />
<key c="5"/>
<key c="6"/>
<key c="*"/>
<key shift="0.5" c="d" ne="^" n="6" s="loc ð" />
<key c="h" ne="&amp;" n="7" s="ȝ" />
<key c="t" ne="*" sw="?" se="¿" n="8" s="loc þ" />
<key c="n" sw="(" se=")" n="9" />
<key c="s" n="0" se="loc ß" />
</row>
<row scale="16">
<key c="shift" sw="loc accent_tilde" n="~" />
<key c="q" sw="/" se="\\" s="loc shareText" />
<key c="j" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
<key c="k" n="|" />
<key c="x" n="loc accent_cedille"/>
<key c="1" shift="1.5"/>
<key c="2"/>
<key c="3"/>
<key c="-"/>
<key shift="0.5" c="b" />
<key c="m" n="`" />
<key c="w" />
<key c="v" />
<key c="z" />
</row>
<row scale="16" height="0.95">
<key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
<key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
<key width="2.2" c="space" n="switch_forward" w="cursor_left" e="cursor_right"/>
<key width="1.3" c="loc compose" n="up" e="right" w="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
<key c="0" shift="0.6"/>
<key c="."/>
<key c="="/>
<key c="+"/>
<key width="2.4" shift=".5" c="space" n="switch_backward" w="cursor_left" e="cursor_right"/>
<key width="1.3" c="backspace" n="delete"/>
<key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
</row>
<modmap>
<shift a="'" b="&quot;"/>
<shift a="," b="&lt;"/>
<shift a="." b="&gt;"/>

</modmap>
</keyboard>
41 changes: 41 additions & 0 deletions srcs/layouts/latn_dvorak_left.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't want to add layout variation to the list of layout. Can you post the left hand version to https://github.com/Julow/Unexpected-Keyboard-layouts ?

<keyboard name="Dvorak-Left" bottom_row="false" script="latin">
<row >
<key c="esc" />

<key width="1.5" c="&quot;" nw="`" w="_" e="\\" s="?" sw=":" se=";" n="~" />
<key width="1.5" c="/" nw="{" ne="}" w="(" e=")" sw="[" se="]" n="&lt;" s="&gt;" />
<key width="1.5" c="=" nw="+" ne="*" sw="-" se="/" n="," s="." />
<key width="1.5" c="¡" w="¿" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />

</row>
<row >
<key c="shift" />
<key c="a" n="'" w="1" e="!" />
<key c="o" n="," s="q" w="2" e="\@" />
<key c="e" n="." s="j" w="3" e="\#" />
<key c="u" n="p" s="k" w="4" e="$" />
<key c="i" n="y" s="x" w="5" e="%" />
<key width="1.3" c="backspace" n="delete"/>
<key shift="2" c="" />

</row>
<row >
<key width="1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
<key c="d" n="f" s="b" w="6" e="^" />
<key c="h" n="g" s="m" w="7" e="&amp;" />
<key c="t" n="c" s="w" w="8" e="*" />
<key c="n" n="r" s="v" w="9" e="!" />
<key c="s" n="l" s="z" w="0" />
<key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
<key shift="2" c="" />

</row>
<row height="0.95">
<key width="0.5" c="" />

<key width="1.5" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
<key width="2.5" c="space" n="switch_forward" s="switch_backward" w="cursor_left" e="cursor_right"/>
<key width="1.5" c="loc compose" n="up" e="right" w="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
</row>
</keyboard>