Refactor: Associate key events in KeyModifier

Two advantages:
- No need to distinguish modifiers in KeyEventHandler. The KeyValue is
  enough to decide what action to do.
- Keys are never a Char and Event at the same time, fields can be
  merged.

1 files changed, 0 insertions, 21 deletions

diff --git a/srcs/juloo.keyboard2/KeyEventHandler.java b/srcs/juloo.keyboard2/KeyEventHandler.java
index 90f4a1a..8be8bf7 100644
--- a/srcs/juloo.keyboard2/KeyEventHandler.java
+++ b/srcs/juloo.keyboard2/KeyEventHandler.java
@@ -19,10 +19,6 @@ class KeyEventHandler implements Config.IKeyEventHandler
     switch (key.getKind())
     {
       case Char:
-        // Send an event if some modifiers are active.
-        event = key.getCharEvent();
-        if (shouldSendEvents(mods) && event != KeyValue.EVENT_NONE)
-          handleKeyUpWithModifier(event, mods);
         _recv.commitChar(key.getChar());
         break;
       case String:
@@ -102,23 +98,6 @@ class KeyEventHandler implements Config.IKeyEventHandler
       metaState = sendMetaKeyForModifier(mods.get(i), metaState, false);
 	}
 
-  /** Whether to send up and down events (true) or commit the text (false). */
-  private boolean shouldSendEvents(Pointers.Modifiers mods)
-  {
-    // Check for modifiers
-    for (int i = 0; i < mods.size(); i++)
-    {
-      switch (mods.get(i))
-      {
-        case KeyValue.MOD_CTRL:
-        case KeyValue.MOD_ALT:
-        case KeyValue.MOD_META: return true;
-        default: break;
-      }
-    }
-    return false;
-  }
-
   public static interface IReceiver
   {
     public void switchToNextInputMethod();