Commits September 2009

commits@lists.geany.org

4 participants
131 discussions

SF.net SVN: geany:[4164] trunk
by ntrel＠users.sourceforge.net 07 Sep '09

07 Sep '09

Revision: 4164 http://geany.svn.sourceforge.net/geany/?rev=4164&view=rev Author: ntrel Date: 2009-09-07 11:50:06 +0000 (Mon, 07 Sep 2009) Log Message: ----------- Fix multi-byte character constant comparison. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/txt2tags.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 20:57:42 UTC (rev 4163) +++ trunk/ChangeLog 2009-09-07 11:50:06 UTC (rev 4164) @@ -1,3 +1,9 @@ +2009-09-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * tagmanager/txt2tags.c: + Fix multi-byte character constant comparison. + + 2009-09-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/plugins.c: Modified: trunk/tagmanager/txt2tags.c =================================================================== --- trunk/tagmanager/txt2tags.c 2009-09-06 20:57:42 UTC (rev 4163) +++ trunk/tagmanager/txt2tags.c 2009-09-07 11:50:06 UTC (rev 4164) @@ -86,7 +86,7 @@ vStringTerminate(name); makeTxt2tagsTag(name, FALSE); }*/ - else if (line[0] == '°') { + else if (strcmp((char*)line, "°") == 0) { /*vStringClear(name);*/ vStringCatS(name, (const char *) line); vStringTerminate(name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4163] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4163 http://geany.svn.sourceforge.net/geany/?rev=4163&view=rev Author: eht16 Date: 2009-09-06 20:57:42 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Add new filetype: Txt2Tags (patch by Eric Forgeot, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/data/filetype_extensions.conf trunk/src/about.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/plugindata.h trunk/src/symbols.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h trunk/wscript Added Paths: ----------- trunk/data/filetypes.txt2tags trunk/tagmanager/txt2tags.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/ChangeLog 2009-09-06 20:57:42 UTC (rev 4163) @@ -25,6 +25,12 @@ replace_target() to the plugin API (patch by Eugene Arshinov, thanks). Add new plugin signal: "document-filetype-set" (closes #2852286). + * data/filetype_extensions.conf, data/filetypes.txt2tags, src/about.c, + src/filetypes.c, src/filetypes.h, src/plugindata.h, src/symbols.c, + tagmanager/Makefile.am, tagmanager/makefile.win32, + tagmanager/parsers.h, tagmanager/txt2tags.c, tagmanager/txt2tags.c, + wscript, THANKS: + Add new filetype: Txt2Tags (patch by Eric Forgeot, thanks). 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/THANKS 2009-09-06 20:57:42 UTC (rev 4163) @@ -67,6 +67,7 @@ Jesse Mayes <plasmasheep(at)gmail(dot)com> - Tango'ish Save All icon Eugene Arshinov <earshinov(at)gmail(dot)com> - Reload color schemes, split lines KB patches, and more Jon Strait <jstrait(at)moonloop(dot)net> - Markdown filetype patch +Forgeot Eric <eforgeot(at)yahoo(dot)fr> - Txt2Tags filetype patch Translators: ------------ Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/data/filetype_extensions.conf 2009-09-06 20:57:42 UTC (rev 4163) @@ -43,6 +43,7 @@ Po=*.po;*.pot; LaTeX=*.tex;*.sty;*.idx;*.ltx; reStructuredText=*.rest;*.reST;*.rst; +txt2tags=*.t2t; SQL=*.sql; YAML=*.yaml;*.yml; None=*; Added: trunk/data/filetypes.txt2tags =================================================================== --- trunk/data/filetypes.txt2tags (rev 0) +++ trunk/data/filetypes.txt2tags 2009-09-06 20:57:42 UTC (rev 4163) @@ -0,0 +1,9 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# no syntax highlighting yet + +[settings] +# default extension used when saving files +extension=txt2tags + + Property changes on: trunk/data/filetypes.txt2tags ___________________________________________________________________ Added: keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/src/about.c 2009-09-06 20:57:42 UTC (rev 4163) @@ -82,7 +82,7 @@ static const gchar *contributors = "Alexander Rodin, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, Bronisław Białek, Catalin Marinas, " "Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., Dave Moore, Dirk Weber, " -"Elias Pschernig, Eugene Arshinov, Felipe Pena, François Cami, " +"Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, " "Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, Jean-François Wauthy, Jeff Pohlmeyer, " "Jesse Mayes, John Gabriele, Jon Strait, Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, Moritz Barsnick, " "Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, Robert McGinley, Roland Baudin, S Jagannathan, Saleem Abdulrasool, " Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/src/filetypes.c 2009-09-06 20:57:42 UTC (rev 4163) @@ -379,6 +379,17 @@ ft->comment_open = NULL; ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; + +#define TXT2TAGS + ft = filetypes[GEANY_FILETYPES_TXT2TAGS]; + ft->lang = 37; + ft->name = g_strdup("Txt2tags"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->extension = g_strdup("t2t"); + ft->pattern = utils_strv_new("*.t2t", "*.txt2tags", NULL); + ft->comment_open = NULL; + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; #define SH ft = filetypes[GEANY_FILETYPES_SH]; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/src/filetypes.h 2009-09-06 20:57:42 UTC (rev 4163) @@ -78,6 +78,7 @@ GEANY_FILETYPES_ADA, GEANY_FILETYPES_CMAKE, GEANY_FILETYPES_MARKDOWN, + GEANY_FILETYPES_TXT2TAGS, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/src/plugindata.h 2009-09-06 20:57:42 UTC (rev 4163) @@ -50,7 +50,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 154, + GEANY_API_VERSION = 155, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/src/symbols.c 2009-09-06 20:57:42 UTC (rev 4163) @@ -695,6 +695,7 @@ break; } case GEANY_FILETYPES_REST: + case GEANY_FILETYPES_TXT2TAGS: { tag_list_add_groups(tag_store, &(tv_iters.tag_namespace), _("Chapter"), NULL, Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/tagmanager/Makefile.am 2009-09-06 20:57:42 UTC (rev 4163) @@ -61,6 +61,7 @@ python.c\ tcl.c\ sh.c\ + txt2tags.c\ vhdl.c\ actionscript.c\ nsis.c\ Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/tagmanager/makefile.win32 2009-09-06 20:57:42 UTC (rev 4163) @@ -43,7 +43,7 @@ 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 nestlevel.o \ options.o \ -parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o css.o \ +parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o text2tags.o css.o \ vstring.o regex.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ tm_symbol.o tm_file_entry.o tm_tagmanager.o $(AR) rc $@ $^ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/tagmanager/parsers.h 2009-09-06 20:57:42 UTC (rev 4163) @@ -51,7 +51,8 @@ ValaParser, \ ActionScriptParser, \ NsisParser, \ - MarkdownParser + MarkdownParser, \ + Txt2tagsParser /* langType of each parser 0 CParser @@ -91,6 +92,7 @@ 34 ActionScriptParser 35 NsisParser 36 MarkdownParser +37 Txt2tagsParser */ #endif /* _PARSERS_H */ Added: trunk/tagmanager/txt2tags.c =================================================================== --- trunk/tagmanager/txt2tags.c (rev 0) +++ trunk/tagmanager/txt2tags.c 2009-09-06 20:57:42 UTC (rev 4163) @@ -0,0 +1,118 @@ +/* +* Copyright (c) 2009, Eric Forgeot +* +* Based on work by Jon Strait +* +* 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 Txt2tags files. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <ctype.h> +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ + +static kindOption Txt2tagsKinds[] = { + { TRUE, 'v', "members", "sections" }, + { TRUE, 's', "struct", "header1"} +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static void makeTxt2tagsTag (const vString* const name, boolean name_before) +{ + tagEntryInfo e; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; /* we want the line before the underline chars */ + e.kindName = "variable"; + e.kind = 'v'; + + makeTagEntry(&e); +} + +static void makeTxt2tagsTag2 (const vString* const name, boolean name_before) +{ + tagEntryInfo e; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; + e.kindName = "struct"; + e.kind = 's'; + + makeTagEntry(&e); +} + +static void findTxt2tagsTags (void) +{ + vString *name = vStringNew(); + const unsigned char *line; + + while ((line = fileReadLine()) != NULL) + { + /*int name_len = vStringLength(name);*/ + + /* underlines must be the same length or more */ + /*if (name_len > 0 && (line[0] == '=' || line[0] == '-') && issame((const char*) line)) + { + makeTxt2tagsTag(name, TRUE); + }*/ + if (line[0] == '=') { + /*vStringClear(name);*/ + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeTxt2tagsTag(name, FALSE); + } + /*else if (line[0] == "=") { + vStringClear(name); + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeTxt2tagsTag(name, FALSE); + }*/ + else if (line[0] == '°') { + /*vStringClear(name);*/ + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeTxt2tagsTag2(name, FALSE); + } + else { + vStringClear (name); + if (! isspace(*line)) + vStringCatS(name, (const char*) line); + vStringTerminate(name); + } + } + vStringDelete (name); +} + +extern parserDefinition* Txt2tagsParser (void) +{ + static const char *const patterns [] = { "*.t2t", NULL }; + static const char *const extensions [] = { "t2t", NULL }; + parserDefinition* const def = parserNew ("Txt2tags"); + + def->kinds = Txt2tagsKinds; + def->kindCount = KIND_COUNT (Txt2tagsKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findTxt2tagsTags; + return def; +} + Property changes on: trunk/tagmanager/txt2tags.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-09-06 16:51:11 UTC (rev 4162) +++ trunk/wscript 2009-09-06 20:57:42 UTC (rev 4163) @@ -72,7 +72,8 @@ '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', + 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/txt2tags.c', 'tagmanager/tcl.c', + 'tagmanager/tm_file_entry.c', 'tagmanager/tm_project.c', 'tagmanager/tm_source_file.c', 'tagmanager/tm_symbol.c', 'tagmanager/tm_tag.c', 'tagmanager/tm_tagmanager.c', 'tagmanager/tm_work_object.c', 'tagmanager/tm_workspace.c', 'tagmanager/vhdl.c', 'tagmanager/vstring.c' ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4162] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4162 http://geany.svn.sourceforge.net/geany/?rev=4162&view=rev Author: eht16 Date: 2009-09-06 16:51:11 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Add new plugin signal: "document-before-save". Add get_line_end_position(), set_target_start(), set_target_end(), replace_target() to the plugin API (patch by Eugene Arshinov, thanks). Add new plugin signal: "document-filetype-set" (closes #2852286). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/doc/plugins.dox trunk/plugins/geanyfunctions.h trunk/src/document.c trunk/src/geanyobject.c trunk/src/geanyobject.h trunk/src/plugindata.h trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/ChangeLog 2009-09-06 16:51:11 UTC (rev 4162) @@ -17,6 +17,14 @@ * src/build.c, src/project.c: Use NZV() macro instead of strlen() to check for empty strings. Remove the FOREACH_GEANYBUILDCMD_ENTRY() macro. + * doc/plugins.dox, plugins/geanyfunctions.h, src/document.c, + src/geanyobject.c, src/geanyobject.h, src/plugindata.h, + src/plugins.c, THANKS: + Add new plugin signal: "document-before-save". + Add get_line_end_position(), set_target_start(), set_target_end(), + replace_target() to the plugin API + (patch by Eugene Arshinov, thanks). + Add new plugin signal: "document-filetype-set" (closes #2852286). 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/THANKS 2009-09-06 16:51:11 UTC (rev 4162) @@ -65,7 +65,7 @@ Simon Treny <simon(dot)treny(at)free(dot)fr> - Documents sidebar stock icons patch Elias Pschernig <elias(at)users(dot)sourceforge(dot)net> - Recent Projects menu patch Jesse Mayes <plasmasheep(at)gmail(dot)com> - Tango'ish Save All icon -Eugene Arshinov <earshinov(at)gmail(dot)com> - Reload color schemes, split lines KB patches +Eugene Arshinov <earshinov(at)gmail(dot)com> - Reload color schemes, split lines KB patches, and more Jon Strait <jstrait(at)moonloop(dot)net> - Markdown filetype patch Translators: Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/doc/plugins.dox 2009-09-06 16:51:11 UTC (rev 4162) @@ -116,6 +116,20 @@ * @param user_data user data. * @endsignaldef * + * @signaldef document-before-save + * @signalproto + * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent before a document is saved. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * + * @param obj a GeanyObject instance, should be ignored. + * @param doc the document to be saved. + * @param user_data user data. + * @endsignaldef + * * @signaldef document-save * @signalproto * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); @@ -130,6 +144,23 @@ * @param user_data user data. * @endsignaldef * + * @signaldef document-filetype-set + * @signalproto + * void user_function(GObject *obj, GeanyDocument *doc, GeanyFiletype *filetype_old, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent after the filetype of a document has been changed. + * The previous filetype object is passed but it can be NULL (e.g. at startup). + * The new filetype can be read with: @code + * GeanyFiletype *ft = doc->filetype; + * @endcode + * + * @param obj a GeanyObject instance, should be ignored. + * @param doc the saved document. + * @param filetype_old the previous filetype of the document. + * @param user_data user data. + * @endsignaldef + * * @signaldef document-activate * @signalproto * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); Modified: trunk/plugins/geanyfunctions.h =================================================================== --- trunk/plugins/geanyfunctions.h 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/plugins/geanyfunctions.h 2009-09-06 16:51:11 UTC (rev 4162) @@ -160,6 +160,14 @@ geany_functions->p_sci->get_selection_contents #define sci_set_font \ geany_functions->p_sci->set_font +#define sci_get_line_end_position \ + geany_functions->p_sci->get_line_end_position +#define sci_set_target_start \ + geany_functions->p_sci->set_target_start +#define sci_set_target_end \ + geany_functions->p_sci->set_target_end +#define sci_replace_target \ + geany_functions->p_sci->replace_target #define templates_get_template_fileheader \ geany_functions->p_templates->get_template_fileheader #define utils_str_equal \ Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/src/document.c 2009-09-06 16:51:11 UTC (rev 4162) @@ -1720,8 +1720,10 @@ /** * Save the document. Saving includes replacing tabs by spaces, * stripping trailing spaces and adding a final new line at the end of the file (all only if - * user enabled these features). The filetype is set again or auto-detected if it wasn't - * set yet. After all, the "document-save" signal is emitted for plugins. + * user enabled these features). Then the "document-before-save" signal is emitted, + * allowing plugins to modify the document before it is saved, and data is + * actually written to disk. The filetype is set again or auto-detected if it wasn't set yet. + * After all, the "document-save" signal is emitted for plugins. * * If the file is not modified, this functions does nothing unless force is set to @c TRUE. * @@ -1760,6 +1762,9 @@ if (file_prefs.final_new_line) editor_ensure_final_newline(doc->editor); + /* notify plugins which may wish to modify the document before it's saved */ + g_signal_emit_by_name(geany_object, "document-before-save", doc); + len = sci_get_length(doc->editor->sci) + 1; if (doc->has_bom && encodings_is_unicode_charset(doc->encoding)) { /* always write a UTF-8 BOM because in this moment the text itself is still in UTF-8 @@ -2480,11 +2485,13 @@ void document_set_filetype(GeanyDocument *doc, GeanyFiletype *type) { gboolean ft_changed; + GeanyFiletype *old_ft; g_return_if_fail(doc); if (type == NULL) type = filetypes[GEANY_FILETYPES_NONE]; + old_ft = doc->file_type; geany_debug("%s : %s (%s)", (doc->file_name != NULL) ? doc->file_name : "unknown", (type->name != NULL) ? type->name : "unknown", @@ -2492,6 +2499,9 @@ ft_changed = (doc->file_type != type); /* filetype has changed */ document_load_config(doc, type, ft_changed); + + if (ft_changed) + g_signal_emit_by_name(geany_object, "document-filetype-set", doc, old_ft); } Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/src/geanyobject.c 2009-09-06 16:51:11 UTC (rev 4162) @@ -91,6 +91,36 @@ } +static void geany_cclosure_marshal_VOID__POINTER_POINTER(GClosure *closure, GValue *ret_val, + guint n_param_vals, const GValue *param_values, gpointer hint, gpointer mdata) +{ + typedef gboolean (*GeanyMarshalFunc_VOID__POINTER_POINTER) + (gpointer data1, gconstpointer arg_1, gconstpointer arg_2, gpointer data2); + + register GeanyMarshalFunc_VOID__POINTER_POINTER callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail(n_param_vals == 3); + + if (G_CCLOSURE_SWAP_DATA(closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer(param_values + 0); + } + else + { + data1 = g_value_peek_pointer(param_values + 0); + data2 = closure->data; + } + callback = (GeanyMarshalFunc_VOID__POINTER_POINTER) (mdata ? mdata : cc->callback); + callback(data1, + g_value_get_pointer(param_values + 1), + g_value_get_pointer(param_values + 2), + data2); +} + + static gboolean boolean_handled_accumulator(GSignalInvocationHint *ihint, GValue *return_accu, const GValue *handler_return, gpointer dummy) { @@ -162,6 +192,15 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + geany_object_signals[GCB_DOCUMENT_BEFORE_SAVE] = g_signal_new ( + "document-before-save", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, document_before_save), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_SAVE] = g_signal_new ( "document-save", G_OBJECT_CLASS_TYPE (g_object_class), @@ -171,6 +210,15 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + geany_object_signals[GCB_DOCUMENT_FILETYPE_SET] = g_signal_new ( + "document-filetype-set", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, document_filetype_set), + NULL, NULL, + geany_cclosure_marshal_VOID__POINTER_POINTER, + G_TYPE_NONE, 2, + G_TYPE_POINTER, G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_ACTIVATE] = g_signal_new ( "document-activate", G_OBJECT_CLASS_TYPE (g_object_class), Modified: trunk/src/geanyobject.h =================================================================== --- trunk/src/geanyobject.h 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/src/geanyobject.h 2009-09-06 16:51:11 UTC (rev 4162) @@ -34,7 +34,9 @@ { GCB_DOCUMENT_NEW, GCB_DOCUMENT_OPEN, + GCB_DOCUMENT_BEFORE_SAVE, GCB_DOCUMENT_SAVE, + GCB_DOCUMENT_FILETYPE_SET, GCB_DOCUMENT_ACTIVATE, GCB_DOCUMENT_CLOSE, GCB_PROJECT_OPEN, @@ -76,7 +78,9 @@ void (*document_new)(GeanyDocument *doc); void (*document_open)(GeanyDocument *doc); + void (*document_before_save)(GeanyDocument *doc); void (*document_save)(GeanyDocument *doc); + void (*document_filetype_set)(GeanyDocument *doc, GeanyFiletype *filetype_old); void (*document_activate)(GeanyDocument *doc); void (*document_close)(GeanyDocument *doc); void (*project_open)(GKeyFile *keyfile); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/src/plugindata.h 2009-09-06 16:51:11 UTC (rev 4162) @@ -50,7 +50,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 153, + GEANY_API_VERSION = 154, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -337,6 +337,10 @@ gchar* (*get_contents_range) (struct _ScintillaObject *sci, gint start, gint end); gchar* (*get_selection_contents) (struct _ScintillaObject *sci); void (*set_font) (struct _ScintillaObject *sci, gint style, const gchar *font, gint size); + gint (*get_line_end_position) (ScintillaObject* sci, gint line); + void (*set_target_start) (ScintillaObject *sci, gint start); + void (*set_target_end) (ScintillaObject *sci, gint end); + gint (*replace_target) (ScintillaObject *sci, const gchar *text, gboolean regex); } SciFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-09-06 16:50:47 UTC (rev 4161) +++ trunk/src/plugins.c 2009-09-06 16:51:11 UTC (rev 4162) @@ -167,7 +167,11 @@ &sci_get_contents, &sci_get_contents_range, &sci_get_selection_contents, - &sci_set_font + &sci_set_font, + &sci_get_line_end_position, + &sci_set_target_start, + &sci_set_target_end, + &sci_replace_target }; static TemplateFuncs template_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:[4161] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4161 http://geany.svn.sourceforge.net/geany/?rev=4161&view=rev Author: eht16 Date: 2009-09-06 16:50:47 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Remove the FOREACH_GEANYBUILDCMD_ENTRY() macro. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:50:34 UTC (rev 4160) +++ trunk/ChangeLog 2009-09-06 16:50:47 UTC (rev 4161) @@ -16,6 +16,7 @@ Adjust coding style (no code changes). * src/build.c, src/project.c: Use NZV() macro instead of strlen() to check for empty strings. + Remove the FOREACH_GEANYBUILDCMD_ENTRY() macro. 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-06 16:50:34 UTC (rev 4160) +++ trunk/src/build.c 2009-09-06 16:50:47 UTC (rev 4161) @@ -83,7 +83,6 @@ #define GBO_TO_POINTER(gbo) (GRP_CMD_TO_POINTER(GBO_TO_GBG(gbo), GBO_TO_CMD(gbo))) #define GPOINTER_TO_CMD(gptr) (GPOINTER_TO_INT(gptr)&0x1f) #define GPOINTER_TO_GRP(gptr) ((GPOINTER_TO_INT(gptr)&0xe0)>>5) -#define FOREACH_GEANYBUILDCMD_ENTRY(i) for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) static gpointer last_toolbutton_action = GBO_TO_POINTER(GEANY_GBO_BUILD); @@ -241,7 +240,7 @@ for (k = 0; k < build_groups_count[j]; ++k) if (cl[j][i] != NULL && *(cl[j][i]) != NULL && (*(cl[j][i]))[k].exists) { - FOREACH_GEANYBUILDCMD_ENTRY(n) + for (n = 0; n < GEANY_BC_CMDENTRIES_COUNT; n++) { if ((*(cl[j][i]))[k].entries[n] != NULL && (l=strlen((*(cl[j][i]))[k].entries[n])) > m) @@ -264,7 +263,7 @@ { if (cl[i][j]!=NULL && *(cl[i][j]) != NULL && (*(cl[i][j]))[k].exists) { - FOREACH_GEANYBUILDCMD_ENTRY(n) + for (n = 0; n < GEANY_BC_CMDENTRIES_COUNT; n++) { if ((*(cl[i][j]))[k].entries[i] != NULL) printf("%c %*.*s",c,cc[j],cc[j],(*(cl[i][j]))[k].entries[i]); @@ -1660,7 +1659,7 @@ { r->cmdsrc = bc; r->src = src; - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { gtk_entry_set_text(GTK_ENTRY(r->entries[i]), id_to_str(bc,i) != NULL ? id_to_str(bc,i) : ""); @@ -1669,7 +1668,7 @@ else { r->cmdsrc = NULL; - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { gtk_entry_set_text(GTK_ENTRY(r->entries[i]), ""); } @@ -1721,7 +1720,7 @@ roww->grp = grp; roww->cmd = cmd; roww->dst = dst; - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { column += 1; roww->entries[i] = gtk_entry_new(); @@ -1739,7 +1738,7 @@ if (bc != NULL) roww->src = src; - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { gchar *str = ""; if (bc != NULL && (str = bc->entries[i]) == NULL) @@ -1748,7 +1747,7 @@ } if (src > (gint)dst || (grp == GEANY_GBG_FT && (doc == NULL || doc->file_type == NULL))) { - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) gtk_widget_set_sensitive(roww->entries[i], FALSE); gtk_widget_set_sensitive(clear, FALSE); } @@ -1924,7 +1923,7 @@ src = table_data->rows[drow]->src; - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { entries[i] = g_strdup(gtk_entry_get_text(GTK_ENTRY(table_data->rows[drow]->entries[i]))); } @@ -1966,7 +1965,7 @@ { if (*(dst->dst[grp]) == NULL) *(dst->dst[grp]) = g_new0(GeanyBuildCommand, build_groups_count[grp]); - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) setptr((*(dst->dst[grp]))[cmd].entries[i], entries[i]); (*(dst->dst[grp]))[cmd].exists = TRUE; (*(dst->dst[grp]))[cmd].changed = TRUE; @@ -1975,7 +1974,7 @@ } else { - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) g_free(entries[i]); } return changed; @@ -2334,7 +2333,7 @@ set_key_cmd(key, cmdbuf); if (src[cmd].exists) { - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { set_key_fld(key, config_keys[i]); g_key_file_set_string(config, build_grp_name, key, src[cmd].entries[i]); @@ -2343,7 +2342,7 @@ } else { - FOREACH_GEANYBUILDCMD_ENTRY(i) + for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { set_key_fld(key, config_keys[i]); g_key_file_remove_key(config, build_grp_name, key, NULL); @@ -2486,7 +2485,7 @@ enum GeanyBuildCmdEntries k; GeanyBuildCommand *cmd = &((*(default_cmds[cmdindex].ptr))[ default_cmds[cmdindex].index ]); cmd->exists = TRUE; - FOREACH_GEANYBUILDCMD_ENTRY(k) + for (k = 0; k < GEANY_BC_CMDENTRIES_COUNT; k++) { cmd->entries[k] = g_strdup(default_cmds[cmdindex].entries[k]); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4160] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4160 http://geany.svn.sourceforge.net/geany/?rev=4160&view=rev Author: eht16 Date: 2009-09-06 16:50:34 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Use NZV() macro instead of strlen() to check for empty strings. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:50:20 UTC (rev 4159) +++ trunk/ChangeLog 2009-09-06 16:50:34 UTC (rev 4160) @@ -14,6 +14,8 @@ Fix crash when opening documents. * src/build.c, src/build.h, src/project.c: Adjust coding style (no code changes). + * src/build.c, src/project.c: + Use NZV() macro instead of strlen() to check for empty strings. 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-06 16:50:20 UTC (rev 4159) +++ trunk/src/build.c 2009-09-06 16:50:34 UTC (rev 4160) @@ -355,7 +355,7 @@ return get_next_build_cmd(doc, grp, cmdindex, GEANY_BCS_COUNT, from); } -#define return_nonblank_regex(src, ptr) if ((ptr) != NULL && strlen(ptr) > 0) \ +#define return_nonblank_regex(src, ptr) if (NZV(ptr)) \ { *fr = (src); return &(ptr); } @@ -631,8 +631,7 @@ #endif utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); - utf8_working_dir = (dir != NULL && strlen(dir) > 0) ? - g_strdup(dir) : g_path_get_dirname(doc->file_name); + utf8_working_dir = NZV(dir) ? g_strdup(dir) : g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); gtk_list_store_clear(msgwindow.store_compiler); @@ -1433,7 +1432,7 @@ (grp == GEANY_GBG_FT && bc != NULL && have_path && ! build_running) || (grp == GEANY_GBG_NON_FT && bc != NULL && ! build_running); gtk_widget_set_sensitive(menu_item, cmd_sensitivity); - if (bc != NULL && label != NULL && strlen(label) > 0) + if (bc != NULL && NZV(label)) { geany_menu_item_set_label(menu_item, label); gtk_widget_show_all(menu_item); @@ -1461,7 +1460,7 @@ if (cmd == GBO_TO_CMD(GEANY_GBO_EXEC)) run_running = exec_running; gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image); - if (bc != NULL && label != NULL && strlen(label) > 0) + if (bc != NULL && NZV(label)) { geany_menu_item_set_label(menu_item, label); gtk_widget_show_all(menu_item); @@ -1945,9 +1944,9 @@ table_data->rows[drow]->cmdsrc == NULL /* originally there was no content */ && ( - strlen(entries[GEANY_BC_LABEL]) > 0 /* but now one field has some */ - || strlen(entries[GEANY_BC_COMMAND]) > 0 - || strlen(entries[GEANY_BC_WORKING_DIR]) > 0 + NZV(entries[GEANY_BC_LABEL]) /* but now one field has some */ + || NZV(entries[GEANY_BC_COMMAND]) + || NZV(entries[GEANY_BC_WORKING_DIR]) ) ) || @@ -1992,7 +1991,7 @@ (src == NULL /* originally there was no regex */ || *src == NULL /* or it was NULL*/ ) - && strlen(reg) > 0 /* and something was typed */ + && NZV(reg) > 0 /* and something was typed */ ) ||(src != NULL /* originally there was a regex*/ && strcmp(*src, reg) != 0 /* and it has been changed */ @@ -2236,7 +2235,7 @@ /* set GeanyBuildCommand if it doesn't already exist and there is a command */ #define ASSIGNIF(type, id, string, value) \ - if (value != NULL && ! type[GBO_TO_CMD(id)].exists && strlen(value) > 0) { \ + if (NZV(value) && ! type[GBO_TO_CMD(id)].exists) { \ type[GBO_TO_CMD(id)].exists = TRUE; \ setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_LABEL], g_strdup(_(string))); \ setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_COMMAND], (value)); \ @@ -2280,7 +2279,7 @@ if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].old) setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].entries[GEANY_BC_WORKING_DIR], g_strdup("%d")); value = g_key_file_get_string(config, "project", "run_cmd", NULL); - if (value != NULL && strlen(value) > 0) + if (NZV(value)) { if (exec_proj == NULL) exec_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); @@ -2372,7 +2371,7 @@ gchar *regkey = g_strdup_printf("%serror_regex", ft->name); i += build_save_menu_grp(d->config, ft->projfilecmds, GEANY_GBG_FT, ft->name); - if (ft->projerror_regex_string != NULL && strlen(ft->projerror_regex_string) > 0) + if (NZV(ft->projerror_regex_string)) { g_key_file_set_string(d->config, build_grp_name, regkey, ft->projerror_regex_string); i++; @@ -2400,7 +2399,7 @@ build_save_menu_grp(config, ft->homefilecmds, GEANY_GBG_FT, NULL); build_save_menu_grp(config, ft->homeexeccmds, GEANY_GBG_EXEC, NULL); regkey = g_strdup_printf("%serror_regex", ft->name); - if (ft->homeerror_regex_string != NULL && strlen(ft->homeerror_regex_string) > 0) + if (NZV(ft->homeerror_regex_string)) g_key_file_set_string(config, build_grp_name, regkey, ft->projerror_regex_string); else g_key_file_remove_key(config, build_grp_name,regkey, NULL); @@ -2409,7 +2408,7 @@ case GEANY_BCS_PREF: build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL); build_save_menu_grp(config, exec_pref, GEANY_GBG_EXEC, NULL); - if (regex_pref != NULL && strlen(regex_pref) > 0) + if (NZV(regex_pref)) g_key_file_set_string(config, build_grp_name, "error_regex", regex_pref); else g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); @@ -2418,7 +2417,7 @@ pj = (GeanyProject*)ptr; build_save_menu_grp(config, non_ft_proj, GEANY_GBG_NON_FT, NULL); build_save_menu_grp(config, exec_proj, GEANY_GBG_EXEC, NULL); - if (regex_proj != NULL && strlen(regex_proj) > 0) + if (NZV(regex_proj)) g_key_file_set_string(config, build_grp_name, "error_regex", regex_proj); else g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2009-09-06 16:50:20 UTC (rev 4159) +++ trunk/src/project.c 2009-09-06 16:50:34 UTC (rev 4160) @@ -880,7 +880,7 @@ return; name = gtk_editable_get_chars(editable, 0, -1); - if (name != NULL && strlen(name) > 0) + if (NZV(name)) { base_path = g_strconcat(project_dir, G_DIR_SEPARATOR_S, name, G_DIR_SEPARATOR_S, 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:[4159] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4159 http://geany.svn.sourceforge.net/geany/?rev=4159&view=rev Author: eht16 Date: 2009-09-06 16:50:20 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Adjust coding style (no code changes). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:50:04 UTC (rev 4158) +++ trunk/ChangeLog 2009-09-06 16:50:20 UTC (rev 4159) @@ -12,6 +12,8 @@ Fix a compiler warning. * src/document.c: Fix crash when opening documents. + * src/build.c, src/build.h, src/project.c: + Adjust coding style (no code changes). 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-06 16:50:04 UTC (rev 4158) +++ trunk/src/build.c 2009-09-06 16:50:20 UTC (rev 4159) @@ -68,7 +68,7 @@ { GPid pid; gint file_type_id; -}RunInfo; +} RunInfo; static RunInfo *run_info; @@ -83,7 +83,7 @@ #define GBO_TO_POINTER(gbo) (GRP_CMD_TO_POINTER(GBO_TO_GBG(gbo), GBO_TO_CMD(gbo))) #define GPOINTER_TO_CMD(gptr) (GPOINTER_TO_INT(gptr)&0x1f) #define GPOINTER_TO_GRP(gptr) ((GPOINTER_TO_INT(gptr)&0xe0)>>5) -#define FOREACH_GEANYBUILDCMD_ENTRY(i) for(i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) +#define FOREACH_GEANYBUILDCMD_ENTRY(i) for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) static gpointer last_toolbutton_action = GBO_TO_POINTER(GEANY_GBO_BUILD); @@ -135,6 +135,7 @@ gtk_widget_destroy(latex_menu_items.menu); */ } + /* note: copied from keybindings.c, may be able to go away */ static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, GtkAccelGroup *accel_group, GtkWidget *menuitem) @@ -146,31 +147,36 @@ kb->key, kb->mods, GTK_ACCEL_VISIBLE); } + /* convenience routines to access parts of GeanyBuildCommand */ -static gchar* id_to_str(GeanyBuildCommand *bc, gint id) +static gchar *id_to_str(GeanyBuildCommand *bc, gint id) { return bc->entries[id]; } -static gchar* buildcmd_label(GeanyBuildCommand *bc) + +static gchar *buildcmd_label(GeanyBuildCommand *bc) { return id_to_str(bc, GEANY_BC_LABEL); } -static gchar* buildcmd_cmd(GeanyBuildCommand *bc) + +static gchar *buildcmd_cmd(GeanyBuildCommand *bc) { return id_to_str(bc, GEANY_BC_COMMAND); } -static gchar* buildcmd_working_dir(GeanyBuildCommand *bc) + +static gchar *buildcmd_working_dir(GeanyBuildCommand *bc) { return id_to_str(bc, GEANY_BC_WORKING_DIR); } -static const gchar* config_keys[] = { - [GEANY_BC_LABEL] = "LB", - [GEANY_BC_COMMAND] = "CM", - [GEANY_BC_WORKING_DIR]= "WD", + +static const gchar *config_keys[] = { + [GEANY_BC_LABEL] = "LB", + [GEANY_BC_COMMAND] = "CM", + [GEANY_BC_WORKING_DIR] = "WD" }; /*----------------------------------------------------- @@ -180,10 +186,16 @@ *-----------------------------------------------------*/ /* the various groups of commands not in the filetype struct */ -GeanyBuildCommand *ft_def=NULL, *non_ft_proj=NULL, *non_ft_pref=NULL, *non_ft_def=NULL, - *exec_proj=NULL, *exec_pref=NULL, *exec_def=NULL; +GeanyBuildCommand *ft_def = NULL; +GeanyBuildCommand *non_ft_proj = NULL; +GeanyBuildCommand *non_ft_pref = NULL; +GeanyBuildCommand *non_ft_def = NULL; +GeanyBuildCommand *exec_proj = NULL; +GeanyBuildCommand *exec_pref = NULL; +GeanyBuildCommand *exec_def = NULL; /* and the regexen not in the filetype structure */ -gchar *regex_pref=NULL, *regex_proj=NULL; +gchar *regex_pref = NULL; +gchar *regex_proj = NULL; /* control if build commands are printed by get_build_cmd, for debug purposes only*/ #ifndef PRINTBUILDCMDS @@ -192,12 +204,13 @@ gboolean printbuildcmds=PRINTBUILDCMDS; static GeanyBuildCommand **cl[GEANY_GBG_COUNT][GEANY_BCS_COUNT] = { - /* GEANY_BCS_DEF, GEANY_BCS_FT, GEANY_BCS_HOME_FT, GEANY_BCS_PREF, GEANY_BCS_PROJ */ - { &ft_def, NULL, NULL, NULL, NULL }, - { &non_ft_def, NULL, NULL, &non_ft_pref, &non_ft_proj }, - { &exec_def, NULL, NULL, &exec_pref, &exec_proj } + /* GEANY_BCS_DEF, GEANY_BCS_FT, GEANY_BCS_HOME_FT, GEANY_BCS_PREF, GEANY_BCS_PROJ */ + { &ft_def, NULL, NULL, NULL, NULL }, + { &non_ft_def, NULL, NULL, &non_ft_pref, &non_ft_proj }, + { &exec_def, NULL, NULL, &exec_pref, &exec_proj } }; + /* for debug only, print the commands structures in priority order */ static void printfcmds() { @@ -208,8 +221,9 @@ gint cc[GEANY_BCS_COUNT]; gchar c; doc=document_get_current(); - if (doc!=NULL)ft = doc->file_type; - if (ft!=NULL) + if (doc != NULL) + ft = doc->file_type; + if (ft != NULL) { printf("filetype %s\n",ft->name); cl[GEANY_GBG_FT][GEANY_BCS_FT] = &(ft->filecmds); @@ -219,36 +233,40 @@ cl[GEANY_GBG_EXEC][GEANY_BCS_FT] = &(ft->execcmds); cl[GEANY_GBG_EXEC][GEANY_BCS_HOME_FT] = &(ft->homeexeccmds); } - for(i=0;i<GEANY_BCS_COUNT;++i) + for (i = 0; i < GEANY_BCS_COUNT; ++i) { - m=1; - for(j=0;j<GEANY_GBG_COUNT;++j) + m = 1; + for (j = 0; j < GEANY_GBG_COUNT; ++j) { - for(k=0;k<build_groups_count[j];++k) - if (cl[j][i]!=NULL && *(cl[j][i])!=NULL && (*(cl[j][i]))[k].exists) + for (k = 0; k < build_groups_count[j]; ++k) + if (cl[j][i] != NULL && *(cl[j][i]) != NULL && (*(cl[j][i]))[k].exists) { FOREACH_GEANYBUILDCMD_ENTRY(n) { - if ((*(cl[j][i]))[k].entries[n]!=NULL && (l=strlen((*(cl[j][i]))[k].entries[n]))>m)m=l; + if ((*(cl[j][i]))[k].entries[n] != NULL && + (l=strlen((*(cl[j][i]))[k].entries[n])) > m) + { + m = l; + } } } } - cc[i]=m; + cc[i] = m; } - for(i=0;i<GEANY_GBG_COUNT;++i) + for (i = 0; i < GEANY_GBG_COUNT; ++i) { - for(k=0;k<build_groups_count[i];++k) + for (k = 0; k < build_groups_count[i]; ++k) { - for(l=0;l<2;++l) + for (l = 0; l < 2; ++l) { - c=' '; - for(j=0;j<GEANY_BCS_COUNT;++j) + c = ' '; + for (j = 0; j < GEANY_BCS_COUNT; ++j) { - if (cl[i][j]!=NULL && *(cl[i][j])!=NULL && (*(cl[i][j]))[k].exists) + if (cl[i][j]!=NULL && *(cl[i][j]) != NULL && (*(cl[i][j]))[k].exists) { FOREACH_GEANYBUILDCMD_ENTRY(n) { - if ((*(cl[i][j]))[k].entries[i]!=NULL) + if ((*(cl[i][j]))[k].entries[i] != NULL) printf("%c %*.*s",c,cc[j],cc[j],(*(cl[i][j]))[k].entries[i]); else printf("%c %*.*s",c,cc[j],cc[j]," "); @@ -256,7 +274,7 @@ } else printf("%c %*.*s",c,cc[j],cc[j]," "); - c=','; + c = ','; } printf("\n"); } @@ -265,15 +283,16 @@ } } + /* macros to save typing and make the logic visible */ -#define return_cmd_if(src, cmds) if (cmds!=NULL && cmds[cmdindex].exists && below>src)\ +#define return_cmd_if(src, cmds) if (cmds != NULL && cmds[cmdindex].exists && below>src)\ { \ *fr=src; \ if (printbuildcmds) \ printf("cmd[%d,%d]=%d\n",cmdgrp,cmdindex,src); \ return &(cmds[cmdindex]); \ } -#define return_ft_cmd_if(src, cmds) if (ft!=NULL && ft->cmds!=NULL \ +#define return_ft_cmd_if(src, cmds) if (ft != NULL && ft->cmds != NULL \ && ft->cmds[cmdindex].exists && below>src)\ { \ *fr=src; \ @@ -282,22 +301,28 @@ return &(ft->cmds[cmdindex]); \ } + /* get the next lowest command taking priority into account */ static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, gint cmdgrp, gint cmdindex, - gint below, gint *from) + gint below, gint *from) { GeanyFiletype *ft=NULL; gint sink, *fr = &sink; - if (printbuildcmds)printfcmds(); - if (cmdgrp>=GEANY_GBG_COUNT)return NULL; - if (from!=NULL)fr = from; - if (doc==NULL)doc = document_get_current(); - if (doc!=NULL)ft = doc->file_type; + if (printbuildcmds) + printfcmds(); + if (cmdgrp >= GEANY_GBG_COUNT) + return NULL; + if (from != NULL) + fr = from; + if (doc == NULL) + doc = document_get_current(); + if (doc != NULL) + ft = doc->file_type; switch(cmdgrp) { case GEANY_GBG_FT: /* order proj ft, home ft, ft, defft */ - if (ft!=NULL) + if (ft != NULL) { return_ft_cmd_if(GEANY_BCS_PROJ, projfilecmds); return_ft_cmd_if(GEANY_BCS_PREF, homefilecmds); @@ -330,26 +355,31 @@ return get_next_build_cmd(doc, grp, cmdindex, GEANY_BCS_COUNT, from); } -#define return_nonblank_regex(src, ptr) if ((ptr)!=NULL && strlen(ptr)>0){ *fr = (src); return &(ptr); } +#define return_nonblank_regex(src, ptr) if ((ptr) != NULL && strlen(ptr) > 0) \ + { *fr = (src); return &(ptr); } + /* like get_build_cmd, but for regexen, used by filetypes */ gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from) { gint sink, *fr = &sink; - if (from!=NULL) fr=from; - if (grp==GEANY_GBG_FT) + if (from != NULL) + fr=from; + if (grp == GEANY_GBG_FT) { - if (ft==NULL) + if (ft == NULL) { GeanyDocument *doc=document_get_current(); - if (doc!=NULL)ft=doc->file_type; + if (doc != NULL) + ft=doc->file_type; } - if (ft==NULL) return NULL; + if (ft == NULL) + return NULL; return_nonblank_regex(GEANY_BCS_PROJ, ft->projerror_regex_string); return_nonblank_regex(GEANY_BCS_HOME_FT, ft->homeerror_regex_string); return_nonblank_regex(GEANY_BCS_FT, ft->error_regex_string); } - else if (grp==GEANY_GBG_NON_FT) + else if (grp == GEANY_GBG_NON_FT) { return_nonblank_regex(GEANY_BCS_PROJ, regex_proj); return_nonblank_regex(GEANY_BCS_PREF, regex_pref); @@ -357,6 +387,7 @@ return NULL; } + /* get pointer to the command group array */ static GeanyBuildCommand *get_build_group(GeanyBuildSource src, GeanyBuildGroup grp) { @@ -406,37 +437,47 @@ } } -/* remove the specified command, cmd<0 remove whole group */ + +/* remove the specified command, cmd < 0 remove whole group */ void build_remove_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd) { GeanyBuildCommand *bc; gint i; bc = get_build_group(src, grp); - if (bc==NULL)return; - if (cmd<0) - for (i=0; i<build_groups_count[grp]; ++i) - bc[i].exists=FALSE; - else if(cmd<build_groups_count[grp]) - bc[cmd].exists=FALSE; + if (bc == NULL) + return; + if (cmd < 0) + { + for (i = 0; i < build_groups_count[grp]; ++i) + bc[i].exists = FALSE; + } + else if(cmd < build_groups_count[grp]) + bc[cmd].exists = FALSE; } + /* get the build build command for the specified menu item */ GeanyBuildCommand *build_get_menu_item(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd) { GeanyBuildCommand *bc; - if (src>=GEANY_BCS_COUNT || grp>=GEANY_GBG_COUNT || cmd>=build_groups_count[grp]) return NULL; + if (src >= GEANY_BCS_COUNT || grp >= GEANY_GBG_COUNT || cmd >= build_groups_count[grp]) + return NULL; bc = get_build_group(src, grp); - if (bc==NULL) return NULL; + if (bc == NULL) + return NULL; return &(bc[cmd]); } + /* parameter checked version of get_build_cmd for external interface */ GeanyBuildCommand *build_get_current_menu_item(GeanyBuildGroup grp, gint cmd, gint *src) { - if (*src>=GEANY_BCS_COUNT || grp>=GEANY_GBG_COUNT || cmd>=build_groups_count[grp]) return NULL; + if (*src >= GEANY_BCS_COUNT || grp >= GEANY_GBG_COUNT || cmd >= build_groups_count[grp]) + return NULL; return get_build_cmd(NULL, grp, cmd, src); } + /* Clear all error indicators in all documents. */ static void clear_errors(GeanyDocument *doc) { @@ -491,20 +532,18 @@ #endif -/* - * Replaces occurences of %e and %p with the appropriate filenames, - * +/* Replaces occurences of %e and %p with the appropriate filenames, * %d and %p replacements should be in UTF8 */ -static gchar* build_replace_placeholder(const GeanyDocument* doc, const gchar* src) +static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *src) { - GString* stack; - gchar* filename = NULL; - gchar* replacement; - gchar* executable = NULL; - gchar* ret_str; /* to be freed when not in use anymore */ + GString *stack; + gchar *filename = NULL; + gchar *replacement; + gchar *executable = NULL; + gchar *ret_str; /* to be freed when not in use anymore */ stack = g_string_new(src); - if (doc!=NULL && doc->file_name!=NULL) + if (doc != NULL && doc->file_name != NULL) { filename = utils_get_utf8_from_locale(doc->file_name); @@ -534,7 +573,7 @@ else if (strstr(stack->str, "%p")) { /* fall back to %d */ ui_set_statusbar(FALSE, _("failed to substitute %%p, no project active")); - if (doc!=NULL && filename!=NULL) + if (doc != NULL && filename != NULL) replacement = g_path_get_dirname(filename); } @@ -549,8 +588,8 @@ return ret_str; /* don't forget to free src also if needed */ } -/* - * dir is the UTF-8 working directory to run cmd in. It can be NULL to use the + +/* dir is the UTF-8 working directory to run cmd in. It can be NULL to use the * idx document directory */ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir) { @@ -568,14 +607,14 @@ gint stderr_fd; #endif - if(!( (doc!=NULL && NZV(doc->file_name)) || NZV(dir) )) + if( !((doc != NULL && NZV(doc->file_name)) || NZV(dir))) { geany_debug("Failed to run command with no working directory"); ui_set_statusbar(TRUE, _("Process failed, no working directory")); - return (GPid)1; + return (GPid) 1; } - if (doc!=NULL) + if (doc != NULL) clear_errors(doc); setptr(current_dir_entered, NULL); @@ -592,8 +631,8 @@ #endif utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); - utf8_working_dir = (dir != NULL && strlen(dir)>0) ? g_strdup(dir) : - g_path_get_dirname(doc->file_name); + utf8_working_dir = (dir != NULL && strlen(dir) > 0) ? + g_strdup(dir) : g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); gtk_list_store_clear(msgwindow.store_compiler); @@ -605,7 +644,7 @@ /* set the build info for the message window */ g_free(build_info.dir); build_info.dir = g_strdup(working_dir); - build_info.file_type_id = (doc==NULL)?GEANY_FILETYPES_NONE : FILETYPE_ID(doc->file_type); + build_info.file_type_id = (doc == NULL) ? GEANY_FILETYPES_NONE : FILETYPE_ID(doc->file_type); build_info.message_count = 0; #ifdef G_OS_WIN32 @@ -665,7 +704,7 @@ gboolean autoclose = FALSE; gboolean result = FALSE; gchar *tmp; - gchar *cmd_string; + gchar *cmd_string; if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = NULL; @@ -675,10 +714,10 @@ have_project = project != NULL; cmd = get_build_cmd(doc, GEANY_GBG_EXEC, cmdindex, NULL); - cmd_string = build_replace_placeholder(doc, buildcmd_cmd(cmd)); cmd_working_dir = buildcmd_working_dir(cmd); - if (!NZV(cmd_working_dir)) cmd_working_dir = "%d"; + if (! NZV(cmd_working_dir)) + cmd_working_dir = "%d"; working_dir = build_replace_placeholder(doc, cmd_working_dir); /* in utf-8 */ /* only test whether working dir exists, don't change it or else Windows support will break @@ -1079,6 +1118,7 @@ return TRUE; } + typedef void Callback(GtkWidget *w, gpointer u); /* run the command catenating cmd_cat if present */ @@ -1087,9 +1127,9 @@ gchar *dir; gchar *full_command, *subs_command; GeanyBuildCommand *buildcmd = get_build_cmd(doc, grp, cmd, NULL); - gchar* cmdstr; + gchar *cmdstr; - if (buildcmd==NULL) + if (buildcmd == NULL) return; cmdstr = buildcmd_cmd(buildcmd); @@ -1104,7 +1144,6 @@ else full_command = cmdstr; - dir = build_replace_placeholder(doc, buildcmd_working_dir(buildcmd)); subs_command = build_replace_placeholder(doc, full_command); build_info.grp = grp; @@ -1112,7 +1151,8 @@ build_spawn_cmd(doc, subs_command, dir); g_free(subs_command); g_free(dir); - if (cmd_cat != NULL) g_free(full_command); + if (cmd_cat != NULL) + g_free(full_command); build_menu_update(doc); } @@ -1123,7 +1163,6 @@ * Create build menu and handle callbacks (&toolbar callbacks) * *----------------------------------------------------------------*/ - static void on_make_custom_input_response(const gchar *input) { GeanyDocument *doc = document_get_current(); @@ -1132,23 +1171,26 @@ build_info.custom_target); } + static void on_build_menu_item(GtkWidget *w, gpointer user_data) { GeanyDocument *doc = document_get_current(); GeanyBuildCommand *bc; - gint grp=GPOINTER_TO_GRP(user_data); - gint cmd=GPOINTER_TO_CMD(user_data); + gint grp = GPOINTER_TO_GRP(user_data); + gint cmd = GPOINTER_TO_CMD(user_data); if (doc && doc->changed) document_save_file(doc, FALSE); if (grp == GEANY_GBG_NON_FT && cmd == GBO_TO_CMD(GEANY_GBO_CUSTOM)) { - static GtkWidget *dialog = NULL; /* keep dialog for combo history */ + static GtkWidget *dialog = NULL; /* keep dialog for combo history */ if (! dialog) + { dialog = dialogs_show_input(_("Custom Text"), _("Enter custom text here, all entered text is appended to the command."), build_info.custom_target, TRUE, &on_make_custom_input_response); + } else { gtk_widget_show(dialog); @@ -1163,10 +1205,11 @@ return; } bc = get_build_cmd(doc, grp, cmd, NULL); - if (bc!=NULL && strcmp(buildcmd_cmd(bc), "builtin")==0) + if (bc != NULL && strcmp(buildcmd_cmd(bc), "builtin") == 0) { gchar *uri; - if (doc==NULL)return; + if (doc == NULL) + return; uri = g_strconcat("file:///", g_path_skip_root(doc->file_name), NULL); utils_open_browser(uri); g_free(uri); @@ -1179,6 +1222,7 @@ build_command(doc, grp, cmd, NULL); }; + /* group codes for menu items other than the known commands * value order is important, see the following table for use */ @@ -1198,7 +1242,8 @@ static struct BuildMenuItemSpec { const gchar *stock_id; const gint key_binding; - const gint build_grp, build_cmd; + const gint build_grp; + const gint build_cmd; const gchar *fix_label; Callback *cb; } build_menu_specs[] = { @@ -1238,27 +1283,29 @@ 0, NULL, NULL } }; + static void create_build_menu_item(GtkWidget *menu, GeanyKeyGroup *group, GtkAccelGroup *ag, struct BuildMenuItemSpec *bs, gchar *lbl, gint grp, gint cmd) { GtkWidget *item = gtk_image_menu_item_new_with_mnemonic(lbl); - if (bs->stock_id!=NULL) + if (bs->stock_id != NULL) { GtkWidget *image = gtk_image_new_from_stock(bs->stock_id, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); } gtk_widget_show(item); - if (bs->key_binding>=0) + if (bs->key_binding >= 0) add_menu_accel(group, bs->key_binding, ag, item); gtk_container_add(GTK_CONTAINER(menu), item); - if (bs->cb!=NULL) + if (bs->cb != NULL) { g_signal_connect(item, "activate", G_CALLBACK(bs->cb), GRP_CMD_TO_POINTER(grp,cmd)); } menu_items.menu_item[grp][cmd] = item; } + static void create_build_menu(BuildMenuItems *build_menu_items) { GtkWidget *menu; @@ -1272,7 +1319,7 @@ build_menu_items->menu_item[GEANY_GBG_EXEC] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_EXEC]); build_menu_items->menu_item[GBG_FIXED] = g_new0(GtkWidget*, GBF_COUNT); - for (i=0; build_menu_specs[i].build_grp != MENU_DONE; ++i) + for (i = 0; build_menu_specs[i].build_grp != MENU_DONE; ++i) { struct BuildMenuItemSpec *bs = &(build_menu_specs[i]); if (bs->build_grp == MENU_SEPARATOR) @@ -1282,25 +1329,25 @@ gtk_container_add(GTK_CONTAINER(menu), item); build_menu_items->menu_item[GBG_FIXED][bs->build_cmd] = item; } - else if (bs->fix_label!=NULL) + else if (bs->fix_label != NULL) { create_build_menu_item(menu, keygroup, accel_group, bs, gettext(bs->fix_label), GBG_FIXED, bs->build_cmd); } else if (bs->build_grp >= MENU_FT_REST && bs->build_grp <= MENU_SEPARATOR) { - gint grp = bs->build_grp-GEANY_GBG_COUNT; - for (j=bs->build_cmd; j<build_groups_count[grp]; ++j) + gint grp = bs->build_grp - GEANY_GBG_COUNT; + for (j = bs->build_cmd; j < build_groups_count[grp]; ++j) { GeanyBuildCommand *bc = get_build_cmd(NULL, grp, j, NULL); - gchar *lbl = (bc==NULL)?"":buildcmd_label(bc); + gchar *lbl = (bc == NULL) ? "" : buildcmd_label(bc); create_build_menu_item(menu, keygroup, accel_group, bs, lbl, grp, j); } } else { GeanyBuildCommand *bc = get_build_cmd(NULL, bs->build_grp, bs->build_cmd, NULL); - gchar *lbl = (bc==NULL)?"":buildcmd_label(bc); + gchar *lbl = (bc == NULL) ? "" : buildcmd_label(bc); create_build_menu_item(menu, keygroup, accel_group, bs, lbl, bs->build_grp, bs->build_cmd); } } @@ -1309,42 +1356,44 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(ui_lookup_widget(main_widgets.window, "menu_build1")), menu); } + /* portability to various GTK versions needs checking * conforms to description of gtk_accel_label as child of menu item * NB 2.16 adds set_label but not yet set_label_mnemonic */ static void geany_menu_item_set_label(GtkWidget *w, gchar *label) { - GtkWidget *c=gtk_bin_get_child(GTK_BIN(w)); + GtkWidget *c = gtk_bin_get_child(GTK_BIN(w)); gtk_label_set_text_with_mnemonic(GTK_LABEL(c), label); } + /* Call this whenever build menu items need to be enabled/disabled. * Uses current document (if there is one) when idx == -1 */ void build_menu_update(GeanyDocument *doc) { gint i, cmdcount, cmd, grp; - gboolean vis=FALSE; + gboolean vis = FALSE; gboolean have_path, build_running, exec_running, have_errors, cmd_sensitivity; gboolean can_compile, can_make, run_sensitivity, run_running; GeanyBuildCommand *bc; - if (menu_items.menu==NULL) + if (menu_items.menu == NULL) create_build_menu(&menu_items); if (doc == NULL) doc = document_get_current(); - have_path = doc!=NULL && doc->file_name != NULL; + have_path = doc != NULL && doc->file_name != NULL; build_running = build_info.pid > (GPid) 1; have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler), NULL) > 0; - for (i=0; build_menu_specs[i].build_grp != MENU_DONE; ++i) + for (i = 0; build_menu_specs[i].build_grp != MENU_DONE; ++i) { struct BuildMenuItemSpec *bs = &(build_menu_specs[i]); switch(bs->build_grp) { case MENU_SEPARATOR: - if (vis==TRUE) + if (vis == TRUE) { gtk_widget_show_all(menu_items.menu_item[GBG_FIXED][bs->build_cmd]); - vis=FALSE; + vis = FALSE; } else gtk_widget_hide_all(menu_items.menu_item[GBG_FIXED][bs->build_cmd]); @@ -1358,20 +1407,20 @@ vis |= TRUE; break; default: /* all configurable commands */ - if (bs->build_grp >=GEANY_GBG_COUNT) + if (bs->build_grp >= GEANY_GBG_COUNT) { - grp = bs->build_grp-GEANY_GBG_COUNT; + grp = bs->build_grp - GEANY_GBG_COUNT; cmdcount = build_groups_count[grp]; } else { grp = bs->build_grp; - cmdcount = bs->build_cmd+1; + cmdcount = bs->build_cmd + 1; } - for (cmd=bs->build_cmd; cmd<cmdcount; ++cmd) + for (cmd = bs->build_cmd; cmd < cmdcount; ++cmd) { GtkWidget *menu_item = menu_items.menu_item[grp][cmd]; - gchar* label; + gchar *label; bc = get_build_cmd(doc, grp, cmd, NULL); if (bc) label = buildcmd_label(bc); @@ -1381,11 +1430,10 @@ if (grp < GEANY_GBG_EXEC) { cmd_sensitivity = - (grp == GEANY_GBG_FT && bc!=NULL && have_path && ! build_running) || - (grp == GEANY_GBG_NON_FT && bc!=NULL && ! build_running); + (grp == GEANY_GBG_FT && bc != NULL && have_path && ! build_running) || + (grp == GEANY_GBG_NON_FT && bc != NULL && ! build_running); gtk_widget_set_sensitive(menu_item, cmd_sensitivity); - if (bc != NULL && label != NULL - && strlen(label) > 0) + if (bc != NULL && label != NULL && strlen(label) > 0) { geany_menu_item_set_label(menu_item, label); gtk_widget_show_all(menu_item); @@ -1398,10 +1446,11 @@ { GtkWidget *image; exec_running = run_info[cmd].pid > (GPid) 1; - cmd_sensitivity = bc!=NULL || exec_running; + cmd_sensitivity = (bc != NULL) || exec_running; gtk_widget_set_sensitive(menu_item, cmd_sensitivity); - if (cmd==GBO_TO_CMD(GEANY_GBO_EXEC)) run_sensitivity = cmd_sensitivity; - if (!exec_running) + if (cmd == GBO_TO_CMD(GEANY_GBO_EXEC)) + run_sensitivity = cmd_sensitivity; + if (! exec_running) { image = gtk_image_new_from_stock(bs->stock_id, GTK_ICON_SIZE_MENU); } @@ -1409,10 +1458,10 @@ { image = gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); } - if (cmd==GBO_TO_CMD(GEANY_GBO_EXEC)) run_running = exec_running; + if (cmd == GBO_TO_CMD(GEANY_GBO_EXEC)) + run_running = exec_running; gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image); - if (bc != NULL && label != NULL - && strlen(label) > 0) + if (bc != NULL && label != NULL && strlen(label) > 0) { geany_menu_item_set_label(menu_item, label); gtk_widget_show_all(menu_item); @@ -1425,22 +1474,22 @@ } } - can_compile = get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_BUILD), NULL)!=NULL + can_compile = get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_BUILD), NULL) != NULL && have_path && ! build_running; if (widgets.toolitem_build != NULL) gtk_widget_set_sensitive(widgets.toolitem_build, can_compile); can_make = FALSE; if (widgets.toolitem_make_all != NULL) gtk_widget_set_sensitive(widgets.toolitem_make_all, - (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_MAKE_ALL), NULL)!=NULL + (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_MAKE_ALL), NULL) != NULL && ! build_running)); if (widgets.toolitem_make_custom != NULL) gtk_widget_set_sensitive(widgets.toolitem_make_custom, - (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_CUSTOM), NULL)!=NULL + (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_CUSTOM), NULL) != NULL && ! build_running)); if (widgets.toolitem_make_object != NULL) gtk_widget_set_sensitive(widgets.toolitem_make_object, - (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT), NULL)!=NULL + (can_make |= get_build_cmd(doc, GEANY_GBG_FT, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT), NULL) != NULL && ! build_running)); if (widgets.toolitem_set_args != NULL) gtk_widget_set_sensitive(widgets.toolitem_set_args, TRUE); @@ -1454,6 +1503,7 @@ } + /* Call build_menu_update() instead of calling this directly. */ static void set_stop_button(gboolean stop) { @@ -1482,13 +1532,14 @@ } } + static void on_set_build_commands_activate(GtkWidget *w, gpointer u) { show_build_commands_dialog(); } -static void -on_toolbutton_build_activate(GtkWidget *menuitem, gpointer user_data) + +static void on_toolbutton_build_activate(GtkWidget *menuitem, gpointer user_data) { last_toolbutton_action = user_data; g_object_set(widgets.build_action, "tooltip", _("Build the current file"), NULL); @@ -1496,8 +1547,7 @@ } -static void -on_toolbutton_make_activate (GtkWidget *menuitem, gpointer user_data) +static void on_toolbutton_make_activate(GtkWidget *menuitem, gpointer user_data) { gchar *msg; gint grp,cmd; @@ -1505,11 +1555,11 @@ last_toolbutton_action = user_data; grp = GPOINTER_TO_GRP(user_data); cmd = GPOINTER_TO_CMD(user_data); - if ( last_toolbutton_action==GBO_TO_POINTER(GEANY_GBO_MAKE_ALL)) + if ( last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_MAKE_ALL)) msg = _("Build the current file with Make and the default target"); - else if (last_toolbutton_action==GBO_TO_POINTER(GEANY_GBO_CUSTOM)) + else if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_CUSTOM)) msg = _("Build the current file with Make and the specified target"); - else if (last_toolbutton_action==GBO_TO_POINTER(GEANY_GBO_MAKE_OBJECT)) + else if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_MAKE_OBJECT)) msg = _("Compile the current file with Make"); else msg = NULL; @@ -1517,12 +1567,12 @@ on_build_menu_item(menuitem, user_data); } + static void kill_process(GPid *pid) { /* Unix: SIGQUIT is not the best signal to use because it causes a core dump (this should not * perforce necessary for just killing a process). But we must use a signal which we can * ignore because the main process get it too, it is declared to ignore in main.c. */ - gint result; #ifdef G_OS_WIN32 @@ -1546,9 +1596,7 @@ } -static void -on_build_next_error (GtkWidget *menuitem, - gpointer user_data) +static void on_build_next_error(GtkWidget *menuitem,gpointer user_data) { if (ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_compiler), msgwin_goto_compiler_file_line)) @@ -1560,9 +1608,7 @@ } -static void -on_build_previous_error (GtkWidget *menuitem, - gpointer user_data) +static void on_build_previous_error(GtkWidget *menuitem, gpointer user_data) { if (ui_tree_view_find_previous(GTK_TREE_VIEW(msgwindow.tree_compiler), msgwin_goto_compiler_file_line)) @@ -1573,6 +1619,7 @@ ui_set_statusbar(FALSE, _("No more build errors.")); } + void build_toolbutton_build_clicked(GtkAction *action, gpointer unused) { if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_BUILD)) @@ -1585,33 +1632,39 @@ } } + /*------------------------------------------------------ * * Create and handle the build menu configuration dialog * *-------------------------------------------------------*/ - -typedef struct RowWidgets { +typedef struct RowWidgets +{ GtkWidget *entries[GEANY_BC_CMDENTRIES_COUNT]; - GeanyBuildSource src, dst; + GeanyBuildSource src; + GeanyBuildSource dst; GeanyBuildCommand *cmdsrc; - gint grp,cmd; + gint grp; + gint cmd; gboolean cleared; -}RowWidgets; +} RowWidgets; -static void on_clear_dialog_row( GtkWidget *unused, gpointer user_data ) + +static void on_clear_dialog_row(GtkWidget *unused, gpointer user_data) { RowWidgets *r = (RowWidgets*)user_data; gint src; enum GeanyBuildCmdEntries i; GeanyBuildCommand *bc = get_next_build_cmd(NULL, r->grp, r->cmd, r->dst, &src); + if (bc != NULL) { r->cmdsrc = bc; r->src = src; FOREACH_GEANYBUILDCMD_ENTRY(i) { - gtk_entry_set_text(GTK_ENTRY(r->entries[i]), id_to_str(bc,i) != NULL? id_to_str(bc,i):""); + gtk_entry_set_text(GTK_ENTRY(r->entries[i]), + id_to_str(bc,i) != NULL ? id_to_str(bc,i) : ""); } } else @@ -1625,13 +1678,16 @@ r->cleared = TRUE; } -static void on_clear_dialog_regex_row( GtkEntry *regex, gpointer unused ) + +static void on_clear_dialog_regex_row(GtkEntry *regex, gpointer unused) { gtk_entry_set_text(regex,""); } + /* Column headings, array NULL-terminated */ -static gchar *colheads[] = { +static gchar *colheads[] = +{ N_("Item"), N_("Label"), N_("Command"), @@ -1647,6 +1703,7 @@ static const int entry_x_padding = 3; static const int entry_y_padding = 0; + static RowWidgets *build_add_dialog_row(GeanyDocument *doc, GtkTable *table, gint row, GeanyBuildSource dst, gint grp, gint cmd, gboolean dir) { @@ -1655,12 +1712,11 @@ GeanyBuildCommand *bc; gint src; enum GeanyBuildCmdEntries i; - gint column = 0; - label = gtk_label_new(g_strdup_printf("%d:", cmd+1)); - gtk_table_attach(table, label, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + label = gtk_label_new(g_strdup_printf("%d:", cmd + 1)); + gtk_table_attach(table, label, column, column + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); roww = g_new0(RowWidgets, 1); roww->src = GEANY_BCS_COUNT; roww->grp = grp; @@ -1668,28 +1724,30 @@ roww->dst = dst; FOREACH_GEANYBUILDCMD_ENTRY(i) { - column+=1; + column += 1; roww->entries[i] = gtk_entry_new(); - gtk_table_attach(table, roww->entries[i], column, column+1, row, row+1, GTK_FILL, - GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + gtk_table_attach(table, roww->entries[i], column, column + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); } column++; clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); - g_signal_connect((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_row), (gpointer)roww); - gtk_table_attach(table, clear, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + g_signal_connect(clear, "clicked", G_CALLBACK(on_clear_dialog_row), roww); + gtk_table_attach(table, clear, column, column + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); roww->cmdsrc = bc = get_build_cmd(doc, grp, cmd, &src); - if (bc!=NULL)roww->src = src; + if (bc != NULL) + roww->src = src; FOREACH_GEANYBUILDCMD_ENTRY(i) { - gchar *str=""; - if (bc!=NULL && (str = bc->entries[i])==NULL)str=""; + gchar *str = ""; + if (bc != NULL && (str = bc->entries[i]) == NULL) + str = ""; gtk_entry_set_text(GTK_ENTRY(roww->entries[i]), str); } - if (src>(gint)dst || (grp==GEANY_GBG_FT && (doc==NULL || doc->file_type==NULL))) + if (src > (gint)dst || (grp == GEANY_GBG_FT && (doc == NULL || doc->file_type == NULL))) { FOREACH_GEANYBUILDCMD_ENTRY(i) gtk_widget_set_sensitive(roww->entries[i], FALSE); @@ -1698,12 +1756,17 @@ return roww; } -typedef struct TableFields { + +typedef struct TableFields +{ RowWidgets **rows; - GtkWidget *fileregex, *nonfileregex; - gchar **fileregexstring, **nonfileregexstring; + GtkWidget *fileregex; + GtkWidget *nonfileregex; + gchar **fileregexstring; + gchar **nonfileregexstring; } TableFields; + GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data, GeanyFiletype *ft) { @@ -1715,134 +1778,144 @@ gint src; gboolean sensitivity; - table = GTK_TABLE(gtk_table_new(build_items_count+12, 5, FALSE)); + table = GTK_TABLE(gtk_table_new(build_items_count + 12, 5, FALSE)); fields = g_new0(TableFields, 1); - fields->rows = g_new0(RowWidgets *, build_items_count); - for (ch= colheads, col=0; *ch!=NULL; ch++, col++) + fields->rows = g_new0(RowWidgets*, build_items_count); + for (ch = colheads, col = 0; *ch != NULL; ch++, col++) { label = gtk_label_new(gettext(*ch)); - gtk_table_attach(table, label, col, col+1, 0, 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + gtk_table_attach(table, label, col, col + 1, 0, 1, + GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); } sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); - if (ft!=NULL){ + entry_x_padding, entry_y_padding); + if (ft != NULL) + { txt = g_strdup_printf(_("%s commands"), ft->title); - } else + } + else txt = g_strdup(_("No Filetype")); label = gtk_label_new(txt); g_free(txt); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach(table, label, 0, DC_N_COL, 2, 3, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); - for (row=3, cmdindex=0, cmd=0; cmd<build_groups_count[GEANY_GBG_FT]; ++row, ++cmdindex, ++cmd) + entry_x_padding, entry_y_padding); + for (row = 3, cmdindex = 0, cmd = 0; cmd < build_groups_count[GEANY_GBG_FT]; ++row, ++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_FT, cmd, FALSE); label = gtk_label_new(_("Error Regular Expression")); - gtk_table_attach(table, label, 0, DC_ENTRIES+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + gtk_table_attach(table, label, 0, DC_ENTRIES + 1, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); fields->fileregex = gtk_entry_new(); fields->fileregexstring = build_get_regex(GEANY_GBG_FT, NULL, &src); - sensitivity = ft==NULL?FALSE:TRUE; - if (fields->fileregexstring!=NULL && *(fields->fileregexstring)!=NULL) + sensitivity = (ft == NULL) ? FALSE : TRUE; + if (fields->fileregexstring != NULL && *(fields->fileregexstring) != NULL) { gtk_entry_set_text(GTK_ENTRY(fields->fileregex), *(fields->fileregexstring)); - if (src>(gint)dst) sensitivity = FALSE; + if (src > (gint)dst) + sensitivity = FALSE; } - gtk_table_attach(table, fields->fileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, - GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + gtk_table_attach(table, fields->fileregex, DC_ENTRIES + 1, DC_CLEAR, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); - g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), - (gpointer)(fields->fileregex)); - gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + g_signal_connect_swapped(clear, "clicked", + G_CALLBACK(on_clear_dialog_regex_row), (fields->fileregex)); + gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); gtk_widget_set_sensitive(fields->fileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); ++row; sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; label = gtk_label_new(_("Non Filetype Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); - for (++row, cmd=0; cmd<build_groups_count[GEANY_GBG_NON_FT]; ++row,++cmdindex, ++cmd) - fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_NON_FT, cmd, TRUE); + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + for (++row, cmd = 0; cmd < build_groups_count[GEANY_GBG_NON_FT]; ++row,++cmdindex, ++cmd) + fields->rows[cmdindex] = build_add_dialog_row( + doc, table, row, dst, GEANY_GBG_NON_FT, cmd, TRUE); label = gtk_label_new(_("Error Regular Expression")); - gtk_table_attach(table, label, 0, DC_ENTRIES+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + gtk_table_attach(table, label, 0, DC_ENTRIES + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); fields->nonfileregex = gtk_entry_new(); fields->nonfileregexstring = build_get_regex(GEANY_GBG_NON_FT, NULL, &src); sensitivity = TRUE; - if (fields->nonfileregexstring!=NULL && *(fields->nonfileregexstring)!=NULL) + if (fields->nonfileregexstring != NULL && *(fields->nonfileregexstring) != NULL) { gtk_entry_set_text(GTK_ENTRY(fields->nonfileregex), *(fields->nonfileregexstring)); - sensitivity = src>(gint)dst?FALSE:TRUE; + sensitivity = src > (gint)dst ? FALSE : TRUE; } - gtk_table_attach(table, fields->nonfileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, - GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + gtk_table_attach(table, fields->nonfileregex, DC_ENTRIES + 1, DC_CLEAR, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); - g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), - (gpointer)(fields->nonfileregex)); - gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + g_signal_connect_swapped(clear, "clicked", + G_CALLBACK(on_clear_dialog_regex_row), (fields->nonfileregex)); + gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR + 1, row, row + 1, GTK_FILL, + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); gtk_widget_set_sensitive(fields->nonfileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); ++row; sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; label = gtk_label_new(_("Execute Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); - for (++row, cmd=0; cmd<build_groups_count[GEANY_GBG_EXEC]; ++row,++cmdindex, ++cmd) + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + for (++row, cmd = 0; cmd < build_groups_count[GEANY_GBG_EXEC]; ++row,++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_EXEC, cmd, TRUE); sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; label = gtk_label_new(_( "Notes:\n" " %d, %e, %f, %p are substituted in Commands and Working dir, see manual for details\n" " Non-filetype menu Item 2 opens a dialog and appends the reponse to the command")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); -/* printf("%d extra rows in dialog\n", row-build_items_count); */ + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + /*printf("%d extra rows in dialog\n", row-build_items_count);*/ ++row; *table_data = fields; return GTK_WIDGET(table); } + void build_free_fields(TableData table_data) { gint cmdindex; - for (cmdindex=0; cmdindex<build_items_count; ++cmdindex) + for (cmdindex = 0; cmdindex < build_items_count; ++cmdindex) g_free(table_data->rows[cmdindex]); g_free(table_data->rows); g_free(table_data); } + /* string compare where null pointers match null or 0 length strings */ static int stcmp(const gchar *a, const gchar *b) { - if (a==NULL && b==NULL) return 0; - if (a==NULL && b!=NULL) return strlen(b); - if (a!=NULL && b==NULL) return strlen(a); + if (a == NULL && b == NULL) + return 0; + if (a == NULL && b != NULL) + return strlen(b); + if (a != NULL && b == NULL) + return strlen(a); return strcmp(a, b); } + static gboolean read_row(BuildDestination *dst, TableData table_data, gint drow, gint grp, gint cmd) { gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; @@ -1858,45 +1931,46 @@ } if (table_data->rows[drow]->cleared) { - if (dst->dst[grp]!=NULL) + if (dst->dst[grp] != NULL) { - if (*(dst->dst[grp])==NULL)*(dst->dst[grp])=g_new0(GeanyBuildCommand, build_groups_count[grp]); - (*(dst->dst[grp]))[cmd].exists=FALSE; - (*(dst->dst[grp]))[cmd].changed=TRUE; - changed=TRUE; + if (*(dst->dst[grp]) == NULL) + *(dst->dst[grp]) = g_new0(GeanyBuildCommand, build_groups_count[grp]); + (*(dst->dst[grp]))[cmd].exists = FALSE; + (*(dst->dst[grp]))[cmd].changed = TRUE; + changed = TRUE; } } if ( ( - table_data->rows[drow]->cmdsrc==NULL /* originally there was no content */ + table_data->rows[drow]->cmdsrc == NULL /* originally there was no content */ && ( - strlen(entries[GEANY_BC_LABEL])>0 /* but now one field has some */ - || strlen(entries[GEANY_BC_COMMAND])>0 - || strlen(entries[GEANY_BC_WORKING_DIR])>0 + strlen(entries[GEANY_BC_LABEL]) > 0 /* but now one field has some */ + || strlen(entries[GEANY_BC_COMMAND]) > 0 + || strlen(entries[GEANY_BC_WORKING_DIR]) > 0 ) ) || ( - table_data->rows[drow]->cmdsrc!=NULL /* originally there was content */ + table_data->rows[drow]->cmdsrc != NULL /* originally there was content */ && ( /* and some of it was changed */ - stcmp(entries[GEANY_BC_LABEL], table_data->rows[drow]->cmdsrc->entries[GEANY_BC_LABEL])!=0 - || stcmp(entries[GEANY_BC_COMMAND], table_data->rows[drow]->cmdsrc->entries[GEANY_BC_COMMAND])!=0 + stcmp(entries[GEANY_BC_LABEL], table_data->rows[drow]->cmdsrc->entries[GEANY_BC_LABEL]) != 0 + || stcmp(entries[GEANY_BC_COMMAND], table_data->rows[drow]->cmdsrc->entries[GEANY_BC_COMMAND]) != 0 || stcmp(entries[GEANY_BC_WORKING_DIR], - table_data->rows[drow]->cmdsrc->entries[GEANY_BC_WORKING_DIR])!=0 + table_data->rows[drow]->cmdsrc->entries[GEANY_BC_WORKING_DIR]) != 0 ) ) ) { - if (dst->dst[grp]!=NULL) + if (dst->dst[grp] != NULL) { - if (*(dst->dst[grp])==NULL) + if (*(dst->dst[grp]) == NULL) *(dst->dst[grp]) = g_new0(GeanyBuildCommand, build_groups_count[grp]); FOREACH_GEANYBUILDCMD_ENTRY(i) setptr((*(dst->dst[grp]))[cmd].entries[i], entries[i]); (*(dst->dst[grp]))[cmd].exists = TRUE; - (*(dst->dst[grp]))[cmd].changed=TRUE; + (*(dst->dst[grp]))[cmd].changed = TRUE; changed = TRUE; } } @@ -1908,24 +1982,24 @@ return changed; } + static gboolean read_regex(GtkWidget *regexentry, gchar **src, gchar **dst) { gboolean changed = FALSE; gchar *reg = g_strdup(gtk_entry_get_text(GTK_ENTRY(regexentry))); if ( - ( - ( src==NULL /* originally there was no regex */ - || *src==NULL /* or it was NULL*/ - ) - && strlen(reg)>0 /* and something was typed */ - ) - ||( /* or */ - src!=NULL /* originally there was a regex*/ - && strcmp(*src, reg)!=0 /* and it has been changed */ - ) - ) + ( + (src == NULL /* originally there was no regex */ + || *src == NULL /* or it was NULL*/ + ) + && strlen(reg) > 0 /* and something was typed */ + ) + ||(src != NULL /* originally there was a regex*/ + && strcmp(*src, reg) != 0 /* and it has been changed */ + ) + ) { - if (dst!=NULL) + if (dst != NULL) { setptr(*dst, reg); changed = TRUE; @@ -1934,6 +2008,7 @@ return changed; } + gboolean build_read_commands(BuildDestination *dst, TableData table_data, gint response) { gint cmdindex, cmd; @@ -1941,11 +2016,11 @@ if (response == GTK_RESPONSE_ACCEPT) { - for (cmdindex=0, cmd=0; cmd<build_groups_count[GEANY_GBG_FT]; ++cmdindex, ++cmd) + for (cmdindex = 0, cmd = 0; cmd < build_groups_count[GEANY_GBG_FT]; ++cmdindex, ++cmd) changed |= read_row(dst, table_data, cmdindex, GEANY_GBG_FT, cmd); - for (cmd=0; cmd<build_groups_count[GEANY_GBG_NON_FT]; ++cmdindex, ++cmd) + for (cmd = 0; cmd < build_groups_count[GEANY_GBG_NON_FT]; ++cmdindex, ++cmd) changed |= read_row(dst, table_data, cmdindex, GEANY_GBG_NON_FT, cmd); - for (cmd=0; cmd<build_groups_count[GEANY_GBG_EXEC]; ++cmdindex, ++cmd) + for (cmd = 0; cmd < build_groups_count[GEANY_GBG_EXEC]; ++cmdindex, ++cmd) changed |= read_row(dst, table_data, cmdindex, GEANY_GBG_EXEC, cmd); changed |= read_regex(table_data->fileregex, table_data->fileregexstring, dst->fileregexstr); changed |= read_regex(table_data->nonfileregex, table_data->nonfileregexstring, dst->nonfileregexstr); @@ -1953,7 +2028,8 @@ return changed; } -static void show_build_commands_dialog() + +static void show_build_commands_dialog(void) { GtkWidget *dialog, *table, *vbox; GeanyDocument *doc = document_get_current(); @@ -1978,7 +2054,7 @@ prefdsts.dst[GEANY_GBG_NON_FT] = &non_ft_pref; prefdsts.dst[GEANY_GBG_EXEC] = &exec_pref; - if (ft!=NULL) + if (ft != NULL) { prefdsts.dst[GEANY_GBG_FT] = &(ft->homefilecmds); prefdsts.fileregexstr = &(ft->homeerror_regex_string); @@ -1989,7 +2065,7 @@ prefdsts.fileregexstr = NULL; } prefdsts.nonfileregexstr = &regex_pref; - if (build_read_commands(&prefdsts, table_data, response) && ft!=NULL) + if (build_read_commands(&prefdsts, table_data, response) && ft != NULL) ft->home_save_needed = TRUE; build_free_fields(table_data); @@ -1997,32 +2073,35 @@ gtk_widget_destroy(dialog); } + /* Creates the relevant build menu if necessary. */ BuildMenuItems *build_get_menu_items(gint filetype_idx) { BuildMenuItems *items; items = &menu_items; - if (items->menu == NULL) create_build_menu(items); + if (items->menu == NULL) + create_build_menu(items); return items; } + /* set non_ft working directory entries to %p for project */ void build_set_non_ft_wd_to_proj(TableData table_data) { gint i, start, end; start = build_groups_count[GEANY_GBG_FT]; end = start + build_groups_count[GEANY_GBG_NON_FT]; - for (i = start; i<end; ++i) + for (i = start; i < end; ++i) gtk_entry_set_text(GTK_ENTRY(table_data->rows[i]->entries[GEANY_BC_WORKING_DIR]), "%p"); } + /*---------------------------------------------------------- * * Load and store configuration * * ---------------------------------------------------------*/ - static const gchar *build_grp_name = "build-menu"; /* config format for build-menu group is prefix_gg_nn_xx=value @@ -2042,16 +2121,18 @@ gint cmd, prefixlen; /* NOTE prefixlen used in macros above */ GeanyBuildCommand *dstcmd; gchar *key; - static gchar cmdbuf[3]=" "; + static gchar cmdbuf[3] = " "; - if (*dst==NULL)*dst = g_new0(GeanyBuildCommand, build_groups_count[grp]); + if (*dst == NULL) + *dst = g_new0(GeanyBuildCommand, build_groups_count[grp]); dstcmd = *dst; - prefixlen = prefix==NULL?0:strlen(prefix); - key = g_strconcat(prefix==NULL?"":prefix, fixedkey, NULL); - for (cmd=0; cmd<build_groups_count[grp]; ++cmd) + prefixlen = prefix == NULL ? 0 : strlen(prefix); + key = g_strconcat(prefix == NULL ? "" : prefix, fixedkey, NULL); + for (cmd = 0; cmd < build_groups_count[grp]; ++cmd) { gchar *label; - if (cmd<0 || cmd>=100)return; /* ensure no buffer overflow */ + if (cmd < 0 || cmd >= 100) + return; /* ensure no buffer overflow */ sprintf(cmdbuf, "%02d", cmd); set_key_grp(key, groups[grp]); set_key_cmd(key, cmdbuf); @@ -2060,7 +2141,7 @@ label = g_key_file_get_locale_string(config, build_grp_name, key, NULL, NULL); else label = g_key_file_get_string(config, build_grp_name, key, NULL); - if (label!=NULL) + if (label != NULL) { dstcmd[cmd].exists = TRUE; setptr(dstcmd[cmd].entries[GEANY_BC_LABEL], label); @@ -2076,11 +2157,12 @@ g_free(key); } + /* for the specified source load new format build menu items or try to make some sense of * old format setings, not done perfectly but better than ignoring them */ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) { -/* gint grp;*/ + /*gint grp;*/ GeanyFiletype *ft; GeanyProject *pj; gchar **ftlist; @@ -2093,7 +2175,8 @@ { case GEANY_BCS_FT: ft = (GeanyFiletype*)p; - if (ft==NULL)return; + if (ft == NULL) + return; build_load_menu_grp(config, &(ft->filecmds), GEANY_GBG_FT, NULL, TRUE); build_load_menu_grp(config, &(ft->ftdefcmds), GEANY_GBG_NON_FT, NULL, TRUE); build_load_menu_grp(config, &(ft->execcmds), GEANY_GBG_EXEC, NULL, TRUE); @@ -2102,7 +2185,8 @@ break; case GEANY_BCS_HOME_FT: ft = (GeanyFiletype*)p; - if (ft==NULL)return; + if (ft == NULL) + return; build_load_menu_grp(config, &(ft->homefilecmds), GEANY_GBG_FT, NULL, FALSE); build_load_menu_grp(config, &(ft->homeexeccmds), GEANY_GBG_EXEC, NULL, FALSE); setptr(ft->homeerror_regex_string, @@ -2118,17 +2202,19 @@ build_load_menu_grp(config, &exec_proj, GEANY_GBG_EXEC, NULL, FALSE); setptr(regex_proj, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); pj = (GeanyProject*)p; - if (p==NULL)return; + if (p == NULL) + return; ftlist = g_key_file_get_string_list(config, build_grp_name, "filetypes", NULL, NULL); - if (ftlist!=NULL) + if (ftlist != NULL) { gchar **ftname; - if (pj->build_filetypes_list==NULL) pj->build_filetypes_list = g_ptr_array_new(); + if (pj->build_filetypes_list == NULL) + pj->build_filetypes_list = g_ptr_array_new(); g_ptr_array_set_size(pj->build_filetypes_list, 0); - for (ftname=ftlist; *ftname!=NULL; ++ftname) + for (ftname = ftlist; *ftname != NULL; ++ftname) { - ft=filetypes_lookup_by_name(*ftname); - if (ft!=NULL) + ft = filetypes_lookup_by_name(*ftname); + if (ft != NULL) { gchar *regkey = g_strdup_printf("%serror_regex", *ftname); g_ptr_array_add(pj->build_filetypes_list, ft); @@ -2150,7 +2236,7 @@ /* set GeanyBuildCommand if it doesn't already exist and there is a command */ #define ASSIGNIF(type, id, string, value) \ - if (value!=NULL && !type[GBO_TO_CMD(id)].exists && strlen(value)>0) { \ + if (value != NULL && ! type[GBO_TO_CMD(id)].exists && strlen(value) > 0) { \ type[GBO_TO_CMD(id)].exists = TRUE; \ setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_LABEL], g_strdup(_(string))); \ setptr(type[GBO_TO_CMD(id)].entries[GEANY_BC_COMMAND], (value)); \ @@ -2163,24 +2249,30 @@ { case GEANY_BCS_FT: ft = (GeanyFiletype*)p; - if (ft->filecmds==NULL)ft->filecmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]); + if (ft->filecmds == NULL) + ft->filecmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]); value = g_key_file_get_string(config, "build_settings", "compiler", NULL); ASSIGNIF(ft->filecmds, GEANY_GBO_COMPILE, "_Compile", value); value = g_key_file_get_string(config, "build_settings", "linker", NULL); ASSIGNIF(ft->filecmds, GEANY_GBO_BUILD, "_Build", value); - if (ft->execcmds==NULL)ft->execcmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); + if (ft->execcmds == NULL) + ft->execcmds = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); value = g_key_file_get_string(config, "build_settings", "run_cmd", NULL); ASSIGNIF(ft->execcmds, GEANY_GBO_EXEC, "_Execute", value); - if (ft->error_regex_string==NULL) + if (ft->error_regex_string == NULL) ft->error_regex_string = g_key_file_get_string(config, "build_settings", "error_regex", NULL); break; case GEANY_BCS_PROJ: - if (non_ft_proj==NULL)non_ft_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); + if (non_ft_proj == NULL) + non_ft_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); basedir = project_get_base_path(); - if (basedir==NULL) basedir = g_strdup("%d"); + if (basedir == NULL) + basedir = g_strdup("%d"); bvalue = g_key_file_get_boolean(config, "project", "make_in_base_path", NULL); - if (bvalue) makebasedir = g_strdup(basedir); - else makebasedir = g_strdup("%d"); + if (bvalue) + makebasedir = g_strdup(basedir); + else + makebasedir = g_strdup("%d"); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].old) setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].entries[GEANY_BC_WORKING_DIR], g_strdup(makebasedir)); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].old) @@ -2188,10 +2280,11 @@ if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].old) setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].entries[GEANY_BC_WORKING_DIR], g_strdup("%d")); value = g_key_file_get_string(config, "project", "run_cmd", NULL); - if (value!=NULL && strlen(value)>0) + if (value != NULL && strlen(value) > 0) { - if (exec_proj==NULL)exec_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); - if (!exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists) + if (exec_proj == NULL) + exec_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); + if (! exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists) { exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists = TRUE; setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].entries[GEANY_BC_LABEL], g_strdup(_("_Execute"))); @@ -2204,7 +2297,8 @@ g_free(basedir); break; case GEANY_BCS_PREF: - if (non_ft_pref==NULL)non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); + if (non_ft_pref == NULL) + non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); value = g_key_file_get_string(config, "tools", "make_cmd", NULL); ASSIGNIF(non_ft_pref, GEANY_GBO_CUSTOM, "Make Custom _Target", g_strdup_printf("%s ", value)); @@ -2217,22 +2311,25 @@ } } + static gint build_save_menu_grp(GKeyFile *config, GeanyBuildCommand *src, gint grp, gchar *prefix) { gint cmd, prefixlen; /* NOTE prefixlen used in macros above */ gchar *key; - gint count=0; + gint count = 0; enum GeanyBuildCmdEntries i; - if (src==NULL)return 0; - prefixlen = prefix==NULL?0:strlen(prefix); - key = g_strconcat(prefix==NULL?"":prefix, fixedkey, NULL); - for (cmd=0; cmd<build_groups_count[grp]; ++cmd) + if (src == NULL) + return 0; + prefixlen = prefix == NULL ? 0 : strlen(prefix); + key = g_strconcat(prefix == NULL ? "" : prefix, fixedkey, NULL); + for (cmd = 0; cmd < build_groups_count[grp]; ++cmd) { if (src[cmd].changed) { - static gchar cmdbuf[4]=" "; - if (cmd<0 || cmd>=100)return count; /* ensure no buffer overflow */ + static gchar cmdbuf[4] = " "; + if (cmd < 0 || cmd >= 100) + return count; /* ensure no buffer overflow */ sprintf(cmdbuf, "%02d", cmd); set_key_grp(key, groups[grp]); set_key_cmd(key, cmdbuf); @@ -2259,29 +2356,32 @@ return count; } + typedef struct ForEachData { GKeyFile *config; GPtrArray *ft_names; -}ForEachData; +} ForEachData; + static void foreach_project_filetype(gpointer data, gpointer user_data) { - GeanyFiletype *ft = (GeanyFiletype*)data; - ForEachData *d = (ForEachData*)user_data; - gint i=0; + GeanyFiletype *ft = (GeanyFiletype*) data; + ForEachData *d = (ForEachData*) user_data; + gint i = 0; gchar *regkey = g_strdup_printf("%serror_regex", ft->name); i += build_save_menu_grp(d->config, ft->projfilecmds, GEANY_GBG_FT, ft->name); - if (ft->projerror_regex_string!=NULL && strlen(ft->projerror_regex_string)>0) + if (ft->projerror_regex_string != NULL && strlen(ft->projerror_regex_string) > 0) { g_key_file_set_string(d->config, build_grp_name, regkey, ft->projerror_regex_string); - i+=1; + i++; } else g_key_file_remove_key(d->config, build_grp_name,regkey, NULL); g_free(regkey); - if (i>0)g_ptr_array_add(d->ft_names, ft->name); + if (i > 0) + g_ptr_array_add(d->ft_names, ft->name); } void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) @@ -2295,11 +2395,12 @@ { case GEANY_BCS_HOME_FT: ft = (GeanyFiletype*)ptr; - if (ft==NULL)return; + if (ft == NULL) + return; build_save_menu_grp(config, ft->homefilecmds, GEANY_GBG_FT, NULL); build_save_menu_grp(config, ft->homeexeccmds, GEANY_GBG_EXEC, NULL); regkey = g_strdup_printf("%serror_regex", ft->name); - if (ft->homeerror_regex_string!=NULL && strlen(ft->homeerror_regex_string)>0) + if (ft->homeerror_regex_string != NULL && strlen(ft->homeerror_regex_string) > 0) g_key_file_set_string(config, build_grp_name, regkey, ft->projerror_regex_string); else g_key_file_remove_key(config, build_grp_name,regkey, NULL); @@ -2308,7 +2409,7 @@ case GEANY_BCS_PREF: build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL); build_save_menu_grp(config, exec_pref, GEANY_GBG_EXEC, NULL); - if (regex_pref!=NULL && strlen(regex_pref)>0) + if (regex_pref != NULL && strlen(regex_pref) > 0) g_key_file_set_string(config, build_grp_name, "error_regex", regex_pref); else g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); @@ -2317,16 +2418,16 @@ pj = (GeanyProject*)ptr; build_save_menu_grp(config, non_ft_proj, GEANY_GBG_NON_FT, NULL); build_save_menu_grp(config, exec_proj, GEANY_GBG_EXEC, NULL); - if (regex_proj!=NULL && strlen(regex_proj)>0) + if (regex_proj != NULL && strlen(regex_proj) > 0) g_key_file_set_string(config, build_grp_name, "error_regex", regex_proj); else g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); - if (pj->build_filetypes_list!=NULL) + if (pj->build_filetypes_list != NULL) { data.config = config; data.ft_names = g_ptr_array_new(); g_ptr_array_foreach(pj->build_filetypes_list, foreach_project_filetype, (gpointer)(&data)); - if (data.ft_names->pdata!=NULL) + if (data.ft_names->pdata != NULL) g_key_file_set_string_list(config, build_grp_name, "filetypes", (const gchar**)(data.ft_names->pdata), data.ft_names->len); else @@ -2339,21 +2440,26 @@ } } + void build_set_group_count(GeanyBuildGroup grp, gint count) { gint i, sum; if (count>build_groups_count[grp]) - build_groups_count[grp]=count; - for (i=0, sum=0; i<GEANY_GBG_COUNT; ++i)sum+=build_groups_count[i]; + build_groups_count[grp] = count; + for (i = 0, sum = 0; i < GEANY_GBG_COUNT; ++i) + sum += build_groups_count[i]; build_items_count = sum; } + gint build_get_group_count(GeanyBuildGroup grp) { return build_groups_count[grp]; } -static struct { + +static struct +{ gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; GeanyBuildCommand **ptr; gint index; @@ -2365,6 +2471,7 @@ { {NULL, NULL, NULL}, NULL, 0 } }; + void build_init(void) { GtkWidget *item; @@ -2375,7 +2482,7 @@ non_ft_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); exec_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); run_info = g_new0(RunInfo, build_groups_count[GEANY_GBG_EXEC]); - for (cmdindex=0; default_cmds[cmdindex].entries[GEANY_BC_COMMAND] != NULL; ++cmdindex) + for (cmdindex = 0; default_cmds[cmdindex].entries[GEANY_BC_COMMAND] != NULL; ++cmdindex) { enum GeanyBuildCmdEntries k; GeanyBuildCommand *cmd = &((*(default_cmds[cmdindex].ptr))[ default_cmds[cmdindex].index ]); @@ -2386,7 +2493,6 @@ } } - /* create the toolbar Build item sub menu */ toolmenu = gtk_menu_new(); g_object_ref(toolmenu); Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2009-09-06 16:50:04 UTC (rev 4158) +++ trunk/src/build.h 2009-09-06 16:50:20 UTC (rev 4159) @@ -140,13 +140,15 @@ gboolean old; /**< Converted from old format. */ } GeanyBuildCommand; -extern GeanyBuildCommand *non_ft_proj, *exec_proj; /* project command array pointers */ +/* project command array pointers */ +extern GeanyBuildCommand *non_ft_proj; +extern GeanyBuildCommand *exec_proj; extern gchar *regex_proj; /* project non-fileregex string */ typedef struct BuildMenuItems { GtkWidget *menu; - GtkWidget **menu_item[GEANY_GBG_COUNT+1]; /* +1 for fixed items */ + GtkWidget **menu_item[GEANY_GBG_COUNT + 1]; /* +1 for fixed items */ } BuildMenuItems; /* a structure defining the destinations for a set of groups of commands & regex */ @@ -165,11 +167,11 @@ void build_finalize(void); /* menu configuration dialog functions */ -GtkWidget *build_commands_table( GeanyDocument *doc, GeanyBuildSource dst, TableData *data, GeanyFiletype *ft ); +GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *data, GeanyFiletype *ft); -gboolean build_read_commands( BuildDestination *dst, TableData data, gint response ); +gboolean build_read_commands(BuildDestination *dst, TableData data, gint response); -void build_free_fields( TableData data ); +void build_free_fields(TableData data); void build_set_non_ft_wd_to_proj(TableData table_data); @@ -256,9 +258,9 @@ BuildMenuItems *build_get_menu_items(gint filetype_idx); /* load and store menu configuration */ -void build_load_menu( GKeyFile *config, GeanyBuildSource dst, gpointer ptr); +void build_load_menu(GKeyFile *config, GeanyBuildSource dst, gpointer ptr); -void build_save_menu( GKeyFile *config, gpointer ptr, GeanyBuildSource src); +void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src); void build_set_group_count(GeanyBuildGroup grp, gint count); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2009-09-06 16:50:04 UTC (rev 4158) +++ trunk/src/project.c 2009-09-06 16:50:20 UTC (rev 4159) @@ -63,7 +63,7 @@ static struct { gchar *project_file_path; /* in UTF-8 */ -} local_prefs = {NULL}; +} local_prefs = { NULL }; static gboolean entries_modified; @@ -109,7 +109,8 @@ PropertyDialogElements *e; gint response; - if (! project_ask_close()) return; + if (! project_ask_close()) + return; g_return_if_fail(app->project == NULL); @@ -324,7 +325,7 @@ static void remove_foreach_project_filetype( gpointer data, gpointer user_data ) { GeanyFiletype *ft = (GeanyFiletype*)data; - if (ft!=NULL) + if (ft != NULL) { setptr( ft->projfilecmds, NULL); setptr(ft->projerror_regex_string, NULL); @@ -332,6 +333,7 @@ } } + /* open_default will make function reload default session files on close */ void project_close(gboolean open_default) { @@ -343,15 +345,15 @@ write_config(FALSE); /* remove project filetypes build entries */ - if (app->project->build_filetypes_list!=NULL) + if (app->project->build_filetypes_list != NULL) { - g_ptr_array_foreach( app->project->build_filetypes_list, remove_foreach_project_filetype, NULL ); + g_ptr_array_foreach( app->project->build_filetypes_list, remove_foreach_project_filetype, NULL); g_ptr_array_free(app->project->build_filetypes_list, FALSE); } /* remove project non filetype build menu items */ - build_remove_menu_item( GEANY_BCS_PROJ, GEANY_GBG_NON_FT, -1 ); - build_remove_menu_item( GEANY_BCS_PROJ, GEANY_GBG_EXEC, -1 ); + build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_NON_FT, -1); + build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_EXEC, -1); /* remove project regexen */ setptr(regex_proj, NULL); @@ -383,13 +385,13 @@ update_ui(); } -static void on_set_use_base_path_clicked( GtkWidget *unused1, gpointer user_data ) + +static void on_set_use_base_path_clicked(GtkWidget *unused1, gpointer user_data) { - TableData td = (TableData)user_data; - - build_set_non_ft_wd_to_proj(td); + build_set_non_ft_wd_to_proj((TableData)user_data); } + static void create_properties_dialog(PropertyDialogElements *e) { GtkWidget *table, *notebook, *build_table; @@ -733,7 +735,8 @@ setptr(p->description, g_strdup(gtk_text_buffer_get_text(buffer, &start, &end, FALSE))); /* read the project build menu */ - if ( doc!=NULL )ft=doc->file_type; + if ( doc!=NULL ) + ft = doc->file_type; if ( ft!=NULL ) { menu_dst.dst[GEANY_GBG_FT] = &(ft->projfilecmds); @@ -750,9 +753,10 @@ menu_dst.dst[GEANY_GBG_EXEC] = &exec_proj; menu_dst.nonfileregexstr = &regex_proj; build_read_commands( &menu_dst, e->build_properties, GTK_RESPONSE_ACCEPT ); - if (ft!=NULL && ft->projfilecmds!=oldvalue && ft->project_list_entry<0) + if (ft != NULL && ft->projfilecmds != oldvalue && ft->project_list_entry < 0) { - if (p->build_filetypes_list==NULL)p->build_filetypes_list = g_ptr_array_new(); + if (p->build_filetypes_list == NULL) + p->build_filetypes_list = g_ptr_array_new(); ft->project_list_entry = p->build_filetypes_list->len; g_ptr_array_add(p->build_filetypes_list, ft); } @@ -813,8 +817,7 @@ g_free(locale_dir); } } - else - if (gtk_file_chooser_get_action(GTK_FILE_CHOOSER(dialog)) != GTK_FILE_CHOOSER_ACTION_OPEN) + else if (gtk_file_chooser_get_action(GTK_FILE_CHOOSER(dialog)) != GTK_FILE_CHOOSER_ACTION_OPEN) { gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), utf8_filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4158] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4158 http://geany.svn.sourceforge.net/geany/?rev=4158&view=rev Author: eht16 Date: 2009-09-06 16:50:04 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Fix crash when opening documents. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:49:51 UTC (rev 4157) +++ trunk/ChangeLog 2009-09-06 16:50:04 UTC (rev 4158) @@ -10,6 +10,8 @@ Remove trailing spaces (patch by André Hentschel, thanks). * src/treeviews.c: Fix a compiler warning. + * src/document.c: + Fix crash when opening documents. 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-09-06 16:49:51 UTC (rev 4157) +++ trunk/src/document.c 2009-09-06 16:50:04 UTC (rev 4158) @@ -1234,7 +1234,7 @@ document_check_disk_status(doc, TRUE); /* force a file changed check */ } } - if (reload || (!reload && doc != NULL)) + if (reload || (!reload && doc == NULL)) { /* doc possibly changed */ display_filename = utils_str_middle_truncate(utf8_filename, 100); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4157] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4157 http://geany.svn.sourceforge.net/geany/?rev=4157&view=rev Author: eht16 Date: 2009-09-06 16:49:51 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Fix a compiler warning. Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:49:38 UTC (rev 4156) +++ trunk/ChangeLog 2009-09-06 16:49:51 UTC (rev 4157) @@ -8,6 +8,8 @@ * src/prefs.c, src/tagmanager/include/guregex.h, src/tagmanager/include/tm_tagmanager.h: Remove trailing spaces (patch by André Hentschel, thanks). + * src/treeviews.c: + Fix a compiler warning. 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2009-09-06 16:49:38 UTC (rev 4156) +++ trunk/src/treeviews.c 2009-09-06 16:49:51 UTC (rev 4157) @@ -774,8 +774,8 @@ event->keyval == GDK_KP_Enter || event->keyval == GDK_space) { + GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); may_steal_focus = TRUE; - GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); /* delay the query of selection state because this callback is executed before GTK * changes the selection (g_signal_connect_after would be better but it doesn't work) */ if (widget == tv.tree_openfiles) /* tag and doc list have separate handlers */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4156] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4156 http://geany.svn.sourceforge.net/geany/?rev=4156&view=rev Author: eht16 Date: 2009-09-06 16:49:38 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Remove trailing spaces (patch by Andr?\195?\169 Hentschel, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/include/gnuregex.h trunk/tagmanager/include/tm_tagmanager.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:49:22 UTC (rev 4155) +++ trunk/ChangeLog 2009-09-06 16:49:38 UTC (rev 4156) @@ -5,6 +5,9 @@ * doc/geany.css: Use "max-width" to set the document width of the generated HTML documentation to let the text be auto-wrapped. + * src/prefs.c, src/tagmanager/include/guregex.h, + src/tagmanager/include/tm_tagmanager.h: + Remove trailing spaces (patch by André Hentschel, thanks). 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/tagmanager/include/gnuregex.h =================================================================== --- trunk/tagmanager/include/gnuregex.h 2009-09-06 16:49:22 UTC (rev 4155) +++ trunk/tagmanager/include/gnuregex.h 2009-09-06 16:49:38 UTC (rev 4156) @@ -42,7 +42,7 @@ #define RE_BACKSLASH_ESCAPE_IN_LISTS (1) /* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. + literals. If set, then \+ and \? are operators and + and ? are literals. */ #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) @@ -58,7 +58,7 @@ ^ is an anchor if it is at the beginning of a regular expression or after an open-group or an alternation operator; $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. + before a close-group or an alternation operator. This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because POSIX draft 11.2 says that * etc. in leading positions is undefined. @@ -69,7 +69,7 @@ /* If this bit is set, then special characters are always special regardless of where they are in the pattern. If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, + some contexts; otherwise they are ordinary. Specifically, * + ? and intervals are only special when not after the beginning, open-group, or alternation operator. */ #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) @@ -91,7 +91,7 @@ #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) /* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. + interval, depending on RE_NO_BK_BRACES. If not set, \{, \}, {, and } are literals. */ #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) @@ -116,7 +116,7 @@ If not set, then \<digit> is a back-reference. */ #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) -/* If this bit is set, then | is an alternation operator, and \| is literal. +/* If this bit is set, then | is an alternation operator, and \| is literal. If not set, then \| is an alternation operator, and | is literal. */ #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) @@ -135,10 +135,10 @@ stored in the pattern buffer, so changing this does not affect already-compiled regexps. */ extern reg_syntax_t re_syntax_options; - + /* Define combinations of the above bits for the standard possibilities. (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ + don't delete them!) */ /* [[[begin syntaxes]]] */ #define RE_SYNTAX_EMACS 0 @@ -198,14 +198,14 @@ | RE_NO_BK_PARENS | RE_NO_BK_REFS \ | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) /* [[[end syntaxes]]] */ - + /* Maximum number of duplicates an interval can allow. Some systems (erroneously) define this in other header files, but we want our value, so remove any previous define. */ #ifdef RE_DUP_MAX #undef RE_DUP_MAX #endif -#define RE_DUP_MAX ((1 << 15) - 1) +#define RE_DUP_MAX ((1 << 15) - 1) /* POSIX `cflags' bits (i.e., information for `regcomp'). */ @@ -217,7 +217,7 @@ /* If this bit is set, then ignore case when matching. If not set, then case is significant. */ #define REG_ICASE (REG_EXTENDED << 1) - + /* If this bit is set, then anchors do not match at newline characters in the string. If not set, then anchors do match at newlines. */ @@ -256,7 +256,7 @@ REG_EESCAPE, /* Trailing backslash. */ REG_ESUBREG, /* Invalid back reference. */ REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ + REG_EPAREN, /* Parenthesis imbalance. */ REG_EBRACE, /* Unmatched \{. */ REG_BADBR, /* Invalid contents of \{\}. */ REG_ERANGE, /* Invalid range end. */ @@ -268,7 +268,7 @@ REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ } reg_errcode_t; - + /* This data structure represents a compiled pattern. Before calling the pattern compiler, the fields `buffer', `allocated', `fastmap', `translate', and `no_sub' can be set. After the pattern has been @@ -287,7 +287,7 @@ unsigned long allocated; /* Number of bytes actually used in `buffer'. */ - unsigned long used; + unsigned long used; /* Syntax setting with which the pattern was compiled. */ reg_syntax_t syntax; @@ -331,7 +331,7 @@ unsigned no_sub : 1; /* If set, a beginning-of-line anchor doesn't match at the - beginning of the string. */ + beginning of the string. */ unsigned not_bol : 1; /* Similarly for an end-of-line anchor. */ @@ -349,7 +349,7 @@ /* search.c (search_buffer) in Emacs needs this one opcode value. It is defined both in `regex.c' and here. */ #define RE_EXACTN_VALUE 1 - + /* Type for byte offsets within the string. POSIX mandates this. */ typedef int regoff_t; @@ -380,7 +380,7 @@ regoff_t rm_so; /* Byte offset from string's start to substring's start. */ regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ } regmatch_t; - + /* Declarations for routines. */ /* To avoid duplicating every routine declaration -- once with a @@ -443,7 +443,7 @@ /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern int re_match_2 +extern int re_match_2 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, int length1, const char *string2, int length2, int start, struct re_registers *regs, int stop)); @@ -480,7 +480,7 @@ extern void regfree _RE_ARGS ((regex_t *preg)); #endif /* not __REGEXP_LIBRARY_H__ */ - + /* Local variables: make-backup-files: t Modified: trunk/tagmanager/include/tm_tagmanager.h =================================================================== --- trunk/tagmanager/include/tm_tagmanager.h 2009-09-06 16:49:22 UTC (rev 4155) +++ trunk/tagmanager/include/tm_tagmanager.h 2009-09-06 16:49:38 UTC (rev 4156) @@ -38,12 +38,12 @@ if you want to hack on the sources. If you simply plan to use it, only GLib is required. \section Installation TagManager can be installed using the standard UNIX method, i.e.: - + -# tar zxvf TagManager-[Version].tar.gz -# cd TagManager-[Version] -# ./configure [configure options] -# make - + Currently, 'make install' will not do anything since TagManager is meant to be included statically in projects. This might change in the future. \section Usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4155] trunk
by eht16＠users.sourceforge.net 06 Sep '09

06 Sep '09

Revision: 4155 http://geany.svn.sourceforge.net/geany/?rev=4155&view=rev Author: eht16 Date: 2009-09-06 16:49:22 +0000 (Sun, 06 Sep 2009) Log Message: ----------- Use "max-width" to set the document width of the generated HTML documentation to let the text be auto-wrapped. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.css Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-06 16:49:09 UTC (rev 4154) +++ trunk/ChangeLog 2009-09-06 16:49:22 UTC (rev 4155) @@ -2,6 +2,9 @@ * src/plugins.c: Improve the opening string in the plugin manager dialog. + * doc/geany.css: + Use "max-width" to set the document width of the generated + HTML documentation to let the text be auto-wrapped. 2009-09-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.css =================================================================== --- trunk/doc/geany.css 2009-09-06 16:49:09 UTC (rev 4154) +++ trunk/doc/geany.css 2009-09-06 16:49:22 UTC (rev 4155) @@ -12,7 +12,7 @@ background-color: #f2f2f2; color: #404040; margin-left: 0.4em; - width: 60em; + max-width: 60em; font-size: 90%; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009