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

Merge branch 'layout_fixes' into 'master'

Browse Source 
Layout fixes

See merge request Librem5/squeekboard!131
This commit is contained in:
David Boddie
2019-08-26 12:21:09 +00:00
parent 607f5ed877 bc82b59e47
commit d2e5cdef4e
4 changed files with 143 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,54 +14,12 @@
<point x="48.39024" y="52"/> <point x="48.39024" y="52"/>
<point x="0.000000" y="52"/> <point x="0.000000" y="52"/>
</outline> </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"/>
<point x="0.000000" y="52"/>
</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"/>
<point x="0.000000" y="52"/>
</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"/>
<point x="0.000000" y="52"/>
</outline>
<outline id="outline7" corner-radius="1.000000"> <outline id="outline7" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/> <point x="0.000000" y="0.000000"/>
<point x="88.97561" y="0.000000"/> <point x="88.97561" y="0.000000"/>
<point x="88.97561" y="52"/> <point x="88.97561" y="52"/>
<point x="0.000000" y="52"/> <point x="0.000000" y="52"/>
</outline> </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"/>
<point x="0.000000" y="52"/>
</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"/>
<point x="0.000000" y="52"/>
</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"/>
<point x="0.000000" y="52"/>
</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"/>
<point x="0.000000" y="52"/>
</outline>
<outline id="spaceline" corner-radius="1.000000"> <outline id="spaceline" corner-radius="1.000000">
<point x="0.000000" y="0.000000"/> <point x="0.000000" y="0.000000"/>
<point x="150.5853" y="0.000000"/> <point x="150.5853" y="0.000000"/>
@ -75,8 +33,9 @@
<button name="show_numbers" oref="altline" keycode="0" /> <button name="show_numbers" oref="altline" keycode="0" />
<button name="show_letters" oref="altline" keycode="0" /> <button name="show_letters" oref="altline" keycode="0" />
<button name="show_symbols" oref="altline" keycode="0" /> <button name="show_symbols" oref="altline" keycode="0" />
<button name="period" oref="altline" />
<button name="space" oref="spaceline" /> <button name="space" oref="spaceline" />
<button name="return" oref="outline7" /> <button name="Return" oref="outline7" />
<view> <view>
<section angle="0">q w e r t y u i o p</section> <section angle="0">q w e r t y u i o p</section>

133
data/keyboards/symbols/special/number.xml
View File

@ -1,117 +1,22 @@
<?xml version='1.0' encoding='ASCII' standalone='yes'?> <?xml version='1.0' encoding='ASCII' standalone='yes'?>
<symbols version="0.90"> <symbols version="0.90">
<key name="AD01"> <symbol label="1">1</symbol>
<symbol label="1">1</symbol> <symbol label="2">2</symbol>
<symbol label="1">1</symbol> <symbol label="3">3</symbol>
<symbol label="1">1</symbol> <symbol label="(">parenleft</symbol>
<symbol label="1">1</symbol> <symbol label=")">parenright</symbol>
</key> <symbol label="4">4</symbol>
<key name="AD02"> <symbol label="5">5</symbol>
<symbol label="2">2</symbol> <symbol label="6">6</symbol>
<symbol label="2">2</symbol> <symbol label="#">numbersign</symbol>
<symbol label="2">2</symbol> <symbol label="*">asterisk</symbol>
<symbol label="2">2</symbol> <symbol label="7">7</symbol>
</key> <symbol label="8">8</symbol>
<key name="AD03"> <symbol label="9">9</symbol>
<symbol label="3">3</symbol> <symbol label="+">plus</symbol>
<symbol label="3">3</symbol> <symbol label="-">minus</symbol>
<symbol label="3">3</symbol> <symbol label="0">0</symbol>
<symbol label="3">3</symbol> <symbol keyval="65293" icon="key-enter">Return</symbol>
</key> <symbol label=" ">space</symbol>
<key name="AD04"> <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol label="(">parenleft</symbol>
<symbol label="(">parenleft</symbol>
<symbol label="(">parenleft</symbol>
<symbol label="(">parenleft</symbol>
</key>
<key name="AD05">
<symbol label=")">parenright</symbol>
<symbol label=")">parenright</symbol>
<symbol label=")">parenright</symbol>
<symbol label=")">parenright</symbol>
</key>
<key name="AC01">
<symbol label="4">4</symbol>
<symbol label="4">4</symbol>
<symbol label="4">4</symbol>
<symbol label="4">4</symbol>
</key>
<key name="AC02">
<symbol label="5">5</symbol>
<symbol label="5">5</symbol>
<symbol label="5">5</symbol>
<symbol label="5">5</symbol>
</key>
<key name="AC03">
<symbol label="6">6</symbol>
<symbol label="6">6</symbol>
<symbol label="6">6</symbol>
<symbol label="6">6</symbol>
</key>
<key name="AC04">
<symbol label="#">numbersign</symbol>
<symbol label="#">numbersign</symbol>
<symbol label="#">numbersign</symbol>
<symbol label="#">numbersign</symbol>
</key>
<key name="AC05">
<symbol label="*">asterisk</symbol>
<symbol label="*">asterisk</symbol>
<symbol label="*">asterisk</symbol>
<symbol label="*">asterisk</symbol>
</key>
<key name="AB01">
<symbol label="7">7</symbol>
<symbol label="7">7</symbol>
<symbol label="7">7</symbol>
<symbol label="7">7</symbol>
</key>
<key name="AB02">
<symbol label="8">8</symbol>
<symbol label="8">8</symbol>
<symbol label="8">8</symbol>
<symbol label="8">8</symbol>
</key>
<key name="AB03">
<symbol label="9">9</symbol>
<symbol label="9">9</symbol>
<symbol label="9">9</symbol>
<symbol label="9">9</symbol>
</key>
<key name="AB04">
<symbol label="+">plus</symbol>
<symbol label="+">plus</symbol>
<symbol label="+">plus</symbol>
<symbol label="+">plus</symbol>
</key>
<key name="AB05">
<symbol label="-">minus</symbol>
<symbol label="-">minus</symbol>
<symbol label="-">minus</symbol>
<symbol label="-">minus</symbol>
</key>
<key name="AB06">
<symbol label="0">0</symbol>
<symbol label="0">0</symbol>
<symbol label="0">0</symbol>
<symbol label="0">0</symbol>
</key>
<key name="RTRN">
<symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol keyval="65293" icon="key-enter">Return</symbol>
</key>
<key name="SPCE">
<symbol label=" ">space</symbol>
<symbol label=" ">space</symbol>
<symbol label=" ">space</symbol>
<symbol label=" ">space</symbol>
</key>
<key name="BKSP">
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
</key>
</symbols> </symbols>

317
data/keyboards/symbols/us.xml
View File

@ -2,208 +2,117 @@
<symbols version="0.90"> <symbols version="0.90">
<symbol label="*">asterisk</symbol> <symbol label="*">asterisk</symbol>
<symbol label="+/=">show_symbols</symbol> <symbol label="+/=">show_symbols</symbol>
<key name="AD01"> <symbol label="q">q</symbol>
<symbol label="q">q</symbol> <symbol label="Q">Q</symbol>
<symbol label="Q">Q</symbol> <symbol label="1">1</symbol>
<symbol label="1">1</symbol> <symbol label="~">asciitilde</symbol>
<symbol label="~">asciitilde</symbol> <symbol label="w">w</symbol>
</key> <symbol label="W">W</symbol>
<key name="AD02"> <symbol label="2">2</symbol>
<symbol label="w">w</symbol> <symbol label="`">quoteleft</symbol>
<symbol label="W">W</symbol> <symbol label="e">e</symbol>
<symbol label="2">2</symbol> <symbol label="E">E</symbol>
<symbol label="`">quoteleft</symbol> <symbol label="3">3</symbol>
</key> <symbol label="|">bar</symbol>
<key name="AD03"> <symbol label="r">r</symbol>
<symbol label="e">e</symbol> <symbol label="R">R</symbol>
<symbol label="E">E</symbol> <symbol label="4">4</symbol>
<symbol label="3">3</symbol> <symbol label="&#183;">U00B7</symbol>
<symbol label="|">bar</symbol> <symbol label="t">t</symbol>
</key> <symbol label="T">T</symbol>
<key name="AD04"> <symbol label="5">5</symbol>
<symbol label="r">r</symbol> <symbol label="&#8730;">squareroot</symbol>
<symbol label="R">R</symbol> <symbol label="y">y</symbol>
<symbol label="4">4</symbol> <symbol label="Y">Y</symbol>
<symbol label="&#183;">U00B7</symbol> <symbol label="6">6</symbol>
</key> <symbol label="&#960;">Greek_pi</symbol>
<key name="AD05"> <symbol label="u">u</symbol>
<symbol label="t">t</symbol> <symbol label="U">U</symbol>
<symbol label="T">T</symbol> <symbol label="7">7</symbol>
<symbol label="5">5</symbol> <symbol label="&#247;">division</symbol>
<symbol label="&#8730;">squareroot</symbol> <symbol label="i">i</symbol>
</key> <symbol label="I">I</symbol>
<key name="AD06"> <symbol label="8">8</symbol>
<symbol label="y">y</symbol> <symbol label="&#215;">multiply</symbol>
<symbol label="Y">Y</symbol> <symbol label="o">o</symbol>
<symbol label="6">6</symbol> <symbol label="O">O</symbol>
<symbol label="&#960;">Greek_pi</symbol> <symbol label="9">9</symbol>
</key> <symbol label="&#182;">paragraph</symbol>
<key name="AD07"> <symbol label="p">p</symbol>
<symbol label="u">u</symbol> <symbol label="P">P</symbol>
<symbol label="U">U</symbol> <symbol label="0">0</symbol>
<symbol label="7">7</symbol> <symbol label="&#964;">Greek_tau</symbol>
<symbol label="&#247;">division</symbol> <symbol label="a">a</symbol>
</key> <symbol label="A">A</symbol>
<key name="AD08"> <symbol label="@">at</symbol>
<symbol label="i">i</symbol> <symbol label="&#169;">copyright</symbol>
<symbol label="I">I</symbol> <symbol label="s">s</symbol>
<symbol label="8">8</symbol> <symbol label="S">S</symbol>
<symbol label="&#215;">multiply</symbol> <symbol label="#">numbersign</symbol>
</key> <symbol label="&#174;">U00AE</symbol>
<key name="AD09"> <symbol label="d">d</symbol>
<symbol label="o">o</symbol> <symbol label="D">D</symbol>
<symbol label="O">O</symbol> <symbol label="$">dollar</symbol>
<symbol label="9">9</symbol> <symbol label="&#163;">U00A3</symbol>
<symbol label="&#182;">paragraph</symbol> <symbol label="f">f</symbol>
</key> <symbol label="F">F</symbol>
<key name="AD10"> <symbol label="%">percent</symbol>
<symbol label="p">p</symbol> <symbol label="&#8364;">EuroSign</symbol>
<symbol label="P">P</symbol> <symbol label="g">g</symbol>
<symbol label="0">0</symbol> <symbol label="G">G</symbol>
<symbol label="&#964;">Greek_tau</symbol> <symbol label="&amp;">ampersand</symbol>
</key> <symbol label="&#165;">U00A5</symbol>
<key name="AC01"> <symbol label="h">h</symbol>
<symbol label="a">a</symbol> <symbol label="H">H</symbol>
<symbol label="A">A</symbol> <symbol label="-">minus</symbol>
<symbol label="@">at</symbol> <symbol label="^">asciicircum</symbol>
<symbol label="&#169;">copyright</symbol> <symbol label="j">j</symbol>
</key> <symbol label="J">J</symbol>
<key name="AC02"> <symbol label="_">underscore</symbol>
<symbol label="s">s</symbol> <symbol label="&#176;">degree</symbol>
<symbol label="S">S</symbol> <symbol label="k">k</symbol>
<symbol label="#">numbersign</symbol> <symbol label="K">K</symbol>
<symbol label="&#174;">U00AE</symbol> <symbol label="+">plus</symbol>
</key> <symbol label="=">equal</symbol>
<key name="AC03"> <symbol label="l">l</symbol>
<symbol label="d">d</symbol> <symbol label="L">L</symbol>
<symbol label="D">D</symbol> <symbol label="(">parenleft</symbol>
<symbol label="$">dollar</symbol> <symbol label="{">braceleft</symbol>
<symbol label="&#163;">U00A3</symbol> <symbol label=")">parenright</symbol>
</key> <symbol label="}">braceright</symbol>
<key name="AC04"> <symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol label="f">f</symbol> <symbol keyval="65505" icon="key-shift">Shift_L</symbol>
<symbol label="F">F</symbol> <symbol label="z">z</symbol>
<symbol label="%">percent</symbol> <symbol label="Z">Z</symbol>
<symbol label="&#8364;">EuroSign</symbol> <symbol label=",">comma</symbol>
</key> <symbol label="\">backslash</symbol>
<key name="AC05"> <symbol label="x">x</symbol>
<symbol label="g">g</symbol> <symbol label="X">X</symbol>
<symbol label="G">G</symbol> <symbol label="&quot;">quotedbl</symbol>
<symbol label="&amp;">ampersand</symbol> <symbol label="/">slash</symbol>
<symbol label="&#165;">U00A5</symbol> <symbol label="c">c</symbol>
</key> <symbol label="C">C</symbol>
<key name="AC06"> <symbol label="'">quoteright</symbol>
<symbol label="h">h</symbol> <symbol label="&lt;">less</symbol>
<symbol label="H">H</symbol> <symbol label="v">v</symbol>
<symbol label="-">minus</symbol> <symbol label="V">V</symbol>
<symbol label="^">asciicircum</symbol> <symbol label=":">colon</symbol>
</key> <symbol label="&gt;">greater</symbol>
<key name="AC07"> <symbol label="b">b</symbol>
<symbol label="j">j</symbol> <symbol label="B">B</symbol>
<symbol label="J">J</symbol> <symbol label=";">semicolon</symbol>
<symbol label="_">underscore</symbol> <symbol label="n">n</symbol>
<symbol label="&#176;">degree</symbol> <symbol label="N">N</symbol>
</key> <symbol label="!">exclam</symbol>
<key name="AC08"> <symbol label="[">bracketleft</symbol>
<symbol label="k">k</symbol> <symbol label="m">m</symbol>
<symbol label="K">K</symbol> <symbol label="M">M</symbol>
<symbol label="+">plus</symbol> <symbol label="?">question</symbol>
<symbol label="=">equal</symbol> <symbol label="]">bracketright</symbol>
</key> <symbol label=".">period</symbol>
<key name="AC09"> <symbol label="123">show_numbers</symbol>
<symbol label="l">l</symbol> <symbol label="ABC">show_letters</symbol>
<symbol label="L">L</symbol> <symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
<symbol label="(">parenleft</symbol> <symbol label=" ">space</symbol>
<symbol label="{">braceleft</symbol> <symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
</key>
<key name="AC10">
<!-- Empty labels cause keys to be hidden when the level they are defined
for is shown. -->
<symbol label=""></symbol>
<symbol label=""></symbol>
<symbol label=")">parenright</symbol>
<symbol label="}">braceright</symbol>
</key>
<key name="RTRN">
<symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol keyval="65293" icon="key-enter">Return</symbol>
<symbol keyval="65293" icon="key-enter">Return</symbol>
</key>
<key name="LFSH">
<keysym keyval="65505" icon="key-shift">Shift_L</keysym>
<keysym keyval="65505" icon="key-shift">Shift_L</keysym>
<keysym keyval="65505" label="=/+">Shift_L</keysym>
<keysym keyval="65505" label="123">Shift_L</keysym>
</key>
<key name="AB01">
<symbol label="z">z</symbol>
<symbol label="Z">Z</symbol>
<symbol label=",">comma</symbol>
<symbol label="\">backslash</symbol>
</key>
<key name="AB02">
<symbol label="x">x</symbol>
<symbol label="X">X</symbol>
<symbol label="&quot;">quotedbl</symbol>
<symbol label="/">slash</symbol>
</key>
<key name="AB03">
<symbol label="c">c</symbol>
<symbol label="C">C</symbol>
<symbol label="'">quoteright</symbol>
<symbol label="&lt;">less</symbol>
</key>
<key name="AB04">
<symbol label="v">v</symbol>
<symbol label="V">V</symbol>
<symbol label=":">colon</symbol>
<symbol label="&gt;">greater</symbol>
</key>
<key name="AB05">
<symbol label="b">b</symbol>
<symbol label="B">B</symbol>
<symbol label=";">semicolon</symbol>
<symbol label="=">equal</symbol>
</key>
<key name="AB06">
<symbol label="n">n</symbol>
<symbol label="N">N</symbol>
<symbol label="!">exclam</symbol>
<symbol label="[">bracketleft</symbol>
</key>
<key name="AB07">
<symbol label="m">m</symbol>
<symbol label="M">M</symbol>
<symbol label="?">question</symbol>
<symbol label="]">bracketright</symbol>
</key>
<key name="AB08">
<symbol label=".">period</symbol>
<symbol label=".">period</symbol>
<symbol label=".">period</symbol>
<symbol label=".">period</symbol>
</key>
<key name="ABC123">
<symbol label="123">show_numbers</symbol>
<symbol label="ABC">show_letters</symbol>
</key>
<key name="I149">
<symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
<symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
<symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
<symbol label="&#9786;" icon="keyboard-mode-symbolic" tooltip="Setup">preferences</symbol>
</key>
<key name="SPCE">
<symbol label=" ">space</symbol>
<symbol label=" ">space</symbol>
<symbol label=" ">space</symbol>
<symbol label=" ">space</symbol>
</key>
<key name="BKSP">
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
<symbol keyval="65288" icon="edit-clear-symbolic">BackSpace</symbol>
</key>
</symbols> </symbols>

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

@ -53,8 +53,8 @@ typedef struct _EekXmlLayoutPrivate
} EekXmlLayoutPrivate; } EekXmlLayoutPrivate;
G_DEFINE_TYPE_EXTENDED (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT, G_DEFINE_TYPE_EXTENDED (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT,
0, /* GTypeFlags */ 0, /* GTypeFlags */
G_ADD_PRIVATE(EekXmlLayout) G_ADD_PRIVATE(EekXmlLayout)
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
initable_iface_init)) initable_iface_init))
@ -674,11 +674,6 @@ static const gchar *symbols_valid_path_list[] = {
"symbols", "symbols",
"symbol/symbols", "symbol/symbols",
"include/symbols", "include/symbols",
"key/symbols",
"text/key/symbols",
"keysym/key/symbols",
"symbol/key/symbols",
"invalid/key/symbols",
}; };
static void static void
@ -699,22 +694,7 @@ symbols_start_element_callback (GMarkupParseContext *pcontext,
error)) error))
return; return;
if (g_strcmp0 (element_name, "keysym") == 0) { if (g_strcmp0 (element_name, "symbol") == 0) {
attribute = get_attribute (attribute_names, attribute_values,
"keyval");
if (attribute == NULL) {
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_MISSING_ATTRIBUTE,
"no \"keyval\" attribute for \"keysym\"");
return;
}
data->keyval = strtoul (attribute, NULL, 0);
}
if (g_strcmp0 (element_name, "symbol") == 0 ||
g_strcmp0 (element_name, "keysym") == 0 ||
g_strcmp0 (element_name, "text") == 0) {
attribute = get_attribute (attribute_names, attribute_values, attribute = get_attribute (attribute_names, attribute_values,
"label"); "label");
if (attribute != NULL) if (attribute != NULL)
@ -753,9 +733,7 @@ symbols_end_element_callback (GMarkupParseContext *pcontext,
// TODO: this could all be moved to text handler // TODO: this could all be moved to text handler
text = g_strndup (data->text->str, data->text->len); text = g_strndup (data->text->str, data->text->len);
if (g_strcmp0 (element_name, "symbol") == 0 || if (g_strcmp0 (element_name, "symbol") == 0) {
g_strcmp0 (element_name, "keysym") == 0 ||
g_strcmp0 (element_name, "text") == 0) {
gchar *name = text; gchar *name = text;
EekKey *key = eek_keyboard_find_key_by_name (data->keyboard, EekKey *key = eek_keyboard_find_key_by_name (data->keyboard,
@ -1013,7 +991,7 @@ static void
eek_xml_layout_finalize (GObject *object) eek_xml_layout_finalize (GObject *object)
{ {
EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private ( EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (
EEK_XML_LAYOUT (object)); EEK_XML_LAYOUT (object));
g_free (priv->id); g_free (priv->id);
@ -1036,10 +1014,10 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
gobject_class->finalize = eek_xml_layout_finalize; gobject_class->finalize = eek_xml_layout_finalize;
pspec = g_param_spec_string ("id", pspec = g_param_spec_string ("id",
"ID", "ID",
"ID", "ID",
NULL, NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE); G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_ID, pspec); g_object_class_install_property (gobject_class, PROP_ID, pspec);
} }