Commits November 2008

commits@lists.geany.org

4 participants
134 discussions

SF.net SVN: geany:[3168] trunk/po
by frlan＠users.sourceforge.net 03 Nov '08

03 Nov '08

Revision: 3168 http://geany.svn.sourceforge.net/geany/?rev=3168&view=rev Author: frlan Date: 2008-11-03 18:45:47 +0000 (Mon, 03 Nov 2008) Log Message: ----------- Little update of French translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/fr.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-11-03 17:38:50 UTC (rev 3167) +++ trunk/po/ChangeLog 2008-11-03 18:45:47 UTC (rev 3168) @@ -1,3 +1,9 @@ +2008-11-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * fr.po: Little update of French translation. Removes a fuzzy string. + Thanks to Roland Baudin for input. + + 2008-10-31 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * fr.po: Little update of French translation. Closes #2210060. Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2008-11-03 17:38:50 UTC (rev 3167) +++ trunk/po/fr.po 2008-11-03 18:45:47 UTC (rev 3168) @@ -1037,9 +1037,8 @@ #: ../src/filetypes.c:1232 #, c-format -#, fuzzy msgid "Bad regex for filetype %s: %s" -msgstr "Mauvaise expression régulière pour le type de fichier %s %s" +msgstr "Mauvaise expression régulière pour le type de fichier %s : %s" #: ../src/geany.h:50 msgid "untitled" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3167] trunk
by ntrel＠users.sourceforge.net 03 Nov '08

03 Nov '08

Revision: 3167 http://geany.svn.sourceforge.net/geany/?rev=3167&view=rev Author: ntrel Date: 2008-11-03 17:38:50 +0000 (Mon, 03 Nov 2008) Log Message: ----------- Fix GLib warning when pressing Close File keybinding and no documents are open. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-03 17:25:35 UTC (rev 3166) +++ trunk/ChangeLog 2008-11-03 17:38:50 UTC (rev 3167) @@ -1,3 +1,10 @@ +2008-11-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/callbacks.c: + Fix GLib warning when pressing Close File keybinding and no + documents are open. + + 2008-10-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/splitwindow.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-11-03 17:25:35 UTC (rev 3166) +++ trunk/src/callbacks.c 2008-11-03 17:38:50 UTC (rev 3167) @@ -236,8 +236,10 @@ on_close1_activate (GtkMenuItem *menuitem, gpointer user_data) { - guint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); - document_remove_page(cur_page); + GeanyDocument *doc = document_get_current(); + + if (doc) + document_close(doc); } @@ -690,8 +692,7 @@ on_toolbutton_close_clicked (GtkToolButton *toolbutton, gpointer user_data) { - gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); - document_remove_page(cur_page); + on_close1_activate(NULL, NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3166] branches/symbol-tree
by ntrel＠users.sourceforge.net 03 Nov '08

03 Nov '08

Revision: 3166 http://geany.svn.sourceforge.net/geany/?rev=3166&view=rev Author: ntrel Date: 2008-11-03 17:25:35 +0000 (Mon, 03 Nov 2008) Log Message: ----------- Remove symbol tree 'skipped' code, instead sort parents first when adding tree iters. This should fix missing symbols sometimes. Use TMTag instead of GeanySymbol so the symbol tree can read the scope without parsing it (fixes problems with '.' characters in tag names for e.g. HTML). Free tag list straight after use, instead of next time the list is generated. Use TMTag pointer tree model column instead of line number. Fix not allowing a leading underscore when using scope name prefix. Remember parent tree iter for a tag if it is used for a child tag's scope, rather than just for tags of a certain type. This should be more flexible for various filetypes. Various symbol-tree code refactoring. Modified Paths: -------------- branches/symbol-tree/ChangeLog branches/symbol-tree/src/symbols.c branches/symbol-tree/src/treeviews.c branches/symbol-tree/src/treeviews.h Modified: branches/symbol-tree/ChangeLog =================================================================== --- branches/symbol-tree/ChangeLog 2008-11-01 02:45:55 UTC (rev 3165) +++ branches/symbol-tree/ChangeLog 2008-11-03 17:25:35 UTC (rev 3166) @@ -1,3 +1,21 @@ +2008-11-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * treeviews.c, treeviews.h, symbols.c: + Remove symbol tree 'skipped' code, instead sort parents first when + adding tree iters. This should fix missing symbols sometimes. + Use TMTag instead of GeanySymbol so the symbol tree can read the + scope without parsing it (fixes problems with '.' characters in tag + names for e.g. HTML). + Free tag list straight after use, instead of next time the list is + generated. + Use TMTag pointer tree model column instead of line number. + Fix not allowing a leading underscore when using scope name prefix. + Remember parent tree iter for a tag if it is used for a child tag's + scope, rather than just for tags of a certain type. This should be + more flexible for various filetypes. + Various symbol-tree code refactoring. + + 2008-10-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Create symbol-tree branch. Modified: branches/symbol-tree/src/symbols.c =================================================================== --- branches/symbol-tree/src/symbols.c 2008-11-01 02:45:55 UTC (rev 3165) +++ branches/symbol-tree/src/symbols.c 2008-11-03 17:25:35 UTC (rev 3166) @@ -22,9 +22,9 @@ */ /* - * Tagmanager related convenience functions. - * Tagmanager parses tags in the current documents, known as the workspace, plus global tags, - * which are lists of tags for each filetype. Global tags are loaded when a document with a + * Symbol Tree and TagManager-related convenience functions. + * TagManager parses tags for each document, and also adds them to the workspace (session). + * Global tags are lists of tags for each filetype, loaded when a document with a * matching filetype is first loaded. */ @@ -89,7 +89,9 @@ static gchar *user_tags_dir; +static GPtrArray *top_level_iter_names = NULL; + static void html_tags_loaded(void); static void load_user_tags(filetype_id ft_id); @@ -370,113 +372,60 @@ } -/* small struct to track tag name and type together */ -typedef struct GeanySymbol +/* sort by name, then line */ +static gint compare_symbol(const TMTag *tag_a, const TMTag *tag_b) { - gchar *str; - gint type; - gint line; -} GeanySymbol; - - -/* sort by name, line */ -static gint compare_symbol(const GeanySymbol *a, const GeanySymbol *b) -{ gint ret; - if (a == NULL || b == NULL) return 0; + if (tag_a == NULL || tag_b == NULL) + return 0; - ret = strcmp(a->str, b->str); + ret = strcmp(tag_a->name, tag_b->name); if (ret == 0) { - return a->line - b->line; + return tag_a->atts.entry.line - tag_b->atts.entry.line; } return ret; } /* sort by line only */ -static gint compare_symbol_lines(const GeanySymbol *a, const GeanySymbol *b) +static gint compare_symbol_lines(gconstpointer a, gconstpointer b) { - if (a == NULL || b == NULL) return 0; + const TMTag *tag_a = TM_TAG(a); + const TMTag *tag_b = TM_TAG(b); - return a->line - b->line; + if (a == NULL || b == NULL) + return 0; + + return tag_a->atts.entry.line - tag_b->atts.entry.line; } -static const GList *get_tag_list(GeanyDocument *doc, guint tag_types, gint sort_mode) +static GList *get_tag_list(GeanyDocument *doc, guint tag_types) { - static GList *tag_names = NULL; + GList *tag_names = NULL; + TMTag *tag; + guint i; - if (doc != NULL && doc->tm_file && - doc->tm_file->tags_array) - { - TMTag *tag; - guint i; - GeanySymbol *symbol; - gboolean doc_is_utf8 = FALSE; - gchar *utf8_name; - const gchar *cosep = - symbols_get_context_separator(FILETYPE_ID(doc->file_type)); + g_return_val_if_fail(doc, NULL); - if (tag_names) - { - GList *tmp; - for (tmp = tag_names; tmp; tmp = g_list_next(tmp)) - { - g_free(((GeanySymbol*)tmp->data)->str); - g_free(tmp->data); - } - g_list_free(tag_names); - tag_names = NULL; - } + if (!doc->tm_file || !doc->tm_file->tags_array) + return NULL; - /* encodings_convert_to_utf8_from_charset() fails with charset "None", so skip conversion - * for None at this point completely */ - if (utils_str_equal(doc->encoding, "UTF-8") || - utils_str_equal(doc->encoding, "None")) - doc_is_utf8 = TRUE; + for (i = 0; i < doc->tm_file->tags_array->len; ++i) + { + tag = TM_TAG(doc->tm_file->tags_array->pdata[i]); + if (tag == NULL) + return NULL; - for (i = 0; i < (doc->tm_file)->tags_array->len; ++i) + if (tag->type & tag_types) { - tag = TM_TAG((doc->tm_file)->tags_array->pdata[i]); - if (tag == NULL) - return NULL; - - if (tag->type & tag_types) - { - if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, - (gsize)-1, doc->encoding, TRUE); - else utf8_name = tag->name; - - if (utf8_name == NULL) - continue; - - symbol = g_new0(GeanySymbol, 1); - if ((tag->atts.entry.scope != NULL) && isalpha(tag->atts.entry.scope[0])) - { - symbol->str = g_strconcat(tag->atts.entry.scope, cosep, utf8_name, NULL); - } - else - { - symbol->str = g_strdup(utf8_name); - } - symbol->type = tag->type; - symbol->line = tag->atts.entry.line; - tag_names = g_list_prepend(tag_names, symbol); - - if (! doc_is_utf8) g_free(utf8_name); - } + tag_names = g_list_append(tag_names, tag); } - if (sort_mode == SYMBOLS_SORT_BY_NAME) - tag_names = g_list_sort(tag_names, (GCompareFunc) compare_symbol); - else - tag_names = g_list_sort(tag_names, (GCompareFunc) compare_symbol_lines); - - return tag_names; } - else - return NULL; + tag_names = g_list_sort(tag_names, compare_symbol_lines); + return tag_names; } @@ -513,13 +462,8 @@ } -/* Adds symbol list groups in (iter*, title) pairs. - * The list must be ended with NULL. */ -static void G_GNUC_NULL_TERMINATED -tag_list_add_groups(GtkTreeStore *tree_store, ...) +static GdkPixbuf *get_tag_icon(const gchar *icon_name) { - va_list args; - GtkTreeIter *iter; static GtkIconTheme *icon_theme = NULL; static gint x, y; @@ -537,7 +481,20 @@ g_free(path); #endif } + return gtk_icon_theme_load_icon(icon_theme, icon_name, x, 0, NULL); +} + +/* Adds symbol list groups in (iter*, title) pairs. + * The list must be ended with NULL. */ +static void G_GNUC_NULL_TERMINATED +tag_list_add_groups(GtkTreeStore *tree_store, ...) +{ + va_list args; + GtkTreeIter *iter; + + g_return_if_fail(top_level_iter_names); + va_start(args, tree_store); for (; iter = va_arg(args, GtkTreeIter*), iter != NULL;) { @@ -547,30 +504,35 @@ if (icon_name) { - icon = gtk_icon_theme_load_icon(icon_theme, icon_name, x, 0, NULL); + icon = get_tag_icon(icon_name); } g_assert(title != NULL); + g_ptr_array_add(top_level_iter_names, title); + gtk_tree_store_append(tree_store, iter, NULL); if (G_IS_OBJECT(icon)) { - gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, - SYMBOLS_COLUMN_NAME, title, -1); + gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, -1); g_object_unref(icon); } - else - gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1); + gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1); } va_end(args); } -static void init_tag_list(GeanyDocument *doc) +static void add_top_level_items(GeanyDocument *doc) { filetype_id ft_id = doc->file_type->id; GtkTreeStore *tag_store = doc->priv->tag_store; + if (top_level_iter_names == NULL) + top_level_iter_names = g_ptr_array_new(); + else + g_ptr_array_set_size(top_level_iter_names, 0); + init_tag_iters(); switch (ft_id) @@ -841,227 +803,317 @@ } -static void add_tree_tags(GtkTreeStore *tree_store, const GList *tags, filetype_id ft_id) +static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, + gboolean found_parent) { - GList *tmp, *skipped = NULL; - GtkTreeIter iter; - gint num_parents = 0, do_skipped = FALSE, num_skipped = 0; - GHashTable *parent_hash; + gchar *utf8_name; + const gchar *scope = tag->atts.entry.scope; + static GString *buffer = NULL; /* buffer will be small so we can keep it for reuse */ + gboolean doc_is_utf8 = FALSE; + + /* encodings_convert_to_utf8_from_charset() fails with charset "None", so skip conversion + * for None at this point completely */ + if (utils_str_equal(doc->encoding, "UTF-8") || + utils_str_equal(doc->encoding, "None")) + doc_is_utf8 = TRUE; + + if (! doc_is_utf8) + utf8_name = encodings_convert_to_utf8_from_charset(tag->name, + (gsize)-1, doc->encoding, TRUE); + else + utf8_name = tag->name; + + if (utf8_name == NULL) + return NULL; + + if (!buffer) + buffer = g_string_new(NULL); + else + g_string_truncate(buffer, 0); + + /* check first char of scope is a wordchar */ + if (!found_parent && scope && + strpbrk(scope, GEANY_WORDCHARS) == scope) + { + const gchar *sep = symbols_get_context_separator(FILETYPE_ID(doc->file_type)); + + g_string_append(buffer, scope); + g_string_append(buffer, sep); + } + g_string_append(buffer, utf8_name); + + if (! doc_is_utf8) + g_free(utf8_name); + + g_string_append_printf(buffer, " [%lu]", tag->atts.entry.line); + + return buffer->str; +} + + +/* find the last word in "foo::bar::blah", e.g. "blah" */ +const gchar *get_parent_name(const TMTag *tag, filetype_id ft_id) +{ + const gchar *scope = tag->atts.entry.scope; const gchar *separator = symbols_get_context_separator(ft_id); + const gchar *str, *ptr; - /* Create a hash table to keep track of parents */ - parent_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, - g_free); + if (!scope) + return NULL; - for (tmp = (GList*)tags; tmp && num_skipped < 20;) + str = scope; + + while (1) { - gchar buf[100] = "", buf2[100] = ""; - const GeanySymbol *symbol = (GeanySymbol*)tmp->data; - GtkTreeIter *parent = NULL, *parent_search = NULL, *parent_search_short = NULL; - GtkTreeIter *parent_icon = NULL, *child = NULL; - GdkPixbuf *icon = NULL; - gint add_parent = FALSE, add_child = FALSE, skip = FALSE; - const gchar *final_name = symbol->str; + ptr = strstr(str, separator); + if (ptr) + { + str = ptr + strlen(separator); + } + else + break; + } - switch (symbol->type) + return NZV(str) ? str : NULL; +} + + +static GtkTreeIter *get_tag_type_iter(TMTagType tag_type, filetype_id ft_id) +{ + GtkTreeIter *iter = NULL; + + switch (tag_type) + { + case tm_tag_prototype_t: + case tm_tag_method_t: + case tm_tag_function_t: { - case tm_tag_prototype_t: - case tm_tag_method_t: - case tm_tag_function_t: + iter = &tv_iters.tag_function; + break; + } + case tm_tag_macro_t: + case tm_tag_macro_with_arg_t: + { + iter = &tv_iters.tag_macro; + break; + } + case tm_tag_class_t: + { + iter = &tv_iters.tag_class; + break; + } + case tm_tag_member_t: + case tm_tag_field_t: + { + iter = &tv_iters.tag_member; + break; + } + case tm_tag_typedef_t: + case tm_tag_enum_t: + { + /* TODO separate C-like types here also */ + if (ft_id == GEANY_FILETYPES_HAXE) { - if (tv_iters.tag_function.stamp == -1) break; - parent = &(tv_iters.tag_function); - parent_icon = &(tv_iters.tag_function); - if (ft_id != GEANY_FILETYPES_DIFF) - add_child = TRUE; + iter = &tv_iters.tag_type; break; } - case tm_tag_macro_t: - case tm_tag_macro_with_arg_t: - { - if (tv_iters.tag_macro.stamp == -1) break; - parent = &(tv_iters.tag_macro); - break; - } - case tm_tag_class_t: - { - if (tv_iters.tag_class.stamp == -1) break; - parent = &(tv_iters.tag_class); - parent_icon = &(tv_iters.tag_class); - add_parent = TRUE; - add_child = TRUE; - break; - } - case tm_tag_member_t: - case tm_tag_field_t: - { - if (tv_iters.tag_member.stamp == -1) break; - parent = &(tv_iters.tag_member); - parent_icon = &(tv_iters.tag_member); - add_parent = TRUE; - add_child = TRUE; - break; - } - case tm_tag_typedef_t: - case tm_tag_enum_t: - { - /* TODO separate C-like types here also */ - if (ft_id == GEANY_FILETYPES_HAXE) - { - if (tv_iters.tag_type.stamp == -1) break; - parent = &(tv_iters.tag_type); - break; - } - } - case tm_tag_union_t: - case tm_tag_struct_t: - case tm_tag_interface_t: - { - if (tv_iters.tag_struct.stamp == -1) break; - parent = &(tv_iters.tag_struct); - parent_icon = &(tv_iters.tag_struct); - add_parent = TRUE; - add_child = TRUE; - break; - } - case tm_tag_variable_t: - { - if (tv_iters.tag_variable.stamp == -1) break; - parent = &(tv_iters.tag_variable); - parent_icon = &(tv_iters.tag_variable); - add_child = TRUE; - break; - } - case tm_tag_namespace_t: - case tm_tag_package_t: - { - if (tv_iters.tag_namespace.stamp == -1) break; - parent = &(tv_iters.tag_namespace); - parent_icon = &(tv_iters.tag_namespace); - add_child = TRUE; - add_parent = TRUE; - break; - } - default: - { - if (tv_iters.tag_other.stamp == -1) break; - parent = &(tv_iters.tag_other); - parent_icon = &(tv_iters.tag_variable); - add_child = TRUE; - } + /* fall through */ } + case tm_tag_union_t: + case tm_tag_struct_t: + case tm_tag_interface_t: + { + iter = &tv_iters.tag_struct; + break; + } + case tm_tag_variable_t: + { + iter = &tv_iters.tag_variable; + break; + } + case tm_tag_namespace_t: + case tm_tag_package_t: + { + iter = &tv_iters.tag_namespace; + break; + } + default: + { + iter = &tv_iters.tag_other; + } + } + if (iter->stamp != -1) + return iter; + else + return NULL; +} - if (parent) - { /* Split the string to obtain parent child names */ - gchar **name_elems = g_strsplit(symbol->str, separator, 10); - const gchar *child_name = NULL; - gchar *parent_name = buf2; - gchar *end_ptr = parent_name; - gint ne; /* number of name_elements */ - buf2[0]='\0'; - parent_search_short = NULL; - for (ne = 0; name_elems[ne]; ne++) - { - child_name = name_elems[ne]; - if (name_elems[ne+1]) - { - if (ne > 0) - end_ptr = g_stpcpy(end_ptr, separator); - end_ptr = g_stpcpy(end_ptr, name_elems[ne]); - parent_search_short = - (GtkTreeIter *)g_hash_table_lookup(parent_hash, (gpointer)name_elems[ne]); - } - } +static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash) +{ + filetype_id ft_id = FILETYPE_ID(doc->file_type); + GtkTreeStore *tree_store = doc->priv->tag_store; + GtkTreeIter *parent = NULL; - child = &iter; - if (!parent_icon) - parent_icon = parent; + parent = get_tag_type_iter(tag->type, ft_id); - gtk_tree_model_get(GTK_TREE_MODEL(tree_store), parent_icon, - SYMBOLS_COLUMN_ICON, &icon, -1); - if (add_child) - { - if (parent_name) - { - parent_search = (GtkTreeIter *)g_hash_table_lookup(parent_hash, (gpointer)parent_name); - if (parent_search) - parent = parent_search; - else if (parent_search_short) - parent = parent_search_short; + if (parent) + { + const gchar *name; + const gchar *parent_name = get_parent_name(tag, ft_id); + GtkTreeIter iter; + GtkTreeIter *icon_iter = NULL, *child = NULL; + GdkPixbuf *icon = NULL; - if (child_name) - final_name = child_name; - else - final_name = symbol->str; - } - if (ne > 1 && !parent_search && !parent_search_short) - { /* Want to add child but parent not found */ - GList *newstart; - tmp = g_list_previous(tmp); - newstart = g_list_remove(tmp, (gconstpointer) symbol); - newstart = g_list_append(tmp, (gpointer) symbol); - skip = TRUE; - num_skipped++; - } - } + child = &iter; + icon_iter = (parent != &tv_iters.tag_other) ? parent : &tv_iters.tag_variable; - if (!skip || do_skipped) - { - num_skipped = 0; - if (add_parent) - { - GtkTreeIter *new_iter = g_new0(GtkTreeIter, 1); - g_hash_table_insert(parent_hash, symbol->str, new_iter); - child = new_iter; - num_parents++; - } + gtk_tree_model_get(GTK_TREE_MODEL(tree_store), icon_iter, + SYMBOLS_COLUMN_ICON, &icon, -1); - g_snprintf(buf, sizeof(buf), "%s [%d]", final_name, symbol->line); - gtk_tree_store_append(tree_store, child, parent); - gtk_tree_store_set(tree_store, child, - SYMBOLS_COLUMN_ICON, icon, - SYMBOLS_COLUMN_NAME, buf, - SYMBOLS_COLUMN_LINE, symbol->line, -1); - } + if (parent_name) + { + GtkTreeIter *parent_search = + (GtkTreeIter *)g_hash_table_lookup(parent_hash, parent_name); + + if (parent_search) + parent = parent_search; else - { /* Put in skipped list */ -/* - skipped = g_list_append(skipped, (gpointer)symbol); -*/ - } + parent_name = NULL; + } - if (G_LIKELY(G_IS_OBJECT(icon))) - g_object_unref(icon); - g_strfreev(name_elems); + /* check if the current tag is a parent of other tags */ + if (g_hash_table_lookup_extended(parent_hash, tag->name, NULL, NULL)) + { + GtkTreeIter *new_iter = g_new0(GtkTreeIter, 1); + + /* set an iter value for the hash key */ + g_hash_table_insert(parent_hash, tag->name, new_iter); + /* instead of ignoring the appended child iter below, use the one in the hash table */ + child = new_iter; } - if (! do_skipped && !g_list_next(tmp)) - { /* Start adding skipped items */ - do_skipped = TRUE; - tmp = g_list_first(skipped); - } - else - tmp = g_list_next(tmp); + gtk_tree_store_append(tree_store, child, parent); + + name = get_symbol_name(doc, tag, (parent_name != NULL)); + gtk_tree_store_set(tree_store, child, + SYMBOLS_COLUMN_ICON, icon, + SYMBOLS_COLUMN_NAME, name, + SYMBOLS_COLUMN_TAG, tag, -1); + + if (G_LIKELY(G_IS_OBJECT(icon))) + g_object_unref(icon); } + else + geany_debug("Missing symbol-tree parent iter for type %d!", tag->type); +} + + +static void add_tree_tags(GeanyDocument *doc, const GList *tags) +{ + const GList *item; + GHashTable *parent_hash; + + /* Create a hash table "parent_tag_name":(GtkTreeIter*) */ + parent_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free); + + /* find and store all parent names in the hash table */ + for (item = tags; item; item = g_list_next(item)) + { + const TMTag *tag = item->data; + const gchar *name = get_parent_name(tag, FILETYPE_ID(doc->file_type)); + + if (name) + g_hash_table_insert(parent_hash, (gpointer)name, NULL); + } + for (item = tags; item; item = g_list_next(item)) + { + const TMTag *tag = item->data; + + add_tree_tag(doc, tag, parent_hash); + } g_hash_table_destroy(parent_hash); } +/* @param item Must be a (gpointer*) for implementation reasons. + * @example gchar *name = *item; (for when the GPtrArray contains char pointers). */ +#define foreach_ptr_array(item, ptr_array) \ + for (item = ptr_array->pdata; item < &ptr_array->pdata[ptr_array->len]; item++) + +/* we don't want to sort 1st-level nodes, but we can't return 0 because the tree sort + * is not stable, so the order is already lost. */ +static gint compare_top_level_names(const gchar *a, const gchar *b) +{ + gpointer *item; + + foreach_ptr_array(item, top_level_iter_names) + { + const gchar *name = *item; + + if (utils_str_equal(name, a)) + return -1; + if (utils_str_equal(name, b)) + return 1; + } + g_warning("Couldn't find top level node '%s' or '%s'!", a, b); + return 0; +} + + +static gint tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, + gpointer user_data) +{ + gboolean sort_by_name = GPOINTER_TO_INT(user_data); + const TMTag *tag_a, *tag_b; + + gtk_tree_model_get(model, a, SYMBOLS_COLUMN_TAG, &tag_a, -1); + gtk_tree_model_get(model, b, SYMBOLS_COLUMN_TAG, &tag_b, -1); + + if (tag_a && tag_b) + { + return sort_by_name ? compare_symbol(tag_a, tag_b) : + compare_symbol_lines(tag_a, tag_b); + } + else + { + gchar *astr, *bstr; + gint cmp; + + gtk_tree_model_get(model, a, SYMBOLS_COLUMN_NAME, &astr, -1); + gtk_tree_model_get(model, b, SYMBOLS_COLUMN_NAME, &bstr, -1); + + /* if a is toplevel, b must be also */ + if (gtk_tree_store_iter_depth(GTK_TREE_STORE(model), a) == 0) + cmp = compare_top_level_names(astr, bstr); + else + cmp = strcmp(astr, bstr); + + g_free(astr); + g_free(bstr); + return cmp; + } +} + + +static void sort_tree(GtkTreeStore *store, gboolean sort_by_name) +{ + gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), 1, tree_sort_func, + GINT_TO_POINTER(sort_by_name), NULL); + + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 1, GTK_SORT_ASCENDING); +} + + gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) { - const GList *tags; + GList *tags; static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME; g_return_val_if_fail(doc != NULL, FALSE); - if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS) - sort_mode = prev_sort_mode; - else - prev_sort_mode = sort_mode; - - tags = get_tag_list(doc, tm_tag_max_t, sort_mode); - if (doc->tm_file == NULL || tags == NULL) + tags = get_tag_list(doc, tm_tag_max_t); + if (tags == NULL) return FALSE; /* Make sure the model stays with us after the tree view unrefs it */ @@ -1072,12 +1124,20 @@ gtk_tree_store_clear(doc->priv->tag_store); /* add grandparent type iters */ - init_tag_list(doc); + add_top_level_items(doc); - add_tree_tags(doc->priv->tag_store, tags, FILETYPE_ID(doc->file_type)); + add_tree_tags(doc, tags); + g_list_free(tags); hide_empty_rows(doc->priv->tag_store); + if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS) + sort_mode = prev_sort_mode; + else + prev_sort_mode = sort_mode; + + sort_tree(doc->priv->tag_store, sort_mode == SYMBOLS_SORT_BY_NAME); + /* Re-attach model to view */ gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), GTK_TREE_MODEL(doc->priv->tag_store)); Modified: branches/symbol-tree/src/treeviews.c =================================================================== --- branches/symbol-tree/src/treeviews.c 2008-11-01 02:45:55 UTC (rev 3165) +++ branches/symbol-tree/src/treeviews.c 2008-11-03 17:25:35 UTC (rev 3166) @@ -188,7 +188,7 @@ if (doc->priv->tag_tree == NULL) { doc->priv->tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); doc->priv->tag_tree = gtk_tree_view_new(); prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); gtk_widget_show(doc->priv->tag_tree); @@ -637,7 +637,13 @@ if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_LINE, &line, -1); + const TMTag *tag; + + gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); + if (!tag) + return FALSE; + + line = tag->atts.entry.line; if (line > 0) { GeanyDocument *doc = document_get_current(); Modified: branches/symbol-tree/src/treeviews.h =================================================================== --- branches/symbol-tree/src/treeviews.h 2008-11-01 02:45:55 UTC (rev 3165) +++ branches/symbol-tree/src/treeviews.h 2008-11-03 17:25:35 UTC (rev 3166) @@ -41,7 +41,7 @@ { SYMBOLS_COLUMN_ICON, SYMBOLS_COLUMN_NAME, - SYMBOLS_COLUMN_LINE, + SYMBOLS_COLUMN_TAG, SYMBOLS_N_COLUMNS }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3165] branches/build-system
by elextr＠users.sourceforge.net 01 Nov '08

01 Nov '08

Revision: 3165 http://geany.svn.sourceforge.net/geany/?rev=3165&view=rev Author: elextr Date: 2008-11-01 02:45:55 +0000 (Sat, 01 Nov 2008) Log Message: ----------- Fixed geany.txt to build to html without errors Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/doc/geany.html branches/build-system/doc/geany.txt Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2008-10-31 12:29:34 UTC (rev 3164) +++ branches/build-system/ChangeLog 2008-11-01 02:45:55 UTC (rev 3165) @@ -1,3 +1,10 @@ +2008-111-01 Lex Trotman <elextr(at)gmail(dot)com> + + Updated Manual to build geany.html + + * doc/geany.txt: + Modified to make geany.html build w/o errors + 2008-10-27 Lex Trotman <elextr(at)gmail(dot)com> Updated Manual to reflect desired full functionality of build system Modified: branches/build-system/doc/geany.html =================================================================== --- branches/build-system/doc/geany.html 2008-10-31 12:29:34 UTC (rev 3164) +++ branches/build-system/doc/geany.html 2008-11-01 02:45:55 UTC (rev 3165) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-10-02" /> +<meta name="date" content="2008-10-27" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-10-02</td></tr> +<td>2008-10-27</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -302,97 +302,103 @@ <li><a class="reference" href="#new-project" id="id107" name="id107">New Project</a></li> <li><a class="reference" href="#project-properties" id="id108" name="id108">Project Properties</a><ul> <li><a class="reference" href="#make-in-base-path" id="id109" name="id109">Make in base path</a></li> -<li><a class="reference" href="#run-command" id="id110" name="id110">Run command</a></li> </ul> </li> -<li><a class="reference" href="#open-project" id="id111" name="id111">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id112" name="id112">Close Project</a></li> +<li><a class="reference" href="#open-project" id="id110" name="id110">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id111" name="id111">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#build-system" id="id113" name="id113">Build system</a><ul> -<li><a class="reference" href="#compile" id="id114" name="id114">Compile</a></li> -<li><a class="reference" href="#build" id="id115" name="id115">Build</a></li> -<li><a class="reference" href="#make-all" id="id116" name="id116">Make all</a></li> -<li><a class="reference" href="#make-custom-target" id="id117" name="id117">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id118" name="id118">Make object</a></li> -<li><a class="reference" href="#execute" id="id119" name="id119">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id120" name="id120">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id121" name="id121">Terminal emulators</a></li> +<li><a class="reference" href="#build-system" id="id112" name="id112">Build system</a><ul> +<li><a class="reference" href="#rationale" id="id113" name="id113">Rationale</a></li> +<li><a class="reference" href="#operation" id="id114" name="id114">Operation</a></li> +<li><a class="reference" href="#default-menu-actions" id="id115" name="id115">Default Menu Actions</a><ul> +<li><a class="reference" href="#compile" id="id116" name="id116">Compile</a></li> +<li><a class="reference" href="#build" id="id117" name="id117">Build</a></li> +<li><a class="reference" href="#spare" id="id118" name="id118">Spare</a></li> +<li><a class="reference" href="#make-all" id="id119" name="id119">Make All</a></li> +<li><a class="reference" href="#make-custom-target" id="id120" name="id120">Make Custom Target</a></li> +<li><a class="reference" href="#make-object" id="id121" name="id121">Make Object</a></li> +<li><a class="reference" href="#make" id="id122" name="id122">Make</a></li> +<li><a class="reference" href="#execute" id="id123" name="id123">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id124" name="id124">Stopping running processes</a></li> +<li><a class="reference" href="#terminal-emulators" id="id125" name="id125">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#configure-commands" id="id122" name="id122">Configure Commands</a><ul> -<li><a class="reference" href="#for-filetype-x" id="id123" name="id123">For Filetype X</a></li> -<li><a class="reference" href="#one-step-compilation" id="id124" name="id124">One step compilation</a></li> -<li><a class="reference" href="#project-make" id="id125" name="id125">[Project] Make</a></li> +<li><a class="reference" href="#set-build-menu-commands" id="id126" name="id126">Set Build Menu Commands</a><ul> +<li><a class="reference" href="#filetype-commands" id="id127" name="id127">Filetype commands</a></li> +<li><a class="reference" href="#one-step-compilation" id="id128" name="id128">One step compilation</a></li> +<li><a class="reference" href="#build-commands" id="id129" name="id129">Build Commands</a></li> +<li><a class="reference" href="#extendable-command" id="id130" name="id130">Extendable Command</a></li> +<li><a class="reference" href="#execute-command" id="id131" name="id131">Execute Command</a></li> </ul> </li> -<li><a class="reference" href="#indicators" id="id126" name="id126">Indicators</a></li> +<li><a class="reference" href="#indicators" id="id132" name="id132">Indicators</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id127" name="id127">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id128" name="id128">Plugins</a></li> -<li><a class="reference" href="#keybindings" id="id129" name="id129">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id130" name="id130">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id131" name="id131">Configurable keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id133" name="id133">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id134" name="id134">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id135" name="id135">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id136" name="id136">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id137" name="id137">Configurable keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id132" name="id132">Configuration files</a><ul> -<li><a class="reference" href="#global-configuration-file" id="id133" name="id133">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id134" name="id134">Filetype definition files</a><ul> -<li><a class="reference" href="#format" id="id135" name="id135">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id136" name="id136">[styling] Section</a></li> -<li><a class="reference" href="#keywords-section" id="id137" name="id137">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id138" name="id138">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id139" name="id139">[build_settings] Section</a></li> +<li><a class="reference" href="#configuration-files" id="id138" name="id138">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id139" name="id139">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id140" name="id140">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id141" name="id141">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id142" name="id142">[styling] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id143" name="id143">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id144" name="id144">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id145" name="id145">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id140" name="id140">Special file filetypes.common</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id146" name="id146">Special file filetypes.common</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id141" name="id141">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id142" name="id142">Templates</a><ul> -<li><a class="reference" href="#template-metadata" id="id143" name="id143">Template metadata</a></li> -<li><a class="reference" href="#file-templates" id="id144" name="id144">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id145" name="id145">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id146" name="id146">Filetype templates</a></li> +<li><a class="reference" href="#filetype-extensions" id="id147" name="id147">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id148" name="id148">Templates</a><ul> +<li><a class="reference" href="#template-metadata" id="id149" name="id149">Template metadata</a></li> +<li><a class="reference" href="#file-templates" id="id150" name="id150">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id151" name="id151">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id152" name="id152">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id147" name="id147">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id148" name="id148">Template wildcards</a></li> +<li><a class="reference" href="#customizing-templates" id="id153" name="id153">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id154" name="id154">Template wildcards</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference" href="#plugin-documentation" id="id149" name="id149">Plugin documentation</a><ul> -<li><a class="reference" href="#instant-save" id="id150" name="id150">Instant Save</a></li> -<li><a class="reference" href="#backup-copy" id="id151" name="id151">Backup Copy</a></li> +<li><a class="reference" href="#plugin-documentation" id="id155" name="id155">Plugin documentation</a><ul> +<li><a class="reference" href="#instant-save" id="id156" name="id156">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id157" name="id157">Backup Copy</a></li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id152" name="id152">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id153" name="id153">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id154" name="id154">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id158" name="id158">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id159" name="id159">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id160" name="id160">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#tips-and-tricks" id="id155" name="id155">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id156" name="id156">Document notebook</a></li> -<li><a class="reference" href="#symbols" id="id157" name="id157">Symbols</a></li> -<li><a class="reference" href="#gtk-related" id="id158" name="id158">GTK-related</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id161" name="id161">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id162" name="id162">Document notebook</a></li> +<li><a class="reference" href="#symbols" id="id163" name="id163">Symbols</a></li> +<li><a class="reference" href="#gtk-related" id="id164" name="id164">GTK-related</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id159" name="id159">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id160" name="id160">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id161" name="id161">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id162" name="id162">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id163" name="id163">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id164" name="id164">keyfile.c</a></li> +<li><a class="reference" href="#hidden-preferences" id="id165" name="id165">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id166" name="id166">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id167" name="id167">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id168" name="id168">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id169" name="id169">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id170" name="id170">keyfile.c</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id165" name="id165">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id166" name="id166">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id171" name="id171">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id172" name="id172">License for Scintilla and SciTE</a></li> </ul> </div> <div class="section"> @@ -1947,8 +1953,7 @@ <div class="note"> <p class="first admonition-title">Note</p> <p class="last">The make commands are set in the <em>Build->Configure Commands</em> dialog. -This directory is used so that the builder command need not be in -the default path.</p> +This directory is not used for the project based commands.</p> </div> <dl class="docutils"> <dt>Terminal</dt> @@ -2140,21 +2145,9 @@ path. Uncheck this if you want to use the current file's directory instead.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id110" id="run-command" name="run-command">Run command</a></h4> -<p>The <em>Run command</em> overrides the default run command. You can set this -to the executable or main script file for the project, and append -any command-line arguments.</p> -<p>The following variables can be used:</p> -<ul class="simple"> -<li>%f -- complete filename without path</li> -<li>%e -- filename without path and without extension</li> -</ul> -<p>See <a class="reference" href="#build-settings-section">[build_settings] Section</a> for details.</p> </div> -</div> <div class="section"> -<h3><a class="toc-backref" href="#id111" id="open-project" name="open-project">Open Project</a></h3> +<h3><a class="toc-backref" href="#id110" id="open-project" name="open-project">Open Project</a></h3> <p>The Open command displays a standard file chooser, starting in <tt class="docutils literal"><span class="pre">~/projects</span></tt>. Choose a project file named with the <tt class="docutils literal"><span class="pre">.geany</span></tt> extension.</p> @@ -2162,75 +2155,137 @@ open files and open the session files associated with the project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id112" id="close-project" name="close-project">Close Project</a></h3> +<h3><a class="toc-backref" href="#id111" id="close-project" name="close-project">Close Project</a></h3> <p>Project file settings are saved when the project is closed.</p> <p>When project session support is enabled, Geany will close the project session files and open any previously closed default session files.</p> </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id113" id="build-system" name="build-system">Build system</a></h2> +<h2><a class="toc-backref" href="#id112" id="build-system" name="build-system">Build system</a></h2> <p>Geany does not have it's own integrated build system, instead it provides a fast flexible means of invoking customisable build/execute commands appropriate to the type of source file, or, to invoke your favourite make/build tool. This system allows Geany to default to sane actions for simple single file programs whilst still being configurable to support multiple target/multiple programming language projects.</p> +<div class="section"> +<h3><a class="toc-backref" href="#id113" id="rationale" name="rationale">Rationale</a></h3> +<p>If on first reading the build system sounds complicated, it may help to +keep in mind the rationale behind its design. Geany supports many +languages which have different commands to compile/link/run their code +so different commands must be used for each type of source file that +Geany understands. Therefore some commands are stored for each type of file.</p> +<p>As software gets more complex and is divided into several source files it +is usual to run the file containing the main program, not the one currently +being edited. In this case Geany cannot generally identify the correct +file, so the user has to configure it. To keep it separate from filetype +information, this execute command is stored in the user preferences.</p> +<p>For larger software projects compiling and running individual files is +not very effective as differing settings and flags may be needed, making +manual building complex. Instead some form of build software such as +"Make" is used. It is useful to be able to invoke the builder from +Geany, and so have the output parsed for error messages, allowing Geany +to take you straight to the source line of the error. To do this Geany +needs to know some more commands which are independant of the type of +source. These commands are also stored with the user preferences.</p> +<p>When operating on several software projects it is annoying and error +prone to have to set the build and execute commands each time you start +work on a different set of software. By using the Geany project file to +store the commands for each different project it is possible to have them +set automatically whenever that project is opened.</p> +<p>Finally a set of common default values are provided if the user doesn't +set any specific information, making simple systems work out of the box.</p> +</div> +<div class="section"> +<h3><a class="toc-backref" href="#id114" id="operation" name="operation">Operation</a></h3> <p>Two actions are performed for all the build menu items.</p> -<p>First the current source file will be saved before it is processed. This +<ul class="simple"> +<li>First the current source file will be saved before it is processed. This is for convenience so that you don't need to keep saving small changes -to the current file before building.</p> -<p>Second the output for Compile, Build and Make actions will be captured +to the current file before building.</li> +<li>Second the output for Compile, Build and Make actions will be captured in the Compiler notebook tab of the messages window. If there are any warnings or errors with line numbers shown in red in the Compiler output tab, you can click on them and Geany will switch to the relevant source file (or open it) and mark the line number so the problem can be corrected. Geany will also set indicators for warnings or errors with -line numbers.</p> +line numbers.</li> +</ul> <div class="tip"> <p class="first admonition-title">Tip</p> <p class="last">If Geany's default error message parsing does not parse errors for the tool you're using, you can set a custom regex. See <a class="reference" href="#filetype-definition-files">Filetype definition files</a> and the <a class="reference" href="#build-settings-section">[build_settings] Section</a>.</p> </div> -<p>Depending on the current file's filetype and project settings, the -default Build menu will contain the following items:</p> +<p>The build menu is very flexible and can be set up to perform any +actions the user requires, and depend on the type of the current file and +whether there is a project open. The user can modify both the commands +the menu items invoke and the menu item labels themselves so that they +can continue to describe the action they perform.</p> +<p>The default menu (with the current file being a C source file) is shown +below with the sections of the menu labelled.</p> +<img alt="./images/build_menu.png" src="./images/build_menu.png" /> +<p>The sections marked on the menu are:</p> +<ul> +<li><p class="first">Filetype menu items - up to three menu items which depend on the +filetype of the current file. As noted, by default a C language file +has only two menu items in this section. Many interpreted languages +have only one by default, however users can add commands using the <em>Set +Build Menu Command</em> dialog.</p> +</li> +<li><p class="first">Project or user preference items - four menu items which do not depend +on the current filetype, instead getting their values using the +following process:</p> <ul class="simple"> -<li>Compile</li> -<li>Build</li> -<li>Make All</li> -<li>Make Custom Target</li> -<li>Make Object</li> -<li>Execute</li> -<li>Configure Commands</li> +<li>If a project is open, the menu item labels and commands can be set +and stored in the project file using the <em>Set Build Menu Commands</em> +dialog. Individual menu item labels and commands can be set, +any field not set in the project file will get its value from one +of the following sources.</li> +<li>If no project is open the menu item labels and commands can be +set and stored in the user preference file using the <em>Set Build Menu +Commands</em> dialog.</li> +<li>Any menu item labels or commands not defined will get the default +values shown and described below.</li> </ul> -<p>The Compile, Build and Execute actions depend on the filetype of the -currently open document, whereas the Make series of actions do not. -The intention is that the Compile, Build and Execute actions support -simple single-file actions whilst the Make actions support larger systems -which use builder tools. The Make commands and menu item names are set -from the first of the following places where the commands are defined:</p> +</li> +<li><p class="first">Compilation Error Navigation items - help navigate errors found +during compilations. These are not user modifyable.</p> +</li> +<li><p class="first">Execute Menu Item - is intended to provide a flexible method of +running and stopping the program. The execute menu item obtains its +value using the following process:</p> <ul class="simple"> -<li>From the project file if a project is open and the project file has -make commands defined.</li> -<li>From the user preferences if the user has make commands defined.</li> -<li>From the global preferences/defaults.</li> +<li>If a project is open and defines the menu item label or command use +that or,</li> +<li>if no project is open and the menu item label or command is defined +in the user preference file, use that, otherwise,</li> +<li>the menu item label or command as defined by the current filetype +is used.</li> </ul> -<p>The Execute command can also be customised from the project file.</p> -<p>The menu item names for the Make commands can be changed, for example -if you change the commands to invoke a builder other than Make then you -can change the menu labels to reflect that.</p> +<p>When a program is running this menu item changes to 'Stop'. Note that +the stop function does not use a command and is not user configurable.</p> +</li> +<li><p class="first">Set Build Menu Commands - opens the dialog to modify any of the menu +items associated with the build menu and the commands they run.</p> +</li> +</ul> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">Some support for building for different targets on different machines can be provided by having several project files for the same software, -e.g. if supporting windows and Linux from the same source you could +e.g. if supporting Windows and Linux from the same source you could have 'my_proj_win.geany' with Make Object defined as 'nmake %e.obj' and 'my_proj_lin.geany' with Make Object defined as 'make %e.o' and so on for the other commands.</p> </div> +</div> <div class="section"> -<h3><a class="toc-backref" href="#id114" id="compile" name="compile">Compile</a></h3> +<h3><a class="toc-backref" href="#id115" id="default-menu-actions" name="default-menu-actions">Default Menu Actions</a></h3> +<p>This section describes the default menu items and their actions.</p> +<div class="section"> +<h4><a class="toc-backref" href="#id116" id="compile" name="compile">Compile</a></h4> <p>The Compile command has different uses for different kinds of files.</p> <p>For compilable languages such as C and C++, the default Compile command is setup to compile the current source file into a binary object file.</p> @@ -2238,62 +2293,36 @@ languages such as Perl, Python, Ruby will compile to bytecode if the language supports it, or will run a syntax check, or failing that will run the file in its language interpreter.</p> -<p>The following table summarises the default commands for each filetype:</p> -<table border="1" class="docutils"> -<colgroup> -<col width="13%" /> -<col width="15%" /> -<col width="40%" /> -<col width="32%" /> -</colgroup> -<thead valign="bottom"> -<tr><th class="head">Language</th> -<th class="head">Menu Item</th> -<th class="head">Action</th> -<th class="head">Command</th> -</tr> -</thead> -<tbody valign="top"> -<tr><td rowspan="3">C</td> -<td>Compile</td> -<td>Compile the current file</td> -<td>gcc -Wall -c "%f"</td> -</tr> -<tr><td>Build</td> -<td>Compile the current file to -an executable</td> -<td>gcc -Wall -o "%e" "%f"</td> -</tr> -<tr><td>Run</td> -<td>Run a pre-compiled program</td> -<td>"./%e"</td> -</tr> -<tr><td>C++</td> -<td colspan="3">ETC</td> -</tr> -</tbody> -</table> +<p>The table at Appendix ... shows the default command values.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id115" id="build" name="build">Build</a></h3> +<h4><a class="toc-backref" href="#id117" id="build" name="build">Build</a></h4> <p>For compilable languages such as C and C++, the Build command will link the current source file's equivalent object file into an executable. If the object file does not exist, the source will be compiled and linked in one step, producing just the executable binary.</p> -<p>Interpreted languages do not use the Build command.</p> +<p>Interpreted languages do not use the Build command so the user can +re-define it to be any useful command.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id116" id="make-all" name="make-all">Make all</a></h3> -<p>By default this effectively runs "make all" in the same directory as the +<h4><a class="toc-backref" href="#id118" id="spare" name="spare">Spare</a></h4> +<p>There is also a spare command with no default value that the user can use +for any operation appropriate for the filetype, e.g. running lint</p> +</div> +<div class="section"> +<h4><a class="toc-backref" href="#id119" id="make-all" name="make-all">Make All</a></h4> +<p>By default this runs "make all" in the same directory as the current file.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">For each of the Make commands, The Make tool path must be correctly -set in the Tools tab of the Preferences dialog.</p> +set in the Tools tab of the Preferences dialog. This path is used +for commands not defined by project files. Commands in project files +have to contain the full path if required.</p> </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id117" id="make-custom-target" name="make-custom-target">Make custom target</a></h3> +<h4><a class="toc-backref" href="#id120" id="make-custom-target" name="make-custom-target">Make Custom Target</a></h4> <p>The default use is similar to running 'Make all' but you will be prompted for the make target name to be passed to the Make tool. For example, typing 'clean' in the dialog prompt will run "make clean".</p> @@ -2305,13 +2334,17 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id118" id="make-object" name="make-object">Make object</a></h3> +<h4><a class="toc-backref" href="#id121" id="make-object" name="make-object">Make Object</a></h4> <p>By default Make Object will run "make current_file.o" in the same directory as the current file, using its prefix for 'current_file'. It is useful for compiling just the current file without building the whole project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id119" id="execute" name="execute">Execute</a></h3> +<h4><a class="toc-backref" href="#id122" id="make" name="make">Make</a></h4> +<p>Make runs the default "make" command.</p> +</div> +<div class="section"> +<h4><a class="toc-backref" href="#id123" id="execute" name="execute">Execute</a></h4> <p>Execute will run the corresponding executable file, shell script or interpreted script in a terminal window. Note that the Terminal tool path must be correctly set in the Tools tab of the Preferences dialog - @@ -2322,7 +2355,7 @@ output from the program before the terminal window is closed.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id120" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h3> +<h4><a class="toc-backref" href="#id124" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h4> <p>When there is a running program, the Run button in the toolbar becomes a stop button and you can stop the current action. This works by sending a signal to the process (and its child process(es)) @@ -2330,8 +2363,9 @@ <p>Depending on the process you started it might occur that the process cannot be stopped. This can happen when the process creates more than one child process.</p> +</div> <div class="section"> -<h4><a class="toc-backref" href="#id121" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> +<h4><a class="toc-backref" href="#id125" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> <p>Xterm is known to work properly. If you are using "Terminal" (the terminal program of Xfce), you should add the command line option <tt class="docutils literal"><span class="pre">--disable-server</span></tt> otherwise the started process cannot be @@ -2340,19 +2374,19 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id122" id="configure-commands" name="configure-commands">Configure Commands</a></h3> +<h3><a class="toc-backref" href="#id126" id="set-build-menu-commands" name="set-build-menu-commands">Set Build Menu Commands</a></h3> <p>By default the Compile and Build commands invoke the compiler and linker with only the basic arguments needed by all programs. Using -<em>Configure Commands</em> you can add any include paths and compile +<em>Set Build Menu Commands</em> you can add any include paths and compile flags for the compiler, any library names and paths for the linker, -and any arguments you want to use when running Execute.</p> +and any arguments you want to use when running Execute or you can +completely change the operation of these menu items.</p> <p>These settings are saved automatically when Geany is shut down.</p> <p>The following variables can be used:</p> <ul class="simple"> <li>%f -- complete filename without path</li> <li>%e -- filename without path and without extension</li> </ul> -<p>See <a class="reference" href="#build-settings-section">[build_settings] Section</a> for details.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">If you need complex settings for your build system, or several @@ -2360,38 +2394,63 @@ recommended; this will also make it easier for users to build your software.</p> </div> -<p>The commands are listed under two varying headings:</p> +<p>A typical <em>Set Build Menu Commands</em> dialog box is shown in the following +figure with the various parts of the dialog labelled. Note that if a +project is not open the <em>Project Build Menu Commands</em> will be replaced by +<em>User Preferred Build Menu Commands</em>.</p> +<img alt="./images/build_menu_cmds.png" src="./images/build_menu_cmds.png" /> +<p>The commands are labelled to show that there are two parts to the dialog.</p> <ul class="simple"> -<li>'For Filetype X' where X is the type of the current file.</li> -<li>'Make' or 'Project Make' depending on whether a project file is open.</li> +<li>'Filetype commands' which depend on the type of the current file. Do +check you have the correct filetype before changing them.</li> +<li>'Build Commands' which do not depend on the type of the current file +but do depend on the open project or if non is open.</li> </ul> +<p>All commands allow both the label and the command to be changed. The +right hand button clears the manu label and command to allow it to +return to the default value, deleting the menu label or command text sets +the command to blank, not back to default.</p> <div class="section"> -<h4><a class="toc-backref" href="#id123" id="for-filetype-x" name="for-filetype-x">For Filetype X</a></h4> +<h4><a class="toc-backref" href="#id127" id="filetype-commands" name="filetype-commands">Filetype commands</a></h4> <p>These settings are specific to the particular filetype. Although they traditionally support the actions described above, you can change the commands to perform any file specific action you want, e.g. to run Lint or other tools.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id124" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> +<h4><a class="toc-backref" href="#id128" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> <p>If you are using the Build command to compile and link in one step, you will need to set both the compiler arguments and the linker -arguments in the linker command setting.</p> +arguments in this command setting.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id125" id="project-make" name="project-make">[Project] Make</a></h4> -<p>These commands allow you to set the 'Make' series of commands. -The variable heading indicates whether the commands you are changing -will be saved in the project file or preferences file. The current -project file is displayed in the Geany title bar in [] so you can -check that you will be saving to the correct one.</p> -<p>Remember that menu item two (default the 'Make Custom Target' item) -will pop up a dialog to ask for additional targets/options when invoked -allowing you to add to the command you define here.</p> +<h4><a class="toc-backref" href="#id129" id="build-commands" name="build-commands">Build Commands</a></h4> +<p>These commands allow you to set the commands that are independant of the +filetype. The dialog section heading indicates whether the commands you +are changing will be saved in the project file or preferences file. The +current project file is displayed in the Geany title bar in [] so you can +check that you will be saving to the correct one. Commands stored in +project files do not use the 'Make Command Path" preference setting so +that each project can use differing tools, make sure commands stored in +project files include paths if needed.</p> </div> +<div class="section"> +<h4><a class="toc-backref" href="#id130" id="extendable-command" name="extendable-command">Extendable Command</a></h4> +<p>Remember that the second of the build menu items (default the 'Make +Custom Target' item) will pop up a dialog to ask for additional +targets/options when invoked, allowing you to add to the command which +you define here.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id126" id="indicators" name="indicators">Indicators</a></h3> +<h4><a class="toc-backref" href="#id131" id="execute-command" name="execute-command">Execute Command</a></h4> +<p>As noted on the dialog, if an execute command is set in user preferences +or the currently open project it will override the filetype dependent +menu item/command. Remember to clear the saved execute command you must +use the clear button to the right of the line.</p> +</div> +</div> +<div class="section"> +<h3><a class="toc-backref" href="#id132" id="indicators" name="indicators">Indicators</a></h3> <p>Indicators are red squiggly underlines which are used to highlight errors which occured while compiling the current file. So you can easily see where your code failed to compile. To remove the indicators, @@ -2401,7 +2460,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id127" id="printing-support" name="printing-support">Printing support</a></h2> +<h2><a class="toc-backref" href="#id133" id="printing-support" name="printing-support">Printing support</a></h2> <p>Since Geany 0.13 there is full printing support using GTK's printing API. The printed page(s) will look nearly the same as on your screen in Geany. Additionally, there are some options to modify the printed page(s). You @@ -2449,7 +2508,7 @@ gtklp or similar programs can be used.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id128" id="plugins" name="plugins">Plugins</a></h2> +<h2><a class="toc-backref" href="#id134" id="plugins" name="plugins">Plugins</a></h2> <p>Plugins are loaded at startup, if the <em>Enable plugin support</em> general preference is set. There is also a command-line option, <tt class="docutils literal"><span class="pre">-p</span></tt>, which prevents plugins being loaded. Plugins are scanned in @@ -2471,13 +2530,13 @@ which are included in Geany.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id129" id="keybindings" name="keybindings">Keybindings</a></h2> +<h2><a class="toc-backref" href="#id135" id="keybindings" name="keybindings">Keybindings</a></h2> <p>Geany supports the default keyboard shortcuts for the Scintilla editing widget. For a list of these commands, see <a class="reference" href="#scintilla-keyboard-commands">Scintilla keyboard commands</a>. The Scintilla keyboard shortcuts will be overridden by any custom keybindings with the same keyboard shortcut.</p> <div class="section"> -<h3><a class="toc-backref" href="#id130" id="switching-documents" name="switching-documents">Switching documents</a></h3> +<h3><a class="toc-backref" href="#id136" id="switching-documents" name="switching-documents">Switching documents</a></h3> <p>There are a few non-configurable bindings to switch between documents, listed below. These can also be overridden by custom keybindings.</p> <table border="1" class="docutils"> @@ -2507,7 +2566,7 @@ </table> </div> <div class="section"> -<h3><a class="toc-backref" href="#id131" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> +<h3><a class="toc-backref" href="#id137" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> <p>For all actions listed below you can define your own keybindings. Open the Preferences dialog, select the desired action and click on change. In the opening dialog you can press any key combination you @@ -3073,9 +3132,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id132" id="configuration-files" name="configuration-files">Configuration files</a></h1> +<h1><a class="toc-backref" href="#id138" id="configuration-files" name="configuration-files">Configuration files</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id133" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> +<h2><a class="toc-backref" href="#id139" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> <p>You can use a global configuration file for Geany which will be used if the user starts Geany for the first time and an user's configuration file was not yet created or in case an user deleted the configuration @@ -3095,7 +3154,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id134" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> +<h2><a class="toc-backref" href="#id140" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> <p>All colour definitions and other filetype specific settings are stored in the filetype definition files. Those settings are colours for syntax highlighting, general settings like comment characters or @@ -3123,9 +3182,9 @@ to change. All missing settings will be read from the corresponding global definition file in <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt>.</p> <div class="section"> -<h3><a class="toc-backref" href="#id135" id="format" name="format">Format</a></h3> +<h3><a class="toc-backref" href="#id141" id="format" name="format">Format</a></h3> <div class="section"> -<h4><a class="toc-backref" href="#id136" id="styling-section" name="styling-section">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id142" id="styling-section" name="styling-section">[styling] Section</a></h4> <p>In this section the colours for syntax highlighting are defined. The format is always: key=forground_colour;background_colour;bold;italic</p> <p>Colours have to be specified as RGB hex values prefixed by @@ -3135,7 +3194,7 @@ value is something other than "true" or "false", "false" is assumed.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id137" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> +<h4><a class="toc-backref" href="#id143" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> <p>This section contains keys for different keyword lists specific to the filetype. Some filetypes do not support keywords, so adding a new key will not work. You can only add or remove keywords to/from @@ -3146,7 +3205,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id138" id="settings-section" name="settings-section">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id144" id="settings-section" name="settings-section">[settings] Section</a></h4> <dl class="docutils"> <dt>extension</dt> <dd><p class="first">This is the default file extension used when saving files, not @@ -3207,7 +3266,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id139" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> +<h4><a class="toc-backref" href="#id145" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> <dl class="docutils"> <dt>error_regex</dt> <dd><p class="first">This is a GNU-style extended regular expression to parse a filename @@ -3222,7 +3281,7 @@ </dd> </dl> <p><strong>Build commands</strong></p> -<p>The build commands are all configurable using the <a class="reference" href="#configure-commands">Configure Commands</a> dialog.</p> +<p>The build commands are all configurable using the <a class="reference" href="#set-build-menu-commands">Set Build Menu Commands</a> dialog.</p> <dl class="docutils"> <dt>compiler</dt> <dd><p class="first">This item specifies the command to compile source code files. But @@ -3251,11 +3310,13 @@ complete filename, e.g. for shell scripts.</p> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">run_cmd="./%e"</span></tt></p> </dd> +<dt>spare_cmd</dt> +<dd>This item is used for an extra command which can be sued for anything.</dd> </dl> </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id140" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id146" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> <p>There is a special filetype definition file called filetypes.common. This file defines some general non-filetype-specific settings.</p> @@ -3421,7 +3482,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id141" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id147" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> <p>To change the default filetype extension used when saving a new file, see <a class="reference" href="#filetype-definition-files">Filetype definition files</a>.</p> <p>You can override the list of file extensions that Geany uses for each @@ -3447,7 +3508,7 @@ </pre> </div> <div class="section"> -<h2><a class="toc-backref" href="#id142" id="templates" name="templates">Templates</a></h2> +<h2><a class="toc-backref" href="#id148" id="templates" name="templates">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -3470,7 +3531,7 @@ function description won't contain the correct function name but "unknown" instead.</p> <div class="section"> -<h3><a class="toc-backref" href="#id143" id="template-metadata" name="template-metadata">Template metadata</a></h3> +<h3><a class="toc-backref" href="#id149" id="template-metadata" name="template-metadata">Template metadata</a></h3> <p>Metadata can be used with all templates, but by default user set metadata is only used for the ChangeLog and File header templates.</p> <p>In the configuration dialog you can find a tab "Templates" (see @@ -3480,7 +3541,7 @@ at startup.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id144" id="file-templates" name="file-templates">File templates</a></h3> +<h3><a class="toc-backref" href="#id150" id="file-templates" name="file-templates">File templates</a></h3> <p>File templates are templates used as the basis of a new file. To use them, choose the <em>New (with Template)</em> menu item from the <em>File</em> menu.</p> @@ -3492,7 +3553,7 @@ be placed anywhere, but is usually on the first line of the file, followed by a blank line.</p> <div class="section"> -<h4><a class="toc-backref" href="#id145" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> +<h4><a class="toc-backref" href="#id151" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> <p>These are read from the <tt class="docutils literal"><span class="pre">~/.geany/templates/files</span></tt> directory (created the first time Geany is started). The filetype to use is detected from the template file's extension, if any. For example, creating a file @@ -3503,7 +3564,7 @@ template.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id146" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> +<h4><a class="toc-backref" href="#id152" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> <p>Filetype template files are read from the <tt class="docutils literal"><span class="pre">~/.geany/templates</span></tt> directory, and are named "filetype." followed by the filetype name, e.g. "filetype.python", "filetype.sh", etc. If you are @@ -3515,7 +3576,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id147" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> +<h3><a class="toc-backref" href="#id153" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> <p>Each template can be customized to your needs. The templates are stored in the <tt class="docutils literal"><span class="pre">~/.geany/templates/</span></tt> directory (see the section called <a class="reference" href="#command-line-options">Command line options</a> for further information about the configuration @@ -3523,7 +3584,7 @@ Geany ;-) ) and edit the template to your needs. There are some wildcards which will be automatically replaced by Geany at startup.</p> <div class="section"> -<h4><a class="toc-backref" href="#id148" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> +<h4><a class="toc-backref" href="#id154" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> <p>All wildcards must be enclosed by "{" and "}", e.g. {date}.</p> <table border="1" class="docutils"> <colgroup> @@ -3642,9 +3703,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id149" id="plugin-documentation" name="plugin-documentation">Plugin documentation</a></h1> +<h1><a class="toc-backref" href="#id155" id="plugin-documentation" name="plugin-documentation">Plugin documentation</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id150" id="instant-save" name="instant-save">Instant Save</a></h2> +<h2><a class="toc-backref" href="#id156" id="instant-save" name="instant-save">Instant Save</a></h2> <p>This plugin sets on every new file (File->New or File-> New (with template)) a randomly chosen filename and set its filetype appropriate to the used template or when no template was used, to a configurable default filetype. @@ -3654,7 +3715,7 @@ similar.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id151" id="backup-copy" name="backup-copy">Backup Copy</a></h2> +<h2><a class="toc-backref" href="#id157" id="backup-copy" name="backup-copy">Backup Copy</a></h2> <p>This plugin creates a backup copy of the current file in Geany when it is saved. You can specify the directory where the backup copy is saved and you can configure the automatically added extension in the configure dialog @@ -3664,7 +3725,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id152" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> +<h1><a class="toc-backref" href="#id158" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> <p>This document (<tt class="docutils literal"><span class="pre">geany.txt</span></tt>) is written in <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (or "reST"). The source file for it is located in Geany's <tt class="docutils literal"><span class="pre">doc</span></tt> subdirectory. If you intend on making changes, you should grab the @@ -3684,7 +3745,7 @@ and Fedora systems.</p> </div> <div class="section"> -<h1><a class="toc-backref" href="#id153" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> +<h1><a class="toc-backref" href="#id159" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> <p>Copyright © 1998, 2006 Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>This appendix is distributed under the terms of the License for Scintilla and SciTE. A copy of this license can be found in the file @@ -3693,7 +3754,7 @@ Scintilla and SciTE</a>.</p> <p>20 June 2006</p> <div class="section"> -<h2><a class="toc-backref" href="#id154" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> +<h2><a class="toc-backref" href="#id160" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> <p>Keyboard commands for Scintilla mostly follow common Windows and GTK+ conventions. All move keys (arrows, page up/down, home and end) allows to extend or reduce the stream selection when holding the @@ -3781,9 +3842,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id155" id="tips-and-tricks" name="tips-and-tricks">Tips and tricks</a></h1> +<h1><a class="toc-backref" href="#id161" id="tips-and-tricks" name="tips-and-tricks">Tips and tricks</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id156" id="document-notebook" name="document-notebook">Document notebook</a></h2> +<h2><a class="toc-backref" href="#id162" id="document-notebook" name="document-notebook">Document notebook</a></h2> <ul class="simple"> <li>Double-click on empty space in the notebook tab bar to open a new document.</li> @@ -3793,14 +3854,14 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id157" id="symbols" name="symbols">Symbols</a></h2> +<h2><a class="toc-backref" href="#id163" id="symbols" name="symbols">Symbols</a></h2> <ul class="simple"> <li>Ctrl-click on a word in a document to perform <em>Go to Tag Definition</em>.</li> <li>Double-click on a symbol-list group to expand or compact it.</li> </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id158" id="gtk-related" name="gtk-related">GTK-related</a></h2> +<h2><a class="toc-backref" href="#id164" id="gtk-related" name="gtk-related">GTK-related</a></h2> <ul class="simple"> <li>Scrolling the mouse wheel over a notebook tab bar will switch notebook pages.</li> @@ -3815,7 +3876,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id159" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> +<h1><a class="toc-backref" href="#id165" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> <p>There are some uncommon preferences that are not shown in the Preferences dialog. These can be set by editing <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>, then restarting Geany. Search for the key name, then edit the value. Example:</p> @@ -3878,7 +3939,7 @@ </table> </div> <div class="section"> -<h1><a class="toc-backref" href="#id160" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> +<h1><a class="toc-backref" href="#id166" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> <p>There are some options which can only be changed at compile time, and some options which are used as the default for configurable options. To change these options, edit the appropriate source file @@ -3890,7 +3951,7 @@ <p class="last">Most users should not need to change these options.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id161" id="src-geany-h" name="src-geany-h">src/geany.h</a></h2> +<h2><a class="toc-backref" href="#id167" id="src-geany-h" name="src-geany-h">src/geany.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -3947,7 +4008,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id162" id="project-h" name="project-h">project.h</a></h2> +<h2><a class="toc-backref" href="#id168" id="project-h" name="project-h">project.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -3972,7 +4033,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id163" id="editor-h" name="editor-h">editor.h</a></h2> +<h2><a class="toc-backref" href="#id169" id="editor-h" name="editor-h">editor.h</a></h2> <table border="1" class="docutils"> <colgroup> <col width="33%" /> @@ -3998,7 +4059,7 @@ </table> </div> <div class="section"> -<h2><a class="toc-backref" href="#id164" id="keyfile-c" name="keyfile-c">keyfile.c</a></h2> +<h2><a class="toc-backref" href="#id170" id="keyfile-c" name="keyfile-c">keyfile.c</a></h2> <p>These are default settings that can be overridden in the <a class="reference" href="#preferences">Preferences</a> dialog.</p> <table border="1" class="docutils"> <colgroup> @@ -4080,7 +4141,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id165" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1> +<h1><a class="toc-backref" href="#id171" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1> <pre class="literal-block"> GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -4425,7 +4486,7 @@ </pre> </div> <div class="section"> -<h1><a class="toc-backref" href="#id166" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1> +<h1><a class="toc-backref" href="#id172" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1> <p>Copyright 1998-2003 by Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>All Rights Reserved</p> <p>Permission to use, copy, modify, and distribute this software and @@ -4445,7 +4506,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-10-10 15:03 UTC. +Generated on: 2008-11-01 02:40 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: branches/build-system/doc/geany.txt =================================================================== --- branches/build-system/doc/geany.txt 2008-10-31 12:29:34 UTC (rev 3164) +++ branches/build-system/doc/geany.txt 2008-11-01 02:45:55 UTC (rev 3165) @@ -1989,21 +1989,21 @@ If on first reading the build system sounds complicated, it may help to keep in mind the rationale behind its design. Geany supports many -languages which have different commands to compile/link/run their code. -So different commands must be used for each type of source file that -Geany understands, therefore some commands are stored for each type of file. +languages which have different commands to compile/link/run their code +so different commands must be used for each type of source file that +Geany understands. Therefore some commands are stored for each type of file. As software gets more complex and is divided into several source files it is usual to run the file containing the main program, not the one currently being edited. In this case Geany cannot generally identify the correct -file so the user has to configure it. To keep it separate from filetype +file, so the user has to configure it. To keep it separate from filetype information, this execute command is stored in the user preferences. For larger software projects compiling and running individual files is -not very effective as differing settings and flags may be needed making +not very effective as differing settings and flags may be needed, making manual building complex. Instead some form of build software such as -"Make" is used. It is usefull to be able to invoke the builder from -Geany, and so have the output parsed for error messages allowing Geany +"Make" is used. It is useful to be able to invoke the builder from +Geany, and so have the output parsed for error messages, allowing Geany to take you straight to the source line of the error. To do this Geany needs to know some more commands which are independant of the type of source. These commands are also stored with the user preferences. @@ -2022,25 +2022,25 @@ Two actions are performed for all the build menu items. -First the current source file will be saved before it is processed. This -is for convenience so that you don't need to keep saving small changes -to the current file before building. +* First the current source file will be saved before it is processed. This + is for convenience so that you don't need to keep saving small changes + to the current file before building. -Second the output for Compile, Build and Make actions will be captured -in the Compiler notebook tab of the messages window. If there are -any warnings or errors with line numbers shown in red in the Compiler -output tab, you can click on them and Geany will switch to the relevant -source file (or open it) and mark the line number so the problem can be -corrected. Geany will also set indicators for warnings or errors with -line numbers. +* Second the output for Compile, Build and Make actions will be captured + in the Compiler notebook tab of the messages window. If there are + any warnings or errors with line numbers shown in red in the Compiler + output tab, you can click on them and Geany will switch to the relevant + source file (or open it) and mark the line number so the problem can be + corrected. Geany will also set indicators for warnings or errors with + line numbers. .. tip:: If Geany's default error message parsing does not parse errors for the tool you're using, you can set a custom regex. See `Filetype definition files`_ and the `[build_settings] Section`_. -The build menu is very flexible and can be set up to perform the -actions the user requires depending on the type of the current file and +The build menu is very flexible and can be set up to perform any +actions the user requires, and depend on the type of the current file and whether there is a project open. The user can modify both the commands the menu items invoke and the menu item labels themselves so that they can continue to describe the action they perform. @@ -2048,7 +2048,7 @@ The default menu (with the current file being a C source file) is shown below with the sections of the menu labelled. -..image:: ./images/build_menu.png +.. image:: ./images/build_menu.png The sections marked on the menu are: @@ -2061,14 +2061,17 @@ * Project or user preference items - four menu items which do not depend on the current filetype, instead getting their values using the following process: + - If a project is open, the menu item labels and commands can be set - and stored in the project file using the Set Build Menu Commands - dialog. Individual menu item labels and commands can be set, - any field not set in the project file will get its value from one - of the following sources. + and stored in the project file using the *Set Build Menu Commands* + dialog. Individual menu item labels and commands can be set, + any field not set in the project file will get its value from one + of the following sources. + - If no project is open the menu item labels and commands can be set and stored in the user preference file using the *Set Build Menu - Commands* dialog. + Commands* dialog. + - Any menu item labels or commands not defined will get the default values shown and described below. @@ -2078,12 +2081,16 @@ * Execute Menu Item - is intended to provide a flexible method of running and stopping the program. The execute menu item obtains its value using the following process: + - If a project is open and defines the menu item label or command use that or, + - if no project is open and the menu item label or command is defined in the user preference file, use that, otherwise, + - the menu item label or command as defined by the current filetype is used. + When a program is running this menu item changes to 'Stop'. Note that the stop function does not use a command and is not user configurable. @@ -2144,8 +2151,8 @@ .. note:: For each of the Make commands, The Make tool path must be correctly set in the Tools tab of the Preferences dialog. This path is used - for commands not defined by project files. Commands in project files - have to contain the full path if required. + for commands not defined by project files. Commands in project files + have to contain the full path if required. Make Custom Target @@ -2237,12 +2244,13 @@ project is not open the *Project Build Menu Commands* will be replaced by *User Preferred Build Menu Commands*. -.. image:: ./images/build_menu_commands.png +.. image:: ./images/build_menu_cmds.png The commands are labelled to show that there are two parts to the dialog. * 'Filetype commands' which depend on the type of the current file. Do check you have the correct filetype before changing them. + * 'Build Commands' which do not depend on the type of the current file but do depend on the open project or if non is open. @@ -2914,7 +2922,7 @@ **Build commands** -The build commands are all configurable using the `Configure Commands`_ dialog. +The build commands are all configurable using the `Set Build Menu Commands`_ dialog. compiler This item specifies the command to compile source code files. But 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 November 2008