Add additional keyword group for python and slightly change the foreground colour for style "word2".

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2357 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-03-17 17:22:24 +00:00
parent 8e26cfe7c1
commit d8f028f888
3 changed files with 11 additions and 4 deletions

View File

@ -16,6 +16,9 @@
Remove old and useless code from build_link_file().
Don't add "-o" compiler option automatically instead make it
configurable through linker command.
* data/filetypes.python, src/highlighting.c:
Add additional keyword group for python and slightly change the
foreground colour for style "word2".
2008-03-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

View File

@ -15,12 +15,14 @@ operator=0x300080;0xffffff;false;false
identifier=0x000000;0xffffff;false;false
commentblock=0x808080;0xffffff;false;false
stringeol=0x000000;0xe0c0e0;false;false
word2=0x800060;0xffffff;true;false
word2=0xdd00a6;0xffffff;true;false
decorator=0x808000;0xffffff;false;false
[keywords]
# all items must be in one line
primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
# additional keywords, will be highlighted with style "word2"
identifiers=
[settings]

View File

@ -1494,12 +1494,13 @@ static void styleset_python_init(gint ft_id, GKeyFile *config, GKeyFile *config_
get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[11]);
get_keyfile_hex(config, config_home, "styling", "commentblock", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[12]);
get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[13]);
get_keyfile_hex(config, config_home, "styling", "word2", "0x800060", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PYTHON].styling[14]);
get_keyfile_hex(config, config_home, "styling", "word2", "0xdd00a6", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PYTHON].styling[14]);
get_keyfile_hex(config, config_home, "styling", "decorator", "0x808000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[15]);
style_sets[GEANY_FILETYPES_PYTHON].keywords = g_new(gchar*, 2);
style_sets[GEANY_FILETYPES_PYTHON].keywords = g_new(gchar*, 3);
get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PYTHON, 0, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True");
style_sets[GEANY_FILETYPES_PYTHON].keywords[1] = NULL;
get_keyfile_keywords(config, config_home, "keywords", "identifiers", GEANY_FILETYPES_PYTHON, 1, "");
style_sets[GEANY_FILETYPES_PYTHON].keywords[2] = NULL;
get_keyfile_wordchars(config, config_home,
&style_sets[GEANY_FILETYPES_PYTHON].wordchars);
@ -1515,6 +1516,7 @@ static void styleset_python(ScintillaObject *sci)
apply_filetype_properties(sci, SCLEX_PYTHON, ft_id);
SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_PYTHON].keywords[0]);
SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_PYTHON].keywords[1]);
set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PYTHON, 0);
set_sci_style(sci, SCE_P_DEFAULT, GEANY_FILETYPES_PYTHON, 0);