From 573c13fb825f41a926dca838ef5a396ccce6a3eb Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 11 Dec 2021 17:05:49 +0100
Subject: Add Swedish

First add the 'ring' accent.
The swedish language uses the qwerty layout and three accents (aigu,
trema, ring)
---
 srcs/juloo.keyboard2/Config.java      | 1 +
 srcs/juloo.keyboard2/KeyModifier.java | 5 +++++
 srcs/juloo.keyboard2/KeyValue.java    | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'srcs')

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 67722c5..8c6a46a 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -118,6 +118,7 @@ class Config
       case "tilde": return KeyValue.FLAG_ACCENT4;
       case "cedille": return KeyValue.FLAG_ACCENT5;
       case "trema": return KeyValue.FLAG_ACCENT6;
+      case "ring": return KeyValue.FLAG_ACCENT_RING;
       default: throw new RuntimeException(name);
     }
   }
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 3e70912..7b7d971 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -102,6 +102,11 @@ class KeyModifier
           case '-': return '÷';
           default: return (char)KeyCharacterMap.getDeadChar('\u00A8', c);
         }
+      case KeyValue.FLAG_ACCENT_RING:
+        switch (c)
+        {
+          default: return (char)KeyCharacterMap.getDeadChar('\u02DA', c);
+        }
       case KeyValue.FLAG_ACCENT_SUPERSCRIPT:
         switch (c)
         {
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index 19a58f8..6677248 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -41,10 +41,11 @@ class KeyValue
   public static final int FLAG_ACCENT6 = (1 << 21); // Tréma
   public static final int FLAG_ACCENT_SUPERSCRIPT = (1 << 22);
   public static final int FLAG_ACCENT_SUBSCRIPT = (1 << 23);
+  public static final int FLAG_ACCENT_RING = (1 << 24);
 
   public static final int FLAGS_ACCENTS = FLAG_ACCENT1 | FLAG_ACCENT2 |
     FLAG_ACCENT3 | FLAG_ACCENT4 | FLAG_ACCENT5 | FLAG_ACCENT6 |
-    FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT;
+    FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT | FLAG_ACCENT_RING;
 
   public final String name;
   public final String symbol;
@@ -131,6 +132,7 @@ class KeyValue
     addModifierKey("accent_tilde", "◌̃", FLAG_ACCENT4);
     addModifierKey("accent_cedille", "◌̧", FLAG_ACCENT5);
     addModifierKey("accent_trema", "◌̈", FLAG_ACCENT6);
+    addModifierKey("accent_ring", "◌̊", FLAG_ACCENT_RING);
     addModifierKey("superscript", "◌͆", FLAG_ACCENT_SUPERSCRIPT);
     addModifierKey("subscript", "◌̺", FLAG_ACCENT_SUBSCRIPT);
     addModifierKey("fn", "Fn", FLAG_FN);
-- 
cgit v1.2.3