From ab3bc3fb06f864cc1522c87e9d0320a5586b82e9 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Thu, 11 Jul 2019 15:07:17 +0000
Subject: [PATCH] Improve view behavior to more closely reflect #38

---
 eek/eek-keyboard.c | 59 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c
index 313f5c38..6c51d517 100644
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@@ -53,6 +53,13 @@ enum {
     LAST_SIGNAL
 };
 
+enum {
+    VIEW_LETTERS_LOWER,
+    VIEW_LETTERS_UPPER,
+    VIEW_NUMBERS,
+    VIEW_SYMBOLS
+};
+
 static guint signals[LAST_SIGNAL] = { 0, };
 
 #define EEK_KEYBOARD_GET_PRIVATE(obj)                                  \
@@ -63,6 +70,7 @@ struct _EekKeyboardPrivate
     EekLayout *layout;
     EekModifierBehavior modifier_behavior;
     EekModifierType modifiers;
+    EekModifierType old_level;
     GList *pressed_keys;
     GList *locked_keys;
     GArray *outline_array;
@@ -206,24 +214,45 @@ static void
 set_level_from_modifiers (EekKeyboard *self)
 {
     EekKeyboardPrivate *priv = EEK_KEYBOARD_GET_PRIVATE(self);
-    gint level = 0;
 
-    if (priv->modifiers & priv->alt_gr_mask) {
-        /* Alt-Gr is the 123 and ABC keys */
+    /* The levels are: 0 Letters, 1 Upper case letters, 2 Numbers, 3 Symbols */
+    gint level = ((priv->modifiers & priv->alt_gr_mask) ? 2 : 0) |
+                 ((priv->modifiers & EEK_SHIFT_MASK) ? 1 : 0);
+
+    g_debug("XXXX: %i %i", priv->old_level, level);
+
+    switch (priv->old_level) {
+    case VIEW_LETTERS_UPPER:
+    {
+        /* Redirect upper case letters to numbers instead of symbols, clearing
+           the shift modifier to keep the modifiers in sync with the level */
+        if (level == VIEW_SYMBOLS) {
+            level = VIEW_NUMBERS;
+            priv->modifiers &= ~EEK_SHIFT_MASK;
+        }
+        break;
+    }
+    case VIEW_SYMBOLS:
+    {
+        /* Redirect symbols to lower case letters instead of upper case,
+           clearing the shift modifier to keep the modifiers in sync with the
+           level */
+        if (level == VIEW_LETTERS_UPPER) {
+            level = VIEW_LETTERS_LOWER;
+            priv->modifiers &= ~EEK_SHIFT_MASK;
+        }
+        break;
+    }
+    case VIEW_LETTERS_LOWER:    /* Direct transitions between views */
+    case VIEW_NUMBERS:
+    default:
+        break;
+    }
+
+    if (level == VIEW_NUMBERS || level == VIEW_SYMBOLS)
         priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LOCK;
-        level |= 2;
-    }
-
-    if (priv->modifiers & EEK_SHIFT_MASK) {
-        /* Left Shift is the Shift and =/+ keys */
-        level |= 1;
-
-        if (level == 1)
-            priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LATCH;
-        else
-            priv->modifier_behavior = EEK_MODIFIER_BEHAVIOR_LOCK;
-    }
 
+    priv->old_level = level;
     eek_element_set_level (EEK_ELEMENT(self), level);
 }