Changeset a106037 in mainline

Timestamp:

2021-07-21T18:04:12Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

21b0013, 5de71df

Parents:

282c86d

Message:

Selecting entry text by shift-click

You can never have enough ways of selecting text. Besides, mouse drag
does not work in console, because console does not deliver position
update events (we might have to rethink that).

Location:

uspace/lib/ui

Files:

• private/entry.h (modified) (1 diff)
• src/entry.c (modified) (2 diffs)

uspace/lib/ui/private/entry.h

@@ -68 +68 @@
         /** Button is held down */
         bool held;
+        /** Left shift is held down */
+        bool lshift_held;
+        /** Right shift is held down */
+        bool rshift_held;
 };
 

uspace/lib/ui/src/entry.c

@@ -733 +733 @@
         }
 
+        /*
+         * Need to keep track if any shift is held for the case
+         * of selecting by shift-click. This could be simplified
+         * if position events were decorated with modifier
+         * state.
+         */
+
+        if (event->type == KEY_PRESS && event->key == KC_LSHIFT)
+                entry->lshift_held = true;
+        if (event->type == KEY_RELEASE && event->key == KC_LSHIFT)
+                entry->lshift_held = false;
+        if (event->type == KEY_PRESS && event->key == KC_RSHIFT)
+                entry->rshift_held = true;
+        if (event->type == KEY_RELEASE && event->key == KC_RSHIFT)
+                entry->rshift_held = false;
+
         if (event->type == KEY_PRESS &&
             (event->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0)
@@ -800 +816 @@
                         entry->held = true;
                         entry->pos = ui_entry_find_pos(entry, &pos);
-                        entry->sel_start = entry->pos;
+
+                        /* Clear selection if no shift key is held */
+                        if (!entry->lshift_held && !entry->rshift_held)
+                                entry->sel_start = entry->pos;
+
                         if (entry->active)
                                 ui_entry_paint(entry);