From 3f6b6fd23253e5326d9ba29cac10be36305b3019 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Mon, 1 Apr 2024 22:57:53 +0200
Subject: refactor: Apply the modmap in KeyModifier

This makes possible to apply other modifiers to mapped keys and ensures
that the modmap really override the shift key behavior.
---
 srcs/juloo.keyboard2/Keyboard2View.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2View.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 61a62e9..40def60 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -104,6 +104,7 @@ public class Keyboard2View extends View
     }
     _compose_kv = KeyValue.getKeyByName("compose");
     _compose_key = _keyboard.findKeyWithValue(_compose_kv);
+    KeyModifier.set_modmap(_keyboard.modmap);
     reset();
   }
 
@@ -137,15 +138,6 @@ public class Keyboard2View extends View
 
   public KeyValue modifyKey(KeyValue k, Pointers.Modifiers mods)
   {
-    if (_keyboard.modmap != null)
-    {
-      if (mods.has(KeyValue.Modifier.SHIFT))
-      {
-        KeyValue km = _keyboard.modmap.shift.get(k);
-        if (km != null)
-          return km;
-      }
-    }
     return KeyModifier.modify(k, mods);
   }
 
-- 
cgit v1.2.3