ports/mc
ports/mc
1
1
Форкнуть 0
Код Релизы 2 Активность

Fixed broken search results highlighting

Просмотр исходного кода 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Этот коммит содержится в:
Slava Zanko 2011-07-16 00:32:27 +03:00
родитель 064352e14d
Коммит 1940e8f5dd
3 изменённых файлов: 71 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
lib/search/regex.c
Просмотреть файл

@ -816,6 +816,9 @@ mc_search__run_regex (mc_search_t * lc_mc_search, const void *user_data,
if (current_chr == MC_SEARCH_CB_ABORT)
break;
if (current_chr == MC_SEARCH_CB_INVALID)
continue;
current_pos++;
if (current_chr == MC_SEARCH_CB_SKIP)

33
src/viewer/nroff.c
Просмотреть файл

@ -82,10 +82,9 @@ mcview_nroff_get_char (mcview_nroff_t * nroff, int *ret_val, off_t nroff_index)
return FALSE;
}
if (!g_unichar_isprint (c))
return FALSE;
*ret_val = c;
return TRUE;
return g_unichar_isprint (c);
}
/* --------------------------------------------------------------------------------------------- */
@ -275,14 +274,20 @@ mcview__get_nroff_real_len (mcview_t * view, off_t start, off_t length)
nroff = mcview_nroff_seq_new_num (view, start);
if (nroff == NULL)
return 0;
while (i < length)
{
if (nroff->type != NROFF_TYPE_NONE)
switch (nroff->type)
{
ret += 1 + nroff->char_width;
case NROFF_TYPE_BOLD:
ret += 1 + nroff->char_width; /* real char width and 0x8 */
break;
case NROFF_TYPE_UNDERLINE:
ret += 2; /* underline symbol and ox8 */
break;
default:
break;
}
i++;
i += nroff->char_width;
mcview_nroff_seq_next (nroff);
}
@ -379,10 +384,20 @@ mcview_nroff_seq_next (mcview_nroff_t * nroff)
nroff->prev_type = nroff->type;
switch (nroff->type)
{
case NROFF_TYPE_BOLD:
nroff->index += 1 + nroff->char_width;
break;
case NROFF_TYPE_UNDERLINE:
nroff->index += 2;
break;
default:
break;
}
nroff->index += nroff->char_width;
if (nroff->prev_type != NROFF_TYPE_NONE)
nroff->index += 2;
mcview_nroff_seq_info (nroff);
return nroff->current_char;
}

67
src/viewer/search.c
Просмотреть файл

@ -116,17 +116,21 @@ mcview_find (mcview_t * view, gsize search_start, gsize * len)
static void
mcview_search_show_result (mcview_t * view, Dlg_head ** d, size_t match_len)
{
int nroff_len;
view->search_start = view->search->normal_offset +
mcview__get_nroff_real_len (view,
view->search->start_buffer,
view->search->normal_offset - view->search->start_buffer);
nroff_len =
view->text_nroff_mode
? mcview__get_nroff_real_len (view, view->search->start_buffer,
view->search->normal_offset - view->search->start_buffer) : 0;
view->search_start = view->search->normal_offset + nroff_len;
if (!view->hex_mode)
view->search_start++;
view->search_end = view->search_start + match_len +
mcview__get_nroff_real_len (view, view->search_start - 1, match_len);
nroff_len =
view->text_nroff_mode ? mcview__get_nroff_real_len (view, view->search_start - 1,
match_len) : 0;
view->search_end = view->search_start + match_len + nroff_len;
if (view->hex_mode)
{
@ -161,34 +165,23 @@ mcview_search_cmd_callback (const void *user_data, gsize char_offset)
if (!view->text_nroff_mode)
{
if (!mcview_get_byte (view, char_offset, &lc_byte))
return MC_SEARCH_CB_INVALID;
return MC_SEARCH_CB_OK;
return lc_byte;
}
if (view->search_numNeedSkipChar)
if (view->search_numNeedSkipChar != 0)
{
view->search_numNeedSkipChar--;
return MC_SEARCH_CB_SKIP;
}
if (search_cb_char_curr_index == -1)
if (search_cb_char_curr_index == -1
|| search_cb_char_curr_index >= view->search_nroff_seq->char_width)
{
search_cb_char_curr_index = 0;
if (view->search_nroff_seq->char_width > 1)
g_unichar_to_utf8 (view->search_nroff_seq->current_char, search_cb_char_buffer);
else
search_cb_char_buffer[0] = (char) view->search_nroff_seq->current_char;
}
if (search_cb_char_curr_index < view->search_nroff_seq->char_width)
{
lc_byte = search_cb_char_buffer[search_cb_char_curr_index];
search_cb_char_curr_index++;
return (lc_byte != -1) ? (unsigned char) lc_byte : MC_SEARCH_CB_INVALID;
}
if (search_cb_char_curr_index != -1)
mcview_nroff_seq_next (view->search_nroff_seq);
search_cb_char_curr_index = 0;
if (view->search_nroff_seq->char_width > 1)
g_unichar_to_utf8 (view->search_nroff_seq->current_char, search_cb_char_buffer);
@ -196,9 +189,26 @@ mcview_search_cmd_callback (const void *user_data, gsize char_offset)
search_cb_char_buffer[0] = (char) view->search_nroff_seq->current_char;
if (view->search_nroff_seq->type != NROFF_TYPE_NONE)
view->search_numNeedSkipChar = 1 + view->search_nroff_seq->char_width;
{
switch (view->search_nroff_seq->type)
{
case NROFF_TYPE_BOLD:
view->search_numNeedSkipChar = 1 + view->search_nroff_seq->char_width; /* real char width and 0x8 */
break;
case NROFF_TYPE_UNDERLINE:
view->search_numNeedSkipChar = 2; /* underline symbol and ox8 */
break;
default:
break;
}
}
return MC_SEARCH_CB_INVALID;
}
lc_byte = search_cb_char_buffer[search_cb_char_curr_index];
search_cb_char_curr_index++;
return (lc_byte != -1) ? (unsigned char) lc_byte : MC_SEARCH_CB_INVALID;
return MC_SEARCH_CB_SKIP;
}
/* --------------------------------------------------------------------------------------------- */
@ -247,11 +257,16 @@ mcview_do_search (mcview_t * view)
/*for avoid infinite search loop we need to increase or decrease start offset of search */
if (view->search_start != 0)
{
if (!view->text_nroff_mode)
search_start = view->search_start + (mcview_search_options.backwards ? -2 : 0);
else
{
int nroff_real_len = mcview__get_nroff_real_len (view, view->search_start + 1, 2);
search_start = mcview_search_options.backwards ? -2 : nroff_real_len != 0 ? 2 : 0;
search_start = mcview_search_options.backwards ? -2 : nroff_real_len != 0 ? 1 : 0;
search_start += view->search_start + nroff_real_len * search_start;
}
}
if (mcview_search_options.backwards && (int) search_start < 0)
search_start = 0;