SF.net SVN: geany: [2387] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Sun Mar 23 14:57:53 UTC 2008
Revision: 2387
http://geany.svn.sourceforge.net/geany/?rev=2387&view=rev
Author: eht16
Date: 2008-03-23 07:57:53 -0700 (Sun, 23 Mar 2008)
Log Message:
-----------
Add styles to customize line and search marker and add translucency setting.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.common
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-03-21 18:44:12 UTC (rev 2386)
+++ trunk/ChangeLog 2008-03-23 14:57:53 UTC (rev 2387)
@@ -1,3 +1,11 @@
+2008-03-23 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/filetypes.common, doc/geany.txt, doc/geany.html,
+ src/highlighting.c:
+ Add styles to customize line and search marker and add
+ translucency setting.
+
+
2008-03-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/callbacks.c:
Modified: trunk/data/filetypes.common
===================================================================
--- trunk/data/filetypes.common 2008-03-21 18:44:12 UTC (rev 2386)
+++ trunk/data/filetypes.common 2008-03-23 14:57:53 UTC (rev 2387)
@@ -26,6 +26,18 @@
# only the first and second argument is interpreted
translucency=256;256;false;false
+# style for a highlighted line (e.g when using Goto line or goto tag)
+# only the first and second argument is interpreted
+marker_line=0x000000;0xffff00;false;false
+
+# style for a highlighted search result (e.g when using "Mark" in Search dialogs)
+# only the first and second argument is interpreted
+marker_search=0x000000;0xB8F4B8;false;false
+
+# translucency for the line marker(first argument) and the search marker (second argument)
+# only the first and second argument is interpreted
+marker_translucency=256;256;false;false
+
# colour of the caret(the blinking cursor), only first and third argument is interpreted
# set the third argument to true to change the caret into a block caret
caret=0x000000;0x0;false;false
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2008-03-21 18:44:12 UTC (rev 2386)
+++ trunk/doc/geany.html 2008-03-23 14:57:53 UTC (rev 2387)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
<meta name="date" content="2008-03-20" />
@@ -2588,13 +2588,35 @@
<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_indent=0;0;false;false</span></tt></p>
</dd>
<dt>translucency</dt>
-<dd><p class="first">Translucency for the current line(first argument) and the selection
+<dd><p class="first">Translucency for the current line (first argument) and the selection
(second argument). Values between 0 and 256 are accepted.</p>
<p>Note for Windows 95, 98 and ME users:
keep this value at 256 to disable translucency otherwise Geany might crash.</p>
<p>Only the first and second argument is interpreted.</p>
<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">translucency=256;256;false;false</span></tt></p>
</dd>
+<dt>marker_line</dt>
+<dd><p class="first">The style for a highlighted line (e.g when using Goto line or goto tag).
+The forground colour (first argument) is only used when the Markers margin
+is enabled (see View menu).</p>
+<p>Only the first and second argument is interpreted.</p>
+<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_line=0x000000;0xffff00;false;false</span></tt></p>
+</dd>
+<dt>marker_search</dt>
+<dd><p class="first">The style for a highlighted search result (e.g when using "Mark" in
+Search dialogs). The foreground colour (first argument) is only used
+when the Markers margin is enabled (see View menu).</p>
+<p>Only the first and second argument is interpreted.</p>
+<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_search=0x000000;0xB8F4B8;false;false</span></tt></p>
+</dd>
+<dt>marker_translucency</dt>
+<dd><p class="first">Translucency for the line marker (first argument) and the search marker
+(second argument). Values between 0 and 256 are accepted.</p>
+<p>Note for Windows 95, 98 and ME users:
+keep this value at 256 to disable translucency otherwise Geany might crash.</p>
+<p>Only the first and second argument is interpreted.</p>
+<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">marker_translucency=256;256;false;false</span></tt></p>
+</dd>
<dt>whitespace_chars</dt>
<dd><p class="first">Characters to treat as whitespace. These characters are ignored
when moving, selecting and deleting across word boundaries
@@ -3513,7 +3535,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-03-20 17:07 UTC.
+Generated on: 2008-03-23 14:56 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2008-03-21 18:44:12 UTC (rev 2386)
+++ trunk/doc/geany.txt 2008-03-23 14:57:53 UTC (rev 2387)
@@ -2311,7 +2311,7 @@
*Example:* ``line_wrap_indent=0;0;false;false``
translucency
- Translucency for the current line(first argument) and the selection
+ Translucency for the current line (first argument) and the selection
(second argument). Values between 0 and 256 are accepted.
Note for Windows 95, 98 and ME users:
@@ -2321,6 +2321,35 @@
*Example:* ``translucency=256;256;false;false``
+marker_line
+ The style for a highlighted line (e.g when using Goto line or goto tag).
+ The forground colour (first argument) is only used when the Markers margin
+ is enabled (see View menu).
+
+ Only the first and second argument is interpreted.
+
+ *Example:* ``marker_line=0x000000;0xffff00;false;false``
+
+marker_search
+ The style for a highlighted search result (e.g when using "Mark" in
+ Search dialogs). The foreground colour (first argument) is only used
+ when the Markers margin is enabled (see View menu).
+
+ Only the first and second argument is interpreted.
+
+ *Example:* ``marker_search=0x000000;0xB8F4B8;false;false``
+
+marker_translucency
+ Translucency for the line marker (first argument) and the search marker
+ (second argument). Values between 0 and 256 are accepted.
+
+ Note for Windows 95, 98 and ME users:
+ keep this value at 256 to disable translucency otherwise Geany might crash.
+
+ Only the first and second argument is interpreted.
+
+ *Example:* ``marker_translucency=256;256;false;false``
+
whitespace_chars
Characters to treat as whitespace. These characters are ignored
when moving, selecting and deleting across word boundaries
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2008-03-21 18:44:12 UTC (rev 2386)
+++ trunk/src/highlighting.c 2008-03-23 14:57:53 UTC (rev 2387)
@@ -70,6 +70,9 @@
GCS_LINE_WRAP_VISUALS,
GCS_LINE_WRAP_INDENT,
GCS_TRANSLUCENCY,
+ GCS_MARKER_LINE,
+ GCS_MARKER_SEARCH,
+ GCS_MARKER_TRANSLUCENCY,
GCS_MAX
};
@@ -364,6 +367,10 @@
"0xc0c0c0", "0xffffff", "false", &common_style_set.styling[GCS_INDENT_GUIDE]);
get_keyfile_hex(config, config_home, "styling", "white_space",
"0xc0c0c0", "0xffffff", "true", &common_style_set.styling[GCS_WHITE_SPACE]);
+ get_keyfile_hex(config, config_home, "styling", "marker_line",
+ "0x000000", "0xffff00", "false", &common_style_set.styling[GCS_MARKER_LINE]);
+ get_keyfile_hex(config, config_home, "styling", "marker_search",
+ "0x000000", "0xB8F4B8", "false", &common_style_set.styling[GCS_MARKER_SEARCH]);
{
/* hack because get_keyfile_int uses a Style struct */
HighlightingStyle tmp_style;
@@ -391,6 +398,10 @@
256, 256, &tmp_style);
common_style_set.styling[GCS_TRANSLUCENCY].foreground = tmp_style.foreground;
common_style_set.styling[GCS_TRANSLUCENCY].background = tmp_style.background;
+ get_keyfile_int(config, config_home, "styling", "marker_translucency",
+ 256, 256, &tmp_style);
+ common_style_set.styling[GCS_MARKER_TRANSLUCENCY].foreground = tmp_style.foreground;
+ common_style_set.styling[GCS_MARKER_TRANSLUCENCY].background = tmp_style.background;
}
get_keyfile_wordchars(config, config_home, &common_style_set.wordchars);
@@ -436,13 +447,15 @@
/* define marker symbols
* 0 -> line marker */
SSM(sci, SCI_MARKERDEFINE, 0, SC_MARK_SHORTARROW);
- SSM(sci, SCI_MARKERSETFORE, 0, invert(0x00007f));
- SSM(sci, SCI_MARKERSETBACK, 0, invert(0x00ffff));
+ SSM(sci, SCI_MARKERSETFORE, 0, invert(common_style_set.styling[GCS_MARKER_LINE].foreground));
+ SSM(sci, SCI_MARKERSETBACK, 0, invert(common_style_set.styling[GCS_MARKER_LINE].background));
+ SSM(sci, SCI_MARKERSETALPHA, 0, common_style_set.styling[GCS_MARKER_TRANSLUCENCY].foreground);
/* 1 -> user marker */
SSM(sci, SCI_MARKERDEFINE, 1, SC_MARK_PLUS);
- SSM(sci, SCI_MARKERSETFORE, 1, invert(0x000000));
- SSM(sci, SCI_MARKERSETBACK, 1, invert(0xB8F4B8));
+ SSM(sci, SCI_MARKERSETFORE, 1, invert(common_style_set.styling[GCS_MARKER_SEARCH].foreground));
+ SSM(sci, SCI_MARKERSETBACK, 1, invert(common_style_set.styling[GCS_MARKER_SEARCH].background));
+ SSM(sci, SCI_MARKERSETALPHA, 1, common_style_set.styling[GCS_MARKER_TRANSLUCENCY].background);
/* 2 -> folding marker, other folding settings */
SSM(sci, SCI_SETMARGINTYPEN, 2, SC_MARGIN_SYMBOL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list