mirror of
https://github.com/Julow/Unexpected-Keyboard.git
synced 2025-08-18 12:20:40 +02:00
Compare commits
1 Commits
sel-mode-f
...
sel-mode-f
Author | SHA1 | Date | |
---|---|---|---|
|
5d62cf7901 |
@@ -78,11 +78,6 @@ public final class KeyEventHandler
|
|||||||
case Compose_pending:
|
case Compose_pending:
|
||||||
_autocap.stop();
|
_autocap.stop();
|
||||||
break;
|
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;
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -104,7 +99,7 @@ public final class KeyEventHandler
|
|||||||
case Modifier: break;
|
case Modifier: break;
|
||||||
case Editing: handle_editing_key(key.getEditing()); break;
|
case Editing: handle_editing_key(key.getEditing()); break;
|
||||||
case Compose_pending: _recv.set_compose_pending(true); break;
|
case Compose_pending: _recv.set_compose_pending(true); break;
|
||||||
case Slider: handle_slider(key.getSlider(), key.getSliderRepeat(), false); break;
|
case Slider: handle_slider(key.getSlider(), key.getSliderRepeat()); break;
|
||||||
case Macro: evaluate_macro(key.getMacro()); break;
|
case Macro: evaluate_macro(key.getMacro()); break;
|
||||||
}
|
}
|
||||||
update_meta_state(old_mods);
|
update_meta_state(old_mods);
|
||||||
@@ -266,7 +261,7 @@ public final class KeyEventHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** [r] might be negative, in which case the direction is reversed. */
|
/** [r] might be negative, in which case the direction is reversed. */
|
||||||
void handle_slider(KeyValue.Slider s, int r, boolean key_down)
|
void handle_slider(KeyValue.Slider s, int r)
|
||||||
{
|
{
|
||||||
switch (s)
|
switch (s)
|
||||||
{
|
{
|
||||||
@@ -274,8 +269,8 @@ public final class KeyEventHandler
|
|||||||
case Cursor_right: move_cursor(r); break;
|
case Cursor_right: move_cursor(r); break;
|
||||||
case Cursor_up: move_cursor_vertical(-r); break;
|
case Cursor_up: move_cursor_vertical(-r); break;
|
||||||
case Cursor_down: move_cursor_vertical(r); break;
|
case Cursor_down: move_cursor_vertical(r); break;
|
||||||
case Selection_cursor_left: move_cursor_sel(r, true, key_down); break;
|
case Selection_cursor_left: move_cursor_sel(r, true); break;
|
||||||
case Selection_cursor_right: move_cursor_sel(r, false, key_down); break;
|
case Selection_cursor_right: move_cursor_sel(r, false); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -315,7 +310,7 @@ public final class KeyEventHandler
|
|||||||
|
|
||||||
/** Move one of the two side of a selection. If [sel_left] is true, the left
|
/** 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. */
|
position is moved, otherwise the right position is moved. */
|
||||||
void move_cursor_sel(int d, boolean sel_left, boolean key_down)
|
void move_cursor_sel(int d, boolean sel_left)
|
||||||
{
|
{
|
||||||
InputConnection conn = _recv.getCurrentInputConnection();
|
InputConnection conn = _recv.getCurrentInputConnection();
|
||||||
if (conn == null)
|
if (conn == null)
|
||||||
@@ -325,17 +320,10 @@ public final class KeyEventHandler
|
|||||||
{
|
{
|
||||||
int sel_start = et.selectionStart;
|
int sel_start = et.selectionStart;
|
||||||
int sel_end = et.selectionEnd;
|
int sel_end = et.selectionEnd;
|
||||||
// Reorder the selection when the slider has just been pressed. The
|
boolean modify_sel_start = sel_left == (sel_start <= sel_end);
|
||||||
// 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
|
do
|
||||||
{
|
{
|
||||||
if (sel_left)
|
if (modify_sel_start)
|
||||||
sel_start += d;
|
sel_start += d;
|
||||||
else
|
else
|
||||||
sel_end += d;
|
sel_end += d;
|
||||||
|
@@ -306,6 +306,7 @@ public final class Pointers implements Handler.Callback
|
|||||||
// Start sliding mode
|
// Start sliding mode
|
||||||
if (new_value.getKind() == KeyValue.Kind.Slider)
|
if (new_value.getKind() == KeyValue.Kind.Slider)
|
||||||
startSliding(ptr, x, y, dx, dy, new_value);
|
startSliding(ptr, x, y, dx, dy, new_value);
|
||||||
|
_handler.onPointerDown(new_value, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -468,7 +469,7 @@ public final class Pointers implements Handler.Callback
|
|||||||
stopLongPress(ptr);
|
stopLongPress(ptr);
|
||||||
ptr.flags |= FLAG_P_SLIDING;
|
ptr.flags |= FLAG_P_SLIDING;
|
||||||
ptr.sliding = new Sliding(x, y, dirx, diry, kv.getSlider());
|
ptr.sliding = new Sliding(x, y, dirx, diry, kv.getSlider());
|
||||||
_handler.onPointerDown(kv, true);
|
_handler.onPointerHold(kv, ptr.modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Return the [FLAG_P_*] flags that correspond to pressing [kv]. */
|
/** Return the [FLAG_P_*] flags that correspond to pressing [kv]. */
|
||||||
|
Reference in New Issue
Block a user