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

Timestamp:

2012-08-17T11:44:43Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

1d5a540

Parents:

2f136e4

Message:

Add backwards search functionality to edit.

File:

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

uspace/app/edit/edit.c

@@ -87 +87 @@
         
         char *previous_search;
+        bool previous_search_reverse;
 } pane_t;
 
@@ -159 +160 @@
 static void insert_clipboard_data(void);
 
-static void search(void);
-static void search_forward(char *pattern);
+static void search(char *pattern, bool reverse);
+static void search_prompt(bool reverse);
 static void search_repeat(void);
 
@@ -417 +418 @@
                 break;
         case KC_F:
-                search();
+                search_prompt(false);
                 break;
         case KC_N:
@@ -435 +436 @@
         case KC_RIGHT:
                 caret_move_word_right(true);
+                break;
+        case KC_F:
+                search_prompt(true);
                 break;
         default:
@@ -1161 +1165 @@
 }
 
+static int search_spt_reverse_producer(void *data, wchar_t *ret)
+{
+        assert(data != NULL);
+        assert(ret != NULL);
+        spt_t *spt = data;
+        *ret = spt_prev_char(*spt, spt);
+        return EOK;
+}
+
 static int search_spt_mark(void *data, void **mark)
 {
@@ -1186 +1199 @@
 };
 
+static search_ops_t search_spt_reverse_ops = {
+        .equals = char_exact_equals,
+        .producer = search_spt_reverse_producer,
+        .mark = search_spt_mark,
+        .mark_free = search_spt_mark_free,
+};
+
 /** Ask for line and go to it. */
-static void search(void)
+static void search_prompt(bool reverse)
 {
         char *pattern;
+        
+        const char *prompt_text = "Find next";
+        if (reverse)
+                prompt_text = "Find previous";
         
         const char *default_value = "";
@@ -1195 +1219 @@
                 default_value = pane.previous_search;
         
-        pattern = prompt("Search for", default_value);
+        pattern = prompt(prompt_text, default_value);
         if (pattern == NULL) {
                 status_display("Search cancelled.");
@@ -1204 +1228 @@
                 free(pane.previous_search);
         pane.previous_search = pattern;
-        
-        search_forward(pattern);
+        pane.previous_search_reverse = reverse;
+        
+        search(pattern, reverse);
 }
 
@@ -1215 +1240 @@
         }
         
-        search_forward(pane.previous_search);
-}
-
-static void search_forward(char *pattern)
+        search(pane.previous_search, pane.previous_search_reverse);
+}
+
+static void search(char *pattern, bool reverse)
 {
         status_display("Searching...");
@@ -1225 +1250 @@
         tag_get_pt(&pane.caret_pos, &sp);
         
-        /* Start searching on the position after caret */
-        spt_next_char(sp, &sp);
+        /* Start searching on the position before/after caret */
+        if (!reverse) {
+                spt_next_char(sp, &sp);
+        }
+        else {
+                spt_prev_char(sp, &sp);
+        }
         producer_pos = sp;
         
-        search_t *search = search_init(pattern, &producer_pos, search_spt_ops);
+        search_ops_t ops = search_spt_ops;
+        if (reverse)
+                ops = search_spt_reverse_ops;
+        
+        search_t *search = search_init(pattern, &producer_pos, ops, reverse);
         if (search == NULL) {
                 status_display("Failed initializing search.");
@@ -1249 +1283 @@
                 while (match.length > 0) {
                         match.length--;
-                        spt_prev_char(*end, end);
+                        if (reverse) {
+                                spt_next_char(*end, end);
+                        }
+                        else {
+                                spt_prev_char(*end, end);
+                        }
                 }
                 caret_move(*end, true, true);