vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_code: add text search functions. 

Update the search and replace UI to work with the new elm_ode UI.
This commit is contained in:
Andy Williams 2015-03-22 22:36:04 +00:00
parent 4c8b09de04
commit 4fc9748db3
4 changed files with 138 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
elm_code/src/lib/elm_code_text.c
View File

@ -42,6 +42,38 @@ elm_code_line_text_set(Elm_Code_Line *line, const char *chars, unsigned int leng
elm_code_callback_fire(file->parent, &ELM_CODE_EVENT_LINE_LOAD_DONE, line);
}
EAPI int
elm_code_line_text_strpos(Elm_Code_Line *line, const char *search, int offset)
{
unsigned int length, searchlen, c;
const char *content;
char *ptr;
searchlen = strlen(search);
content = elm_code_line_text_get(line, &length);
ptr = (char *) content;
if (searchlen > length)
return ELM_CODE_TEXT_NOT_FOUND;
ptr += offset;
for (c = offset; c < length - strlen(search); c++)
{
if (!strncmp(ptr, search, searchlen))
return c;
ptr++;
}
return ELM_CODE_TEXT_NOT_FOUND;
}
EAPI Eina_Bool
elm_code_line_text_contains(Elm_Code_Line *line, const char *search)
{
return elm_code_line_text_strpos(line, search, 0) != ELM_CODE_TEXT_NOT_FOUND;
}
static void
_elm_code_line_tokens_move_right(Elm_Code_Line *line, int position, int move)
{

6
elm_code/src/lib/elm_code_text.h
View File

@ -1,6 +1,8 @@
#ifndef ELM_CODE_TEXT_H_
# define ELM_CODE_TEXT_H_
#define ELM_CODE_TEXT_NOT_FOUND -1
#ifdef __cplusplus
extern "C" {
#endif
@ -24,6 +26,10 @@ EAPI const char *elm_code_line_text_get(Elm_Code_Line *line, unsigned int *lengt
EAPI void elm_code_line_text_set(Elm_Code_Line *line, const char *chars, unsigned int length);
EAPI int elm_code_line_text_strpos(Elm_Code_Line *line, const char *search, int offset);
EAPI Eina_Bool elm_code_line_text_contains(Elm_Code_Line *line, const char *search);
EAPI void elm_code_line_text_insert(Elm_Code_Line *line, unsigned int position, const char *string, int length);
EAPI void elm_code_line_text_remove(Elm_Code_Line *line, unsigned int position, int length);

45
elm_code/src/tests/elm_code_test_text.c
View File

@ -37,8 +37,53 @@ START_TEST (elm_code_text_insert_test)
}
END_TEST
START_TEST (elm_code_text_contains_test)
{
Elm_Code *code;
Elm_Code_File *file;
Elm_Code_Line *line;
code = elm_code_create();
file = elm_code_file_new(code);
elm_code_file_line_append(file, "a test string...", 17, NULL);
line = elm_code_file_line_get(file, 1);
ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "test"));
ck_assert_int_eq(EINA_FALSE, elm_code_line_text_contains(line, "text"));
ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "a t"));
ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "..."));
}
END_TEST
START_TEST (elm_code_text_strpos_test)
{
Elm_Code *code;
Elm_Code_File *file;
Elm_Code_Line *line;
code = elm_code_create();
file = elm_code_file_new(code);
elm_code_file_line_append(file, "a test string...", 17, NULL);
line = elm_code_file_line_get(file, 1);
ck_assert_int_eq(2, elm_code_line_text_strpos(line, "test", 0));
ck_assert_int_eq(2, elm_code_line_text_strpos(line, "test", 1));
ck_assert_int_eq(2, elm_code_line_text_strpos(line, "test", 2));
ck_assert_int_eq(ELM_CODE_TEXT_NOT_FOUND, elm_code_line_text_strpos(line, "test", 5));
ck_assert_int_eq(ELM_CODE_TEXT_NOT_FOUND, elm_code_line_text_strpos(line, "text", 0));
ck_assert_int_eq(0, elm_code_line_text_strpos(line, "a t", 0));
ck_assert_int_eq(13, elm_code_line_text_strpos(line, "...", 0));
}
END_TEST
void elm_code_test_text(TCase *tc)
{
tcase_add_test(tc, elm_code_text_get_test);
tcase_add_test(tc, elm_code_text_insert_test);
tcase_add_test(tc, elm_code_text_contains_test);
tcase_add_test(tc, elm_code_text_strpos_test);
}

131
src/bin/editor/edi_editor_search.c
View File

@ -12,6 +12,7 @@
#include <Elementary.h>
#include <Evas.h>
#include <Elm_Code.h>
#include "edi_editor.h"
#include "edi_private.h"
@ -25,7 +26,8 @@ struct _Edi_Editor_Search
Evas_Object *entry; /**< The search text widget */
Evas_Object *widget; /**< The search UI panel we wish to show and hide */
Evas_Object *parent; /**< The parent panel we will insert into */
Evas_Textblock_Cursor *current_search; /**< The current search cursor for this session */
unsigned int current_search_line; /**< The current search cursor line for this session */
unsigned int current_search_col; /**< The current search cursor column for this session */
Eina_Bool term_found;
Evas_Object *replace_entry; /**< The replace text widget */
@ -38,12 +40,12 @@ static Eina_Bool
_edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
{
Eina_Bool try_next = EINA_FALSE;
const char *found, *text;
char *utf8;
const Evas_Object *tb = elm_entry_textblock_get(entry);
Evas_Textblock_Cursor *end, *start, *mcur;
size_t initial_pos;
Evas_Coord x, y, w, h;
Eina_List *item;
Elm_Code *code;
Elm_Code_Line *line;
const char *text;
unsigned int offset, pos_line, pos_col;
int found;
text = elm_object_text_get(search->entry);
if (!text || !*text)
@ -52,72 +54,56 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
return EINA_FALSE;
}
mcur = (Evas_Textblock_Cursor *) evas_object_textblock_cursor_get(tb);
if (!search->current_search)
{
search->current_search = evas_object_textblock_cursor_new(tb);
}
else if (!evas_textblock_cursor_compare(search->current_search, mcur))
eo_do(entry,
code = elm_code_widget_code_get(),
elm_code_widget_cursor_position_get(&pos_col, &pos_line));
if (search->current_search_line == pos_line ||
search->current_search_col == pos_col)
{
try_next = EINA_TRUE;
}
evas_textblock_cursor_paragraph_last(search->current_search);
start = mcur;
end = search->current_search;
initial_pos = evas_textblock_cursor_pos_get(start);
utf8 = evas_textblock_cursor_range_text_get(start, end,
EVAS_TEXTBLOCK_TEXT_PLAIN);
if (!utf8)
found = 0;
EINA_LIST_FOREACH(code->file->lines, item, line)
{
search->term_found = EINA_FALSE;
return EINA_FALSE;
if (line->number < pos_line)
continue;
offset = 0;
if (line->number == pos_line)
offset = pos_col + (try_next ? 1 : 0);
found = elm_code_line_text_strpos(line, text, offset);
if (found == ELM_CODE_TEXT_NOT_FOUND)
continue;
search->current_search_line = line->number;
// TODO make this unicode
search->current_search_col = found + 1;
break;
}
if (try_next)
search->term_found = found != ELM_CODE_TEXT_NOT_FOUND;
elm_code_widget_selection_clear(entry);
if (!search->term_found)
return EINA_FALSE;
/*
size_t pos = 0;
int idx = 0;
while ((utf8 + idx) < found)
{
found = strstr(utf8 + 1, text);
if (!found)
{
found = utf8;
}
}
else
{
found = strstr(utf8, text);
pos++;
eina_unicode_utf8_next_get(utf8, &idx);
}
*/
elm_code_widget_selection_start(entry, search->current_search_line,
search->current_search_col);
// TODO make that strlen unicode strlen
elm_code_widget_selection_end(entry, search->current_search_line,
search->current_search_col + strlen(text) - 1);
search->term_found = !!found;
elm_entry_select_none(entry);
if (found)
{
size_t pos = 0;
int idx = 0;
while ((utf8 + idx) < found)
{
pos++;
eina_unicode_utf8_next_get(utf8, &idx);
}
evas_textblock_cursor_pos_set(mcur, pos + initial_pos + strlen(text));
elm_entry_cursor_geometry_get(entry, &w, &h, NULL, NULL);
elm_entry_cursor_selection_begin(entry);
elm_entry_cursor_pos_set(entry, pos + initial_pos);
elm_entry_cursor_selection_end(entry);
elm_entry_cursor_geometry_get(entry, &x, &y, NULL, NULL);
w -= x;
h -= y;
elm_scroller_region_show(entry, x, y, w, h);
evas_textblock_cursor_copy(mcur, search->current_search);
}
free(utf8);
return !!found;
return EINA_TRUE;
}
static void
@ -150,11 +136,10 @@ _edi_replace_in_entry(void *data, Edi_Editor_Search *search)
// If we found a matching searched term the go ahead and replace it if appropriate.
if (search->term_found)
{
if (search->current_search)
if (search->current_search_line)
{
elm_entry_entry_insert(editor->entry, elm_object_text_get(search->replace_entry));
evas_textblock_cursor_free(search->current_search);
search->current_search = NULL;
// elm_entry_entry_insert(editor->entry, elm_object_text_get(search->replace_entry));
search->current_search_line = 0;
}
_edi_search_in_entry(editor->entry, search);
}
@ -178,10 +163,8 @@ _edi_editor_search_hide(Edi_Editor *editor)
elm_box_unpack(search->parent, search->widget);
}
if (search->current_search)
evas_textblock_cursor_free(search->current_search);
search->current_search = NULL;
elm_entry_select_none(editor->entry);
search->current_search_line = 0;
elm_code_widget_selection_clear(editor->entry);
// Re-focus in the editor proper since we are closing the search bar here
elm_object_focus_set(editor->entry, EINA_TRUE);
@ -262,11 +245,7 @@ _edi_search_key_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
else if (!strcmp(ev->key, "Escape"))
_edi_cancel_clicked(data, NULL, NULL);
else
{
if (search->current_search)
evas_textblock_cursor_free(search->current_search);
search->current_search = NULL;
}
search->current_search_line = 0;
}
void