mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

edit/editcmd.c, edit/editcmd_dialigs.c: added 'search in all charsets' feature 

src/search/search.c: fixed error with multicharset search
This commit is contained in:
Slava Zanko 2009-04-30 16:58:28 +03:00
parent dce5909154
commit e12b9e50db
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
edit/edit-widget.h
View File

@ -56,6 +56,7 @@ struct WEdit {
int replace_mode;
int replace_backwards;
int replace_case;
int all_codepages;
long search_start; /* First character to start searching from */
int found_len; /* Length of found string or 0 if none was found */

2
edit/editcmd.c
View File

@ -1240,6 +1240,7 @@ edit_replace_cmd (WEdit *edit, int again)
return;
}
edit->search->search_type = edit->search_type;
edit->search->is_all_charsets = edit->all_codepages;
edit->search->is_case_sentitive = edit->replace_case;
edit->search->search_fn = edit_search_cmd_callback;
}
@ -1439,6 +1440,7 @@ void edit_search_cmd (WEdit * edit, int again)
return;
}
edit->search->search_type = edit->search_type;
edit->search->is_all_charsets = edit->all_codepages;
edit->search->is_case_sentitive = edit->replace_case;
edit->search->search_fn = edit_search_cmd_callback;
}

20
edit/editcmd_dialogs.c
View File

@ -49,12 +49,12 @@
/*** file scope macro definitions **************************************/
#define SEARCH_DLG_WIDTH 58
#define SEARCH_DLG_MIN_HEIGHT 10
#define SEARCH_DLG_HEIGHT_SUPPLY 2
#define SEARCH_DLG_MIN_HEIGHT 11
#define SEARCH_DLG_HEIGHT_SUPPLY 3
#define REPLACE_DLG_WIDTH 58
#define REPLACE_DLG_MIN_HEIGHT 15
#define REPLACE_DLG_HEIGHT_SUPPLY 4
#define REPLACE_DLG_MIN_HEIGHT 16
#define REPLACE_DLG_HEIGHT_SUPPLY 5
/*** file scope type declarations **************************************/
@ -108,6 +108,7 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
int treplace_backwards = edit->replace_backwards;
int treplace_case = edit->replace_case;
int treplace_mode = edit->replace_mode;
int tall_codepages = edit->all_codepages;
mc_search_type_t ttype_of_search = edit->search_type;
int dialog_result;
@ -126,9 +127,12 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
0, 0, NULL, NULL, NULL},
{quick_radio, 33, REPLACE_DLG_WIDTH, 9, REPLACE_DLG_HEIGHT, "", 2, 0,
{quick_radio, 33, REPLACE_DLG_WIDTH, 10, REPLACE_DLG_HEIGHT, "", 2, 0,
&treplace_mode, const_cast (char **, replace_mode_str), NULL, NULL, NULL},
{quick_checkbox, 33, REPLACE_DLG_WIDTH, 9, REPLACE_DLG_HEIGHT, N_("All charsets"), 0, 0,
&tall_codepages, 0, NULL, NULL, NULL},
{quick_checkbox, 33, REPLACE_DLG_WIDTH, 8, REPLACE_DLG_HEIGHT, N_("&Backwards"), 0, 0,
&treplace_backwards, 0, NULL, NULL, NULL},
@ -174,6 +178,7 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
if (dialog_result != B_CANCEL) {
edit->search_type = ttype_of_search;
edit->replace_mode = treplace_mode;
edit->all_codepages = tall_codepages;
edit->replace_backwards = treplace_backwards;
edit->replace_case = treplace_case;
return;
@ -191,6 +196,7 @@ editcmd_dialog_search_show (WEdit * edit, char **search_text)
{
int tsearch_case = edit->replace_case;
int tsearch_backwards = edit->replace_backwards;
int tall_codepages = edit->all_codepages;
mc_search_type_t ttype_of_search = edit->search_type;
gchar **list_of_types = editcmd_dialog__get_search_types_list();
int SEARCH_DLG_HEIGHT = SEARCH_DLG_MIN_HEIGHT + g_strv_length (list_of_types) - SEARCH_DLG_HEIGHT_SUPPLY;
@ -202,6 +208,9 @@ editcmd_dialog_search_show (WEdit * edit, char **search_text)
{quick_button, 2, 10, 9, SEARCH_DLG_HEIGHT, N_("&OK"), 0, B_ENTER, 0,
0, NULL, NULL, NULL},
{quick_checkbox, 33, SEARCH_DLG_WIDTH, 7, SEARCH_DLG_HEIGHT, N_("All charsets"), 0, 0,
&tall_codepages, 0, NULL, NULL, NULL},
{quick_checkbox, 33, SEARCH_DLG_WIDTH, 6, SEARCH_DLG_HEIGHT, N_("&Backwards"), 0, 0,
&tsearch_backwards, 0, NULL, NULL, NULL},
{quick_checkbox, 33, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT, N_("case &Sensitive"), 0, 0,
@ -228,6 +237,7 @@ editcmd_dialog_search_show (WEdit * edit, char **search_text)
if (quick_dialog (&Quick_input) != B_CANCEL) {
edit->search_type = ttype_of_search;
edit->replace_backwards = tsearch_backwards;
edit->all_codepages = tall_codepages;
edit->replace_case = tsearch_case;
} else {
*search_text = NULL;

4
src/search/search.c
View File

@ -92,11 +92,9 @@ mc_search__conditions_new (mc_search_t * mc_search)
if (mc_search->is_all_charsets) {
gsize loop1, recoded_str_len;
gchar *buffer;
for (loop1 = 0; loop1 < (gsize) n_codepages; loop1++) {
if (g_ascii_strcasecmp (codepages[loop1].id, cp_source)) {
if (!g_ascii_strcasecmp (codepages[loop1].id, cp_source)) {
g_ptr_array_add (ret,
mc_search__cond_struct_new (mc_search, mc_search->original,
mc_search->original_len, cp_source));