[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53419] trunk/blender/source/blender: add syntax highlighting color for symbols
Campbell Barton
ideasman42 at gmail.com
Sun Dec 30 02:26:35 CET 2012
Revision: 53419
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53419
Author: campbellbarton
Date: 2012-12-30 01:26:31 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
add syntax highlighting color for symbols
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_text/text_format_osl.c
trunk/blender/source/blender/editors/space_text/text_format_py.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/editors/include/UI_resources.h 2012-12-30 01:26:31 UTC (rev 53419)
@@ -127,6 +127,7 @@
TH_SYNTAX_L,
TH_SYNTAX_D,
TH_SYNTAX_N,
+ TH_SYNTAX_S,
TH_BONE_SOLID,
TH_BONE_POSE,
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/editors/interface/resources.c 2012-12-30 01:26:31 UTC (rev 53419)
@@ -364,6 +364,8 @@
cp = ts->syntaxr; break;
case TH_SYNTAX_N:
cp = ts->syntaxn; break;
+ case TH_SYNTAX_S:
+ cp = ts->syntaxs; break;
case TH_NODE:
cp = ts->syntaxl; break;
@@ -890,6 +892,7 @@
rgba_char_args_set(btheme->text.syntaxd, 50, 0, 140, 255); /* Decorator/Preprocessor Dir. Blue-purple */
rgba_char_args_set(btheme->text.syntaxr, 140, 60, 0, 255); /* Reserved Orange*/
rgba_char_args_set(btheme->text.syntaxb, 128, 0, 80, 255); /* Builtin Red-purple */
+ rgba_char_args_set(btheme->text.syntaxs, 76, 76, 76, 255); /* Grey (mix between fg/bg) */
/* space oops */
btheme->toops = btheme->tv3d;
@@ -2093,6 +2096,7 @@
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
rgba_char_args_set(btheme->text.syntaxd, 50, 0, 140, 255); /* Decorator/Preprocessor Dir. Blue-purple */
rgba_char_args_set(btheme->text.syntaxr, 140, 60, 0, 255); /* Reserved Orange */
+ rgba_char_args_set(btheme->text.syntaxs, 76, 76, 76, 255); /* Grey (mix between fg/bg) */
}
}
Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c 2012-12-30 01:26:31 UTC (rev 53419)
@@ -120,7 +120,7 @@
case FMT_TYPE_WHITESPACE:
break;
case FMT_TYPE_SYMBOL:
- UI_ThemeColorBlend(TH_TEXT, TH_BACK, 0.5f);
+ UI_ThemeColor(TH_SYNTAX_S);
break;
case FMT_TYPE_COMMENT:
UI_ThemeColor(TH_SYNTAX_C);
Modified: trunk/blender/source/blender/editors/space_text/text_format_osl.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_osl.c 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/editors/space_text/text_format_osl.c 2012-12-30 01:26:31 UTC (rev 53419)
@@ -154,8 +154,8 @@
{
if (string[0] == '#') {
int i = 1;
- /* whitespace is ok '# foo' */
- while (string[i] == '\t' || string[i] == ' ') {
+ /* Whitespace is ok '# foo' */
+ while (text_check_whitespace(string[i])) {
i++;
}
while (text_check_identifier(string[i])) {
@@ -166,24 +166,6 @@
return -1;
}
-/* not in OSL, keep for now though */
-#if 0
-static int txtfmt_osl_find_bool(const char *string)
-{
- int i, len;
-
- if (STR_LITERAL_STARTSWITH(string, "None", len)) i = len;
- else if (STR_LITERAL_STARTSWITH(string, "True", len)) i = len;
- else if (STR_LITERAL_STARTSWITH(string, "False", len)) i = len;
- else i = 0;
-
- /* If next source char is an identifier (eg. 'i' in "Nonetheless") no match */
- if (i == 0 || text_check_identifier(string[i]))
- return -1;
- return i;
-}
-#endif
-
static void txtfmt_osl_format_line(SpaceText *st, TextLine *line, const int do_next)
{
FlattenString fs;
Modified: trunk/blender/source/blender/editors/space_text/text_format_py.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_py.c 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/editors/space_text/text_format_py.c 2012-12-30 01:26:31 UTC (rev 53419)
@@ -127,8 +127,8 @@
{
if (string[0] == '@') {
int i = 1;
- /* whitespace is ok '@ foo' */
- while (string[i] == '\t' || string[i] == ' ') {
+ /* Whitespace is ok '@ foo' */
+ while (text_check_whitespace(string[i])) {
i++;
}
while (text_check_identifier(string[i])) {
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2012-12-30 01:26:31 UTC (rev 53419)
@@ -246,12 +246,14 @@
char vertex_size, outline_width, facedot_size;
char noodle_curving;
- char syntaxl[4], syntaxn[4], syntaxb[4]; /* syntax for textwindow and nodes */
+ /* syntax for textwindow and nodes */
+ char syntaxl[4], syntaxs[4];
+ char syntaxb[4], syntaxn[4];
char syntaxv[4], syntaxc[4];
char syntaxd[4], syntaxr[4];
char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4]; /* for sequence editor */
- char effect[4], hpad0[4], transition[4], meta[4];
+ char effect[4], transition[4], meta[4];
char editmesh_active[4];
char handle_vertex[4];
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-12-30 01:12:21 UTC (rev 53418)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-12-30 01:26:31 UTC (rev 53419)
@@ -1636,6 +1636,12 @@
RNA_def_property_ui_text(prop, "Syntax Built-in", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+ prop = RNA_def_property(srna, "syntax_symbols", PROP_FLOAT, PROP_COLOR_GAMMA);
+ RNA_def_property_float_sdna(prop, NULL, "syntaxs");
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Syntax Symbols", "");
+ RNA_def_property_update(prop, 0, "rna_userdef_update");
+
prop = RNA_def_property(srna, "syntax_special", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "syntaxv");
RNA_def_property_array(prop, 3);
More information about the Bf-blender-cvs
mailing list