Changeset 743e17b in mainline

Timestamp:

2009-09-16T21:25:30Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

985e26d2, e5d4294

Parents:

884b461

Message:

Try maintaining column during vertical caret movements.

File:

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

uspace/app/edit/edit.c

@@ -72 +72 @@
         /** Current position of the caret */
         tag_t caret_pos;
+
+        /** 
+         * Ideal column where the caret should try to get. This is used
+         * for maintaining the same column during vertical movement.
+         */
+        int ideal_column;
 } pane_t;
 
@@ -141 +147 @@
         sheet_get_cell_pt(&doc.sh, &coord, dir_before, &pt);
         sheet_place_tag(&doc.sh, &pt, &pane.caret_pos);
+        pane.ideal_column = coord.column;
 
         if (argc == 2) {
@@ -605 +612 @@
         coord_t coord;
         int num_rows;
+        bool pure_vertical;
 
         tag_get_pt(&pane.caret_pos, &pt);
@@ -617 +625 @@
                 if (coord.row > num_rows) coord.row = num_rows;
         }
+
+        /* For purely vertical movement try attaining @c ideal_column. */
+        pure_vertical = (dcolumn == 0 && align_dir == dir_before);
+        if (pure_vertical)
+                coord.column = pane.ideal_column;
 
         /*
@@ -626 +639 @@
         sheet_place_tag(&doc.sh, &pt, &pane.caret_pos);
 
+        /* For non-vertical movement set the new value for @c ideal_column. */
+        if (!pure_vertical) {
+                spt_get_coord(&pt, &coord);
+                pane.ideal_column = coord.column;
+        }
+
         caret_update();
 }