Automatic placement of f11/f12 placeholders

2025-08-19 08:12:01 +02:00 · 2024-06-09 13:55:27 +02:00
parent 52805d9745
commit 773147ab9c
38 changed files with 121 additions and 95 deletions
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -608,6 +608,7 @@ public final class KeyboardData
  /** See [addExtraKeys()]. */
  public final static class PreferredPos
  {
+    /** Default position for extra keys. */
    public static final PreferredPos DEFAULT;
    public static final PreferredPos ANYWHERE;

@@ -622,6 +623,9 @@ public final class KeyboardData
    public KeyPos[] positions = ANYWHERE_POSITIONS;

    public PreferredPos() {}
+    public PreferredPos(KeyValue next_to_) { next_to = next_to_; }
+    public PreferredPos(KeyPos[] pos) { positions = pos; }
+    public PreferredPos(KeyValue next_to_, KeyPos[] pos) { next_to = next_to_; positions = pos; }

    public PreferredPos(PreferredPos src)
    {
@@ -634,13 +638,12 @@ public final class KeyboardData

    static
    {
-      DEFAULT = new PreferredPos();
-      DEFAULT.positions = new KeyPos[]{
-        new KeyPos(1, -1, 4),
-        new KeyPos(1, -1, 3),
-        new KeyPos(2, -1, 2),
-        new KeyPos(2, -1, 1)
-      };
+      DEFAULT = new PreferredPos(new KeyPos[]{
+          new KeyPos(1, -1, 4),
+          new KeyPos(1, -1, 3),
+          new KeyPos(2, -1, 2),
+          new KeyPos(2, -1, 1)
+        });
      ANYWHERE = new PreferredPos();
    }
  }
--- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
@@ -68,6 +68,8 @@ public class ExtraKeysPreference extends PreferenceCategory
    "redo",
    "superscript",
    "subscript",
+    "f11_placeholder",
+    "f12_placeholder",
  };

  /** Whether an extra key is enabled by default. */
@@ -80,6 +82,8 @@ public class ExtraKeysPreference extends PreferenceCategory
      case "compose":
      case "tab":
      case "esc":
+      case "f11_placeholder":
+      case "f12_placeholder":
        return true;
      default:
        return false;
@@ -119,6 +123,40 @@ public class ExtraKeysPreference extends PreferenceCategory
    return res.getString(id);
  }

+  static String key_title(String key_name, KeyValue kv)
+  {
+    switch (key_name)
+    {
+      case "f11_placeholder": return "F11";
+      case "f12_placeholder": return "F12";
+    }
+    return kv.getString();
+  }
+
+  static KeyboardData.PreferredPos key_preferred_pos(String key_name)
+  {
+    switch (key_name)
+    {
+      case "f11_placeholder":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("9"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(0, 8, 3),
+              new KeyboardData.KeyPos(0, 8, 4),
+              new KeyboardData.KeyPos(0, -1, 3),
+              new KeyboardData.KeyPos(0, -1, 4),
+            });
+      case "f12_placeholder":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("0"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(0, 9, 3),
+              new KeyboardData.KeyPos(0, 9, 4),
+              new KeyboardData.KeyPos(0, -1, 3),
+              new KeyboardData.KeyPos(0, -1, 4),
+            });
+    }
+    return KeyboardData.PreferredPos.DEFAULT;
+  }
+
  /** Get the set of enabled extra keys. */
  public static Map<KeyValue, KeyboardData.PreferredPos> get_extra_keys(SharedPreferences prefs)
  {
@@ -128,7 +166,7 @@ public class ExtraKeysPreference extends PreferenceCategory
    {
      if (prefs.getBoolean(pref_key_of_key_name(key_name),
            default_checked(key_name)))
-        ks.put(KeyValue.getKeyByName(key_name), KeyboardData.PreferredPos.DEFAULT);
+        ks.put(KeyValue.getKeyByName(key_name), key_preferred_pos(key_name));
    }
    return ks;
  }
@@ -166,7 +204,7 @@ public class ExtraKeysPreference extends PreferenceCategory
    {
      super(ctx);
      KeyValue kv = KeyValue.getKeyByName(key_name);
-      String title = kv.getString();
+      String title = key_title(key_name, kv);
      String descr = key_description(ctx.getResources(), key_name);
      if (descr != null)
        title += " (" + descr + ")";
--- a/srcs/layouts/arab_pc.xml
+++ b/srcs/layouts/arab_pc.xml
@@ -11,8 +11,8 @@
    <key key0="ه" key1="&#0247;" key2="8" key3="*"/>
    <key key0="خ" key1="&#0215;" key2="9" key3="("/>
    <key key0="ح" key1="&#1563;" key2="0" key3=")"/>
-    <key key0="ج" key1="&gt;" key2="-" key3="_" key4="f11_placeholder"/>
-    <key key0="د" key1="&lt;" key2="=" key3="ذ" key4="f12_placeholder"/>
+    <key key0="ج" key1="&gt;" key2="-" key3="_"/>
+    <key key0="د" key1="&lt;" key2="=" key3="ذ"/>
    <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
  </row>
  <row>
--- a/srcs/layouts/arab_pc_ckb.xml
+++ b/srcs/layouts/arab_pc_ckb.xml
@@ -34,6 +34,6 @@
    <key key0="ب"/>
    <key key0="ن" key2="&#1548;" key3="&#1563;"/>
    <key key0="م"/>
-    <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="backspace" key2="delete"/>
  </row>
 </keyboard>
--- a/srcs/layouts/arab_pc_hindu.xml
+++ b/srcs/layouts/arab_pc_hindu.xml
@@ -11,8 +11,8 @@
    <key key0="ه" key1="&#0247;" key2="٨" key3="*"/>
    <key key0="خ" key1="&#0215;" key2="٩" key3="("/>
    <key key0="ح" key1="&#1563;" key2="٠" key3=")"/>
-    <key key0="ج" key1="&gt;" key2="-" key3="_" key4="f11_placeholder"/>
-    <key key0="د" key1="&lt;" key2="=" key3="ذ" key4="f12_placeholder"/>
+    <key key0="ج" key1="&gt;" key2="-" key3="_"/>
+    <key key0="د" key1="&lt;" key2="=" key3="ذ"/>
    <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
  </row>
  <row>
--- a/srcs/layouts/arab_pc_ir.xml
+++ b/srcs/layouts/arab_pc_ir.xml
@@ -11,7 +11,7 @@
    <key key0="ه" key2="۸" key3="*"/>
    <key key0="خ" key2="۹" key3="(" key4=")"/>
    <key key0="ح" key2="۰"/>
-    <key key0="ج" key1="f11_placeholder" key3="f12_placeholder"/>
+    <key key0="ج"/>
  </row>
  <row>
    <key key0="ش" key2="loc tab"/>
--- a/srcs/layouts/cyrl_jcuken_ru.xml
+++ b/srcs/layouts/cyrl_jcuken_ru.xml
@@ -11,7 +11,7 @@
    <key key0="ш" key2="8" key3="*"/>
    <key key0="щ" key2="9" key3="(" key4=")"/>
    <key key0="з" key2="0" key3="{" key4="}"/>
-    <key key0="х" key3="[" key4="]" key1="f11_placeholder" key2="f12_placeholder"/>
+    <key key0="х" key3="[" key4="]"/>
  </row>
  <row>
    <key key0="ф" key1="loc tab" key2="`"/>
--- a/srcs/layouts/cyrl_jcuken_uk.xml
+++ b/srcs/layouts/cyrl_jcuken_uk.xml
@@ -10,7 +10,7 @@
    <key key0="г" key1="ґ" key2="7" key3="&amp;"/>
    <key key0="ш" key2="8" key3="*"/>
    <key key0="щ" key2="9" key3="(" key4=")"/>
-    <key key0="з" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="з" key2="0"/>
    <key key0="х"/>
  </row>
  <row>
--- a/srcs/layouts/cyrl_ueishsht.xml
+++ b/srcs/layouts/cyrl_ueishsht.xml
@@ -10,7 +10,7 @@
    <key key0="с" key2="7" key3="&amp;" key4="§"/>
    <key key0="д" key2="8" key3="*" key4="№"/>
    <key key0="з" key2="9" key3="(" key4=")"/>
-    <key key0="ц" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="ц" key2="0"/>
    <key key0="б" key2="€"/>
  </row>
  <row>
--- a/srcs/layouts/cyrl_yaverti.xml
+++ b/srcs/layouts/cyrl_yaverti.xml
@@ -10,7 +10,7 @@
    <key key0="у" key2="7" key3="&amp;" key4="§"/>
    <key key0="и" key2="8" key3="*"/>
    <key key0="о" key2="9" key3="(" key4=")"/>
-    <key key0="п" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="п" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="а" key1="loc tab" key2="`"/>
--- a/srcs/layouts/grek_qwerty.xml
+++ b/srcs/layouts/grek_qwerty.xml
@@ -10,7 +10,7 @@
    <key key0="θ" key2="7" key3="&amp;"/>
    <key key0="ι" key1="accent_trema" key2="8" key3="*"/>
    <key key0="ο" key2="9" key3="(" key4=")"/>
-    <key key0="π" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="π" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="α" key1="loc tab" key2="`"/>
--- a/srcs/layouts/hebr_1_il.xml
+++ b/srcs/layouts/hebr_1_il.xml
@@ -12,7 +12,7 @@
    <key key0="ן" key2="8" key3="*"/>
    <key key0="ם" key2="9" key3="b(" key4="lrm"/>
    <key key0="פ" key2="0" key3="b)" key4="rlm"/>
-    <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="backspace" key2="delete"/>
  </row>
  <row>
    <key key0="ש" key2="`" key1="loc tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
--- a/srcs/layouts/hebr_2_il.xml
+++ b/srcs/layouts/hebr_2_il.xml
@@ -35,6 +35,6 @@
    <key key0="מ" key1="blt" key2=","/>
    <key key0="צ" key1="bgt" key2="."/>
    <key key0="/" key1="\?"/>
-    <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder" width="1.333"/>
+    <key key0="backspace" key2="delete" width="1.333"/>
  </row>
 </keyboard>
--- a/srcs/layouts/latn_azerty_fr.xml
+++ b/srcs/layouts/latn_azerty_fr.xml
@@ -11,8 +11,8 @@
    <key key0="y" key2="6" key3="-" key4="|"/>
    <key key0="u" key2="7" key3="à" key4="`"/>
    <key key0="i" key2="8" key3="_" key4="\\"/>
-    <key key0="o" key2="9" key3="\@" key4="f11_placeholder"/>
-    <key key0="p" key2="0" key3="f12_placeholder"/>
+    <key key0="o" key2="9" key3="\@"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key key0="q" key2="loc tab"/>
--- a/srcs/layouts/latn_bone.xml
+++ b/srcs/layouts/latn_bone.xml
@@ -10,8 +10,8 @@
 		<key key0="p"							key3="!"	key4="7"/>
 		<key key0="h"							key3="&lt;"	key4="8"/>
 		<key key0="l"	key1="ℓ"				key3="&gt;"	key4="9"/>
-		<key key0="m"	key1="≠"				key3="="		key4="f11_placeholder"/>
-		<key key0="w"							key3="&amp;"	key4="f12_placeholder"/>
+		<key key0="m"	key1="≠"				key3="="/>
+		<key key0="w"							key3="&amp;"/>
 	</row>
 	<row>
 		<key key0="c"				key2="loc tab"											key4="\\"/>
--- a/srcs/layouts/latn_colemak.xml
+++ b/srcs/layouts/latn_colemak.xml
@@ -8,7 +8,7 @@
    <key key0="p"                           key2="="              key3="%"/>
    <key key0="g" key1="!"                  key2="/"              key3="\\"/>
    <key key0="j" key1="loc accent_caron"       key2="loc accent_trema"            />
-    <key key0="l" key1="f11_placeholder"    key2="f12_placeholder"/>
+    <key key0="l"/>
    <key key0="u" key1="loc accent_double_aigu" key2="loc accent_ring"    />
    <key key0="y" key1="&quot;"             key2="'"/>

--- a/srcs/layouts/latn_dvorak.xml
+++ b/srcs/layouts/latn_dvorak.xml
@@ -2,8 +2,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;" key4="f11_placeholder"/>
-    <key key0="y" key1="loc accent_grave" key2="," key3="&gt;" key4="f12_placeholder"/>
+    <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="}"/>
--- a/srcs/layouts/latn_neo2.xml
+++ b/srcs/layouts/latn_neo2.xml
@@ -11,8 +11,8 @@
    <key key0="k" key2="6" key4="!"/>
    <key key0="h" key2="7" key4="&lt;"/>
    <key key0="g" key2="8" key4="&gt;"/>
-    <key key0="f" key2="9" key3="f11_placeholder" key4="="/>
-    <key key0="q" key2="0" key3="f12_placeholder" key4="&amp;"/>
+    <key key0="f" key2="9" key4="="/>
+    <key key0="q" key2="0" key4="&amp;"/>
    <key key0="ß" key1="—"/>
  </row>
  <row>
--- a/srcs/layouts/latn_qwerty_br.xml
+++ b/srcs/layouts/latn_qwerty_br.xml
@@ -5,8 +5,8 @@
    <key key0="q" key2="1" key4="loc esc"/>
    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
    <key key0="e" key2="3" key3="\#" key4="€"/>
-    <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
-    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
    <key key0="y" key2="6" key3="^" key4="loc accent_trema"/>
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key2="8" key3="*"/>
--- a/srcs/layouts/latn_qwerty_da.xml
+++ b/srcs/layouts/latn_qwerty_da.xml
@@ -10,8 +10,8 @@
    <key key0="u" key2="7" key4="\\"/>
    <key key0="i" key2="8" key3="*" key4="/"/>
    <key key0="o" key2="9" key3="+"/>
-    <key key0="p" key2="0" key3="=" key4="f11_placeholder"/>
-    <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/>
+    <key key0="p" key2="0" key3="="/>
+    <key key0="å" key1="\?" key3="!"/>
  </row>
  <row>
    <key key0="a" key2="loc tab"/>
--- a/srcs/layouts/latn_qwerty_es.xml
+++ b/srcs/layouts/latn_qwerty_es.xml
@@ -10,7 +10,7 @@
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key2="8" key3="*"/>
    <key key0="o" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key key0="a" key2="loc tab" key4="`"/>
--- a/srcs/layouts/latn_qwerty_gb.xml
+++ b/srcs/layouts/latn_qwerty_gb.xml
@@ -10,7 +10,7 @@
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key2="8" key3="*"/>
    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="a" key1="loc tab" key2="`"/>
--- a/srcs/layouts/latn_qwerty_hu.xml
+++ b/srcs/layouts/latn_qwerty_hu.xml
@@ -5,8 +5,8 @@
    <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
    <key key0="e" key1="&quot;" key2="2" key4="é"/>
    <key key0="r" key2="3" key4="^"/>
-    <key key0="t" key1="!" key2="4" key4="f11_placeholder"/>
-    <key key0="y" key1="%" key2="5" key3="°" key4="f12_placeholder"/>
+    <key key0="t" key1="!" key2="4"/>
+    <key key0="y" key1="%" key2="5" key3="°"/>
    <key key0="u" key1="ű" key2="6" key3="ü" key4="ú"/>
    <key key0="i" key1="=" key2="7" key3="`" key4="í"/>
    <key key0="o" key1="ő" key2="8" key3="ö" key4="ó"/>
--- a/srcs/layouts/latn_qwerty_lv.xml
+++ b/srcs/layouts/latn_qwerty_lv.xml
@@ -4,8 +4,8 @@
    <key key0="q" key2="1" key4="loc esc"/>
    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
    <key key0="e" key1="ē" key2="3" key3="\#" key4="€"/>
-    <key key0="r" key1="ŗ" key2="4" key3="$" key4="f11_placeholder"/>
-    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="r" key1="ŗ" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
    <key key0="y" key2="6" key3="^"/>
    <key key0="u" key1="ū" key2="7" key3="&amp;" key4="*"/>
    <key key0="i" key1="ī" key2="8" key3="(" key4=")"/>
--- a/srcs/layouts/latn_qwerty_no.xml
+++ b/srcs/layouts/latn_qwerty_no.xml
@@ -10,7 +10,7 @@
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key2="8" key3="*"/>
    <key key0="o" key1="ø" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="a" key1="loc tab" key2="`" key3="æ" key4="å"/>
--- a/srcs/layouts/latn_qwerty_ro.xml
+++ b/srcs/layouts/latn_qwerty_ro.xml
@@ -10,7 +10,7 @@
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key1="î" key2="8" key3="*"/>
    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="a" key1="â" key2="ă" key3="`" key4="loc tab"/>
--- a/srcs/layouts/latn_qwerty_se.xml
+++ b/srcs/layouts/latn_qwerty_se.xml
@@ -10,8 +10,8 @@
    <key key0="u" key2="7" key3="~" key4="\\"/>
    <key key0="i" key2="8" key3="*" key4="/"/>
    <key key0="o" key2="9" key3="+" key4="-"/>
-    <key key0="p" key2="0" key3="=" key4="f11_placeholder"/>
-    <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/>
+    <key key0="p" key2="0" key3="="/>
+    <key key0="å" key1="\?" key3="!"/>
  </row>
  <row>
    <key key0="a" key2="loc tab"/>
--- a/srcs/layouts/latn_qwerty_us.xml
+++ b/srcs/layouts/latn_qwerty_us.xml
@@ -31,7 +31,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key2="8" key3="*"/>
    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="a" key1="loc tab" key2="`"/>
--- a/srcs/layouts/latn_qwerty_vi.xml
+++ b/srcs/layouts/latn_qwerty_vi.xml
@@ -11,7 +11,7 @@
    <key key0="u" key2="7" key3="&amp;"/>
    <key key0="i" key2="8" key3="*"/>
    <key key0="o" key1="ô" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key2="0"/>
  </row>
  <row>
    <key shift="0.5" key0="a" key1="loc tab" key2="ă" key3="â"/>
--- a/srcs/layouts/latn_qwertz.xml
+++ b/srcs/layouts/latn_qwertz.xml
@@ -5,8 +5,8 @@
    <key key0="q" key2="1" key4="loc esc"/>
    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
    <key key0="e" key1="§" key2="3" key3="!" key4="€"/>
-    <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
-    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
    <key key0="z" key2="6" key3="&amp;" key4="{"/>
    <key key0="u" key2="7" key3="ü" key4="}"/>
    <key key0="i" key1="(" key2="8" key3="[" key4="]"/>
--- a/srcs/layouts/latn_qwertz_de.xml
+++ b/srcs/layouts/latn_qwertz_de.xml
@@ -5,8 +5,8 @@
    <key key0="q" key2="1" key4="loc esc"/>
    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
    <key key0="e" key1="§" key2="3" key3="!" key4="€"/>
-    <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
-    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
    <key key0="z" key2="6" key3="&amp;"/>
    <key key0="u" key2="7" key3="{" key4="}"/>
    <key key0="i" key2="8" key3="[" key4="]"/>
--- a/srcs/layouts/latn_qwertz_fr_ch.xml
+++ b/srcs/layouts/latn_qwertz_fr_ch.xml
@@ -5,8 +5,8 @@
    <key key0="q" key1="§" key2="1" key4="loc esc"/>
    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
    <key key0="e" key2="3" key3="\#" key4="€"/>
-    <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
-    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
    <key key0="z" key2="6" key3="&amp;"/>
    <key key0="u" key1="ù" key2="7" key3="{" key4="}"/>
    <key key0="i" key2="8" key3="[" key4="]"/>
--- a/srcs/layouts/latn_qwertz_hu.xml
+++ b/srcs/layouts/latn_qwertz_hu.xml
@@ -5,8 +5,8 @@
    <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
    <key key0="e" key1="&quot;" key2="2" key4="é"/>
    <key key0="r" key2="3" key4="^"/>
-    <key key0="t" key1="!" key2="4" key4="f11_placeholder"/>
-    <key key0="z" key1="%" key2="5" key3="°" key4="f12_placeholder"/>
+    <key key0="t" key1="!" key2="4"/>
+    <key key0="z" key1="%" key2="5" key3="°"/>
    <key key0="u" key1="ű" key2="6" key3="ü" key4="ú"/>
    <key key0="i" key1="=" key2="7" key3="`" key4="í"/>
    <key key0="o" key1="ő" key2="8" key3="ö" key4="ó"/>
--- a/srcs/layouts/shaw_imperial_en.xml
+++ b/srcs/layouts/shaw_imperial_en.xml
@@ -11,7 +11,7 @@
    <key key0="𐑙" key2="7" key3="&amp;"/>
    <key key0="𐑘" key2="8" key3="*"/>
    <key key0="𐑡" key2="9" key3="(" key4=")"/>
-    <key key0="𐑔" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="𐑔" key2="0"/>
  </row>
  <row>
    <key key0="𐑭" key1="loc tab" key2="𐑸" key3="`"/>