From ddd2eebb0e2a811c922d9c30c7ce17980caeb2a5 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 11 Jan 2025 16:30:36 +0100
Subject: Remove the 'slider="true"' attribute

Whether a key behaves as a slider is now purely defined by the key
values present on it.
---
 srcs/juloo.keyboard2/KeyboardData.java | 18 ++++++------------
 srcs/juloo.keyboard2/Pointers.java     |  2 +-
 srcs/layouts/latn_neo2.xml             |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'srcs')

diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java
index aca8ba3..0c54291 100644
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -401,9 +401,6 @@ public final class KeyboardData
     public final float width;
     /** Extra empty space on the left of the key. */
     public final float shift;
-    /** Keys 2 and 3 are repeated as the finger moves laterally on the key.
-        Used for the left and right arrow keys on the space bar. */
-    public final boolean slider;
     /** String printed on the keys. It has no other effect. */
     public final String indication;
 
@@ -411,14 +408,13 @@ public final class KeyboardData
     public static final int F_LOC = 1;
     public static final int ALL_FLAGS = F_LOC;
 
-    protected Key(KeyValue[] ks, KeyValue antic, int f, float w, float s, boolean sl, String i)
+    protected Key(KeyValue[] ks, KeyValue antic, int f, float w, float s, String i)
     {
       keys = ks;
       anticircle = antic;
       keysflags = f;
       width = Math.max(w, 0f);
       shift = Math.max(s, 0f);
-      slider = sl;
       indication = i;
     }
 
@@ -487,11 +483,10 @@ public final class KeyboardData
       KeyValue anticircle = parse_nonloc_key_attr(parser, "anticircle");
       float width = attribute_float(parser, "width", 1f);
       float shift = attribute_float(parser, "shift", 0.f);
-      boolean slider = attribute_bool(parser, "slider", false);
       String indication = parser.getAttributeValue(null, "indication");
       while (parser.next() != XmlPullParser.END_TAG)
         continue;
-      return new Key(ks, anticircle, keysflags, width, shift, slider, indication);
+      return new Key(ks, anticircle, keysflags, width, shift, indication);
     }
 
     /** Whether key at [index] as [flag]. */
@@ -503,8 +498,7 @@ public final class KeyboardData
     /** New key with the width multiplied by 's'. */
     public Key scaleWidth(float s)
     {
-      return new Key(keys, anticircle, keysflags, width * s, shift, slider,
-          indication);
+      return new Key(keys, anticircle, keysflags, width * s, shift, indication);
     }
 
     public void getKeys(Map<KeyValue, KeyPos> dst, int row, int col)
@@ -525,12 +519,12 @@ public final class KeyboardData
       for (int j = 0; j < keys.length; j++) ks[j] = keys[j];
       ks[i] = kv;
       int flags = (keysflags & ~(ALL_FLAGS << i));
-      return new Key(ks, anticircle, flags, width, shift, slider, indication);
+      return new Key(ks, anticircle, flags, width, shift, indication);
     }
 
     public Key withShift(float s)
     {
-      return new Key(keys, anticircle, keysflags, width, s, slider, indication);
+      return new Key(keys, anticircle, keysflags, width, s, indication);
     }
 
     public boolean hasValue(KeyValue kv)
@@ -556,7 +550,7 @@ public final class KeyboardData
       for (int i = 0; i < ks.length; i++)
         if (k.keys[i] != null)
           ks[i] = apply(k.keys[i], k.keyHasFlag(i, Key.F_LOC));
-      return new Key(ks, k.anticircle, k.keysflags, k.width, k.shift, k.slider, k.indication);
+      return new Key(ks, k.anticircle, k.keysflags, k.width, k.shift, k.indication);
     }
   }
 
diff --git a/srcs/juloo.keyboard2/Pointers.java b/srcs/juloo.keyboard2/Pointers.java
index 9323980..da8ba39 100644
--- a/srcs/juloo.keyboard2/Pointers.java
+++ b/srcs/juloo.keyboard2/Pointers.java
@@ -295,7 +295,7 @@ public final class Pointers implements Handler.Callback
           ptr.value = new_value;
           ptr.flags = pointer_flags_of_kv(new_value);
           // Start sliding mode
-          if (ptr.key.slider && new_value.getKind() == KeyValue.Kind.Slider)
+          if (new_value.getKind() == KeyValue.Kind.Slider)
             startSliding(ptr, x, (dx < 0 ? -1 : 1), new_value);
           _handler.onPointerDown(new_value, true);
         }
diff --git a/srcs/layouts/latn_neo2.xml b/srcs/layouts/latn_neo2.xml
index 4a7d33a..b600004 100644
--- a/srcs/layouts/latn_neo2.xml
+++ b/srcs/layouts/latn_neo2.xml
@@ -43,7 +43,7 @@
   <row height="0.95">
     <key width="1.7" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
     <key width="1.1" key0="fn" key1="loc alt" key2="loc change_method" key3="switch_emoji" key4="config"/>
-    <key width="4.4" key0="space" key7="switch_forward" key8="switch_backward" key5="cursor_left" key6="cursor_right" slider="true"/>
+    <key width="4.4" key0="space" key7="switch_forward" key8="switch_backward" key5="cursor_left" key6="cursor_right"/>
     <key width="1.1" key0="loc compose" key7="up" key6="right" key5="left" key8="down" key1="loc home" key2="loc page_up" key3="loc end" key4="loc page_down"/>
     <key key0="j" key4=";"/>
     <key width="1.7" key0="enter" key1="loc voice_typing" key2="action"/>
-- 
cgit v1.2.3