Commits April 2009

commits@lists.geany.org

4 participants
79 discussions

SF.net SVN: geany:[3725] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

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.

1 0

SF.net SVN: geany:[3724] trunk/src/build.c
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3724 http://geany.svn.sourceforge.net/geany/?rev=3724&view=rev Author: eht16 Date: 2009-04-21 20:54:30 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Skip empty lines when parsing build output. Modified Paths: -------------- trunk/src/build.c Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-04-21 20:54:19 UTC (rev 3723) +++ trunk/src/build.c 2009-04-21 20:54:30 UTC (rev 3724) @@ -829,6 +829,9 @@ g_strchomp(msg); + if (! NZV(msg)) + return; + if (build_parse_make_dir(msg, &tmp)) { setptr(current_dir_entered, tmp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3723] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3723 http://geany.svn.sourceforge.net/geany/?rev=3723&view=rev Author: eht16 Date: 2009-04-21 20:54:19 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Make build commands on Windows run synchronously to avoid problems with reading build commands' output. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:54:04 UTC (rev 3722) +++ trunk/ChangeLog 2009-04-21 20:54:19 UTC (rev 3723) @@ -14,6 +14,9 @@ Add a hidden preference 'use_safe_file_saving' to save files to disk by creating a temporary file first. This has serious side effects, please read the documentation before enabling this. + * src/build.c: + Make build commands on Windows run synchronously to avoid problems + with reading build commands' output. 2009-04-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-04-21 20:54:04 UTC (rev 3722) +++ trunk/src/build.c 2009-04-21 20:54:19 UTC (rev 3723) @@ -108,11 +108,13 @@ widgets; +#ifndef G_OS_WIN32 +static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); +#endif static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose); static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); static void set_stop_button(gboolean stop); -static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); static void on_build_arguments_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -124,6 +126,8 @@ static void on_build_next_error(GtkMenuItem *menuitem, gpointer user_data); static void on_build_previous_error(GtkMenuItem *menuitem, gpointer user_data); static void kill_process(GPid *pid); +static void show_build_result_message(gboolean failure); +static void process_build_output_line(const gchar *line, gint color); void build_finalize() @@ -422,6 +426,44 @@ g_strfreev(fields); return result; } + +static void parse_build_output(const gchar **output, gint status) +{ + guint x, i, len; + gchar *line, **lines; + + for (x = 0; x < 2; x++) + { + if (NZV(output[x])) + { + lines = g_strsplit_set(output[x], "\r\n", -1); + len = g_strv_length(lines); + + for (i = 0; i < len; i++) + { + if (NZV(lines[i])) + { + line = lines[i]; + while (*line != '\0') + { /* replace any conrol characters in the output */ + if (*line < 32) + *line = 32; + line++; + } + process_build_output_line(lines[i], COLOR_BLACK); + } + } + g_strfreev(lines); + } + } + + show_build_result_message(status != 0); + utils_beep(); + + build_info.pid = 0; + /* enable build items again */ + build_menu_update(NULL); +} #endif @@ -438,8 +480,13 @@ gchar *locale_filename; gchar *executable; gchar *tmp; +#ifdef G_OS_WIN32 + gchar *output[2]; + gint status; +#else gint stdout_fd; gint stderr_fd; +#endif g_return_val_if_fail(doc != NULL, (GPid) 1); @@ -491,8 +538,14 @@ build_info.dir = g_strdup(working_dir); build_info.file_type_id = FILETYPE_ID(doc->file_type); - if (! g_spawn_async_with_pipes(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(build_info.pid), NULL, &stdout_fd, &stderr_fd, &error)) +#ifdef G_OS_WIN32 + if (! utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, + NULL, NULL, &output[0], &output[1], &status, &error)) +#else + if (! g_spawn_async_with_pipes(working_dir, argv, NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, + &(build_info.pid), NULL, &stdout_fd, &stderr_fd, &error)) +#endif { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); @@ -504,6 +557,11 @@ return (GPid) 0; } +#ifdef G_OS_WIN32 + parse_build_output((const gchar**) output, status); + g_free(output[0]); + g_free(output[1]); +#else if (build_info.pid > 0) { g_child_watch_add(build_info.pid, (GChildWatchFunc) build_exit_cb, NULL); @@ -516,6 +574,7 @@ TRUE, build_iofunc, GINT_TO_POINTER(0)); utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, TRUE, build_iofunc, GINT_TO_POINTER(1)); +#endif g_strfreev(argv); g_free(working_dir); @@ -762,47 +821,54 @@ } -static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data) +static void process_build_output_line(const gchar *str, gint color) { - if (cond & (G_IO_IN | G_IO_PRI)) + gchar *msg, *tmp; + + msg = g_strdup(str); + + g_strchomp(msg); + + if (build_parse_make_dir(msg, &tmp)) { - /*GIOStatus s;*/ - gchar *msg; + setptr(current_dir_entered, tmp); + } - while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) + if (editor_prefs.use_indicators) + { + gchar *filename; + gint line; + + msgwin_parse_compiler_error_line(msg, current_dir_entered, &filename, &line); + if (line != -1 && filename != NULL) { - /*if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break;*/ - gint color; - gchar *tmp; + GeanyDocument *doc = document_find_by_filename(filename); - color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; - g_strchomp(msg); + if (doc) + editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1); + color = COLOR_RED; /* error message parsed on the line */ + } + g_free(filename); + } + msgwin_compiler_add_string(color, msg); - if (build_parse_make_dir(msg, &tmp)) - { - setptr(current_dir_entered, tmp); - } + g_free(msg); +} - if (editor_prefs.use_indicators) - { - gchar *filename; - gint line; - msgwin_parse_compiler_error_line(msg, current_dir_entered, - &filename, &line); - if (line != -1 && filename != NULL) - { - GeanyDocument *doc = document_find_by_filename(filename); +#ifndef G_OS_WIN32 +static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data) +{ + if (cond & (G_IO_IN | G_IO_PRI)) + { + gchar *msg; - if (doc) - editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1); - color = COLOR_RED; /* error message parsed on the line */ - } - g_free(filename); - } - msgwin_compiler_add_string(color, msg); + while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) + { + gint color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; - g_free(msg); + process_build_output_line(msg, color); + g_free(msg); } } if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) @@ -810,6 +876,7 @@ return TRUE; } +#endif gboolean build_parse_make_dir(const gchar *string, gchar **prefix) @@ -882,9 +949,9 @@ } +#ifndef G_OS_WIN32 static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { -#ifdef G_OS_UNIX gboolean failure = FALSE; if (WIFEXITED(status)) @@ -902,9 +969,6 @@ failure = TRUE; } show_build_result_message(failure); -#else - show_build_result_message(! win32_get_exit_status(child_pid)); -#endif utils_beep(); g_spawn_close_pid(child_pid); @@ -914,6 +978,7 @@ build_menu_update(NULL); ui_progress_bar_stop(); } +#endif static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3722] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3722 http://geany.svn.sourceforge.net/geany/?rev=3722&view=rev Author: eht16 Date: 2009-04-21 20:54:04 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Add a hidden preference 'use_safe_file_saving' to save files to disk by creating a temporary file first. This has serious side effects, please read the documentation before enabling this. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/document.c trunk/src/document.h trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:53:42 UTC (rev 3721) +++ trunk/ChangeLog 2009-04-21 20:54:04 UTC (rev 3722) @@ -9,6 +9,11 @@ document_get_basename_for_display() to the plugin API. * doc/geany.html, doc/geany.txt, src/toolbar.c: Add new toolbar element: Print (patch by Roland Baudin, thanks). + * doc/geany.html, doc/geany.txt, src/document.c, src/document.h, + src/keyfile.c: + Add a hidden preference 'use_safe_file_saving' to save files to disk + by creating a temporary file first. This has serious side effects, + please read the documentation before enabling this. 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:53:42 UTC (rev 3721) +++ trunk/doc/geany.html 2009-04-21 20:54:04 UTC (rev 3722) @@ -4221,6 +4221,30 @@ <tt class="docutils literal"><span class="pre">vte/termcap/xterm</span></tt>.</td> <td>xterm</td> </tr> +<tr><td><strong>File related</strong></td> +<td> </td> +<td> </td> +</tr> +<tr><td>use_safe_file_saving</td> +<td>Defines the mode how Geany saves files to +disk. If disabled, Geany directly writes +the content of the document to disk. This +might cause in loss of data when there is +no more free space on disk to save the +file. When set to true, Geany first saves +the contents into a temporary file and if +this succeeded, the temporary file is +moved to the real file to save. +This gives better error checking in case of +no more free disk space. But it also +destroys hard links of the original file +and its permissions (e.g. executable flags +are reset). Use this with care as it can +break things seriously. +The better approach would be to ensure your +disk won't run out of free space.</td> +<td>false</td> +</tr> </tbody> </table> </div> @@ -4792,7 +4816,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-04-21 19:06 UTC. +Generated on: 2009-04-21 19:30 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:53:42 UTC (rev 3721) +++ trunk/doc/geany.txt 2009-04-21 20:54:04 UTC (rev 3722) @@ -3704,6 +3704,24 @@ emulation Terminal emulation mode. Only change this xterm if you have VTE termcap files other than ``vte/termcap/xterm``. +**File related** +use_safe_file_saving Defines the mode how Geany saves files to false + disk. If disabled, Geany directly writes + the content of the document to disk. This + might cause in loss of data when there is + no more free space on disk to save the + file. When set to true, Geany first saves + the contents into a temporary file and if + this succeeded, the temporary file is + moved to the real file to save. + This gives better error checking in case of + no more free disk space. But it also + destroys hard links of the original file + and its permissions (e.g. executable flags + are reset). Use this with care as it can + break things seriously. + The better approach would be to ensure your + disk won't run out of free space. ================================ =========================================== ================== Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-04-21 20:53:42 UTC (rev 3721) +++ trunk/src/document.c 2009-04-21 20:54:04 UTC (rev 3722) @@ -1680,34 +1680,55 @@ } -static gint write_data_to_disk(GeanyDocument *doc, const gchar *locale_filename, - const gchar *data, gint len) +static gchar *write_data_to_disk(GeanyDocument *doc, const gchar *locale_filename, + const gchar *data, gint len) { FILE *fp; gint bytes_written; gint err = 0; + GError *error = NULL; - g_return_val_if_fail(data != NULL, EINVAL); + g_return_val_if_fail(doc != NULL, g_strdup(g_strerror(EINVAL))); + g_return_val_if_fail(data != NULL, g_strdup(g_strerror(EINVAL))); - fp = g_fopen(locale_filename, "wb"); - if (G_UNLIKELY(fp == NULL)) - return errno; + /* we never use g_file_set_contents() for remote files as Geany only writes such files + * 'into' the Fuse mountpoint, the file itself is then written by GVfs on the target + * remote filesystem. */ + if (! file_prefs.use_safe_file_saving || doc->priv->is_remote) + { + fp = g_fopen(locale_filename, "wb"); + if (G_UNLIKELY(fp == NULL)) + return g_strdup(g_strerror(errno)); - bytes_written = fwrite(data, sizeof(gchar), len, fp); + bytes_written = fwrite(data, sizeof(gchar), len, fp); - if (G_UNLIKELY(len != bytes_written)) - err = errno; + if (G_UNLIKELY(len != bytes_written)) + err = errno; - fclose(fp); + fclose(fp); + if (err != 0) + return g_strdup(g_strerror(err)); + } + else + { + g_file_set_contents(locale_filename, data, len, &error); + if (error != NULL) + { + gchar *msg = g_strdup(error->message); + g_error_free(error); + return msg; + } + } + /* now the file is on disk, set real_path */ - if (err == 0 && doc->real_path == NULL) + if (doc->real_path == NULL) { doc->real_path = tm_get_real_path(locale_filename); doc->priv->is_remote = utils_is_remote_path(locale_filename); } - return err; + return NULL; } @@ -1726,9 +1747,9 @@ **/ gboolean document_save_file(GeanyDocument *doc, gboolean force) { + gchar *errmsg; gchar *data; gsize len; - gint err; gchar *locale_filename; g_return_val_if_fail(doc != NULL, FALSE); @@ -1793,17 +1814,17 @@ doc->priv->file_disk_status = FILE_IGNORE; /* actually write the content of data to the file on disk */ - err = write_data_to_disk(doc, locale_filename, data, len); + errmsg = write_data_to_disk(doc, locale_filename, data, len); g_free(data); - if (G_UNLIKELY(err != 0)) + if (errmsg != NULL) { - ui_set_statusbar(TRUE, _("Error saving file (%s)."), g_strerror(err)); - dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, - _("Error saving file."), g_strerror(err)); + ui_set_statusbar(TRUE, _("Error saving file (%s)."), errmsg); + dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, _("Error saving file."), errmsg); doc->priv->file_disk_status = FILE_OK; utils_beep(); g_free(locale_filename); + g_free(errmsg); return FALSE; } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2009-04-21 20:53:42 UTC (rev 3721) +++ trunk/src/document.h 2009-04-21 20:54:04 UTC (rev 3722) @@ -56,6 +56,7 @@ gint default_eol_character; gint disk_check_timeout; gboolean cmdline_new_files; /* New file if command-line filename doesn't exist */ + gboolean use_safe_file_saving; } GeanyFilePrefs; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-04-21 20:53:42 UTC (rev 3721) +++ trunk/src/keyfile.c 2009-04-21 20:54:04 UTC (rev 3722) @@ -172,6 +172,8 @@ "show_symbol_list_expanders", TRUE); stash_group_add_boolean(group, &ui_prefs.allow_always_save, "allow_always_save", FALSE); + stash_group_add_boolean(group, &file_prefs.use_safe_file_saving, + "use_safe_file_saving", FALSE); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3721] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3721 http://geany.svn.sourceforge.net/geany/?rev=3721&view=rev Author: eht16 Date: 2009-04-21 20:53:42 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Add new toolbar element: Print (patch by Roland Baudin, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/toolbar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:53:23 UTC (rev 3720) +++ trunk/ChangeLog 2009-04-21 20:53:42 UTC (rev 3721) @@ -7,6 +7,8 @@ * src/plugins.c, src/plugindata.h, plugins/geanyfunctions.h: Add utils_str_middle_truncate() and document_get_basename_for_display() to the plugin API. + * doc/geany.html, doc/geany.txt, src/toolbar.c: + Add new toolbar element: Print (patch by Roland Baudin, thanks). 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:53:23 UTC (rev 3720) +++ trunk/doc/geany.html 2009-04-21 20:53:42 UTC (rev 3721) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2009-03-31" /> +<meta name="date" content="$Date$" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-03-31</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.17</td></tr> </tbody> @@ -3834,8 +3834,8 @@ <p>Then edit it and add any of the available elements listed in the file or remove any of the existing elements. Of course, you can also reorder the elements as you wish and add or remove additional separators. -This file must be valid XML unless it can't be loaded and the global toolbar -UI definition is used.</p> +This file must be valid XML, otherwise the global toolbar UI definition +will be used instead.</p> <div class="note"> <p class="first admonition-title">Note</p> <ol class="last arabic simple"> @@ -3879,6 +3879,9 @@ <tr><td>CloseAll</td> <td>Close all open files</td> </tr> +<tr><td>Print</td> +<td>Print the current file</td> +</tr> <tr><td>Cut</td> <td>Cut the current selection</td> </tr> @@ -3940,7 +3943,7 @@ <td>The goto field belonging to the 'Goto' element (can be used alone)</td> </tr> <tr><td>Goto</td> -<td>Jump to the entered line number (only useful if you also use 'SearchEntry')</td> +<td>Jump to the entered line number (only useful if you also use 'GotoEntry')</td> </tr> <tr><td>Preferences</td> <td>Show the preferences dialog</td> @@ -4789,7 +4792,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-04-05 15:09 UTC. +Generated on: 2009-04-21 19:06 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:53:23 UTC (rev 3720) +++ trunk/doc/geany.txt 2009-04-21 20:53:42 UTC (rev 3721) @@ -3476,6 +3476,7 @@ Reload Reload the current file from disk Close Close the current file CloseAll Close all open files +Print Print the current file Cut Cut the current selection Copy Copy the current selection Paste Paste the contents of the clipboard Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-04-21 20:53:23 UTC (rev 3720) +++ trunk/src/toolbar.c 2009-04-21 20:53:42 UTC (rev 3721) @@ -72,6 +72,7 @@ { "Goto", GTK_STOCK_JUMP_TO, NULL, NULL, N_("Jump to the entered line number"), G_CALLBACK(on_toolbutton_goto_clicked) }, { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Show the preferences dialog"), G_CALLBACK(on_toolbutton_preferences_clicked) }, { "Quit", GTK_STOCK_QUIT, NULL, NULL, N_("Quit Geany"), G_CALLBACK(on_toolbutton_quit_clicked) }, + { "Print", GTK_STOCK_PRINT, NULL, NULL, N_("Print document"), G_CALLBACK(on_print1_activate) } }; const guint ui_entries_n = G_N_ELEMENTS(ui_entries); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3720] trunk/src/ui_utils.c
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3720 http://geany.svn.sourceforge.net/geany/?rev=3720&view=rev Author: eht16 Date: 2009-04-21 20:53:23 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Ellipsize long filenames also in the window title. Modified Paths: -------------- trunk/src/ui_utils.c Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-04-21 20:53:11 UTC (rev 3719) +++ trunk/src/ui_utils.c 2009-04-21 20:53:23 UTC (rev 3720) @@ -272,13 +272,13 @@ g_string_append(str, DOC_FILENAME(doc)); else { - gchar *base_name = g_path_get_basename(DOC_FILENAME(doc)); + gchar *short_name = document_get_basename_for_display(doc, 30); gchar *dirname = g_path_get_dirname(DOC_FILENAME(doc)); - g_string_append(str, base_name); + g_string_append(str, short_name); g_string_append(str, " - "); g_string_append(str, dirname ? dirname : ""); - g_free(base_name); + g_free(short_name); g_free(dirname); } g_string_append(str, " - "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3719] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3719 http://geany.svn.sourceforge.net/geany/?rev=3719&view=rev Author: eht16 Date: 2009-04-21 20:53:11 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Add utils_str_middle_truncate() and document_get_basename_for_display() to the plugin API. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/geanyfunctions.h trunk/src/plugindata.h trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:52:51 UTC (rev 3718) +++ trunk/ChangeLog 2009-04-21 20:53:11 UTC (rev 3719) @@ -4,6 +4,9 @@ src/utils.c, src/utils.h: Ellipsize tab labels and some status messages for very long filenames (closes #2777348). + * src/plugins.c, src/plugindata.h, plugins/geanyfunctions.h: + Add utils_str_middle_truncate() and + document_get_basename_for_display() to the plugin API. 2009-04-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/plugins/geanyfunctions.h =================================================================== --- trunk/plugins/geanyfunctions.h 2009-04-21 20:52:51 UTC (rev 3718) +++ trunk/plugins/geanyfunctions.h 2009-04-21 20:53:11 UTC (rev 3719) @@ -48,6 +48,8 @@ geany_functions->p_document->rename_file #define document_get_status_color \ geany_functions->p_document->get_status_color +#define document_get_basename_for_display \ + geany_functions->p_document->get_basename_for_display #define editor_get_indent_prefs \ geany_functions->p_editor->get_indent_prefs #define editor_create_widget \ @@ -180,6 +182,8 @@ geany_functions->p_utils->open_browser #define utils_string_replace_first \ geany_functions->p_utils->string_replace_first +#define utils_str_middle_truncate \ + geany_functions->p_utils->str_middle_truncate #define ui_dialog_vbox_new \ geany_functions->p_ui->dialog_vbox_new #define ui_frame_new_with_alignment \ Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2009-04-21 20:52:51 UTC (rev 3718) +++ trunk/src/plugindata.h 2009-04-21 20:53:11 UTC (rev 3719) @@ -45,7 +45,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 139, + GEANY_API_VERSION = 140, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -254,6 +254,7 @@ gboolean (*save_file_as) (struct GeanyDocument *doc, const gchar *utf8_fname); void (*rename_file) (struct GeanyDocument *doc, const gchar *new_filename); const GdkColor* (*get_status_color) (struct GeanyDocument *doc); + gchar* (*get_basename_for_display) (struct GeanyDocument *doc, gint length); } DocumentFuncs; @@ -361,6 +362,7 @@ void (*open_browser) (const gchar *uri); guint (*string_replace_first) (GString *haystack, const gchar *needle, const gchar *replace); + gchar* (*str_middle_truncate) (const gchar *string, guint truncate_length); } UtilsFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-04-21 20:52:51 UTC (rev 3718) +++ trunk/src/plugins.c 2009-04-21 20:53:11 UTC (rev 3719) @@ -139,7 +139,8 @@ &document_index, &document_save_file_as, &document_rename_file, - &document_get_status_color + &document_get_status_color, + &document_get_basename_for_display }; static EditorFuncs editor_funcs = { @@ -224,7 +225,8 @@ &utils_str_casecmp, &utils_get_date_time, &utils_open_browser, - &utils_string_replace_first + &utils_string_replace_first, + &utils_str_middle_truncate }; static UIUtilsFuncs uiutils_funcs = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3718] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3718 http://geany.svn.sourceforge.net/geany/?rev=3718&view=rev Author: eht16 Date: 2009-04-21 20:52:51 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Ellipsize tab labels and some status messages for very long filenames (closes #2777348). Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h trunk/src/treeviews.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/ChangeLog 2009-04-21 20:52:51 UTC (rev 3718) @@ -1,3 +1,11 @@ +2009-04-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/dialogs.c, src/document.c, src/document.h, src/treeviews.c, + src/utils.c, src/utils.h: + Ellipsize tab labels and some status messages for very long + filenames (closes #2777348). + + 2009-04-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/callbacks.c, src/editor.c, src/keybindings.c, src/keybindings.h, Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/src/dialogs.c 2009-04-21 20:52:51 UTC (rev 3718) @@ -648,10 +648,7 @@ document_get_notebook_page(doc)); main_status.quitting = old_quitting_state; - if (doc->file_name != NULL) - { - short_fn = g_path_get_basename(doc->file_name); - } + short_fn = document_get_basename_for_display(doc, -1); msg = g_strdup_printf(_("The file '%s' is not saved."), (short_fn != NULL) ? short_fn : GEANY_STRING_UNTITLED); @@ -942,6 +939,7 @@ { GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check, *vbox; gchar *file_size, *title, *base_name, *time_changed, *time_modified, *time_accessed, *enctext; + gchar *short_name; #ifdef HAVE_SYS_TYPES_H struct stat st; off_t filesize; @@ -1003,10 +1001,12 @@ #endif base_name = g_path_get_basename(doc->file_name); - title = g_strconcat(base_name, " ", _("Properties"), NULL); + short_name = utils_str_middle_truncate(base_name, 30); + title = g_strconcat(short_name, " ", _("Properties"), NULL); dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); + g_free(short_name); g_free(title); gtk_widget_set_name(dialog, "GeanyDialog"); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/src/document.c 2009-04-21 20:52:51 UTC (rev 3718) @@ -282,23 +282,55 @@ } +/** + * Returns the last part of the filename of the given GeanyDocument. The result is also + * truncated to a maximum of @c length characters in case the filename is very long. + * + * @param doc The document to use. + * @param length The length of the resulting string or -1 to use a default value. + * + * @return The ellipsized last part of the filename of @c doc, should be freed when no + * longer needed. + * + * @since 0.17 + */ +/* TODO make more use of this */ +gchar *document_get_basename_for_display(GeanyDocument *doc, gint length) +{ + gchar *base_name, *short_name; + + g_return_val_if_fail(doc != NULL, NULL); + + if (length < 0) + length = 30; + + base_name = g_path_get_basename(DOC_FILENAME(doc)); + short_name = utils_str_middle_truncate(base_name, length); + + g_free(base_name); + + return short_name; +} + + void document_update_tab_label(GeanyDocument *doc) { - gchar *base_name; + gchar *short_name; GtkWidget *parent; g_return_if_fail(doc != NULL); - base_name = g_path_get_basename(DOC_FILENAME(doc)); + short_name = document_get_basename_for_display(doc, -1); + /* we need to use the event box for the tooltip, labels don't get the necessary events */ parent = gtk_widget_get_parent(doc->priv->tab_label); parent = gtk_widget_get_parent(parent); - gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); + gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), short_name); ui_widget_set_tooltip_text(parent, DOC_FILENAME(doc)); - g_free(base_name); + g_free(short_name); } @@ -914,8 +946,8 @@ /* loads textfile data, verifies and converts to forced_enc or UTF-8. Also handles BOM. */ -static gboolean load_text_file(const gchar *locale_filename, const gchar *utf8_filename, - FileData *filedata, const gchar *forced_enc) +static gboolean load_text_file(const gchar *locale_filename, const gchar *display_filename, + FileData *filedata, const gchar *forced_enc) { GError *err = NULL; struct stat st; @@ -929,7 +961,8 @@ if (g_stat(locale_filename, &st) != 0) { - ui_set_statusbar(TRUE, _("Could not open file %s (%s)"), utf8_filename, g_strerror(errno)); + ui_set_statusbar(TRUE, _("Could not open file %s (%s)"), + display_filename, g_strerror(errno)); return FALSE; } @@ -963,9 +996,9 @@ "Be aware that saving it can cause data loss.\nThe file was set to read-only."); if (main_status.main_window_realized) - dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, utf8_filename); + dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, display_filename); - ui_set_statusbar(TRUE, warn_msg, utf8_filename); + ui_set_statusbar(TRUE, warn_msg, display_filename); /* set the file to read-only mode because saving it is probably dangerous */ filedata->readonly = TRUE; @@ -985,7 +1018,7 @@ /* For translators: the second wildcard is an encoding name, e.g. * The file \"test.txt\" is not valid UTF-8. */ ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."), - utf8_filename, forced_enc); + display_filename, forced_enc); utils_beep(); g_free(filedata->data); return FALSE; @@ -995,7 +1028,7 @@ { ui_set_statusbar(TRUE, _("The file \"%s\" does not look like a text file or the file encoding is not supported."), - utf8_filename); + display_filename); utils_beep(); g_free(filedata->data); return FALSE; @@ -1181,6 +1214,7 @@ gint editor_mode; gboolean reload = (doc == NULL) ? FALSE : TRUE; gchar *utf8_filename = NULL; + gchar *display_filename = NULL; gchar *locale_filename = NULL; GeanyFiletype *use_ft; FileData filedata; @@ -1223,13 +1257,15 @@ return doc; } } + display_filename = utils_str_middle_truncate(utf8_filename, 100); /* if default encoding for opening files is set, use it if no forced encoding is set */ if (file_prefs.default_open_encoding >= 0 && forced_enc == NULL) forced_enc = encodings[file_prefs.default_open_encoding].charset; - if (! load_text_file(locale_filename, utf8_filename, &filedata, forced_enc)) + if (! load_text_file(locale_filename, display_filename, &filedata, forced_enc)) { + g_free(display_filename); g_free(utf8_filename); g_free(locale_filename); return NULL; @@ -1313,12 +1349,13 @@ g_signal_emit_by_name(geany_object, "document-open", doc); if (reload) - ui_set_statusbar(TRUE, _("File %s reloaded."), utf8_filename); + ui_set_statusbar(TRUE, _("File %s reloaded."), display_filename); else msgwin_status_add(_("File %s opened(%d%s)."), - utf8_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)), - (readonly) ? _(", read-only") : ""); + display_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)), + (readonly) ? _(", read-only") : ""); + g_free(display_filename); g_free(utf8_filename); g_free(locale_filename); Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/src/document.h 2009-04-21 20:52:51 UTC (rev 3718) @@ -225,4 +225,6 @@ const GdkColor *document_get_status_color(GeanyDocument *doc); +gchar *document_get_basename_for_display(GeanyDocument *doc, gint length); + #endif Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/src/treeviews.c 2009-04-21 20:52:51 UTC (rev 3718) @@ -368,7 +368,7 @@ gtk_tree_view_expand_row(GTK_TREE_VIEW(tv.tree_openfiles), path, TRUE); gtk_tree_path_free(path); } - basename = g_path_get_basename(DOC_FILENAME(doc)); + basename = document_get_basename_for_display(doc, 30); gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, GTK_STOCK_FILE, DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, DOC_FILENAME(doc), -1); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/src/utils.c 2009-04-21 20:52:51 UTC (rev 3718) @@ -402,6 +402,60 @@ /** + * Truncates the input string to a given length. + * Characters are removed from the middle of the string, so the start and the end of string + * won't change. + * + * @param string Input string. + * @param truncate_length The length in characters of the resulting string. + * + * @return A copy of @c string which is truncated to @c truncate_length characters, + * should be freed when no longer needed. + * + * @since 0.17 + */ +/* This following function is taken from Gedit. */ +gchar *utils_str_middle_truncate(const gchar *string, guint truncate_length) +{ + GString *truncated; + guint length; + guint n_chars; + guint num_left_chars; + guint right_offset; + guint delimiter_length; + const gchar *delimiter = "\342\200\246"; + + g_return_val_if_fail(string != NULL, NULL); + + length = strlen(string); + + g_return_val_if_fail(g_utf8_validate(string, length, NULL), NULL); + + /* It doesnt make sense to truncate strings to less than the size of the delimiter plus 2 + * characters (one on each side) */ + delimiter_length = g_utf8_strlen(delimiter, -1); + if (truncate_length < (delimiter_length + 2)) + return g_strdup(string); + + n_chars = g_utf8_strlen(string, length); + + /* Make sure the string is not already small enough. */ + if (n_chars <= truncate_length) + return g_strdup (string); + + /* Find the 'middle' where the truncation will occur. */ + num_left_chars = (truncate_length - delimiter_length) / 2; + right_offset = n_chars - truncate_length + num_left_chars + delimiter_length; + + truncated = g_string_new_len(string, g_utf8_offset_to_pointer(string, num_left_chars) - string); + g_string_append(truncated, delimiter); + g_string_append(truncated, g_utf8_offset_to_pointer(string, right_offset)); + + return g_string_free(truncated, FALSE); +} + + +/** * @a NULL-safe string comparison. Returns @a TRUE if both @c a and @c b are @a NULL * or if @c a and @c b refer to valid strings which are equal. * Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-04-21 20:52:32 UTC (rev 3717) +++ trunk/src/utils.h 2009-04-21 20:52:51 UTC (rev 3718) @@ -175,4 +175,6 @@ gboolean utils_is_remote_path(const gchar *path); +gchar *utils_str_middle_truncate(const gchar *string, guint truncate_length); + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3717] trunk/src/document.c
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3717 http://geany.svn.sourceforge.net/geany/?rev=3717&view=rev Author: eht16 Date: 2009-04-21 20:52:32 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Fix build with USE_GIO_FILEMON by declaring the file changed status colour conditionally. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-04-21 20:52:19 UTC (rev 3716) +++ trunk/src/document.c 2009-04-21 20:52:32 UTC (rev 3717) @@ -2702,7 +2702,9 @@ { static GdkColor red = {0, 0xFFFF, 0, 0}; static GdkColor green = {0, 0, 0x7FFF, 0}; - /*static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0};*/ +#if defined(HAVE_GIO) && defined(USE_GIO_FILEMON) + static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0}; +#endif GdkColor *color = NULL; g_return_val_if_fail(doc != NULL, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3716] trunk
by eht16＠users.sourceforge.net 22 Apr '09

22 Apr '09

Revision: 3716 http://geany.svn.sourceforge.net/geany/?rev=3716&view=rev Author: eht16 Date: 2009-04-21 20:52:19 +0000 (Tue, 21 Apr 2009) Log Message: ----------- Add a trivial symbol parser for NSIS files. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/symbols.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h trunk/wscript Added Paths: ----------- trunk/tagmanager/nsis.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/ChangeLog 2009-04-21 20:52:19 UTC (rev 3716) @@ -4,6 +4,9 @@ src/prefs.c: Replace our own GEANY_KEYS_MODIFIER_MASK by gtk_accelerator_get_default_mod_mask() which gives the same result. + * src/filetypes.c, src/symbols.c, tagmanager/Makefile.am, + tagmanager/makefile.win32, tagmanager/parsers.h, wscript: + Add a trivial symbol parser for NSIS files. 2009-04-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/src/filetypes.c 2009-04-21 20:52:19 UTC (rev 3716) @@ -558,7 +558,7 @@ #define NSIS ft = filetypes[GEANY_FILETYPES_NSIS]; - ft->lang = -2; + ft->lang = 35; ft->name = g_strdup("NSIS"); ft->title = g_strdup_printf(_("%s source file"), "NSIS"); ft->extension = g_strdup("nsis"); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/src/symbols.c 2009-04-21 20:52:19 UTC (rev 3716) @@ -602,6 +602,13 @@ &tv_iters.tag_macro, _("Keys"), "classviewer-var", NULL); break; + case GEANY_FILETYPES_NSIS: + tag_list_add_groups(tag_store, + &tv_iters.tag_namespace, _("Sections"), "classviewer-other", + &tv_iters.tag_function, _("Functions"), "classviewer-method", + &(tv_iters.tag_variable), _("Variables"), "classviewer-var", + NULL); + break; case GEANY_FILETYPES_LATEX: { tag_list_add_groups(tag_store, Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/tagmanager/Makefile.am 2009-04-21 20:52:19 UTC (rev 3716) @@ -61,6 +61,7 @@ sh.c\ vhdl.c\ actionscript.c\ + nsis.c\ ctags.c\ entry.c\ get.c\ Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/tagmanager/makefile.win32 2009-04-21 20:52:19 UTC (rev 3716) @@ -40,7 +40,7 @@ -$(RM) deps.mak *.o $(COMPLIB) $(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.o \ -actionscript.o \ +actionscript.o nsis.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o options.o \ parse.o basic.o read.o sort.o strlist.o latex.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o css.o \ vstring.o regex.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ Added: trunk/tagmanager/nsis.c =================================================================== --- trunk/tagmanager/nsis.c (rev 0) +++ trunk/tagmanager/nsis.c 2009-04-21 20:52:19 UTC (rev 3716) @@ -0,0 +1,149 @@ +/* +* $Id$ +* +* Copyright (c) 2000-2002, Darren Hiebert +* Copyright (c) 2009, Enrico Tröger +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for NSIS scripts (based on sh.c). +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "main.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_SECTION, + K_FUNCTION, + K_VARIABLE +} NsisKind; + +static kindOption NsisKinds [] = { + { TRUE, 'n', "namespace", "sections"}, + { TRUE, 'f', "function", "functions"}, + { TRUE, 'v', "variable", "variables"} +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static void findNsisTags (void) +{ + vString *name = vStringNew (); + const unsigned char *line; + + while ((line = fileReadLine ()) != NULL) + { + const unsigned char* cp = line; + + while (isspace (*cp)) + cp++; + + if (*cp == '#' || *cp == ';') + continue; + + /* functions */ + if (strncasecmp ((const char*) cp, "function", (size_t) 8) == 0 && + isspace ((int) cp [8])) + { + cp += 8; + /* skip all whitespace */ + while (isspace ((int) *cp)) + ++cp; + while (isalnum ((int) *cp) || *cp == '_' || *cp == '-' || *cp == '.' || *cp == '!') + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, NsisKinds, K_FUNCTION); + vStringClear (name); + } + /* variables */ + else if (strncasecmp ((const char*) cp, "var", (size_t) 3) == 0 && + isspace ((int) cp [3])) + { + cp += 3; + /* skip all whitespace */ + while (isspace ((int) *cp)) + ++cp; + /* skip any flags */ + while (*cp == '/') + { + ++cp; + while (! isspace ((int) *cp)) + ++cp; + while (isspace ((int) *cp)) + ++cp; + } + while (isalnum ((int) *cp) || *cp == '_') + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, NsisKinds, K_VARIABLE); + vStringClear (name); + } + /* sections */ + else if (strncasecmp ((const char*) cp, "section", (size_t) 7) == 0 && + isspace ((int) cp [7])) + { + boolean in_quotes = FALSE; + cp += 7; + /* skip all whitespace */ + while (isspace ((int) *cp)) + ++cp; + while (isalnum ((int) *cp) || isspace ((int) *cp) || + *cp == '_' || *cp == '-' || *cp == '.' || *cp == '!' || *cp == '"') + { + if (*cp == '"') + { + if (in_quotes) + break; + else + { + in_quotes = TRUE; + ++cp; + continue; + } + } + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + makeSimpleTag (name, NsisKinds, K_SECTION); + vStringClear (name); + } + } + vStringDelete (name); +} + +extern parserDefinition* NsisParser (void) +{ + static const char *const extensions [] = { + "nsi", "nsh", NULL + }; + parserDefinition* def = parserNew ("NSIS"); + def->kinds = NsisKinds; + def->kindCount = KIND_COUNT (NsisKinds); + def->extensions = extensions; + def->parser = findNsisTags; + return def; +} + +/* vi:set tabstop=8 shiftwidth=4: */ Property changes on: trunk/tagmanager/nsis.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/tagmanager/parsers.h 2009-04-21 20:52:19 UTC (rev 3716) @@ -49,7 +49,8 @@ GLSLParser, \ MatlabParser, \ ValaParser, \ - ActionScriptParser + ActionScriptParser, \ + NsisParser /* langType of each parser @@ -88,6 +89,7 @@ 32 MatlabParser 33 ValaParser 34 ActionScriptParser +35 NsisParser */ #endif /* _PARSERS_H */ Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-04-21 20:51:53 UTC (rev 3715) +++ trunk/wscript 2009-04-21 20:52:19 UTC (rev 3716) @@ -58,8 +58,8 @@ 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', - 'tagmanager/make.c', 'tagmanager/matlab.c', 'tagmanager/options.c', 'tagmanager/parse.c', - 'tagmanager/pascal.c', + 'tagmanager/make.c', 'tagmanager/matlab.c', 'tagmanager/nsis.c', 'tagmanager/options.c', + 'tagmanager/parse.c', 'tagmanager/pascal.c', 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/tcl.c', 'tagmanager/tm_file_entry.c', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2009