s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate XKB keymaps from XML instead of using pre-made ones

Browse Source
This commit is contained in:
David Boddie
2019-07-20 21:42:53 +00:00
parent 943b2ad9f3
commit 70895999c2
15 changed files with 438 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
data/keyboards/geometry/compact-landscape.xml Normal file
View File

@ -0,0 +1,189 @@
<?xml version="1.0"?>
<geometry version="0.90">
<bounds x="0.000000" y="10.000000" width="426.0000" height="296.5853"/>
<section angle="0">
<bounds x="0" y="0" width="608.7804" height="201.3658"/>
<row orientation="1">
<key keycode="24" name="AD01" oref="outline2">
<bounds x="65.56097" y="42.14634" width="37.46341" height="52.44877"/>
</key>
<key keycode="25" name="AD02" oref="outline2">
<bounds x="106.1463" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="26" name="AD03" oref="outline2">
<bounds x="145.1707" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="27" name="AD04" oref="outline2">
<bounds x="185.7560" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="28" name="AD05" oref="outline2">
<bounds x="226.3414" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="29" name="AD06" oref="outline2">
<bounds x="266.9268" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="30" name="AD07" oref="outline2">
<bounds x="307.5121" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="31" name="AD08" oref="outline2">
<bounds x="348.0975" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="32" name="AD09" oref="outline2">
<bounds x="388.6829" y="42.14634" width="37.46341" height="37.46341"/>
</key>
<key keycode="33" name="AD10" oref="outline2">
<bounds x="429.2682" y="42.14634" width="37.46341" height="37.46341"/>
</key>
</row>
</section>
<section angle="0">
<bounds x="0" y="0" width="608.7804" height="201.3658"/>
<row orientation="1">
<key keycode="38" name="AC01" oref="outline2">
<bounds x="76.48780" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="39" name="AC02" oref="outline2">
<bounds x="115.5121" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="40" name="AC03" oref="outline2">
<bounds x="156.0975" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="41" name="AC04" oref="outline2">
<bounds x="196.6829" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="42" name="AC05" oref="outline2">
<bounds x="237.2682" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="43" name="AC06" oref="outline2">
<bounds x="277.8536" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="44" name="AC07" oref="outline2">
<bounds x="318.4390" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="45" name="AC08" oref="outline2">
<bounds x="359.0243" y="82.73170" width="37.46341" height="37.46341"/>
</key>
<key keycode="46" name="AC09" oref="outline2">
<bounds x="399.6097" y="82.73170" width="37.46341" height="37.46341"/>
</key>
</row>
</section>
<section angle="0">
<bounds x="0" y="0" width="608.7804" height="201.3658"/>
<row orientation="1">
<key keycode="50" name="LFSH" oref="altline">
<bounds x="3.121951" y="121.7560" width="88.97561" height="37.46341"/>
</key>
<key keycode="52" name="AB01" oref="outline2">
<bounds x="95.21951" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="53" name="AB02" oref="outline2">
<bounds x="135.8048" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="54" name="AB03" oref="outline2">
<bounds x="176.3902" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="55" name="AB04" oref="outline2">
<bounds x="215.4146" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="56" name="AB05" oref="outline2">
<bounds x="256.0000" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="57" name="AB06" oref="outline2">
<bounds x="296.5853" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="58" name="AB07" oref="outline2">
<bounds x="337.1707" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="22" name="BKSP" oref="altline">
<bounds x="529.1707" y="1.560976" width="79.60975" height="37.46341"/>
</key>
</row>
</section>
<section angle="0">
<bounds x="0" y="0" width="608.7804" height="201.3658"/>
<row orientation="1">
<key keycode="0" name="ABC123" oref="altline">
<bounds x="62.43902" y="162.3414" width="48.39024" height="37.46341"/>
</key>
<key keycode="150" name="I150" oref="altline">
<bounds x="113.9512" y="162.3414" width="48.39024" height="37.46341"/>
</key>
<key keycode="65" name="SPCE" oref="spaceline">
<bounds x="165.4634" y="162.3414" width="217.5853" height="37.46341"/>
</key>
<key keycode="60" name="AB09" oref="outline2">
<bounds x="418.3414" y="121.7560" width="37.46341" height="37.46341"/>
</key>
<key keycode="36" name="RTRN" oref="outline7">
<bounds x="519.8048" y="82.73170" width="88.97561" height="37.46341"/>
</key>
</row>
</section>
<outline id="outline2" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="37.46341" y="0.000000"/>
<point x="37.46341" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="altline" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="48.39024" y="0.000000"/>
<point x="48.39024" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline4" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="59.31707" y="0.000000"/>
<point x="59.31707" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline5" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="59.31707" y="0.000000"/>
<point x="59.31707" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline6" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="68.68292" y="0.000000"/>
<point x="68.68292" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline7" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="88.97561" y="0.000000"/>
<point x="88.97561" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline8" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="88.97561" y="0.000000"/>
<point x="88.97561" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline9" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="109.2682" y="0.000000"/>
<point x="109.2682" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline10" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="37.46341" y="0.000000"/>
<point x="37.46341" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="outline13" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="79.60975" y="0.000000"/>
<point x="79.60975" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
<outline id="spaceline" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/>
<point x="150.5853" y="0.000000"/>
<point x="150.5853" y="52.44877"/>
<point x="0.000000" y="52.44877"/>
</outline>
</geometry>

66
data/keyboards/geometry/compact.xml
View File

@ -3,52 +3,52 @@
<bounds x="0" y="10.000000" width="426.0000" height="296.5853"/> <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="24" name="AD01" oref="outline2" /> <key name="AD01" oref="outline2" />
<key keycode="25" name="AD02" oref="outline2" /> <key name="AD02" oref="outline2" />
<key keycode="26" name="AD03" oref="outline2" /> <key name="AD03" oref="outline2" />
<key keycode="27" name="AD04" oref="outline2" /> <key name="AD04" oref="outline2" />
<key keycode="28" name="AD05" oref="outline2" /> <key name="AD05" oref="outline2" />
<key keycode="29" name="AD06" oref="outline2" /> <key name="AD06" oref="outline2" />
<key keycode="30" name="AD07" oref="outline2" /> <key name="AD07" oref="outline2" />
<key keycode="31" name="AD08" oref="outline2" /> <key name="AD08" oref="outline2" />
<key keycode="32" name="AD09" oref="outline2" /> <key name="AD09" oref="outline2" />
<key keycode="33" name="AD10" oref="outline2" /> <key name="AD10" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="38" name="AC01" oref="outline2" /> <key name="AC01" oref="outline2" />
<key keycode="39" name="AC02" oref="outline2" /> <key name="AC02" oref="outline2" />
<key keycode="40" name="AC03" oref="outline2" /> <key name="AC03" oref="outline2" />
<key keycode="41" name="AC04" oref="outline2" /> <key name="AC04" oref="outline2" />
<key keycode="42" name="AC05" oref="outline2" /> <key name="AC05" oref="outline2" />
<key keycode="43" name="AC06" oref="outline2" /> <key name="AC06" oref="outline2" />
<key keycode="44" name="AC07" oref="outline2" /> <key name="AC07" oref="outline2" />
<key keycode="45" name="AC08" oref="outline2" /> <key name="AC08" oref="outline2" />
<key keycode="46" name="AC09" oref="outline2" /> <key name="AC09" oref="outline2" />
<key keycode="47" name="AC10" oref="outline2" /> <key name="AC10" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="50" name="LFSH" oref="altline" /> <key name="LFSH" oref="altline" />
<key keycode="52" name="AB01" oref="outline2" /> <key name="AB01" oref="outline2" />
<key keycode="53" name="AB02" oref="outline2" /> <key name="AB02" oref="outline2" />
<key keycode="54" name="AB03" oref="outline2" /> <key name="AB03" oref="outline2" />
<key keycode="55" name="AB04" oref="outline2" /> <key name="AB04" oref="outline2" />
<key keycode="56" name="AB05" oref="outline2" /> <key name="AB05" oref="outline2" />
<key keycode="57" name="AB06" oref="outline2" /> <key name="AB06" oref="outline2" />
<key keycode="58" name="AB07" oref="outline2" /> <key name="AB07" oref="outline2" />
<key keycode="22" name="BKSP" oref="altline" /> <key name="BKSP" oref="altline" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="0" name="ABC123" oref="altline" /> <key keycode="0" name="ABC123" oref="altline" />
<key keycode="149" name="I149" oref="altline" /> <key name="I149" oref="altline" />
<key keycode="65" name="SPCE" oref="spaceline" /> <key name="SPCE" oref="spaceline" />
<key keycode="59" name="AB08" oref="outline2" /> <key name="AB08" oref="outline2" />
<key keycode="36" name="RTRN" oref="outline7" /> <key name="RTRN" oref="outline7" />
</row> </row>
</section> </section>
<outline id="outline2" corner-radius="1.000000"> <outline id="outline2" corner-radius="1.000000">

70
data/keyboards/geometry/extended.xml
View File

@ -7,54 +7,54 @@
values in the range from 8 to 255. --> values in the range from 8 to 255. -->
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="24" name="AD01" oref="outline2" /> <key name="AD01" oref="outline2" />
<key keycode="25" name="AD02" oref="outline2" /> <key name="AD02" oref="outline2" />
<key keycode="26" name="AD03" oref="outline2" /> <key name="AD03" oref="outline2" />
<key keycode="27" name="AD04" oref="outline2" /> <key name="AD04" oref="outline2" />
<key keycode="28" name="AD05" oref="outline2" /> <key name="AD05" oref="outline2" />
<key keycode="29" name="AD06" oref="outline2" /> <key name="AD06" oref="outline2" />
<key keycode="30" name="AD07" oref="outline2" /> <key name="AD07" oref="outline2" />
<key keycode="31" name="AD08" oref="outline2" /> <key name="AD08" oref="outline2" />
<key keycode="32" name="AD09" oref="outline2" /> <key name="AD09" oref="outline2" />
<key keycode="33" name="AD10" oref="outline2" /> <key name="AD10" oref="outline2" />
<key keycode="34" name="AD11" oref="outline2" /> <key name="AD11" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="38" name="AC01" oref="outline2" /> <key name="AC01" oref="outline2" />
<key keycode="39" name="AC02" oref="outline2" /> <key name="AC02" oref="outline2" />
<key keycode="40" name="AC03" oref="outline2" /> <key name="AC03" oref="outline2" />
<key keycode="41" name="AC04" oref="outline2" /> <key name="AC04" oref="outline2" />
<key keycode="42" name="AC05" oref="outline2" /> <key name="AC05" oref="outline2" />
<key keycode="43" name="AC06" oref="outline2" /> <key name="AC06" oref="outline2" />
<key keycode="44" name="AC07" oref="outline2" /> <key name="AC07" oref="outline2" />
<key keycode="45" name="AC08" oref="outline2" /> <key name="AC08" oref="outline2" />
<key keycode="46" name="AC09" oref="outline2" /> <key name="AC09" oref="outline2" />
<key keycode="47" name="AC10" oref="outline2" /> <key name="AC10" oref="outline2" />
<key keycode="48" name="AC11" oref="outline2" /> <key name="AC11" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="50" name="LFSH" oref="altline" /> <key name="LFSH" oref="altline" />
<key keycode="52" name="AB01" oref="outline2" /> <key name="AB01" oref="outline2" />
<key keycode="53" name="AB02" oref="outline2" /> <key name="AB02" oref="outline2" />
<key keycode="54" name="AB03" oref="outline2" /> <key name="AB03" oref="outline2" />
<key keycode="55" name="AB04" oref="outline2" /> <key name="AB04" oref="outline2" />
<key keycode="56" name="AB05" oref="outline2" /> <key name="AB05" oref="outline2" />
<key keycode="57" name="AB06" oref="outline2" /> <key name="AB06" oref="outline2" />
<key keycode="58" name="AB07" oref="outline2" /> <key name="AB07" oref="outline2" />
<key keycode="22" name="BKSP" oref="altline" /> <key name="BKSP" oref="altline" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="0" name="ABC123" oref="altline" /> <key keycode="0" name="ABC123" oref="altline" />
<key keycode="149" name="I149" oref="altline" /> <key name="I149" oref="altline" />
<key keycode="65" name="SPCE" oref="spaceline" /> <key name="SPCE" oref="spaceline" />
<key keycode="59" name="AB08" oref="outline2" /> <key name="AB08" oref="outline2" />
<key keycode="36" name="RTRN" oref="outline7" /> <key name="RTRN" oref="outline7" />
</row> </row>
</section> </section>
<outline id="outline2" corner-radius="1.000000"> <outline id="outline2" corner-radius="1.000000">

38
data/keyboards/geometry/numbers-keypad.xml
View File

@ -3,37 +3,37 @@
<bounds x="0" y="10.000000" width="426.0000" height="296.5853"/> <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="24" name="AD01" oref="outline2" /> <key name="AD01" oref="outline2" />
<key keycode="25" name="AD02" oref="outline2" /> <key name="AD02" oref="outline2" />
<key keycode="26" name="AD03" oref="outline2" /> <key name="AD03" oref="outline2" />
<key keycode="27" name="AD04" oref="outline2" /> <key name="AD04" oref="outline2" />
<key keycode="28" name="AD05" oref="outline2" /> <key name="AD05" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="38" name="AC01" oref="outline2" /> <key name="AC01" oref="outline2" />
<key keycode="39" name="AC02" oref="outline2" /> <key name="AC02" oref="outline2" />
<key keycode="40" name="AC03" oref="outline2" /> <key name="AC03" oref="outline2" />
<key keycode="41" name="AC04" oref="outline2" /> <key name="AC04" oref="outline2" />
<key keycode="42" name="AC05" oref="outline2" /> <key name="AC05" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="52" name="AB01" oref="outline2" /> <key name="AB01" oref="outline2" />
<key keycode="53" name="AB02" oref="outline2" /> <key name="AB02" oref="outline2" />
<key keycode="54" name="AB03" oref="outline2" /> <key name="AB03" oref="outline2" />
<key keycode="55" name="AB04" oref="outline2" /> <key name="AB04" oref="outline2" />
<key keycode="56" name="AB05" oref="outline2" /> <key name="AB05" oref="outline2" />
</row> </row>
</section> </section>
<section angle="0"> <section angle="0">
<row orientation="1"> <row orientation="1">
<key keycode="22" name="BKSP" oref="altline" /> <key name="BKSP" oref="altline" />
<key keycode="57" name="AB06" oref="outline2" /> <key name="AB06" oref="outline2" />
<key keycode="65" name="SPCE" oref="spaceline" /> <key name="SPCE" oref="spaceline" />
<key keycode="36" name="RTRN" oref="outline7" /> <key name="RTRN" oref="outline7" />
</row> </row>
</section> </section>
<outline id="outline2" corner-radius="1.000000"> <outline id="outline2" corner-radius="1.000000">

26
data/keyboards/symbols/nb.xml
View File

@ -63,8 +63,8 @@
<key name="AD11"> <key name="AD11">
<symbol keyval="229" label="&#229;">aring</symbol> <symbol keyval="229" label="&#229;">aring</symbol>
<symbol keyval="197" label="&#197;">Aring</symbol> <symbol keyval="197" label="&#197;">Aring</symbol>
<symbol label="&#177;">U00B1</symbol> <symbol label=""></symbol>
<symbol label="&#167;">U00A7</symbol> <symbol label=""></symbol>
</key> </key>
<key name="AC01"> <key name="AC01">
<symbol label="a">a</symbol> <symbol label="a">a</symbol>
@ -100,37 +100,37 @@
<symbol label="h">h</symbol> <symbol label="h">h</symbol>
<symbol label="H">H</symbol> <symbol label="H">H</symbol>
<symbol label="-">minus</symbol> <symbol label="-">minus</symbol>
<symbol label="_">underscore</symbol> <symbol label="^">asciicircum</symbol>
</key> </key>
<key name="AC07"> <key name="AC07">
<symbol label="j">j</symbol> <symbol label="j">j</symbol>
<symbol label="J">J</symbol> <symbol label="J">J</symbol>
<symbol label="+">plus</symbol> <symbol label="_">underscore</symbol>
<symbol label="=">equal</symbol> <symbol label="&#176;">degree</symbol>
</key> </key>
<key name="AC08"> <key name="AC08">
<symbol label="k">k</symbol> <symbol label="k">k</symbol>
<symbol label="K">K</symbol> <symbol label="K">K</symbol>
<symbol label="&#252;">U00FC</symbol> <symbol label="+">plus</symbol>
<symbol label="^">asciicircum</symbol> <symbol label="=">equal</symbol>
</key> </key>
<key name="AC09"> <key name="AC09">
<symbol label="l">l</symbol> <symbol label="l">l</symbol>
<symbol label="L">L</symbol> <symbol label="L">L</symbol>
<symbol label="&#246;">U00F6</symbol> <symbol label="(">parenleft</symbol>
<symbol label="&#176;">degree</symbol> <symbol label="{">braceleft</symbol>
</key> </key>
<key name="AC10"> <key name="AC10">
<symbol keyval="248" label="&#248;">oslash</symbol> <symbol keyval="248" label="&#248;">oslash</symbol>
<symbol keyval="216" label="&#216;">Oslash</symbol> <symbol keyval="216" label="&#216;">Oslash</symbol>
<symbol label="(">parenleft</symbol> <symbol label=")">parenright</symbol>
<symbol label="{">braceleft</symbol> <symbol label="}">braceright</symbol>
</key> </key>
<key name="AC11"> <key name="AC11">
<symbol keyval="230" label="&#230;">ae</symbol> <symbol keyval="230" label="&#230;">ae</symbol>
<symbol keyval="198" label="&#198;">AE</symbol> <symbol keyval="198" label="&#198;">AE</symbol>
<symbol label=")">parenright</symbol> <symbol label=""></symbol>
<symbol label="}">braceright</symbol> <symbol label=""></symbol>
</key> </key>
<key name="RTRN"> <key name="RTRN">
<symbol keyval="65293" icon="key-enter">Return</symbol> <symbol keyval="65293" icon="key-enter">Return</symbol>

3
data/squeekboard.gresources.xml
View File

@ -6,9 +6,6 @@
<file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file> <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/extended.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/numbers-keypad.xml</file> <file compressed="true" preprocess="xml-stripblanks">keyboards/geometry/numbers-keypad.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file> <file compressed="true" preprocess="xml-stripblanks">keyboards/keyboards.xml</file>
<file compressed="true">keyboards/keymaps/nb.xkb</file>
<file compressed="true">keyboards/keymaps/us.xkb</file>
<file compressed="true">keyboards/keymaps/numbers.xkb</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file> <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ar.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file> <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/as-inscript.xml</file>
<file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/be.xml</file> <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/be.xml</file>

94
eek/eek-keyboard.c
View File

@ -28,6 +28,7 @@
*/ */
#include "config.h" #include "config.h"
#include <glib/gprintf.h>
#include "eek-keyboard.h" #include "eek-keyboard.h"
#include "eek-marshalers.h" #include "eek-marshalers.h"
@ -36,6 +37,7 @@
#include "eek-symbol.h" #include "eek-symbol.h"
#include "eek-enumtypes.h" #include "eek-enumtypes.h"
#include "eekboard/key-emitter.h" #include "eekboard/key-emitter.h"
#include "keymap.h"
enum { enum {
PROP_0, PROP_0,
@ -72,6 +74,8 @@ struct _EekKeyboardPrivate
GList *pressed_keys; GList *pressed_keys;
GList *locked_keys; GList *locked_keys;
GArray *outline_array; GArray *outline_array;
/* Map key names to key objects: */
GHashTable *names; GHashTable *names;
/* modifiers dynamically assigned at run time */ /* modifiers dynamically assigned at run time */
@ -796,3 +800,93 @@ eek_keyboard_get_locked_keys (EekKeyboard *keyboard)
g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL); g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), NULL);
return g_list_copy (keyboard->priv->locked_keys); return g_list_copy (keyboard->priv->locked_keys);
} }
/**
* eek_keyboard_get_keymap:
* @keyboard: an #EekKeyboard
*
* Get the keymap for the keyboard.
* Returns: a string containing the XKB keymap.
*/
gchar *
eek_keyboard_get_keymap(EekKeyboard *keyboard)
{
/* Start the keycodes and symbols sections with their respective headers. */
gchar *keycodes = g_strdup(keymap_keycodes_header);
gchar *symbols = g_strdup(keymap_symbols_header);
/* Iterate over the keys in the name-to-key hash table. */
GHashTableIter iter;
gpointer key_name, key_ptr;
g_hash_table_iter_init(&iter, keyboard->priv->names);
while (g_hash_table_iter_next(&iter, &key_name, &key_ptr)) {
gchar *current, *line;
EekKey *key = EEK_KEY(key_ptr);
int keycode = eek_key_get_keycode(key);
/* Don't include invalid keycodes in the keymap. */
if (keycode == EEK_INVALID_KEYCODE)
continue;
/* Append a key name-to-keycode definition to the keycodes section. */
current = keycodes;
line = g_strdup_printf(" <%s> = %i;\n", (char *)key_name, keycode);
keycodes = g_strconcat(current, line, NULL);
g_free(line);
g_free(current);
/* Find the symbols associated with the key. */
EekSymbolMatrix *matrix = eek_key_get_symbol_matrix(key);
EekSymbol *syms[4];
int i, j;
/* Get the symbols for all the levels defined for the key, then
pad it out with the first symbol for all levels up to the fourth. */
for (i = 0; i < matrix->num_levels; ++i)
syms[i] = eek_symbol_matrix_get_symbol(matrix, 0, i);
while (i < 4) {
syms[i] = eek_symbol_matrix_get_symbol(matrix, 0, 0);
i++;
}
/* The four levels are split into two groups in the keymap.
Generate strings for each of these groups, where an empty group is
treated specially. */
gchar *groups[2];
for (i = 0, j = 0; i < 2; ++i, j += 2) {
if (syms[j] && syms[j + 1])
groups[i] = g_strjoin(", ", eek_symbol_get_name(syms[j]),
eek_symbol_get_name(syms[j + 1]),
NULL);
else
groups[i] = "";
}
/* Append a key definition to the symbols section. */
current = symbols;
line = g_strdup_printf(" key <%s> { [ %s ], [ %s ] };\n",
(char *)key_name, groups[0], groups[1]);
g_free(groups[0]);
g_free(groups[1]);
symbols = g_strconcat(current, line, NULL);
g_free(line);
g_free(current);
}
/* Assemble the keymap file from the header, sections and footer. */
gchar *keymap = g_strconcat(keymap_header,
keycodes, " };\n\n",
symbols, " };\n\n",
keymap_footer, NULL);
g_free(keycodes);
g_free(symbols);
return keymap;
}

3
eek/eek-keyboard.h
View File

@ -195,5 +195,8 @@ void eek_modifier_key_free
void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp); void eek_keyboard_press_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp);
void eek_keyboard_release_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp); void eek_keyboard_release_key(EekKeyboard *keyboard, EekKey *key, guint32 timestamp);
gchar * eek_keyboard_get_keymap
(EekKeyboard *keyboard);
G_END_DECLS G_END_DECLS
#endif /* EEK_KEYBOARD_H */ #endif /* EEK_KEYBOARD_H */

24
eek/eek-xml-layout.c
View File

@ -247,6 +247,7 @@ struct _GeometryParseData {
gchar *name; gchar *name;
EekOutline outline; EekOutline outline;
gchar *oref; gchar *oref;
gint keycode;
GHashTable *key_oref_hash; GHashTable *key_oref_hash;
GHashTable *oref_outline_hash; GHashTable *oref_outline_hash;
@ -269,6 +270,7 @@ geometry_parse_data_new (EekKeyboard *keyboard)
g_str_equal, g_str_equal,
g_free, g_free,
(GDestroyNotify)eek_outline_free); (GDestroyNotify)eek_outline_free);
data->keycode = 8;
return data; return data;
} }
@ -396,17 +398,6 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
if (g_strcmp0 (element_name, "key") == 0) { if (g_strcmp0 (element_name, "key") == 0) {
guint keycode; guint keycode;
attribute = get_attribute (attribute_names, attribute_values,
"keycode");
if (attribute == NULL) {
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_MISSING_ATTRIBUTE,
"no \"keycode\" attribute for \"key\"");
return;
}
keycode = strtol (attribute, NULL, 10);
attribute = get_attribute (attribute_names, attribute_values, attribute = get_attribute (attribute_names, attribute_values,
"name"); "name");
if (attribute == NULL) { if (attribute == NULL) {
@ -416,9 +407,17 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
"no \"name\" attribute for \"key\""); "no \"name\" attribute for \"key\"");
return; return;
} }
gchar *name = g_strdup (attribute);
attribute = get_attribute (attribute_names, attribute_values,
"keycode");
if (attribute != NULL)
keycode = strtol (attribute, NULL, 10);
else
keycode = data->keycode++;
data->key = eek_section_create_key (data->section, data->key = eek_section_create_key (data->section,
g_strdup (attribute), name,
keycode, keycode,
data->num_columns, data->num_columns,
data->num_rows - 1); data->num_rows - 1);
@ -727,7 +726,6 @@ symbols_end_element_callback (GMarkupParseContext *pcontext,
gint levels = num_symbols / data->groups; gint levels = num_symbols / data->groups;
EekSymbolMatrix *matrix = eek_symbol_matrix_new (data->groups, EekSymbolMatrix *matrix = eek_symbol_matrix_new (data->groups,
levels); levels);
head = data->symbols = g_slist_reverse (data->symbols); head = data->symbols = g_slist_reverse (data->symbols);
for (i = 0; i < num_symbols; i++) { for (i = 0; i < num_symbols; i++) {
if (head && head->data) { if (head && head->data) {

39
eek/keymap.h Normal file
View File

@ -0,0 +1,39 @@
#include <gdk/gdk.h>
#include <xkbcommon/xkbcommon.h>
gboolean
squeek_keymap_get_entries_for_keyval (struct xkb_keymap *xkb_keymap,
guint keyval,
GdkKeymapKey **keys,
guint *n_keys);
static const char *keymap_header = "xkb_keymap {\n\
\n";
static const char *keymap_keycodes_header = "\
xkb_keycodes \"squeekboard\" {\n\n\
minimum = 8;\n\
maximum = 255;\n\
\n";
static const char *keymap_symbols_header = "\
xkb_symbols \"squeekboard\" {\n\
\n\
name[Group1] = \"Letters\";\n\
name[Group2] = \"Numbers/Symbols\";\n\
\n";
static const char *keymap_footer = "\
xkb_types \"squeekboard\" {\n\
\n\
type \"TWO_LEVEL\" {\n\
modifiers = Shift;\n\
map[Shift] = Level2;\n\
level_name[Level1] = \"Base\";\n\
level_name[Level2] = \"Shift\";\n\
};\n\
};\n\
\n\
xkb_compatibility \"squeekboard\" {\n\
};\n\
};";

59
eekboard/eekboard-context-service.c
View File

@ -28,7 +28,6 @@
#include "config.h" #include "config.h"
#include "eekboard/eekboard-context-service.h" #include "eekboard/eekboard-context-service.h"
#include "keymap.h"
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
@ -85,55 +84,6 @@ struct _EekboardContextServicePrivate {
G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
/*static Display *display = NULL; */
gchar *
get_keymap_from_resource(const gchar *keyboard_type, gboolean fallback)
{
g_autoptr (GFile) file = NULL;
g_autoptr (GFileInfo) info = NULL;
g_autoptr (GFileInputStream) stream = NULL;
goffset size = 0;
gsize bytes_read = 0;
g_autofree gchar *contents = NULL;
g_autofree gchar *path = NULL;
GError *error = NULL;
if (fallback)
g_debug ("falling back to loading a %s keymap", keyboard_type);
path = g_strconcat ("resource:///sm/puri/squeekboard/keyboards/keymaps/",
keyboard_type, ".xkb", NULL);
file = g_file_new_for_uri (path);
stream = g_file_read (file, NULL, &error);
if (!stream)
goto keymap_error;
info = g_file_input_stream_query_info (stream,
G_FILE_ATTRIBUTE_STANDARD_SIZE,
NULL,
&error);
if (!info)
goto keymap_error;
size = g_file_info_get_size (info);
contents = g_malloc0 (size);
if (!g_input_stream_read_all (G_INPUT_STREAM(stream), contents, size,
&bytes_read, NULL, &error))
goto keymap_error;
return g_utf8_make_valid (contents, size);
keymap_error:
if (fallback)
g_error ("failed to load keymap from resource: %s", error->message);
g_error_free (error);
return NULL;
}
static EekKeyboard * static EekKeyboard *
eekboard_context_service_real_create_keyboard (EekboardContextService *self, eekboard_context_service_real_create_keyboard (EekboardContextService *self,
const gchar *keyboard_type) const gchar *keyboard_type)
@ -193,13 +143,8 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
if (!context) { if (!context) {
g_error("No context created"); g_error("No context created");
} }
/*
struct xkb_rule_names rules = { 0 }; gchar *keymap_str = eek_keyboard_get_keymap(keyboard);
rules.layout = strdup(keyboard_type);
*/
char *keymap_str = get_keymap_from_resource(keyboard_type, FALSE);
if (!keymap_str)
keymap_str = get_keymap_from_resource("us", TRUE);
struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str, struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS); XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);

182
eekboard/key-emitter.c
View File

@ -20,7 +20,6 @@
/* This file is responsible for managing keycode data and emitting keycodes. */ /* This file is responsible for managing keycode data and emitting keycodes. */
#include "eekboard/key-emitter.h" #include "eekboard/key-emitter.h"
#include "eekboard/keymap.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
@ -39,98 +38,6 @@ typedef struct {
} SeatEmitter; } SeatEmitter;
/* The following functions for keyboard mapping change are direct
translation of the code in Caribou (in libcaribou/xadapter.vala):
- get_replaced_keycode (Caribou: get_reserved_keycode)
- replace_keycode
- get_keycode_from_gdk_keymap (Caribou: best_keycode_keyval_match)
*/
/* Find an unused keycode where a keysym can be assigned. Restricted to Level 1 */
static guint
get_replaced_keycode (SeatEmitter *client)
{
guint keycode;
return 0; // FIXME: no xkb allocated yet
for (keycode = client->xkb->max_key_code;
keycode >= client->xkb->min_key_code;
--keycode) {
guint offset = client->xkb->map->key_sym_map[keycode].offset;
if (client->xkb->map->key_sym_map[keycode].kt_index[0] == XkbOneLevelIndex &&
client->xkb->map->syms[offset] != NoSymbol) {
return keycode;
}
}
return 0;
}
/* Replace keysym assigned to KEYCODE to KEYSYM. Both args are used
as in-out. If KEYCODE points to 0, this function picks a keycode
from the current map and replace the associated keysym to KEYSYM.
In that case, the replaced keycode is stored in KEYCODE and the old
keysym is stored in KEYSYM. If otherwise (KEYCODE points to
non-zero keycode), it simply changes the current map with the
specified KEYCODE and KEYSYM. */
static gboolean
replace_keycode (SeatEmitter *emitter,
guint keycode,
guint *keysym)
{
/* GdkDisplay *display = gdk_display_get_default ();
Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
guint old_keysym;
int keysyms_per_keycode;
KeySym *syms;
*/
return TRUE; // FIXME: no xkb allocated at the moment, pretending all is fine
g_return_val_if_fail (emitter->xkb->min_key_code <= keycode &&
keycode <= emitter->xkb->max_key_code,
FALSE);
g_return_val_if_fail (keysym != NULL, FALSE);
/*
* Update keyboard mapping. Wayland receives keyboard mapping as a string, so XChangeKeyboardMapping needs to translate from the symbol tbale t the string. TODO.
*
syms = XGetKeyboardMapping (xdisplay, keycode, 1, &keysyms_per_keycode);
old_keysym = syms[0];
syms[0] = *keysym;
XChangeKeyboardMapping (xdisplay, keycode, 1, syms, 1);
XSync (xdisplay, False);
XFree (syms);
*keysym = old_keysym;
*/
return TRUE;
}
static gboolean
get_keycode_from_gdk_keymap (SeatEmitter *emitter,
guint keysym,
guint *keycode,
guint *modifiers)
{
GdkKeymapKey *keys, *best_match = NULL;
guint n_keys, i;
if (!squeek_keymap_get_entries_for_keyval (emitter->keymap, keysym, &keys, &n_keys))
return FALSE;
for (i = 0; i < n_keys; i++)
if ((guint)keys[i].group == emitter->group)
best_match = &keys[i];
if (!best_match) {
g_free (keys);
return FALSE;
}
*keycode = best_match->keycode;
*modifiers = best_match->level == 1 ? EEK_SHIFT_MASK : 0;
g_free (keys);
return TRUE;
}
int send_virtual_keyboard_key( int send_virtual_keyboard_key(
struct zwp_virtual_keyboard_v1 *keyboard, struct zwp_virtual_keyboard_v1 *keyboard,
unsigned int keycode, unsigned int keycode,
@ -161,95 +68,6 @@ send_fake_modifiers_events (SeatEmitter *emitter,
zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, proto_modifiers, 0, 0, emitter->group); zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, proto_modifiers, 0, 0, emitter->group);
} }
static void
send_fake_key_event (SeatEmitter *emitter,
guint xkeysym,
guint keyboard_modifiers,
gboolean pressed,
uint32_t timestamp)
{
EekModifierType modifiers;
guint old_keysym = xkeysym;
g_return_if_fail (xkeysym > 0);
guint keycode;
if (!get_keycode_from_gdk_keymap (emitter, xkeysym, &keycode, &modifiers)) {
keycode = get_replaced_keycode (emitter);
if (keycode == 0) {
g_warning ("no available keycode to replace");
return;
}
if (!replace_keycode (emitter, keycode, &old_keysym)) {
g_warning ("failed to lookup X keysym %X", xkeysym);
return;
}
}
/* Clear level shift modifiers */
keyboard_modifiers &= (unsigned)~EEK_SHIFT_MASK;
keyboard_modifiers &= (unsigned)~EEK_LOCK_MASK;
/* FIXME: may need to remap ISO_Level3_Shift and NumLock */
modifiers |= keyboard_modifiers;
send_fake_modifiers_events (emitter, modifiers, timestamp);
// There's something magical about subtracting/adding 8 to keycodes for some reason
send_virtual_keyboard_key (emitter->virtual_keyboard, keycode - 8, (unsigned)pressed, timestamp);
send_fake_modifiers_events (emitter, modifiers, timestamp);
if (old_keysym != xkeysym)
replace_keycode (emitter, keycode, &old_keysym);
}
static void
send_fake_key_events (SeatEmitter *emitter,
EekSymbol *symbol,
EekModifierType keyboard_modifiers,
gboolean pressed,
uint32_t timestamp)
{
/* Ignore modifier keys */
if (eek_symbol_is_modifier (symbol))
return;
/* If symbol is a text, convert chars in it to keysym */
if (EEK_IS_TEXT(symbol)) {
const gchar *utf8 = eek_text_get_text (EEK_TEXT(symbol));
printf("Attempting to send text %s\n", utf8);
/* FIXME:
glong items_written;
gunichar *ucs4 = g_utf8_to_ucs4_fast (utf8, -1, &items_written);
gint i;
for (i = 0; i < items_written; i++) {
guint xkeysym;
EekKeysym *keysym;
gchar *name;
name = g_strdup_printf ("U%04X", ucs4[i]);
xkeysym = XStringToKeysym (name); // TODO: use xkb_get_keysym_from_name
g_free (name);
keysym = eek_keysym_new (xkeysym);
send_fake_key_events (client,
EEK_SYMBOL(keysym),
keyboard_modifiers);
}
g_free (ucs4);
*/
return;
}
if (EEK_IS_KEYSYM(symbol)) {
guint xkeysym = eek_keysym_get_xkeysym (EEK_KEYSYM(symbol));
send_fake_key_event (emitter, xkeysym, keyboard_modifiers, pressed, timestamp);
}
}
/* Finds the first key code for each modifier and saves it in modifier_keycodes */ /* Finds the first key code for each modifier and saves it in modifier_keycodes */
static void static void
update_modifier_info (SeatEmitter *client) update_modifier_info (SeatEmitter *client)

66
eekboard/keymap.c
View File

@ -1,66 +0,0 @@
/* GDK - The GIMP Drawing Kit
* Copyright (C) 2000 Red Hat, Inc.
* Copyright (C) 2019 Purism, SPC
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Modified for squeekboard based on GTK
*/
#include "keymap.h"
gboolean
squeek_keymap_get_entries_for_keyval (struct xkb_keymap *xkb_keymap,
guint keyval,
GdkKeymapKey **keys,
guint *n_keys)
{
GArray *retval;
guint keycode;
xkb_keycode_t min_keycode, max_keycode;
retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
min_keycode = xkb_keymap_min_keycode (xkb_keymap);
max_keycode = xkb_keymap_max_keycode (xkb_keymap);
for (keycode = min_keycode; keycode < max_keycode; keycode++)
{
xkb_layout_index_t num_layouts, layout;
num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, keycode);
for (layout = 0; layout < num_layouts; layout++)
{
xkb_layout_index_t num_levels, level;
num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, keycode, layout);
for (level = 0; level < num_levels; level++)
{
const xkb_keysym_t *syms;
gint num_syms, sym;
num_syms = xkb_keymap_key_get_syms_by_level (xkb_keymap, keycode, layout, level, &syms);
for (sym = 0; sym < num_syms; sym++)
{
if (syms[sym] == keyval)
{
GdkKeymapKey key;
key.keycode = keycode;
key.group = (gint)layout;
key.level = (gint)level;
g_array_append_val (retval, key);
}
}
}
}
}
*n_keys = retval->len;
*keys = (GdkKeymapKey*) g_array_free (retval, FALSE);
return TRUE;
}

8
eekboard/keymap.h
View File

@ -1,8 +0,0 @@
#include <gdk/gdk.h>
#include <xkbcommon/xkbcommon.h>
gboolean
squeek_keymap_get_entries_for_keyval (struct xkb_keymap *xkb_keymap,
guint keyval,
GdkKeymapKey **keys,
guint *n_keys);

1
src/meson.build
View File

@ -40,7 +40,6 @@ sources = [
enums, enums,
keysym_entries, keysym_entries,
marshalers, marshalers,
'../eekboard/keymap.c',
'../eekboard/key-emitter.c', '../eekboard/key-emitter.c',
'../eekboard/eekboard-context-service.c', '../eekboard/eekboard-context-service.c',
'../eekboard/eekboard-context.c', '../eekboard/eekboard-context.c',