Changeset 5882487 in mainline for uspace/app/edit/edit.c

Timestamp:

2012-08-16T09:43:13Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8cbd39

Parents:

b52dd1de (diff), c8444d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/edit/edit.c (modified) (10 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;
@@ -423 +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;
@@ -435 +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) {
@@ -487 +468 @@
 }
 
+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;
+        }
+}
+
 /** Save the document. */
 static int file_save(char const *fname)
@@ -520 +533 @@
         char *fname;
         
-        fname = filename_prompt("Save As", old_fname);
+        fname = prompt("Save As", old_fname);
         if (fname == NULL) {
                 status_display("Save cancelled.");
@@ -535 +548 @@
 }
 
-/** 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;
@@ -842 +855 @@
                 /* Fill until the end of display area. */
 
-                if (str_length(row_buf) < (unsigned) scr_columns)
-                        fill = scr_columns - str_length(row_buf);
+                if ((unsigned)s_column - 1 < scr_columns)
+                        fill = scr_columns - (s_column - 1);
                 else
                         fill = 0;
@@ -1077 +1090 @@
         pane.rflags |= REDRAW_TEXT;
 }
+
+/** 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;
+
+        tag_get_pt(&pane.caret_pos, &pt);
+        spt_get_coord(&pt, &coord);
+
+        caret_movement(row - coord.row, 0, dir_before, false);
+}
+
+/** 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. */