From ec1cd9473ad8cf710c1c8247923f4bea0391e4d7 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <juloo.dsi@gmail.com>
Date: Thu, 29 Apr 2021 00:13:40 +0200
Subject: [PATCH] Improve the azerty layout

- More intuitive placement of (), [], {} and <>.
- Move accent keys into the top-left corner, on a key they may be used with.
- Some minor changes.
---
 res/xml/azerty.xml                 | 36 +++++++++++++++---------------
 srcs/juloo.keyboard2/KeyValue.java |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index 3461ccc..2773b83 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -2,36 +2,36 @@
 <keyboard>
 	<row>
 		<key key0="a" key1="esc" key2="1" key3="&amp;" />
-		<key key0="z" key2="2" key3="accent2" key4="~" />
-		<key key0="e" key2="3" key3="&quot;" key4="\#" />
-		<key key0="r" key2="4" key3="'" key4="{" />
-		<key key0="t" key2="5" key3="(" key4="[" />
+		<key key0="z" key2="2" key4="~" />
+		<key key0="e" key1="accent2" key2="3" key3="&quot;" key4="\#" />
+		<key key0="r" key2="4" key3="'" />
+		<key key0="t" key2="5" key3="(" key4=")" />
 		<key key0="y" key2="6" key3="-" key4="|" />
-		<key key0="u" key2="7" key3="accent1" key4="`" />
-		<key key0="i" key2="8" key3="_" key4="\\" />
-		<key key0="o" key2="9" key3="accent5" key4="^" />
+		<key key0="u" key1="accent1" key2="7" key4="`" />
+		<key key0="i" key1="accent6" key2="8" key3="_" key4="\\" />
+		<key key0="o" key1="accent3" key2="9" />
 		<key key0="p" key1="insert" key2="0" key3="config" key4="\@" />
 	</row>
 	<row>
 		<key key0="q" key1="tab" />
 		<key key0="s" />
 		<key key0="d" />
-		<key key0="f" />
-		<key key0="g" key3=")" key4="]" />
-		<key key0="h" key2="+" key3="=" key4="}" />
-		<key key0="j" key2="accent6" key3="^" />
-		<key key0="k" key2="£" key3="$" key4="accent3" />
-		<key key0="l" key1="accent4" key2="%" />
+    <key key0="f" key3="{" key4="}" />
+		<key key0="g" key3="[" key4="]" />
+		<key key0="h" key3="=" key4="+" />
+		<key key0="j" key3="^" />
+		<key key0="k" key2="€" key3="$" key4="£" />
+		<key key0="l" key2="%" />
 		<key key0="m" key4="*" />
 	</row>
 	<row>
 		<key width="2.0" key0="shift" />
-		<key key0="w" key1="&gt;" key3="&lt;" />
+		<key key0="w" key3="&lt;" key4="&gt;" />
 		<key key0="x" />
-		<key key0="c" key2="\?" key4="," />
-		<key key0="v" key2="." key4=";" />
-		<key key0="b" key2="/" key4=":" />
-		<key key0="n" key2="§" key4="!" />
+		<key key0="c" key1="accent5" key3="," key4="\?" />
+		<key key0="v" key3=";" key4="." />
+		<key key0="b" key3=":" key4="/" />
+		<key key0="n" key1="accent4" key2="§" key4="!" />
 		<key width="2.0" key0="backspace" key2="delete" />
 	</row>
 	<row>
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index b2b6c2f..19d784b 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -104,7 +104,7 @@ class KeyValue
 
   static
   {
-    String chars = "<>&\"_°~{|^}$*:!£%µ?.§";
+    String chars = "<>&\"_°~{|^}$*:!£%µ?.§€";
     for (int i = 0; i < chars.length(); i++)
       addCharKey(chars.charAt(i), EVENT_NONE);