Revision: 3725 http://geany.svn.sourceforge.net/geany/?rev=3725&view=rev Author: eht16 Date: 2009-04-21 20:54:50 +0000 (Tue, 21 Apr 2009)
Log Message: ----------- Limit the amount of highlighted build error messages in the Compiler window to 50 for performance reasons.
Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/build.c trunk/src/build.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:54:30 UTC (rev 3724) +++ trunk/ChangeLog 2009-04-21 20:54:50 UTC (rev 3725) @@ -17,6 +17,9 @@ * src/build.c: Make build commands on Windows run synchronously to avoid problems with reading build commands' output. + * doc/geany.html, doc/geany.txt, src/build.c, src/build.h: + Limit the amount of highlighted build error messages in the + Compiler window to 50 for performance reasons.
2009-04-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-04-21 20:54:30 UTC (rev 3724) +++ trunk/doc/geany.html 2009-04-21 20:54:50 UTC (rev 3725) @@ -410,10 +410,11 @@ <li><a class="reference internal" href="#project-h" id="id171">project.h</a></li> <li><a class="reference internal" href="#editor-h" id="id172">editor.h</a></li> <li><a class="reference internal" href="#keyfile-c" id="id173">keyfile.c</a></li> +<li><a class="reference internal" href="#build-h" id="id174">build.h</a></li> </ul> </li> -<li><a class="reference internal" href="#gnu-general-public-license" id="id174">GNU General Public License</a></li> -<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id175">License for Scintilla and SciTE</a></li> +<li><a class="reference internal" href="#gnu-general-public-license" id="id175">GNU General Public License</a></li> +<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id176">License for Scintilla and SciTE</a></li> </ul> </div> <div class="section" id="introduction"> @@ -4449,9 +4450,39 @@ </tbody> </table> </div> +<div class="section" id="build-h"> +<h2><a class="toc-backref" href="#id174">build.h</a></h2> +<table border="1" class="docutils"> +<colgroup> +<col width="33%" /> +<col width="48%" /> +<col width="20%" /> +</colgroup> +<thead valign="bottom"> +<tr><th class="head">Option</th> +<th class="head">Description</th> +<th class="head">Default</th> +</tr> +</thead> +<tbody valign="top"> +<tr><td>GEANY_BUILD_ERR_HIGHLIGHT_MAX</td> +<td>Amount of build error messages which should +be highlighting in the Compiler message +window. This affects the special colouring +when Geany detects a compiler output line as +an error message and then highlight the +corresponding line in the source code. +Usually only the first few messages are +interesting because following errors are +just aftereffects.</td> +<td>50</td> +</tr> +</tbody> +</table> </div> +</div> <div class="section" id="gnu-general-public-license"> -<h1><a class="toc-backref" href="#id174">GNU General Public License</a></h1> +<h1><a class="toc-backref" href="#id175">GNU General Public License</a></h1> <pre class="literal-block"> GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -4796,7 +4827,7 @@ </pre> </div> <div class="section" id="license-for-scintilla-and-scite"> -<h1><a class="toc-backref" href="#id175">License for Scintilla and SciTE</a></h1> +<h1><a class="toc-backref" href="#id176">License for Scintilla and SciTE</a></h1> <p>Copyright 1998-2003 by Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>All Rights Reserved</p> <p>Permission to use, copy, modify, and distribute this software and @@ -4816,7 +4847,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-04-21 19:30 UTC. +Generated on: 2009-04-21 20:34 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2009-04-21 20:54:30 UTC (rev 3724) +++ trunk/doc/geany.txt 2009-04-21 20:54:50 UTC (rev 3725) @@ -3820,8 +3820,25 @@ Geany provide. ============================== ============================================ ==================
+build.h +-------
+============================== ============================================ ================== +Option Description Default +============================== ============================================ ================== +GEANY_BUILD_ERR_HIGHLIGHT_MAX Amount of build error messages which should 50 + be highlighted in the Compiler message + window. This affects the special coloring + when Geany detects a compiler output line as + an error message and then highlight the + corresponding line in the source code. + Usually only the first few messages are + interesting because following errors are + just aftereffects. +============================== ============================================ ==================
+ + GNU General Public License ==========================
Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-04-21 20:54:30 UTC (rev 3724) +++ trunk/src/build.c 2009-04-21 20:54:50 UTC (rev 3725) @@ -60,7 +60,7 @@ #include "geanymenubuttonaction.h"
-GeanyBuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_NONE, NULL}; +GeanyBuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_NONE, NULL, 0};
static gchar *current_dir_entered = NULL;
@@ -537,6 +537,7 @@ g_free(build_info.dir); build_info.dir = g_strdup(working_dir); build_info.file_type_id = FILETYPE_ID(doc->file_type); + build_info.message_count = 0;
#ifdef G_OS_WIN32 if (! utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, @@ -832,16 +833,17 @@ if (! NZV(msg)) return;
- if (build_parse_make_dir(msg, &tmp)) + if (editor_prefs.use_indicators && build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX) { - setptr(current_dir_entered, tmp); - } - - if (editor_prefs.use_indicators) - { gchar *filename; gint line;
+ build_info.message_count++; + + if (build_parse_make_dir(msg, &tmp)) + { + setptr(current_dir_entered, tmp); + } msgwin_parse_compiler_error_line(msg, current_dir_entered, &filename, &line); if (line != -1 && filename != NULL) {
Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2009-04-21 20:54:30 UTC (rev 3724) +++ trunk/src/build.h 2009-04-21 20:54:50 UTC (rev 3725) @@ -25,6 +25,8 @@ #ifndef GEANY_BUILD_H #define GEANY_BUILD_H 1
+#define GEANY_BUILD_ERR_HIGHLIGHT_MAX 50 + typedef enum /* Geany Build Options */ { GBO_COMPILE, @@ -41,6 +43,7 @@ gchar *dir; guint file_type_id; gchar *custom_target; + gint message_count; } GeanyBuildInfo;
extern GeanyBuildInfo build_info;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.