Improve selection mode when selection ends cross

Emptying the selection with the spacebar slider puts the selection mode
in an unexpected state. This checks that this doesn't happen.

The selection ends can now cross each other, reversing the selection
order. Special care is made to make sure that the sliders go in the
expected direction.

Pointers is changed to send a `onPointerDown` for the first slider event
instead of a `onPointerHold`. This event is detected in
`KeyEventHandler` and the selection ends are reordered if needed when
sliding again.

doc/Custom-layouts.md

@@ -52,11 +52,9 @@ The `<keyboard>`...`</keyboard>` pair follows the declaration tag and encloses t
 * `locale_extra_keys`: Whether Unexpected should add language-dependent extra keys from [method.xml](../res/xml/method.xml) to this layout. It accepts `true` or `false`, and defaults to `true`. To disable these automatic additions, specify `locale_extra_keys="false"`.
 
 ## Row
-The `<row>`...`</row>` pair encloses one row on the keyboard. It has the following optional property:
+The `<row>`...`</row>` pair encloses one row on the keyboard. It has only one optional property:
 * `height`: The height of the row: a positive floating-point value.
 
-* `scale`: A positive floating-point value. If present, scale the width of each key so that the total is equal to the specified value, in key width unit.
-
 A row's default height is 1.0 (one quarter of the keyboard height specified on the Settings menu). The `height` property makes the row taller or shorter than this. For example, if you define a 5-row keyboard but one row has `height="0.7"`, then the keyboard's total height is 4.7 units. If the total is different from 4.0, the keyboard will be taller or shorter than that specified in Settings.
 
 ## Key

srcs/juloo.keyboard2/KeyEventHandler.java

@@ -78,6 +78,11 @@ public final class KeyEventHandler
       case Compose_pending:
         _autocap.stop();
         break;
+      case Slider:
+        // Don't wait for the next key_up and move the cursor right away. This
+        // is called after the trigger distance have been travelled.
+        handle_slider(key.getSlider(), key.getSliderRepeat(), true);
+        break;
       default: break;
     }
   }
@@ -99,7 +104,7 @@ public final class KeyEventHandler
       case Modifier: break;
       case Editing: handle_editing_key(key.getEditing()); break;
       case Compose_pending: _recv.set_compose_pending(true); break;
-      case Slider: handle_slider(key.getSlider(), key.getSliderRepeat()); break;
+      case Slider: handle_slider(key.getSlider(), key.getSliderRepeat(), false); break;
       case Macro: evaluate_macro(key.getMacro()); break;
     }
     update_meta_state(old_mods);
@@ -261,7 +266,7 @@ public final class KeyEventHandler
   }
 
   /** [r] might be negative, in which case the direction is reversed. */
-  void handle_slider(KeyValue.Slider s, int r)
+  void handle_slider(KeyValue.Slider s, int r, boolean key_down)
   {
     switch (s)
     {
@@ -269,8 +274,8 @@ public final class KeyEventHandler
       case Cursor_right: move_cursor(r); break;
       case Cursor_up: move_cursor_vertical(-r); break;
       case Cursor_down: move_cursor_vertical(r); break;
-      case Selection_cursor_left: move_cursor_sel(r, true); break;
+      case Selection_cursor_left: move_cursor_sel(r, true, key_down); break;
-      case Selection_cursor_right: move_cursor_sel(r, false); break;
+      case Selection_cursor_right: move_cursor_sel(r, false, key_down); break;
     }
   }
 
@@ -310,7 +315,7 @@ public final class KeyEventHandler
 
   /** Move one of the two side of a selection. If [sel_left] is true, the left
       position is moved, otherwise the right position is moved. */
-  void move_cursor_sel(int d, boolean sel_left)
+  void move_cursor_sel(int d, boolean sel_left, boolean key_down)
   {
     InputConnection conn = _recv.getCurrentInputConnection();
     if (conn == null)
@@ -320,10 +325,23 @@ public final class KeyEventHandler
     {
       int sel_start = et.selectionStart;
       int sel_end = et.selectionEnd;
-      if (sel_left == (sel_start <= sel_end))
+      // Reorder the selection when the slider has just been pressed. The
+      // selection might have been reversed if one end crossed the other end
+      // with a previous slider.
+      if (key_down && sel_start > sel_end)
+      {
+        sel_start = et.selectionEnd;
+        sel_end = et.selectionStart;
+      }
+      do
+      {
+        if (sel_left)
           sel_start += d;
         else
           sel_end += d;
+        // Move the cursor twice if moving it once would make the selection
+        // empty and stop selection mode.
+      } while (sel_start == sel_end);
       if (conn.setSelection(sel_start, sel_end))
         return; // Fallback to sending key events if [setSelection] failed
     }

srcs/juloo.keyboard2/KeyboardData.java

@@ -336,13 +336,9 @@ public final class KeyboardData
       int status;
       float h = attribute_float(parser, "height", 1f);
       float shift = attribute_float(parser, "shift", 0f);
-      float scale = attribute_float(parser, "scale", 0f);
       while (expect_tag(parser, "key"))
         keys.add(Key.parse(parser));
-      Row row = new Row(keys, h, shift);
+      return new Row(keys, h, shift);
-      if (scale > 0f)
-        row = row.updateWidth(scale);
-      return row;
     }
 
     public Row copy()

srcs/juloo.keyboard2/Pointers.java

@@ -306,7 +306,6 @@ public final class Pointers implements Handler.Callback
           // Start sliding mode
           if (new_value.getKind() == KeyValue.Kind.Slider)
             startSliding(ptr, x, y, dx, dy, new_value);
-          _handler.onPointerDown(new_value, true);
         }
 
       }
@@ -469,7 +468,7 @@ public final class Pointers implements Handler.Callback
     stopLongPress(ptr);
     ptr.flags |= FLAG_P_SLIDING;
     ptr.sliding = new Sliding(x, y, dirx, diry, kv.getSlider());
-    _handler.onPointerHold(kv, ptr.modifiers);
+    _handler.onPointerDown(kv, true);
   }
 
   /** Return the [FLAG_P_*] flags that correspond to pressing [kv]. */

srcs/layouts/cyrl_jcuken_ru.xml

@@ -26,17 +26,17 @@
     <key key0="ж" key2="=" key3="+"/>
     <key key0="э" key2="|" key3="\\"/>
   </row>
-  <row scale="11">
+  <row>
-    <key width="1.22" key0="shift" key2="loc capslock"/>
+    <key width="1.18" key0="shift" key2="loc capslock"/>
-    <key key0="я"/>
+    <key width="0.96" key0="я"/>
-    <key key0="ч"/>
+    <key width="0.96" key0="ч"/>
-    <key key0="с"/>
+    <key width="0.96" key0="с"/>
-    <key key0="м"/>
+    <key width="0.96" key0="м"/>
-    <key key0="и" key1="loc і" key2="&lt;" key3="."/>
+    <key width="0.96" key0="и" key1="loc і" key2="&lt;" key3="."/>
-    <key key0="т" key2="&gt;" key3=","/>
+    <key width="0.96" key0="т" key2="&gt;" key3=","/>
-    <key key0="ь" key1="ъ" key2="\?" key3="/"/>
+    <key width="0.96" key0="ь" key1="ъ" key2="\?" key3="/"/>
-    <key key0="б" key2=":" key3=";"/>
+    <key width="0.96" key0="б" key2=":" key3=";"/>
-    <key key0="ю" key2="&quot;" key3="'"/>
+    <key width="0.96" key0="ю" key2="&quot;" key3="'"/>
-    <key width="1.22" key0="backspace" key2="delete"/>
+    <key width="1.18" key0="backspace" key2="delete"/>
   </row>
 </keyboard>

srcs/layouts/cyrl_yqukeng_tj.xml

@@ -26,17 +26,17 @@
     <key key0="ж" key7="0" />
     <key key0="э" key7="\?" key3="/" />
   </row>
-  <row scale="11">
+  <row>
-    <key width="1.22" key0="shift" key2="loc capslock" />
+    <key width="1.18" key0="shift" key2="loc capslock" />
-    <key key0="я" key7="`" key8=";" />
+    <key width="0.96" key0="я" key7="`" key8=";" />
-    <key key0="ч" key7="*" key8=":" />
+    <key width="0.96" key0="ч" key7="*" key8=":" />
-    <key key0="с"  key7="&amp;" key8="\#" />
+    <key width="0.96" key0="с"  key7="&amp;" key8="\#" />
-    <key key0="м" key7="|" key8="\\" />
+    <key width="0.96" key0="м" key7="|" key8="\\" />
-    <key key0="и" key7="~" />
+    <key width="0.96" key0="и" key7="~" />
-    <key key0="т" key7="ц" />
+    <key width="0.96" key0="т" key7="ц" />
-    <key key0="ӣ" key3="&lt;" key2="&gt;" />
+    <key width="0.96" key0="ӣ" key3="&lt;" key2="&gt;" />
-    <key key0="б" key7="ъ" key8="ы" />
+    <key width="0.96" key0="б" key7="ъ" key8="ы" />
-    <key key0="ю" key7="&quot;" key8="'"/>
+    <key width="0.96" key0="ю" key7="&quot;" key8="'"/>
-    <key width="1.22" key0="." key7="," />
+    <key width="1.18" key0="." key7="," />
   </row>
 </keyboard>

srcs/layouts/cyrl_yxukeng_os.xml

@@ -26,17 +26,17 @@
     <key key0="ж" key7="0" />
     <key key0="э" key7="/" key8="|" />
   </row>
-  <row scale="11">
+  <row>
-    <key width="1.22" key0="shift" />
+    <key width="1.18" key0="shift" />
-    <key key0="ꙗ" key7="combining_breve" key8=";" />
+    <key width="0.96" key0="ꙗ" key7="combining_breve" key8=";" />
-    <key key0="ч" key7="combining_pokrytie" key8=":" />
+    <key width="0.96" key0="ч" key7="combining_pokrytie" key8=":" />
-    <key key0="с" key7="combining_inverted_breve" key8="`" />
+    <key width="0.96" key0="с" key7="combining_inverted_breve" key8="`" />
-    <key key0="м" key7="ѭ" />
+    <key width="0.96" key0="м" key7="ѭ" />
-    <key key0="и" key7="combining_vertical_tilde" key8="-" />
+    <key width="0.96" key0="и" key7="combining_vertical_tilde" key8="-" />
-    <key key0="т" key7="\?" key8="\\" />
+    <key width="0.96" key0="т" key7="\?" key8="\\" />
-    <key key0="ц" key3="&lt;" key2="&gt;" />
+    <key width="0.96" key0="ц" key3="&lt;" key2="&gt;" />
-    <key key0="б" key3="(" key2=")" />
+    <key width="0.96" key0="б" key3="(" key2=")" />
-    <key key0="ю" key3="{" key2="}" />
+    <key width="0.96" key0="ю" key3="{" key2="}" />
-    <key width="1.22" key0="." key7="," key8="_" />
+    <key width="1.18" key0="." key7="," key8="_" />
   </row>
 </keyboard>

srcs/layouts/deva_alt.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="देवनागरी (हिंदी)-2" script="devanagari">
-  <row scale="6.6">
+  <row>
-    <key shift="0.35" c="क" nw="ख" ne="घ" sw="ङ"  se="ग"/>
+    <key shift="0.35" width="0.9" c="क" nw="ख" ne="घ" sw="ङ"  se="ग"/>
-    <key              c="च" nw="छ" ne="झ" sw="ञ"  se="ज"/>
+    <key              width="0.9" c="च" nw="छ" ne="झ" sw="ञ"  se="ज"/>
-    <key              c="ट" nw="ठ" ne="ढ" sw="ण"  se="ड" anticircle="७" indication="७"/>
+    <key              width="0.9" c="ट" nw="ठ" ne="ढ" sw="ण"  se="ड" anticircle="७" indication="७"/>
-    <key              c="त" nw="थ" ne="ध" sw="न"  se="द" anticircle="८" indication="८"/>
+    <key              width="0.9" c="त" nw="थ" ne="ध" sw="न"  se="द" anticircle="८" indication="८"/>
-    <key              c="प" nw="फ" ne="भ" sw="म"  se="ब" anticircle="९" indication="९"/>
+    <key              width="0.9" c="प" nw="फ" ne="भ" sw="म"  se="ब" anticircle="९" indication="९"/>
-    <key              c="र" nw="ज्ञ" ne="ल" sw="य"  se="व"/>
+    <key              width="0.9" c="र" nw="ज्ञ" ne="ल" sw="य"  se="व"/>
-    <key              c="ह" nw="श" ne="ळ" sw="स"  se="ष"/>
+    <key              width="0.9" c="ह" nw="श" ne="ळ" sw="स"  se="ष"/>
   </row>
-  <row scale="6.6">
+  <row>
-    <key shift="0.35" c="ा" nw="अ" ne="आ"/>
+    <key shift="0.35" width="0.9" c="ा" nw="अ" ne="आ"/>
-    <key              c="ि" nw="इ"/>
+    <key              width="0.9" c="ि" nw="इ"/>
-    <key              c="ी" nw="ई" anticircle="४" indication="४"/>
+    <key              width="0.9" c="ी" nw="ई" anticircle="४" indication="४"/>
-    <key              c="ु" nw="उ" ne="ऊ" se="ू" anticircle="५" indication="५"/>
+    <key              width="0.9" c="ु" nw="उ" ne="ऊ" se="ू" anticircle="५" indication="५"/>
-    <key              c="े" nw="ए" ne="ऋ" se="ृ" anticircle="६" indication="६"/>
+    <key              width="0.9" c="े" nw="ए" ne="ऋ" se="ृ" anticircle="६" indication="६"/>
-    <key              c="ै" nw="ऐ" ne="ऌ" se="ॢ"/>
+    <key              width="0.9" c="ै" nw="ऐ" ne="ऌ" se="ॢ"/>
-    <key              c="ो" nw="ओ" ne="औ" se="ौ"/>
+    <key              width="0.9" c="ो" nw="ओ" ne="औ" se="ौ"/>
   </row>
   <row>
     <key c="ऽ" se="\@"/>

srcs/layouts/hebr_1_il.xml

@@ -14,17 +14,17 @@
     <key key0="פ" key2="0" key3="b)" key4="rlm"/>
     <key key0="backspace" key2="delete"/>
   </row>
-  <row scale="11">
+  <row>
-    <key key0="ש" key2="`" key1="loc tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.30"/>
+    <key key0="ש" key2="`" key1="loc tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
-    <key key0="ד" key1="~"/>
+    <key key0="ד" key1="~" width="1.0333"/>
-    <key key0="ג" key1="geresh" key2="gershayim"/>
+    <key key0="ג" key1="geresh" key2="gershayim" width="1.0333"/>
-    <key key0="כ"/>
+    <key key0="כ" width="1.0333"/>
-    <key key0="ע"/>
+    <key key0="ע" width="1.0333"/>
-    <key key0="י" key2="-" key3="_" key4="maqaf"/>
+    <key key0="י" key2="-" key3="_" key4="maqaf" width="1.0333"/>
-    <key key0="ח" key2="=" key3="+"/>
+    <key key0="ח" key2="=" key3="+" width="1.0333"/>
-    <key key0="ל" key2="b[" key3="b{"/>
+    <key key0="ל" key2="b[" key3="b{" width="1.0333"/>
-    <key key0="ך" key2="b]" key3="b}"/>
+    <key key0="ך" key2="b]" key3="b}" width="1.0333"/>
-    <key key0="ף" key2="," key3="&quot;" key1=":" width="1.35"/>
+    <key key0="ף" key2="," key3="&quot;" key1=":" width="1.4006"/>
   </row>
   <row>
     <key key0="\\" key1="|" key2="shift" key3="loc capslock"/>

srcs/layouts/latn_bepo_fr.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Inspired by the bépo layout, but adapted to smartphone -->
 <keyboard name="BEPO (Français)" script="latin">
-  <row scale="11">
+  <row>
-    <key key0="b" key1="loc esc" key2="1" key4="|"/>
+    <key width="1.1" key0="b" key1="loc esc" key2="1" key4="|"/>
-    <key key0="é" key2="2" key4="è"/>
+    <key width="1.1" key0="é" key2="2" key4="è"/>
-    <key key0="p" key2="3"/>
+    <key width="1.1" key0="p" key2="3"/>
-    <key key0="o" key2="4" key4="accent_circonflexe"/>
+    <key width="1.1" key0="o" key2="4" key4="accent_circonflexe"/>
-    <key key0="v" key2="5" key4="{"/>
+    <key width="1.1" key0="v" key2="5" key4="{"/>
-    <key key0="d" key2="6" key4="}"/>
+    <key width="1.1" key0="d" key2="6" key4="}"/>
-    <key key0="l" key2="7" key4="("/>
+    <key width="1.1" key0="l" key2="7" key4="("/>
-    <key key0="j" key2="8" key4=")"/>
+    <key width="1.1" key0="j" key2="8" key4=")"/>
-    <key key0="z" key2="9" key4="["/>
+    <key width="1.1" key0="z" key2="9" key4="["/>
-    <key key0="w" key2="0" key4="]"/>
+    <key width="1.1" key0="w" key2="0" key4="]"/>
   </row>
-  <row scale="11">
+  <row>
-    <key key0="a" key1="loc tab" key4="à"/>
+    <key width="1.1" key0="a" key1="loc tab" key4="à"/>
-    <key key0="u" key1="$" key4="ù"/>
+    <key width="1.1" key0="u" key1="$" key4="ù"/>
-    <key key0="i" key4="&amp;"/>
+    <key width="1.1" key0="i" key4="&amp;"/>
-    <key key0="e" key1="+" key2="accent_trema" key4="€"/>
+    <key width="1.1" key0="e" key1="+" key2="accent_trema" key4="€"/>
-    <key key0="c" key1="=" key4="ç"/>
+    <key width="1.1" key0="c" key1="=" key4="ç"/>
-    <key key0="t" key1="^" key4=";"/>
+    <key width="1.1" key0="t" key1="^" key4=";"/>
-    <key key0="s" key4="!"/>
+    <key width="1.1" key0="s" key4="!"/>
-    <key key0="r" key4="\?"/>
+    <key width="1.1" key0="r" key4="\?"/>
-    <key key0="n" key1="`" key2="'" key4=":"/>
+    <key width="1.1" key0="n" key1="`" key2="'" key4=":"/>
-    <key key0="m" key2="&quot;"/>
+    <key width="1.1" key0="m" key2="&quot;"/>
   </row>
   <row>
     <key width="1.5" key0="shift" key2="loc capslock" key3="&lt;"/>