refactor: Allow modifier of other key kinds

Allow keys of a kind other than Modifier to be a modifier.

This requires writing a compareTo function for KeyValue. Fields are
compared in this order: Kind, value, flags, symbol.

1 files changed, 10 insertions, 0 deletions

diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 146c1bd..a3c499b 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -38,6 +38,16 @@ public final class KeyModifier
     return r;
   }
 
+  public static KeyValue modify(KeyValue k, KeyValue mod)
+  {
+    switch (mod.getKind())
+    {
+      case Modifier:
+        return modify(k, mod.getModifier());
+    }
+    return k;
+  }
+
   public static KeyValue modify(KeyValue k, KeyValue.Modifier mod)
   {
     switch (mod)