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

syntax_color: support configurable syntax color count. 

Previous the color table count is fixed to 6
we can make it changeable by color configurable file.

Please increase MAX_COL_NUM if it really needs.
This commit is contained in:
ChunEon Park 2015-07-09 20:18:43 +09:00
parent c188b78c06
commit d3cfd41e14
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/color/color.src
View File

@ -2,6 +2,7 @@ group "syntax_color_group" struct {
value "string" string: "AAAAAA";
value "comment" string: "00B000";
value "macro" string: "D42A2A";
value "count" string: "6";
group "colors" array {
count 6;
group "color" struct {

18
src/lib/syntax_color.c
View File

@ -5,7 +5,7 @@
#include <Enventor.h>
#include "enventor_private.h"
#define COL_NUM 6
#define MAX_COL_NUM 6
typedef struct color_tuple
{
@ -24,7 +24,8 @@ typedef struct syntax_color_group
char *string;
char *comment;
char *macro;
color colors[COL_NUM];
char *count;
color colors[MAX_COL_NUM];
} syntax_color_group;
struct syntax_color_s
@ -35,7 +36,8 @@ struct syntax_color_s
Eina_Stringshare *col_string;
Eina_Stringshare *col_comment;
Eina_Stringshare *col_macro;
Eina_Stringshare *cols[COL_NUM];
Eina_Stringshare *cols[MAX_COL_NUM];
int color_cnt;
Eina_List *macros;
Ecore_Thread *thread;
@ -85,6 +87,8 @@ eddc_init(void)
comment, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_scg, syntax_color_group, "macro",
macro, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_scg, syntax_color_group, "count",
count, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_color, color, "val", val, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_LIST_STRING(edd_color, color, "keys", keys);
@ -134,10 +138,12 @@ color_table_init(color_data *cd)
//free(scg->comment);
cd->col_macro = eina_stringshare_add(scg->macro);
//free(scg->macro);
cd->color_cnt = atoi(scg->count);
//free(scg->count);
cd->color_hash = eina_hash_string_small_new(hash_free_cb);
for (i = 0; i < COL_NUM; i++)
for (i = 0; i < cd->color_cnt; i++)
{
cd->cols[i] = eina_stringshare_add(scg->colors[i].val);
//free(scg->colors[i].val);
@ -669,7 +675,7 @@ color_markup_insert(Eina_Strbuf *strbuf, const char **src, int length, char **cu
color_data *
color_init(Eina_Strbuf *strbuf)
{
color_data *cd = malloc(sizeof(color_data));
color_data *cd = calloc(1, sizeof(color_data));
if (!cd)
{
EINA_LOG_ERR("Failed to allocate Memory!");
@ -699,7 +705,7 @@ color_term(color_data *cd)
EINA_LIST_FREE(cd->macros, macro) eina_stringshare_del(macro);
int i;
for(i = 0; i < COL_NUM; i++)
for(i = 0; i < cd->color_cnt; i++)
eina_stringshare_del(cd->cols[i]);
free(cd);