Changeset c8444d8 in mainline

Timestamp:

2012-08-16T09:06:58Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5882487, 69cf3a4

Parents:

b8b742e

Message:

Go to Line needs to properly update sel_start tag. It should also stay in the current column.

File:

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

uspace/app/edit/edit.c

@@ -429 +429 @@
 }
 
-static void key_handle_movement(unsigned int key, bool select)
+/** Move caret while preserving or resetting selection. */
+static void caret_movement(int drow, int dcolumn, enum dir_spec align_dir,
+    bool select)
 {
         spt_t pt;
@@ -441 +443 @@
         had_sel = !spt_equal(&caret_pt, &pt);
 
-        switch (key) {
-        case KC_LEFT:
-                caret_move(0, -1, dir_before);
-                break;
-        case KC_RIGHT:
-                caret_move(0, 0, dir_after);
-                break;
-        case KC_UP:
-                caret_move(-1, 0, dir_before);
-                break;
-        case KC_DOWN:
-                caret_move(+1, 0, dir_before);
-                break;
-        case KC_HOME:
-                caret_move(0, -ED_INFTY, dir_before);
-                break;
-        case KC_END:
-                caret_move(0, +ED_INFTY, dir_before);
-                break;
-        case KC_PAGE_UP:
-                caret_move(-pane.rows, 0, dir_before);
-                break;
-        case KC_PAGE_DOWN:
-                caret_move(+pane.rows, 0, dir_before);
-                break;
-        default:
-                break;
-        }
+        caret_move(drow, dcolumn, align_dir);
 
         if (select == false) {
@@ -490 +465 @@
                 /* Redraw because text was unselected. */
                 pane.rflags |= REDRAW_TEXT;
+        }
+}
+
+static void key_handle_movement(unsigned int key, bool select)
+{
+        switch (key) {
+        case KC_LEFT:
+                caret_movement(0, -1, dir_before, select);
+                break;
+        case KC_RIGHT:
+                caret_movement(0, 0, dir_after, select);
+                break;
+        case KC_UP:
+                caret_movement(-1, 0, dir_before, select);
+                break;
+        case KC_DOWN:
+                caret_movement(+1, 0, dir_before, select);
+                break;
+        case KC_HOME:
+                caret_movement(0, -ED_INFTY, dir_before, select);
+                break;
+        case KC_END:
+                caret_movement(0, +ED_INFTY, dir_before, select);
+                break;
+        case KC_PAGE_UP:
+                caret_movement(-pane.rows, 0, dir_before, select);
+                break;
+        case KC_PAGE_DOWN:
+                caret_movement(+pane.rows, 0, dir_before, select);
+                break;
+        default:
+                break;
         }
 }
@@ -1090 +1097 @@
         spt_t pt;
         coord_t coord;
-        int num_rows;
 
         tag_get_pt(&pane.caret_pos, &pt);
         spt_get_coord(&pt, &coord);
-        coord.row = row;
-        coord.column = 1;
-
-        /* Clamp coordinates. */
-        if (coord.row < 1) coord.row = 1;
-        sheet_get_num_rows(&doc.sh, &num_rows);
-        if (coord.row > num_rows) coord.row = num_rows;
-
-        /*
-         * Select the point before the character at the designated
-         * coordinates. The character can be wider than one cell (e.g. tab).
-         */
-        sheet_get_cell_pt(&doc.sh, &coord, dir_before, &pt);
-        sheet_remove_tag(&doc.sh, &pane.caret_pos);
-        sheet_place_tag(&doc.sh, &pt, &pane.caret_pos);
-
-        /* Set the new value for @c ideal_column. */
-        spt_get_coord(&pt, &coord);
-        pane.ideal_column = coord.column;
-
-        caret_update();
+
+        caret_movement(row - coord.row, 0, dir_before, false);
 }