enlightenment/enventor
enlightenment
/
enventor
6
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

syntax_color: improve logic for applying color elaborately. 

Until this patch, it applied the color to subwords.
Now, it applies the color to only independet words.
This commit is contained in:
ChunEon Park 2014-05-23 13:43:15 +09:00
parent 8f9ceccee5
commit c6b7f30c5d
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/color/color.src
View File

@ -17,6 +17,9 @@ group "syntax_color_group" struct {
value "key" string: "(";
value "key" string: ")";
value "key" string: "!";
value "key" string: "=";
value "key" string: "&";
value "key" string: "|";
}
}
group "color" struct {

47
src/bin/syntax_color.c
View File

@ -605,22 +605,49 @@ static int
color_markup_insert(Eina_Strbuf *strbuf, const char **src, int length, char **cur,
char **prev, color_data *cd)
{
char key[2];
key[0] = (*cur)[0];
key[1] = '\0';
const char *SYMBOLS = " {}[];:.()!<>=&|";
char tmp[2];
Eina_Bool symbol = EINA_FALSE;
Eina_Inarray *inarray = eina_hash_find(cd->color_hash, key);
color_tuple *tuple;
tmp[0] = (*cur)[0];
tmp[1] = '\0';
if (strstr(SYMBOLS, tmp)) symbol = EINA_TRUE;
if (!symbol && (*cur > *src))
{
tmp[0] = *(*cur - 1);
tmp[1] = '\0';
if (!strstr(SYMBOLS, tmp)) return 0;
}
tmp[0] = (*cur)[0];
tmp[1] = '\0';
Eina_Inarray *inarray = eina_hash_find(cd->color_hash, tmp);
if (!inarray) return 0;
//Found tuple list. Search in detail.
if (inarray)
{
Eina_Bool found = EINA_FALSE;
color_tuple *tuple;
int len;
EINA_INARRAY_FOREACH(inarray, tuple)
EINA_INARRAY_FOREACH(inarray, tuple)
{
len = strlen(tuple->key);
char *p = *cur + len;
if (!strncmp(*cur, tuple->key, len))
{
if (!strncmp(*cur, tuple->key, strlen(tuple->key)))
if (p <= (*src + length))
{
if (!symbol &&
/* Exceptional Case. For duplicated keywords, it
subdivides with '.' ' '. See the config.src */
(*(p - 1) != '.') &&
(*(p - 1) != ' '))
{
tmp[0] = *p;
tmp[1] = '\0';
if (!strstr(SYMBOLS, tmp)) return 0;
}
if (color_markup_insert_internal(strbuf, src, length, cur,
prev, tuple->key,
tuple->col))