Changeset 8312577 in mainline

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.

Location:

uspace/app/edit

Files:

• edit.c (modified) (11 diffs)
• search.c (modified) (2 diffs)
• search.h (modified) (1 diff)

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);

uspace/app/edit/search.c

@@ -41 +41 @@
 #include "search_impl.h"
 
-search_t *search_init(const char *pattern, void *client_data, search_ops_t ops)
+search_t *search_init(const char *pattern, void *client_data, search_ops_t ops,
+    bool reverse)
 {
         search_t *search = calloc(1, sizeof(search_t));
@@ -47 +48 @@
                 return NULL;
         
-        search->pattern = str_to_awstr(pattern);
-        if (search->pattern == NULL) {
+        wchar_t *p = str_to_awstr(pattern);
+        if (p == NULL) {
                 free(search);
                 return NULL;
         }
         
+        search->pattern_length = wstr_length(p);
+        
+        if (reverse) {
+                /* Reverse the pattern */
+                size_t pos, half;
+                half = search->pattern_length / 2;
+                for (pos = 0; pos < half; pos++) {
+                        wchar_t tmp = p[pos];
+                        p[pos] = p[search->pattern_length - pos - 1];
+                        p[search->pattern_length - pos - 1] = tmp;
+                }
+        }
+        
+        search->pattern = p;
+        
         search->client_data = client_data;
         search->ops = ops;
-        search->pattern_length = wstr_length(search->pattern);
         search->back_table = calloc(search->pattern_length, sizeof(ssize_t));
         if (search->back_table == NULL) {

uspace/app/edit/search.h

@@ -59 +59 @@
 
 extern bool char_exact_equals(const wchar_t, const wchar_t);
-extern search_t *search_init(const char *, void *, search_ops_t);
+extern search_t *search_init(const char *, void *, search_ops_t, bool);
 extern int search_next_match(search_t *, match_t *);
 extern void search_fini(search_t *);