Changeset 6037308 in mainline

Timestamp:

2013-04-12T20:45:31Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c80be58

Parents:

a2bdcf87

Message:

Mouse seeking in text editor.

File:

• uspace/app/edit/edit.c (modified) (6 diffs)

uspace/app/edit/edit.c

@@ -119 +119 @@
 static void cursor_setvis(bool visible);
 
+static void key_handle_press(kbd_event_t *ev);
 static void key_handle_unmod(kbd_event_t const *ev);
 static void key_handle_ctrl(kbd_event_t const *ev);
@@ -124 +125 @@
 static void key_handle_shift_ctrl(kbd_event_t const *ev);
 static void key_handle_movement(unsigned int key, bool shift);
+
+static void pos_handle(pos_event_t *ev);
 
 static int file_save(char const *fname);
@@ -183 +186 @@
 {
         cons_event_t ev;
-        kbd_event_t *kev;
         bool new_file;
         int rc;
@@ -249 +251 @@
                 pane.rflags = 0;
 
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
-                        kev = &ev.ev.key;
-
-                        /* Handle key press. */
-                        if (((kev->mods & KM_ALT) == 0) &&
-                            ((kev->mods & KM_SHIFT) == 0) &&
-                             (kev->mods & KM_CTRL) != 0) {
-                                key_handle_ctrl(kev);
-                        } else if (((kev->mods & KM_ALT) == 0) &&
-                            ((kev->mods & KM_CTRL) == 0) &&
-                             (kev->mods & KM_SHIFT) != 0) {
-                                key_handle_shift(kev);
-                        } else if (((kev->mods & KM_ALT) == 0) &&
-                            ((kev->mods & KM_CTRL) != 0) &&
-                             (kev->mods & KM_SHIFT) != 0) {
-                                key_handle_shift_ctrl(kev);
-                        } else if ((kev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                                key_handle_unmod(kev);
-                        }
+                switch (ev.type) {
+                case CEV_KEY:
+                        if (ev.ev.key.type == KEY_PRESS)
+                                key_handle_press(&ev.ev.key);
+                        break;
+                case CEV_POS:
+                        pos_handle(&ev.ev.pos);
+                        break;
                 }
 
@@ -289 +280 @@
 
         return 0;
+}
+
+/* Handle key press. */
+static void key_handle_press(kbd_event_t *ev)
+{
+        if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_SHIFT) == 0) &&
+             (ev->mods & KM_CTRL) != 0) {
+                key_handle_ctrl(ev);
+        } else if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_CTRL) == 0) &&
+             (ev->mods & KM_SHIFT) != 0) {
+                key_handle_shift(ev);
+        } else if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_CTRL) != 0) &&
+             (ev->mods & KM_SHIFT) != 0) {
+                key_handle_shift_ctrl(ev);
+        } else if ((ev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                key_handle_unmod(ev);
+        }
 }
 
@@ -462 +473 @@
         default:
                 break;
+        }
+}
+
+static void pos_handle(pos_event_t *ev)
+{
+        coord_t bc;
+        spt_t pt;
+
+        if (ev->type == POS_PRESS && ev->vpos < (unsigned)pane.rows) {
+                bc.row = pane.sh_row + ev->vpos;
+                bc.column = pane.sh_column + ev->hpos;
+                sheet_get_cell_pt(doc.sh, &bc, dir_before, &pt);
+
+                caret_move(pt, false, true);
         }
 }