Changeset b8b742e in mainline

Timestamp:

2012-08-15T23:03:55Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

b224a3e, c8444d8

Parents:

a44abb3e

Message:

Add Go To Line functionality for edit (use Ctrl+L).

File:

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

uspace/app/edit/edit.c

@@ -126 +126 @@
 static int file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos);
-static char *filename_prompt(char const *prompt, char const *init_value);
 static char *range_get_str(spt_t const *spos, spt_t const *epos);
+
+static char *prompt(char const *prompt, char const *init_value);
 
 static void pane_text_display(void);
@@ -142 +143 @@
 static void caret_move_word_left(void);
 static void caret_move_word_right(void);
+static void caret_move_to_line(int row);
+static void caret_go_to_line_ask(void);
 
 static bool selection_active(void);
@@ -404 +407 @@
                 caret_move_word_left();
                 break;
+        case KC_L:
+                caret_go_to_line_ask();
+                break;
         default:
                 break;
@@ -520 +526 @@
         char *fname;
         
-        fname = filename_prompt("Save As", old_fname);
+        fname = prompt("Save As", old_fname);
         if (fname == NULL) {
                 status_display("Save cancelled.");
@@ -535 +541 @@
 }
 
-/** Ask for a file name. */
-static char *filename_prompt(char const *prompt, char const *init_value)
+/** Ask for a string. */
+static char *prompt(char const *prompt, char const *init_value)
 {
         kbd_event_t ev;
@@ -1078 +1084 @@
 }
 
+/** Change the caret position to a beginning of a given line
+ */
+static void caret_move_to_line(int row)
+{
+        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();
+}
+
+/** Ask for line and go to it. */
+static void caret_go_to_line_ask(void)
+{
+        char *sline;
+        
+        sline = prompt("Go to line", "");
+        if (sline == NULL) {
+                status_display("Go to line cancelled.");
+                return;
+        }
+        
+        char *endptr;
+        int line = strtol(sline, &endptr, 10);
+        if (*endptr != '\0') {
+                status_display("Invalid number entered.");
+                return;
+        }
+        
+        caret_move_to_line(line);
+}
+
+
 /** Check for non-empty selection. */
 static bool selection_active(void)