Ticket #2371: mc-search_position.patch

lib/search/internal.h

@@ -57 +57 @@
 
 void mc_search__cond_struct_new_init_regex (const char *, mc_search_t *, mc_search_cond_t *);
 
-gboolean mc_search__run_regex (mc_search_t *, const void *, gsize, gsize, gsize *);
+long mc_search__run_regex (mc_search_t *, const void *, gsize, gsize, gsize *);
 
 GString *mc_search_regex_prepare_replace_str (mc_search_t *, GString *);
 
@@ -65 +65 @@
 
 void mc_search__cond_struct_new_init_normal (const char *, mc_search_t *, mc_search_cond_t *);
 
-gboolean mc_search__run_normal (mc_search_t *, const void *, gsize, gsize, gsize *);
+long mc_search__run_normal (mc_search_t *, const void *, gsize, gsize, gsize *);
 
 GString *mc_search_normal_prepare_replace_str (mc_search_t *, GString *);
 

lib/search/normal.c

@@ -108 +108 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-gboolean
+long
 mc_search__run_normal (mc_search_t * lc_mc_search, const void *user_data,
                        gsize start_search, gsize end_search, gsize * found_len)
 {

lib/search/regex.c

@@ -576 +576 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-gboolean
+long
 mc_search__run_regex (mc_search_t * lc_mc_search, const void *user_data,
                       gsize start_search, gsize end_search, gsize * found_len)
 {
@@ -584 +584 @@
     int current_chr = 0;
     gint start_pos;
     gint end_pos;
+    ulong lines = 0;
 
     if (lc_mc_search->regex_buffer != NULL)
         g_string_free (lc_mc_search->regex_buffer, TRUE);
@@ -615 +616 @@
             g_string_append_c (lc_mc_search->regex_buffer, (char) current_chr);
 
 
-            if (current_chr == 0 || (char) current_chr == '\n')
+            if (current_chr == 0 || (char) current_chr == '\n') {
+                lines++;
                 break;
+            }
 
             if (virtual_pos > end_search)
                 break;
@@ -649 +652 @@
             if (found_len)
                 *found_len = end_pos - start_pos;
             lc_mc_search->normal_offset = lc_mc_search->start_buffer + start_pos;
-            return TRUE;
+            return 1+lines;
         case COND__NOT_ALL_FOUND:
             break;
         default:
             g_string_free (lc_mc_search->regex_buffer, TRUE);
             lc_mc_search->regex_buffer = NULL;
-            return FALSE;
+            return 0;
         }
         if ((lc_mc_search->update_fn != NULL) &&
             ((lc_mc_search->update_fn) (user_data, current_pos) == MC_SEARCH_CB_ABORT))
@@ -673 +676 @@
     else
         lc_mc_search->error_str = NULL;
 
-    return FALSE;
+    return 1-lines;
 }
 
 /* --------------------------------------------------------------------------------------------- */

lib/search/search.c

@@ -232 +232 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-gboolean
+long
 mc_search_run (mc_search_t * lc_mc_search, const void *user_data,
                gsize start_search, gsize end_search, gsize * found_len)
 {
-    gboolean ret = FALSE;
-
+    long ret = 0;
     if (!lc_mc_search)
-        return FALSE;
+        return 0;
     if (!mc_search_is_type_avail (lc_mc_search->search_type))
     {
         lc_mc_search->error = MC_SEARCH_E_INPUT;
         lc_mc_search->error_str = g_strdup (_(STR_E_UNKNOWN_TYPE));
-        return FALSE;
+        return 0;
     }
 #ifdef SEARCH_TYPE_GLIB
     if (lc_mc_search->regex_match_info)
@@ -259 +258 @@
     lc_mc_search->error_str = NULL;
 
     if ((lc_mc_search->conditions == NULL) && !mc_search_prepare (lc_mc_search))
-        return FALSE;
+        return 0;
 
     switch (lc_mc_search->search_type)
     {

lib/search.h

@@ -127 +127 @@
 
 gboolean mc_search_prepare (mc_search_t * mc_search);
 
-gboolean mc_search_run (mc_search_t * mc_search, const void *user_data, gsize start_search,
+long mc_search_run (mc_search_t * mc_search, const void *user_data, gsize start_search,
                         gsize end_search, gsize * found_len);
 
 gboolean mc_search_is_type_avail (mc_search_type_t);

src/viewer/search.c

@@ -76 +76 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
-mcview_find (mcview_t * view, gsize search_start, gsize * len)
+mcview_find (mcview_t * view, gsize search_start, gsize * len, gboolean secondPass)
 {
     gsize search_end;
+    long skip_lines;
 
     view->search_numNeedSkipChar = 0;
     search_cb_char_curr_index = -1;
@@ -95 +96 @@
                 && mc_search_is_fixed_search_str (view->search))
                 search_end = search_start + view->search->original_len;
 
-            if (mc_search_run (view->search, (void *) view, search_start, search_end, len)
+            skip_lines = mc_search_run (view->search, (void *) view, search_start, search_end, len);
+            if (skip_lines
                 && view->search->normal_offset == (off_t) search_start)
             {
                 if (view->text_nroff_mode)
                     view->search->normal_offset++;
+                view->dpy_start_line-=skip_lines;
                 return TRUE;
             }
 
@@ -111 +114 @@
     view->search_nroff_seq->index = search_start;
     mcview_nroff_seq_info (view->search_nroff_seq);
 
-    return mc_search_run (view->search, (void *) view, search_start, mcview_get_filesize (view),
+    skip_lines = mc_search_run (view->search, (void *) view, search_start, mcview_get_filesize (view),
                           len);
+    if (skip_lines>1) {
+        view->dpy_start_line+=skip_lines-2;
+        if(secondPass && view->dpy_lines_status != -1) view->dpy_start_line-=view->dpy_lines_total-view->dpy_visible_lines;
+        if(secondPass && view->dpy_lines_status == -1) { view->dpy_start_line+=view->dpy_visible_lines; view->dpy_lines_status = 0; }
+        return TRUE;
+    }
+    if (view->dpy_lines_status==0) {
+        view->dpy_lines_total=view->dpy_start_line-skip_lines;
+        view->dpy_lines_status=1;
+    } else if (view->dpy_lines_status==-1 && view->dpy_lines_total<-skip_lines) {
+        view->dpy_lines_total=-skip_lines;
+    }
+    return FALSE;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -247 +263 @@
     off_t search_start = 0;
     gboolean isFound = FALSE;
     gboolean need_search_again = TRUE;
+    long saved_lines_total = view->dpy_lines_total;
 
     Dlg_head *d = NULL;
 
@@ -293 +310 @@
     /* Compute the percent steps */
     mcview_search_update_steps (view);
     view->update_activate = 0;
+//    view->dpy_visible_lines = 0;      // mcview_search_show_result -> destroy_dlg sets lines_total as start_line (already calculated) + visible_lines (currently shown)
 
     tty_enable_interrupt_key ();
 
@@ -305 +323 @@
         else
             growbufsize = view->search->original_len;
 
-        if (mcview_find (view, search_start, &match_len))
+        if (mcview_find (view, search_start, &match_len, FALSE))
         {
             mcview_search_show_result (view, &d, match_len);
             need_search_again = FALSE;
@@ -336 +354 @@
             query_dialog (_("Search done"), _("Continue from beginning?"), D_NORMAL, 2, _("&Yes"),
                           _("&No"));
 
-        if (result != 0)
+        if (result != 0) {
+            saved_lines_total=view->dpy_lines_total;
             isFound = TRUE;
-        else
+        }
+        else {
             search_start = 0;
+            if (view->dpy_lines_status == -1) {
+//              view->dpy_lines_status = 0;
+//              view->dpy_lines_total = saved_lines_total;      // for mcview_find below
+            }
+        }
     }
 
-    if (!isFound && view->search->error_str != NULL && mcview_find (view, search_start, &match_len))
+    if (!isFound && view->search->error_str != NULL) { if(mcview_find (view, search_start, &match_len, TRUE))
     {
         mcview_search_show_result (view, &d, match_len);
         isFound = TRUE;
-    }
+    } else {
+        saved_lines_total=view->dpy_lines_total;
+        if(view->dpy_lines_status==-1) {
+        view->dpy_lines_status=1;
+        view->dpy_start_line+=view->dpy_lines_total;
+        }
+    }}
 
     if (!isFound && view->search->error_str != NULL)
         message (D_NORMAL, _("Search"), "%s", view->search->error_str);
 
     view->dirty++;
+    view->dpy_lines_total = saved_lines_total;
     mcview_update (view);
 
     tty_disable_interrupt_key ();