From 5ad445054528b30f2540a7f7f2a8dd662e71671a Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 1 May 2021 23:19:21 +0200
Subject: Better placement of accents on QWERTY

Also change internal names for accents.
---
 res/xml/azerty.xml                 | 12 ++++++------
 res/xml/qwerty.xml                 | 16 ++++++++--------
 srcs/juloo.keyboard2/KeyValue.java | 12 ++++++------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index 413d1e7..43225e9 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -3,13 +3,13 @@
 	<row>
 		<key key0="a" key1="esc" key2="1" key3="&amp;" />
 		<key key0="z" key2="2" key4="~" />
-		<key key0="e" key1="accent2" key2="3" key3="&quot;" key4="\#" />
+		<key key0="e" key1="accent_aigu" 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" key1="accent1" key2="7" key4="`" />
-		<key key0="i" key1="accent6" key2="8" key3="_" key4="\\" />
-		<key key0="o" key1="accent3" key2="9" />
+		<key key0="u" key1="accent_grave" key2="7" key4="`" />
+		<key key0="i" key1="accent_trema" key2="8" key3="_" key4="\\" />
+		<key key0="o" key1="accent_circonflexe" key2="9" />
 		<key key0="p" key1="insert" key2="0" key4="\@" />
 	</row>
 	<row>
@@ -28,10 +28,10 @@
 		<key width="2.0" key0="shift" />
 		<key key0="w" key3="&lt;" key4="&gt;" />
 		<key key0="x" />
-		<key key0="c" key1="accent5" key3="," key4="\?" />
+		<key key0="c" key1="accent_cedille" key3="," key4="\?" />
 		<key key0="v" key3=";" key4="." />
 		<key key0="b" key3=":" key4="/" />
-		<key key0="n" key1="accent4" key2="§" key4="!" />
+		<key key0="n" key1="accent_tilde" key2="§" key4="!" />
 		<key width="2.0" key0="backspace" key2="delete" />
 	</row>
 	<row height="0.95">
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index 1a663e5..5450b8c 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -3,19 +3,19 @@
 	<row>
 		<key key0="q" key1="esc" key2="1" key3="~" key4="!" />
 		<key key0="w" key2="2" key3="\@" />
-		<key key0="e" key2="3" key3="\#" />
+		<key key0="e" key1="accent_aigu" key2="3" key3="\#" />
 		<key key0="r" key2="4" key3="$" />
 		<key key0="t" key2="5" key3="%" />
 		<key key0="y" key2="6" key3="^" />
-		<key key0="u" key2="7" key3="&amp;" />
-		<key key0="i" key2="8" key3="*" />
-		<key key0="o" key2="9" key3="(" key4=")" />
+		<key key0="u" key1="accent_grave" key2="7" key3="&amp;" />
+		<key key0="i" key1="accent_trema" key2="8" key3="*" />
+		<key key0="o" key1="accent_circonflexe" key2="9" key3="(" key4=")" />
 		<key key0="p" key1="insert" key2="0" />
 	</row>
 	<row>
 		<key shift="0.5" key0="a" key1="tab" key2="`" />
-		<key key0="s" key1="accent1" key2="accent2" key4="accent6" />
-		<key key0="d" key1="accent3" key2="accent4" key3="accent5" />
+		<key key0="s" />
+		<key key0="d" />
 		<key key0="f" />
 		<key key0="g" key2="-" key3="_" />
 		<key key0="h" key2="=" key3="+" />
@@ -27,10 +27,10 @@
 		<key width="1.5" key0="shift" />
 		<key key0="z" />
 		<key key0="x" />
-		<key key0="c" key1="&lt;" key3="." />
+		<key key0="c" key1="accent_cedille" key2="&lt;" key3="." />
 		<key key0="v" key2="&gt;" key3="," />
 		<key key0="b" key2="\?" key3="/" />
-		<key key0="n" key2=":" key3=";" />
+		<key key0="n" key1="accent_tilde" key2=":" key3=";" />
 		<key key0="m" key2="&quot;" key3="'" />
 		<key width="1.5" key0="backspace" key2="delete" />
 	</row>
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index 19d784b..512f2f9 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -111,12 +111,12 @@ class KeyValue
     addModifierKey("shift", "⇧", FLAG_LOCK | FLAG_SHIFT);
     addModifierKey("ctrl", "Ctrl", FLAG_CTRL);
     addModifierKey("alt", "Alt", FLAG_ALT);
-    addModifierKey("accent1", "\u02CB", FLAG_ACCENT1);
-    addModifierKey("accent2", "\u00B4", FLAG_ACCENT2);
-    addModifierKey("accent3", "\u02C6", FLAG_ACCENT3);
-    addModifierKey("accent4", "\u02DC", FLAG_ACCENT4);
-    addModifierKey("accent5", "\u00B8", FLAG_ACCENT5);
-    addModifierKey("accent6", "\u00A8", FLAG_ACCENT6);
+    addModifierKey("accent_grave", "\u02CB", FLAG_ACCENT1);
+    addModifierKey("accent_aigu", "\u00B4", FLAG_ACCENT2);
+    addModifierKey("accent_circonflexe", "\u02C6", FLAG_ACCENT3);
+    addModifierKey("accent_tilde", "\u02DC", FLAG_ACCENT4);
+    addModifierKey("accent_cedille", "\u00B8", FLAG_ACCENT5);
+    addModifierKey("accent_trema", "\u00A8", FLAG_ACCENT6);
     addModifierKey("fn", "Fn", FLAG_FN);
 
     addCharKey('a', KeyEvent.KEYCODE_A);
-- 
cgit v1.2.3