Changeset 8277 for branches

Timestamp:

03/12/11 14:12:57 (6 months ago)

Author:

westram

Message:

• pass ED4_window to ED4_search_cb to ensure the search is performed in the correct window
• after changing search params
  • perform autojump in all windows
  • redraw all windows

Location:

branches/e4fix/EDIT4

Files:

• ED4_edit_string.cxx (modified) (1 diff)
• ED4_root.cxx (modified) (5 diffs)
• ED4_search.cxx (modified) (5 diffs)
• ed4_search.hxx (modified) (2 diffs)

branches/e4fix/EDIT4/ED4_edit_string.cxx

@@ -777 +777 @@
                         }
                         case 'S': { // CTRL-S = Repeat last search
-                            ad_err      = ED4_repeat_last_search();
+                            ad_err      = ED4_repeat_last_search(current_ed4w());
                             seq_pos     = current_cursor().get_sequence_pos();
                             cursor_jump = ED4_JUMP_KEEP_POSITION;

branches/e4fix/EDIT4/ED4_root.cxx

@@ -1132 +1132 @@
 static void insert_search_fields(AW_window_menu_modes *awmm,
                                  const char *label_prefix, const char *macro_prefix,
-                                 const char *pattern_awar_name, ED4_SearchPositionType type, const char *show_awar_name,
-                                 int short_form)
+                                 const char *pattern_awar_name, const char *show_awar_name,
+                                 int short_form, ED4_search_type_and_ed4w *taw)
 {
     char buf[200];
@@ -1143 +1143 @@
 
     awmm->at(cat(buf, label_prefix, "n"));
-    awmm->callback(ED4_search, ED4_encodeSearchDescriptor(+1, type));
+    awmm->callback(ED4_search_cb, ED4_encodeSearchDescriptor(+1, taw->type), (AW_CL)taw->ed4w);
     awmm->create_button(cat(buf, macro_prefix, "_SEARCH_NEXT"), "#edit/next.bitmap");
 
     awmm->at(cat(buf, label_prefix, "l"));
-    awmm->callback(ED4_search, ED4_encodeSearchDescriptor(-1, type));
+    awmm->callback(ED4_search_cb, ED4_encodeSearchDescriptor(-1, taw->type), (AW_CL)taw->ed4w);
     awmm->create_button(cat(buf, macro_prefix, "_SEARCH_LAST"), "#edit/last.bitmap");
 
     awmm->at(cat(buf, label_prefix, "d"));
-    awmm->callback(AW_POPUP, (AW_CL)ED4_create_search_window, (AW_CL)type);
+    awmm->callback(AW_POPUP, (AW_CL)ED4_create_search_window, (AW_CL)taw);
     awmm->create_button(cat(buf, macro_prefix, "_SEARCH_DETAIL"), "#edit/detail.bitmap");
 
@@ -1549 +1549 @@
             sprintf(menu_entry_name, "%s Search", id);
 
-            hotkey[0] = hotkeys[s];
-            awmm->insert_menu_topic(macro_name, menu_entry_name, hotkey, "e4_search.hlp", AWM_ALL, AW_POPUP, AW_CL(ED4_create_search_window), AW_CL(type));
+            hotkey[0]                     = hotkeys[s];
+            ED4_search_type_and_ed4w *taw = new ED4_search_type_and_ed4w(type, current_ed4w());
+            awmm->insert_menu_topic(macro_name, menu_entry_name, hotkey, "e4_search.hlp", AWM_ALL, AW_POPUP, AW_CL(ED4_create_search_window), AW_CL(taw));
         }
     }
@@ -1885 +1886 @@
 
     awmm->button_length(0);
-#define INSERT_SEARCH_FIELDS(Short, label_prefix, prefix) insert_search_fields(awmm, #label_prefix, #prefix, ED4_AWAR_##prefix##_SEARCH_PATTERN, ED4_##prefix##_PATTERN, ED4_AWAR_##prefix##_SEARCH_SHOW, Short)
+#define INSERT_SEARCH_FIELDS(Short, label_prefix, prefix)                                                               \
+    insert_search_fields(awmm,                                                                                          \
+                         #label_prefix,                                                                                 \
+                         #prefix,                                                                                       \
+                         ED4_AWAR_##prefix##_SEARCH_PATTERN,                                                            \
+                         ED4_AWAR_##prefix##_SEARCH_SHOW,                                                               \
+                         Short,                                                                                         \
+                         new ED4_search_type_and_ed4w(ED4_##prefix##_PATTERN, current_ed4w())                           \
+        )
 
     INSERT_SEARCH_FIELDS(0, u1, USER1);
@@ -1900 +1909 @@
 
     awmm->at("alast");
-    awmm->callback(ED4_search, ED4_encodeSearchDescriptor(-1, ED4_ANY_PATTERN));
+    awmm->callback(ED4_search_cb, ED4_encodeSearchDescriptor(-1, ED4_ANY_PATTERN), (AW_CL)current_ed4w());
     awmm->create_button("ALL_SEARCH_LAST", "#edit/last.bitmap");
 
     awmm->at("anext");
-    awmm->callback(ED4_search, ED4_encodeSearchDescriptor(+1, ED4_ANY_PATTERN));
+    awmm->callback(ED4_search_cb, ED4_encodeSearchDescriptor(+1, ED4_ANY_PATTERN), (AW_CL)current_ed4w());
     awmm->create_button("ALL_SEARCH_NEXT", "#edit/next.bitmap");
 

branches/e4fix/EDIT4/ED4_search.cxx

@@ -727 +727 @@
 
     if (settings[type]->get_autoJump() && (action & DO_AUTO_JUMP)) { // auto jump
-        ED4_MostRecentWinContext context;
-        ED4_cursor *cursor = &current_cursor();
-        bool        jumped = false;
-
-        if (cursor->owner_of_cursor && cursor->owner_of_cursor->is_sequence_terminal()) {
-            int pos = cursor->get_sequence_pos();
-            ED4_sequence_terminal *seq_term = cursor->owner_of_cursor->to_sequence_terminal();
-            ED4_SearchResults *result = &seq_term->results();
-
-            result->search(seq_term);
-            ED4_SearchPosition *found = result->get_last_starting_before(type, pos+1, 0);
-            int bestPos = -1;
-
-            if (found) {
-                bestPos = found->get_start_pos();
-            }
-
-            if (pos>=1) {
-                found = result->get_first_starting_after(type, pos-1, 0);
+        for (ED4_window *win = ED4_ROOT->first_window; win; win = win->next) {
+            ED4_LocalWinContext uses(win);
+
+            ED4_cursor *cursor = &current_cursor();
+            bool        jumped = false;
+
+            if (cursor->owner_of_cursor && cursor->owner_of_cursor->is_sequence_terminal()) {
+                int pos = cursor->get_sequence_pos();
+                ED4_sequence_terminal *seq_term = cursor->owner_of_cursor->to_sequence_terminal();
+                ED4_SearchResults *result = &seq_term->results();
+
+                result->search(seq_term);
+                ED4_SearchPosition *found = result->get_last_starting_before(type, pos+1, 0);
+                int bestPos = -1;
+
                 if (found) {
-                    int next_pos = found->get_start_pos();
-
-                    if (abs(pos-next_pos)<abs(pos-bestPos)) {
-                        bestPos = next_pos;
+                    bestPos = found->get_start_pos();
+                }
+
+                if (pos>=1) {
+                    found = result->get_first_starting_after(type, pos-1, 0);
+                    if (found) {
+                        int next_pos = found->get_start_pos();
+
+                        if (abs(pos-next_pos)<abs(pos-bestPos)) {
+                            bestPos = next_pos;
+                        }
                     }
                 }
-            }
-
-            if (bestPos!=-1) {
-                if (bestPos == pos) {
-                    jumped = true; // already there
-                }
-                else {
-                    jumped = seq_term->setCursorTo(cursor, bestPos, 1, ED4_JUMP_KEEP_POSITION);
-                }
-            }
-        }
-
-        if (!jumped) {
-            ED4_search(0, ED4_encodeSearchDescriptor(+1, type));
+
+                if (bestPos!=-1) {
+                    if (bestPos == pos) {
+                        jumped = true; // already there
+                    }
+                    else {
+                        jumped = seq_term->setCursorTo(cursor, bestPos, 1, ED4_JUMP_KEEP_POSITION);
+                    }
+                }
+            }
+
+            if (!jumped) {
+                ED4_search_cb(0, ED4_encodeSearchDescriptor(+1, type), (AW_CL)current_ed4w());
+            }
         }
     }
@@ -773 +776 @@
         bool old_update                        = ED4_update_global_cursor_awars_allowed;
         ED4_update_global_cursor_awars_allowed = false;
-        ED4_ROOT->refresh_all_windows(0);
+        ED4_ROOT->refresh_all_windows(1);
         ED4_update_global_cursor_awars_allowed = old_update;
     }
@@ -1333 +1336 @@
 static AW_CL last_searchDescriptor = -1;
 
-GB_ERROR ED4_repeat_last_search() {
+GB_ERROR ED4_repeat_last_search(ED4_window *ed4w) {
     if (int(last_searchDescriptor)==-1) {
         return GBS_global_string("You have to search first, before you can repeat a search.");
     }
 
-    ED4_search(0, last_searchDescriptor);
+    ED4_search_cb(0, last_searchDescriptor, (AW_CL)ed4w);
     return 0;
 }
 
-void ED4_search(AW_window *aww , AW_CL searchDescriptor) {
-    ED4_MostRecentWinContext context;
-    int direction; // @@@ fix locals
+void ED4_search_cb(AW_window *, AW_CL searchDescriptor, AW_CL cl_ed4w) {
+    ED4_window *ed4w = (ED4_window*)cl_ed4w;
+    e4_assert(ed4w);
+
+    ED4_LocalWinContext uses(ed4w);
+
+    last_searchDescriptor = searchDescriptor;
+
+    int                    direction;
     ED4_SearchPositionType pattern;
-    int searchOnlyForShownPatterns;
-
-    last_searchDescriptor = searchDescriptor;
     decodeSearchDescriptor(searchDescriptor, &direction, &pattern);
-    searchOnlyForShownPatterns = pattern==ED4_ANY_PATTERN;
+
+    int searchOnlyForShownPatterns = pattern==ED4_ANY_PATTERN;
 
     // detect position where to start searching
@@ -1737 +1744 @@
 
 
-AW_window *ED4_create_search_window(AW_root *root, AW_CL cl) {
-    ED4_SearchPositionType  type     = ED4_SearchPositionType(cl);
-    SearchAwarList         *awarList = &awar_list[type];
-    AW_window_simple       *aws      = new AW_window_simple;
+AW_window *ED4_create_search_window(AW_root *root, AW_CL cl_type_and_ed4w) {
+    ED4_search_type_and_ed4w *taw      = (ED4_search_type_and_ed4w*)cl_type_and_ed4w;
+    ED4_SearchPositionType    type     = taw->type;
+    ED4_window               *ed4w     = taw->ed4w;
+    SearchAwarList           *awarList = &awar_list[type];
+    AW_window_simple         *aws      = new AW_window_simple;
 
     ED4_aws_init(root, aws, "%s_search", "%s Search", ED4_SearchPositionTypeId[type]);
@@ -1762 +1771 @@
 
     aws->at("next");
-    aws->callback(ED4_search, (AW_CL)ED4_encodeSearchDescriptor(+1, type));
+    aws->callback(ED4_search_cb, (AW_CL)ED4_encodeSearchDescriptor(+1, type), (AW_CL)ed4w);
     aws->create_button("SEARCH_NEXT", "#edit/next.bitmap", "N");
 
     aws->at("previous");
-    aws->callback(ED4_search, (AW_CL)ED4_encodeSearchDescriptor(-1, type));
+    aws->callback(ED4_search_cb, (AW_CL)ED4_encodeSearchDescriptor(-1, type), (AW_CL)ed4w);
     aws->create_button("SEARCH_LAST", "#edit/last.bitmap", "L");
 

branches/e4fix/EDIT4/ed4_search.hxx

@@ -28 +28 @@
 };
 
-void       ED4_search(AW_window *aww, AW_CL searchDescriptor);
-GB_ERROR   ED4_repeat_last_search();
-AW_window *ED4_create_search_window(AW_root *root, AW_CL type);
-void       ED4_create_search_awars(AW_root *root);
+void ED4_search_cb(AW_window *aww, AW_CL searchDescriptor, AW_CL cl_ed4w);
+
+GB_ERROR ED4_repeat_last_search(class ED4_window *ed4w);
+AW_window *ED4_create_search_window(AW_root *root, AW_CL cl_type_and_ed4w);
+
+void ED4_create_search_awars(AW_root *root);
 
 // --------------------------------------------------------------------------------
@@ -49 +51 @@
     ED4_SIG3_PATTERN,
     ED4_ANY_PATTERN
+};
+
+struct ED4_search_type_and_ed4w {
+    ED4_SearchPositionType  type;
+    ED4_window             *ed4w;
+
+    ED4_search_type_and_ed4w(ED4_SearchPositionType type_, ED4_window *ed4w_)
+        : type(type_), ed4w(ed4w_) {}
 };