Revision: 841 http://svn.sourceforge.net/geany/?rev=841&view=rev Author: ntrel Date: 2006-09-27 08:08:46 -0700 (Wed, 27 Sep 2006)

Log Message: ----------- Only override the default Scintilla selection style if foreground and/or background flags are set in filetypes.common. Also increase the current line background brightness.

Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/src/highlighting.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-27 14:57:17 UTC (rev 840) +++ trunk/ChangeLog 2006-09-27 15:08:46 UTC (rev 841) @@ -1,6 +1,10 @@ 2006-09-27 Nick Treleaven nick.treleaven@btinternet.com

* src/vte.c: Change VTE word selection chars to include paths. + * src/highlighting.c, data/filetypes.common: + Only override the default Scintilla selection style if foreground + and/or background flags are set in filetypes.common. + Also increase the current line background brightness.

2006-09-27 Enrico Tröger enrico.troeger@uvena.de

Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2006-09-27 14:57:17 UTC (rev 840) +++ trunk/data/filetypes.common 2006-09-27 15:08:46 UTC (rev 841) @@ -1,6 +1,7 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# bold for selection is useless, so say false +# 3rd selection argument is true to override default foreground +# 4th selection argument is true to override default background selection=0xc0c0c0;0x7f0000;false;false brace_good=0x0000ff;0xFFFFFF;true;false brace_bad=0xff0000;0xFFFFFF;true;false @@ -9,7 +10,7 @@ margin_folding=0x000000;0xdfdfdf;false;false # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) -current_line=0x0;0xe5e5e5;true;false +current_line=0x0;0xf0f0f0;true;false # colour of the caret(the blinking cursor), only first argument is interpreted caret=0x000000;0x0;false;false indent_guide=0xc0c0c0;0xffffff;false;false

Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-09-27 14:57:17 UTC (rev 840) +++ trunk/src/highlighting.c 2006-09-27 15:08:46 UTC (rev 841) @@ -321,8 +321,12 @@ SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.at.else", (sptr_t) "1");

- SSM(sci, SCI_SETSELFORE, 1, invert(types[GEANY_FILETYPES_ALL]->styling[0][0])); - SSM(sci, SCI_SETSELBACK, 1, invert(types[GEANY_FILETYPES_ALL]->styling[0][1])); + // 3rd argument is whether to override default foreground selection + if (types[GEANY_FILETYPES_ALL]->styling[0][2]) + SSM(sci, SCI_SETSELFORE, 1, invert(types[GEANY_FILETYPES_ALL]->styling[0][0])); + // 4th argument is whether to override default background selection + if (types[GEANY_FILETYPES_ALL]->styling[0][3]) + SSM(sci, SCI_SETSELBACK, 1, invert(types[GEANY_FILETYPES_ALL]->styling[0][1]));

SSM(sci, SCI_SETSTYLEBITS, style_bits, 0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.