HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement POSIX-regex Find All.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/gnu-regex@4738 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-03-08 12:27:31 +00:00
parent f96c3d1a00
commit c8bac32a8a
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-03-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/search.c:
Implement POSIX-regex Find All.
2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/search.c, src/search.h, src/document.c:

28
src/search.c
View File

@ -1758,6 +1758,30 @@ gint search_replace_target(ScintillaObject *sci, const gchar *replace_text,
}
static gint geany_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf)
{
regex_t regex;
gint pos;
gint ret;
if (~flags & SCFIND_REGEXP)
return sci_find_text(sci, flags, ttf);
if (!compile_regex(&regex, ttf->lpstrText, flags))
return -1;
pos = ttf->chrg.cpMin;
ret = find_regex(sci, pos, &regex);
if (ret >= 0)
{
ttf->chrgText.cpMin = regex_matches[0].rm_so + pos;
ttf->chrgText.cpMax = regex_matches[0].rm_eo + pos;
}
regfree(&regex);
return ret;
}
static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gint flags)
{
gchar *buffer, *short_file_name;
@ -1776,7 +1800,7 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gi
{
gint pos, line, start, find_len;
pos = sci_find_text(doc->editor->sci, flags, &ttf);
pos = geany_find_text(doc->editor->sci, flags, &ttf);
if (pos == -1)
break; /* no more matches */
find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin;
@ -1789,7 +1813,7 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gi
{
buffer = sci_get_line(doc->editor->sci, line);
msgwin_msg_add(COLOR_BLACK, line + 1, doc,
"%s:%d : %s", short_file_name, line + 1, g_strstrip(buffer));
"%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer));
g_free(buffer);
prev_line = line;
}