hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6bf75f20448d3ac639fbeb76909f38ad0c8cbe13
commit 6bf75f20448d3ac639fbeb76909f38ad0c8cbe13
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Aug 1 16:54:52 2016 +0900
text_setting: apply lazy style to syntax color template code.
---
data/color/syntax_template.dat | 2 +-
...syntax_template.dat => syntax_template_old.dat} | 0
src/bin/text_setting.c | 75 +++++++++++++++++++++-
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/data/color/syntax_template.dat b/data/color/syntax_template.dat
index a7d22b3..e9ce6c2 100644
--- a/data/color/syntax_template.dat
+++ b/data/color/syntax_template.dat
@@ -1 +1 @@
- <font_size=%3d><color=#%s>//comment</color><br/> <color=#%s>#define
RECT_COLOR</color> 0 136 170 255<br/> <color=#%s>part</color>
<color=#%s>{</color> <color=#%s>name</color><color=#%s>:</color>
<color=#%s>"rect"</color><color=#%s>;</color><br/>
<color=#%s>type</color><color=#%s>:</color>
<color=#%s>RECT</color><color=#%s>;</color><br/>
<color=#%s>description</color> <color=#%s>{</color>
<color=#%s>state</color><color=#%s>:</color> <color=#%s>"default" [...]
+<font_size=%3d><color=#%s>//comment</color><br/><color=#%s>#define
RECT_COLOR</color> 0 136 170 255<br/><color=#%s>rect</color>
<color=#%s>{</color>
<color=#%s>"part_name"</color><color=#%s>;</color><br/>
<color=#%s>desc</color> <color=#%s>{</color>
<color=#%s>"default"</color> <color=#%s>;</color><br/>
<color=#%s>rel1</color><color=#%s>.</color><color=#%s>relative</color><color=#%s>:</color>
0.0 0.0<color=#%s>;</color><br/> <color=#%s>rel2</color><color=# [...]
diff --git a/data/color/syntax_template.dat b/data/color/syntax_template_old.dat
similarity index 100%
copy from data/color/syntax_template.dat
copy to data/color/syntax_template_old.dat
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index dc1d3e5..4476d57 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -5,7 +5,8 @@
#define UNSUPPORTED_FONT_CNT 28
#define UNSUPPORTED_FONT_MAX_LEN 32
-#define COLOR_KEYWORD_MAX_CNT 76
+//#define COLOR_KEYWORD_MAX_CNT 76 old style
+#define COLOR_KEYWORD_MAX_CNT 66
#define SYNTAX_TEMPLATE_MAX_LEN 3072
#define SYNTAX_TEMPLATE_FONT_SIZE 10
#define SYNTAX_COLOR_LEN 7
@@ -51,6 +52,77 @@ static char
color_val[ENVENTOR_SYNTAX_COLOR_LAST][SYNTAX_COLOR_LEN] = {{0}};
static int color_type_list[COLOR_KEYWORD_MAX_CNT] =
{
+ //comment ... #define ...
+ ENVENTOR_SYNTAX_COLOR_COMMENT, ENVENTOR_SYNTAX_COLOR_MACRO,
+ //rect { ...
+ ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ ENVENTOR_SYNTAX_COLOR_STRING, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //desc { ...
+ ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ ENVENTOR_SYNTAX_COLOR_STRING, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //rel1 { ...
+ ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //relative ...
+ ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //0.0; rel2 ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD,
+ //.relative ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD,
+ //: 1.0 1.0; ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //color: ...
+ ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //RECT_COLOR; ...
+ ENVENTOR_SYNTAX_COLOR_MACRO, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //} } ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //program { ...
+ ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ // "mouse_down"; ...
+ ENVENTOR_SYNTAX_COLOR_STRING, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //signal: ...
+ ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ // "mouse,down,1" ...
+ ENVENTOR_SYNTAX_COLOR_STRING, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //source: ...
+ ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //"rect" ...
+ ENVENTOR_SYNTAX_COLOR_STRING, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //action: ...
+ ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //STATE_SET ...
+ ENVENTOR_SYNTAX_COLOR_CONSTANT, ENVENTOR_SYNTAX_COLOR_STRING,
+ //0.0; target ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD,
+ //: "rect" ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_STRING,
+ //"; } ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //script { ...
+ ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //public flag = ...
+ ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //0; public ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD,
+ //func() { if ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD,
+ //(!get_int ...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SCRIPT_FUNC,
+ //(flag))...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //set_int(...
+ ENVENTOR_SYNTAX_COLOR_SCRIPT_FUNC, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //flag, 1);...
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL,
+ //} }
+ ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL
+};
+
+
+/* old style */
+#if 0
+static int color_type_list[COLOR_KEYWORD_MAX_CNT] =
+{
ENVENTOR_SYNTAX_COLOR_COMMENT, ENVENTOR_SYNTAX_COLOR_MACRO,
ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD, ENVENTOR_SYNTAX_COLOR_SYMBOL,
@@ -90,6 +162,7 @@ static int color_type_list[COLOR_KEYWORD_MAX_CNT] =
ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL,
ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL
};
+#endif
/*****************************************************************************/
/* Internal method implementation */
--
