Commits November 2008

commits@lists.geany.org

4 participants
134 discussions

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

10 Nov '08

Revision: 3198 http://geany.svn.sourceforge.net/geany/?rev=3198&view=rev Author: ntrel Date: 2008-11-10 16:58:33 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Removing completed branch. Removed Paths: ------------- branches/symbol-tree/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

10 Nov '08

Revision: 3197 http://geany.svn.sourceforge.net/geany/?rev=3197&view=rev Author: ntrel Date: 2008-11-10 16:57:18 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Merge symbol-tree branch: Apply patch (with some reworking) from Conrad Steenberg (gnocci-man) to show methods as children of classes in the symbol list, and for other tag types to group children by their parents (thanks; #2083110). This works for any filetype that TagManager can parse tag scopes for. Fix not allowing a leading underscore when using scope name prefix. Fix symbol-tree branch bug: missing C++ constructor declaration tags. - Code changes: Use TMTag instead of GeanySymbol so the symbol tree can read the scope without parsing it. Free tag list straight after use, instead of next time the list is generated. Use TMTag pointer tree model column instead of line number. Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/about.c trunk/src/symbols.c trunk/src/treeviews.c trunk/src/treeviews.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-10 12:28:06 UTC (rev 3196) +++ trunk/ChangeLog 2008-11-10 16:57:18 UTC (rev 3197) @@ -1,3 +1,25 @@ +2008-11-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/about.c, src/treeviews.c, src/treeviews.h, src/symbols.c, + THANKS: + Merge symbol-tree branch: + Apply patch (with some reworking) from Conrad Steenberg + (gnocci-man) to show methods as children of classes in the symbol + list, and for other tag types to group children by their parents + (thanks; #2083110). + This works for any filetype that TagManager can parse tag scopes + for. + Fix not allowing a leading underscore when using scope name prefix. + Fix symbol-tree branch bug: missing C++ constructor declaration + tags. + - Code changes: + Use TMTag instead of GeanySymbol so the symbol tree can read the + scope without parsing it. + Free tag list straight after use, instead of next time the list is + generated. + Use TMTag pointer tree model column instead of line number. + + 2008-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c, doc/geany.txt, doc/geany.html: @@ -3,5 +25,5 @@ Make Ctrl-click go to matching brace if there's no current word. * plugins/vcdiff.c, src/editor.c, src/plugindata.h, src/plugins.c: - Make Version Diff plugin set the indent type for diffs based on the + Make Version Diff plugin set the indent type for diffs based on the current file's indent type. Add editor_set_indent_type() to the API. Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2008-11-10 12:28:06 UTC (rev 3196) +++ trunk/THANKS 2008-11-10 16:57:18 UTC (rev 3197) @@ -51,6 +51,7 @@ Andrew Rowland <weibullguy(at)charter(dot)net> - R filetype patch Bronisław Białek <after89(at)gmail(dot)com> - CSS parser update Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - Matlab filetype patch +Conrad Steenberg <gnocci-man(at)users(dot)sourceforge(dot)net> - symbol tree patch Translators: ------------ Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2008-11-10 12:28:06 UTC (rev 3196) +++ trunk/src/about.c 2008-11-10 16:57:18 UTC (rev 3197) @@ -79,7 +79,7 @@ static const gchar *contributors = "Alexander Rodin, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, Bronisław Białek, Catalin Marinas, " -"Christoph Berg, Daniel Richard G., Dave Moore, Dirk Weber, Felipe Pena, François Cami, " +"Christoph Berg, Conrad Steenberg, Daniel Richard G., Dave Moore, Dirk Weber, Felipe Pena, François Cami, " "Giuseppe Torelli, Guillaume Hoffmann, Jason Oster, Jean-François Wauthy, Jeff Pohlmeyer, " "John Gabriele, Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, " "Peter Strand, Pierre Joye, Rob van der Linde, Robert McGinley, S Jagannathan, Saleem Abdulrasool, " Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-11-10 12:28:06 UTC (rev 3196) +++ trunk/src/symbols.c 2008-11-10 16:57:18 UTC (rev 3197) @@ -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) @@ -857,128 +819,364 @@ } -gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) +static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, + gboolean found_parent) { - GList *tmp; - const GList *tags; - GtkTreeIter iter; - static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME; - filetype_id ft_id; + 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; - g_return_val_if_fail(doc != NULL, 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; - ft_id = FILETYPE_ID(doc->file_type); + 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 (sort_mode == SYMBOLS_SORT_USE_PREVIOUS) - sort_mode = prev_sort_mode; + if (utf8_name == NULL) + return NULL; + + if (!buffer) + buffer = g_string_new(NULL); else - prev_sort_mode = sort_mode; + g_string_truncate(buffer, 0); - tags = get_tag_list(doc, tm_tag_max_t, sort_mode); - if (doc->tm_file == NULL || tags == NULL) - return FALSE; + /* 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)); - /* Make sure the model stays with us after the tree view unrefs it */ - g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store)); - /* Detach model from view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL); - /* Clear all contents */ - gtk_tree_store_clear(doc->priv->tag_store); + g_string_append(buffer, scope); + g_string_append(buffer, sep); + } + g_string_append(buffer, utf8_name); - init_tag_list(doc); - for (tmp = (GList*)tags; tmp; tmp = g_list_next(tmp)) + 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; + + if (!scope) + return NULL; + + str = scope; + + while (1) { - gchar buf[100]; - const GeanySymbol *symbol = (GeanySymbol*)tmp->data; - GtkTreeIter *parent = NULL; - GdkPixbuf *icon = NULL; + ptr = strstr(str, separator); + if (ptr) + { + str = ptr + strlen(separator); + } + else + break; + } - g_snprintf(buf, sizeof(buf), "%s [%d]", symbol->str, symbol->line); + return NZV(str) ? str : NULL; +} - switch (symbol->type) + +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); + 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); - break; - } - case tm_tag_member_t: - case tm_tag_field_t: - { - if (tv_iters.tag_member.stamp == -1) break; - parent = &(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_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); - break; - } - case tm_tag_variable_t: - { - if (tv_iters.tag_variable.stamp == -1) break; - parent = &(tv_iters.tag_variable); - break; - } - case tm_tag_namespace_t: - case tm_tag_package_t: - { - if (tv_iters.tag_namespace.stamp == -1) break; - parent = &(tv_iters.tag_namespace); - break; - } - default: - { - if (tv_iters.tag_other.stamp == -1) break; - parent = &(tv_iters.tag_other); - } + /* 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) + +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; + + parent = get_tag_type_iter(tag->type, ft_id); + + 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; + + child = &iter; + icon_iter = (parent != &tv_iters.tag_other) ? parent : &tv_iters.tag_variable; + + gtk_tree_model_get(GTK_TREE_MODEL(tree_store), icon_iter, + SYMBOLS_COLUMN_ICON, &icon, -1); + + if (parent_name) { - gtk_tree_model_get(GTK_TREE_MODEL(doc->priv->tag_store), parent, - SYMBOLS_COLUMN_ICON, &icon, -1); - gtk_tree_store_append(doc->priv->tag_store, &iter, parent); - gtk_tree_store_set(doc->priv->tag_store, &iter, - SYMBOLS_COLUMN_ICON, icon, - SYMBOLS_COLUMN_NAME, buf, - SYMBOLS_COLUMN_LINE, symbol->line, -1); + GtkTreeIter *parent_search = + (GtkTreeIter *)g_hash_table_lookup(parent_hash, parent_name); - if (G_LIKELY(G_IS_OBJECT(icon))) - g_object_unref(icon); + if (parent_search) + parent = parent_search; + else + parent_name = NULL; } + + /* check if the current tag is a parent of other tags */ + if (g_hash_table_lookup_extended(parent_hash, tag->name, NULL, NULL) && + !utils_str_equal(tag->name, parent_name)) /* prevent Foo::Foo from making parent = child */ + { + 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; + } + + 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 gboolean tag_has_missing_parent(const TMTag *tag, GtkTreeStore *store, + GtkTreeIter *iter) +{ + /* if the tag has a parent tag, it should be at depth >= 2 */ + return NZV(tag->atts.entry.scope) && + gtk_tree_store_iter_depth(store, iter) == 1; +} + + +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); + + /* Check if the iters can be sorted based on tag name and line, not tree item name. + * Sort by tree name if the scope was prepended, e.g. 'ScopeNameWithNoTag::TagName'. */ + if (tag_a && !tag_has_missing_parent(tag_a, GTK_TREE_STORE(model), a) && + tag_b && !tag_has_missing_parent(tag_b, GTK_TREE_STORE(model), 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); + + /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ + if (tag_a && tag_b) + if (!sort_by_name || + (utils_str_equal(tag_a->name, tag_b->name) && + utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope))) + cmp = compare_symbol_lines(tag_a, tag_b); + } + 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) +{ + GList *tags; + static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME; + + g_return_val_if_fail(doc != NULL, FALSE); + + 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 */ + g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store)); + /* Detach model from view */ + gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL); + /* Clear all contents */ + gtk_tree_store_clear(doc->priv->tag_store); + + /* add grandparent type iters */ + add_top_level_items(doc); + + 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: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2008-11-10 12:28:06 UTC (rev 3196) +++ trunk/src/treeviews.c 2008-11-10 16:57:18 UTC (rev 3197) @@ -190,7 +190,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); @@ -640,7 +640,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: trunk/src/treeviews.h =================================================================== --- trunk/src/treeviews.h 2008-11-10 12:28:06 UTC (rev 3196) +++ trunk/src/treeviews.h 2008-11-10 16:57:18 UTC (rev 3197) @@ -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:[3196] branches/build-system
by elextr＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 3196 http://geany.svn.sourceforge.net/geany/?rev=3196&view=rev Author: elextr Date: 2008-11-10 12:28:06 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Prototype C and C++ header filetypes Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/data/filetype_extensions.conf branches/build-system/src/filetypes.c branches/build-system/src/filetypes.h branches/build-system/src/highlighting.c Added Paths: ----------- branches/build-system/data/filetypes.h branches/build-system/data/filetypes.hpp Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2008-11-10 00:49:16 UTC (rev 3195) +++ branches/build-system/ChangeLog 2008-11-10 12:28:06 UTC (rev 3196) @@ -1,5 +1,25 @@ 2008-11-10 Lex Trotman <elextr(at)gmail(dot)com> + Prototype C and CPP header filetypes, also detects .h or no extension + files with -*-C++-*- on line 1 as C++ header + + * src/highlighting.c + highlighting_set_styles() & highlighting_init_styles() added filetypes + H & HPP to switches + * src/filetypes.h + added H and HPP to filetypes enum, changed guard name to aviod clash + with GEANY_FILETYPE_H + * src/filetypes.c + init_builtin_filetypes() added new filetypes for H and HPP and moved + header extensions from C and CPP to them + filetypes_detect_from_file_internal() if extensions are .h or none check + for '-*-C++-*-' on line 1 and set to filetype HPP if found + * data/filetypes.h and data/filetypes.hpp added (copies of .c and .cpp) + * data/extensions.conf added H and H++ types + + +2008-11-10 Lex Trotman <elextr(at)gmail(dot)com> + Fixed build menu updating after dialog close * src/build.c: Modified: branches/build-system/data/filetype_extensions.conf =================================================================== --- branches/build-system/data/filetype_extensions.conf 2008-11-10 00:49:16 UTC (rev 3195) +++ branches/build-system/data/filetype_extensions.conf 2008-11-10 12:28:06 UTC (rev 3196) @@ -5,8 +5,10 @@ #See Geany's main documentation for details. [Extensions] ASM=*.asm; -C=*.c;*.h; -C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; +C=*.c; +H=*.h; +C++=*.cpp;*.cxx;*.c++;*.cc;*.C; +H++=*.hpp;*.h;*.hxx;*.h++;*.hh; C#=*.cs;*.vala; CAML=*.ml;*.mli; D=*.d;*.di; Added: branches/build-system/data/filetypes.h =================================================================== --- branches/build-system/data/filetypes.h (rev 0) +++ branches/build-system/data/filetypes.h 2008-11-10 12:28:06 UTC (rev 3196) @@ -0,0 +1,68 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0x3f5fbf;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +verbatim=0x101030;0xffffff;false;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0x3f5fbf;0xffffff;true;false +commentdockeyword=0x3f5fbf;0xffffff;true;true +commentdockeyworderror=0x3f5fbf;0xffffff;false;false +globalclass=0x0000d0;0xffffff;true;false +# whether arguments of preprocessor commands should be styled (only first argument is used) +# 1 to enable, 0 to disable +styling_within_preprocessor=1;0;false;false + +[keywords] +# all items must be in one line +primary=volatile default export goto sizeof typename asm enum bool union NULL FALSE TRUE typedef struct char int float double void unsigned signed long short extern static register auto const if else switch for while do break continue return inline case +secondary= +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +# default extension used when saving files +#extension=c + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=// +comment_close= +# this is an alternative way, so multiline comments are used +#comment_open=/* +#comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=gcc -Wall -c "%f" +linker= +run_cmd= + + Property changes on: branches/build-system/data/filetypes.h ___________________________________________________________________ Added: svn:executable + * Added: branches/build-system/data/filetypes.hpp =================================================================== --- branches/build-system/data/filetypes.hpp (rev 0) +++ branches/build-system/data/filetypes.hpp 2008-11-10 12:28:06 UTC (rev 3196) @@ -0,0 +1,67 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0x3f5fbf;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +verbatim=0x101030;0xffffff;false;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0x3f5fbf;0xffffff;true;false +commentdockeyword=0x3f5fbf;0xffffff;true;true +commentdockeyworderror=0x3f5fbf;0xffffff;false;false +globalclass=0x0000d0;0xffffff;true;false +# whether arguments of preprocessor commands should be styled (only first argument is used) +# 1 to enable, 0 to disable +styling_within_preprocessor=1;0;false;false + +[keywords] +# all items must be in one line +primary=and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new not not_eq operator or or_eq private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq +secondary= +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +# default extension used when saving files +#extension=cpp + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=// +comment_close= +# this is an alternative way, so multiline comments are used +#comment_open=/* +#comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=g++ -Wall -c "%f" +linker= +run_cmd= + Property changes on: branches/build-system/data/filetypes.hpp ___________________________________________________________________ Added: svn:executable + * Modified: branches/build-system/src/filetypes.c =================================================================== --- branches/build-system/src/filetypes.c 2008-11-10 00:49:16 UTC (rev 3195) +++ branches/build-system/src/filetypes.c 2008-11-10 12:28:06 UTC (rev 3196) @@ -84,10 +84,21 @@ ft->name = g_strdup("C"); ft->title = g_strdup_printf(_("%s source file"), "C"); ft->extension = g_strdup("c"); - ft->pattern = utils_strv_new("*.c", "*.h", NULL); + ft->pattern = utils_strv_new("*.c", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); ft->group = GEANY_FILETYPE_GROUP_COMPILED; + +#define CH + ft = filetypes[GEANY_FILETYPES_H]; + ft->lang = 0; + ft->name = g_strdup("H"); + ft->title = g_strdup_printf(_("%s header file"), "C"); + ft->extension = g_strdup("h"); + ft->pattern = utils_strv_new("*.h", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CPP ft = filetypes[GEANY_FILETYPES_CPP]; @@ -96,10 +107,21 @@ ft->title = g_strdup_printf(_("%s source file"), "C++"); ft->extension = g_strdup("cpp"); ft->pattern = utils_strv_new("*.cpp", "*.cxx", "*.c++", "*.cc", - "*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", "*.C", NULL); + "*.C", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; + +#define HPP + ft = filetypes[GEANY_FILETYPES_HPP]; + ft->lang = 1; + ft->name = g_strdup("H++"); + ft->title = g_strdup_printf(_("%s header file"), "C++"); + ft->extension = g_strdup("hpp"); + ft->pattern = utils_strv_new("*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", NULL); + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CS ft = filetypes[GEANY_FILETYPES_CS]; @@ -767,6 +789,7 @@ const gchar *line) { GeanyFiletype *ft; + filetype_id id; /* try to find a shebang and if found use it prior to the filename extension * also checks for <?xml */ @@ -775,9 +798,16 @@ return ft; if (utf8_filename == NULL) - return filetypes[GEANY_FILETYPES_NONE]; - - return filetypes_detect_from_extension(utf8_filename); + ft = filetypes[GEANY_FILETYPES_NONE]; + else + ft = filetypes_detect_from_extension(utf8_filename); + id = FILETYPE_ID(ft); + if (id == GEANY_FILETYPES_H || id == GEANY_FILETYPES_NONE) + { + if (strstr(line, "-*-C++-*-")) + ft = filetypes[GEANY_FILETYPES_HPP]; + } + return ft; } Modified: branches/build-system/src/filetypes.h =================================================================== --- branches/build-system/src/filetypes.h 2008-11-10 00:49:16 UTC (rev 3195) +++ branches/build-system/src/filetypes.h 2008-11-10 12:28:06 UTC (rev 3196) @@ -22,8 +22,8 @@ */ -#ifndef GEANY_FILETYPES_H -#define GEANY_FILETYPES_H 1 +#ifndef HAVE_GEANY_FILETYPES_H +#define HAVE_GEANY_FILETYPES_H 1 #include "Scintilla.h" #include "ScintillaWidget.h" @@ -38,7 +38,9 @@ /* normally compiled languages */ GEANY_FILETYPES_ASM = 0, GEANY_FILETYPES_C, + GEANY_FILETYPES_H, GEANY_FILETYPES_CPP, + GEANY_FILETYPES_HPP, GEANY_FILETYPES_CS, GEANY_FILETYPES_CAML, GEANY_FILETYPES_D, Modified: branches/build-system/src/highlighting.c =================================================================== --- branches/build-system/src/highlighting.c 2008-11-10 00:49:16 UTC (rev 3195) +++ branches/build-system/src/highlighting.c 2008-11-10 12:28:06 UTC (rev 3196) @@ -3063,9 +3063,11 @@ init_styleset_case(GEANY_FILETYPES_ASM, asm); init_styleset_case(GEANY_FILETYPES_BASIC, basic); init_styleset_case(GEANY_FILETYPES_C, c); + init_styleset_case(GEANY_FILETYPES_H, c); init_styleset_case(GEANY_FILETYPES_CAML, caml); init_styleset_case(GEANY_FILETYPES_CONF, conf); init_styleset_case(GEANY_FILETYPES_CPP, cpp); + init_styleset_case(GEANY_FILETYPES_HPP, cpp); init_styleset_case(GEANY_FILETYPES_CS, cs); init_styleset_case(GEANY_FILETYPES_CSS, css); init_styleset_case(GEANY_FILETYPES_D, d); @@ -3119,9 +3121,11 @@ styleset_case(GEANY_FILETYPES_ASM, asm); styleset_case(GEANY_FILETYPES_BASIC, basic); styleset_case(GEANY_FILETYPES_C, c); + styleset_case(GEANY_FILETYPES_H, c); styleset_case(GEANY_FILETYPES_CAML, caml); styleset_case(GEANY_FILETYPES_CONF, conf); styleset_case(GEANY_FILETYPES_CPP, cpp); + styleset_case(GEANY_FILETYPES_HPP, cpp); styleset_case(GEANY_FILETYPES_CS, cs); styleset_case(GEANY_FILETYPES_CSS, css); styleset_case(GEANY_FILETYPES_D, d); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

09 Nov '08

Revision: 3195 http://geany.svn.sourceforge.net/geany/?rev=3195&view=rev Author: elextr Date: 2008-11-10 00:49:16 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Fix build menu updating Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/doc/geany.html branches/build-system/src/build.c branches/build-system/src/project.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2008-11-08 13:32:55 UTC (rev 3194) +++ branches/build-system/ChangeLog 2008-11-10 00:49:16 UTC (rev 3195) @@ -1,3 +1,15 @@ +2008-11-10 Lex Trotman <elextr(at)gmail(dot)com> + + Fixed build menu updating after dialog close + + * src/build.c: + on_includes_arguments_dialog_response calls projects::update_ui() + create_build_menu_gen() fixed reference to build_2_label SB 3 + format it + * src/projects.c: + make update_ui() non-static + format it + 2008-11-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/build.c: Modified: branches/build-system/doc/geany.html =================================================================== --- branches/build-system/doc/geany.html 2008-11-08 13:32:55 UTC (rev 3194) +++ branches/build-system/doc/geany.html 2008-11-10 00:49:16 UTC (rev 3195) @@ -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-27" /> +<meta name="date" content="2008-11-01" /> <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-27</td></tr> +<td>2008-11-01</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -4506,7 +4506,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-11-01 02:40 UTC. +Generated on: 2008-11-04 00:47 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/src/build.c =================================================================== --- branches/build-system/src/build.c 2008-11-08 13:32:55 UTC (rev 3194) +++ branches/build-system/src/build.c 2008-11-10 00:49:16 UTC (rev 3195) @@ -1127,9 +1127,9 @@ menu_items->item_make_custom = item; /* build the code with make object */ - if (proj!=NULL && proj->build_2_label!=NULL) + if (proj!=NULL && proj->build_3_label!=NULL) { - item = gtk_image_menu_item_new_with_mnemonic(proj->build_2_label); + item = gtk_image_menu_item_new_with_mnemonic(proj->build_3_label); tiptext = NULL; } /* else if prefs */ else @@ -1601,6 +1601,7 @@ proj->build_3_cmd = g_strdup(newstr); } } + update_ui(); } } Modified: branches/build-system/src/project.c =================================================================== --- branches/build-system/src/project.c 2008-11-08 13:32:55 UTC (rev 3194) +++ branches/build-system/src/project.c 2008-11-10 00:49:16 UTC (rev 3195) @@ -82,7 +82,7 @@ #define SHOW_ERR(args) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args) -#define SHOW_ERR1(args,more) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args, more) +#define SHOW_ERR1(args, more) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args, more) #define MAX_NAME_LEN 50 /* "projects" is part of the default project base path so be careful when translating * please avoid special characters and spaces, look at the source for details or ask Frank */ @@ -91,15 +91,15 @@ void project_new() { - GtkWidget *vbox; - GtkWidget *table; - GtkWidget *image; - GtkWidget *button; - GtkWidget *bbox; - GtkWidget *label; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); + GtkWidget *vbox; + GtkWidget *table; + GtkWidget *image; + GtkWidget *button; + GtkWidget *bbox; + GtkWidget *label; + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); PropertyDialogElements *e; - gint response; + gint response; if (! close_open_project()) return; @@ -107,8 +107,8 @@ e = g_new0(PropertyDialogElements, 1); e->dialog = gtk_dialog_new_with_buttons(_("New Project"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); gtk_widget_set_name(e->dialog, "GeanyDialogProject"); bbox = gtk_hbox_new(FALSE, 0); @@ -156,11 +156,11 @@ e->base_path = gtk_entry_new(); gtk_tooltips_set_tip(tooltips, e->base_path, - _("Base directory of all files that make up the project. " - "This can be a new path, or an existing directory tree. " - "You can use paths relative to the project filename."), NULL); + _("Base directory of all files that make up the project. " + "This can be a new path, or an existing directory tree. " + "You can use paths relative to the project filename."), NULL); bbox = ui_path_box_new(_("Choose Project Base Path"), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); ui_table_add_row(GTK_TABLE(table), 2, label, bbox, NULL); @@ -219,6 +219,8 @@ } } } + + #endif @@ -228,9 +230,9 @@ #ifdef G_OS_WIN32 gchar *file; #else - GtkWidget *dialog; + GtkWidget *dialog; GtkFileFilter *filter; - gchar *locale_path; + gchar *locale_path; #endif if (! close_open_project()) return; @@ -254,9 +256,9 @@ #else dialog = gtk_file_chooser_dialog_new(_("Open Project"), GTK_WINDOW(main_widgets.window), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_widget_set_name(dialog, "GeanyDialogProject"); /* set default Open, so pressing enter can open multiple files */ @@ -293,10 +295,11 @@ } -/* Called when creating, opening, closing and updating projects. */ -static void update_ui(void) +/* Called when creating, opening, closing and updating projects or changing + * build commands. */ +void update_ui(void) { - build_default_menu(); + build_default_menu(); ui_set_window_title(NULL); build_menu_update(NULL); } @@ -346,18 +349,18 @@ static void create_properties_dialog(PropertyDialogElements *e) { - GtkWidget *vbox; - GtkWidget *table; - GtkWidget *image; - GtkWidget *button; - GtkWidget *bbox; - GtkWidget *label; - GtkWidget *swin; + GtkWidget *vbox; + GtkWidget *table; + GtkWidget *image; + GtkWidget *button; + GtkWidget *bbox; + GtkWidget *label; + GtkWidget *swin; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); e->dialog = gtk_dialog_new_with_buttons(_("Project Properties"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); gtk_dialog_add_buttons(GTK_DIALOG(e->dialog), GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); gtk_widget_set_name(e->dialog, "GeanyDialogProject"); @@ -369,32 +372,32 @@ label = gtk_label_new(_("Name:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->name = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); label = gtk_label_new(_("Filename:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->file_name = gtk_entry_new(); - gtk_editable_set_editable(GTK_EDITABLE(e->file_name), FALSE); /* read-only */ + gtk_editable_set_editable(GTK_EDITABLE(e->file_name), FALSE); /* read-only */ gtk_table_attach(GTK_TABLE(table), e->file_name, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); label = gtk_label_new(_("Description:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->description = gtk_text_view_new(); @@ -402,45 +405,45 @@ swin = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(swin, 250, 80); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(e->description)); gtk_table_attach(GTK_TABLE(table), swin, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); label = gtk_label_new(_("Base path:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->base_path = gtk_entry_new(); gtk_tooltips_set_tip(tooltips, e->base_path, - _("Base directory of all files that make up the project. " - "This can be a new path, or an existing directory tree. " - "You can use paths relative to the project filename."), NULL); + _("Base directory of all files that make up the project. " + "This can be a new path, or an existing directory tree. " + "You can use paths relative to the project filename."), NULL); bbox = ui_path_box_new(_("Choose Project Base Path"), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); e->make_in_base_path = gtk_check_button_new_with_label(_("Make in base path")); gtk_table_attach(GTK_TABLE(table), e->make_in_base_path, 0, 3, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); label = gtk_label_new(_("Run command:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->run_cmd = gtk_entry_new(); gtk_tooltips_set_tip(tooltips, e->run_cmd, - _("Command-line to run in the project base directory. " - "Options can be appended to the command. " - "Leave blank to use the default run command."), NULL); + _("Command-line to run in the project base directory. " + "Options can be appended to the command. " + "Leave blank to use the default run command."), NULL); button = gtk_button_new(); g_signal_connect(button, "clicked", G_CALLBACK(on_file_open_button_clicked), e->run_cmd); image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); @@ -449,26 +452,26 @@ gtk_box_pack_start_defaults(GTK_BOX(bbox), e->run_cmd); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); #if 0 label = gtk_label_new(_("File patterns:")); /* <small>Separate multiple patterns by a new line</small> */ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 6, 7, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment(GTK_MISC(label), -1, 0); e->patterns = gtk_text_view_new(); swin = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(swin, -1, 80); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(e->patterns)); gtk_table_attach(GTK_TABLE(table), swin, 1, 2, 6, 7, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); #endif gtk_container_add(GTK_CONTAINER(vbox), table); @@ -478,8 +481,8 @@ void project_properties() { PropertyDialogElements *e = g_new(PropertyDialogElements, 1); - GeanyProject *p = app->project; - gint response; + GeanyProject *p = app->project; + gint response; g_return_if_fail(app->project != NULL); @@ -491,18 +494,18 @@ gtk_entry_set_text(GTK_ENTRY(e->name), p->name); if (p->description != NULL) - { /* set text */ + { /* set text */ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); gtk_text_buffer_set_text(buffer, p->description, -1); } #if 0 if (p->file_patterns != NULL) - { /* set the file patterns */ - gint i; - gint len = g_strv_length(p->file_patterns); + { /* set the file patterns */ + gint i; + gint len = g_strv_length(p->file_patterns); GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); - GString *str = g_string_sized_new(len * 4); + GString *str = g_string_sized_new(len * 4); for (i = 0; i < len; i++) { @@ -520,7 +523,7 @@ gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->make_in_base_path), - p->make_in_base_path); + p->make_in_base_path); if (p->run_cmd != NULL) gtk_entry_set_text(GTK_ENTRY(e->run_cmd), p->run_cmd); @@ -547,8 +550,8 @@ if (app->project != NULL) { if (dialogs_show_question_full(NULL, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, - _("Do you want to close it before proceeding?"), - _("The '%s' project is already open."), app->project->name)) + _("Do you want to close it before proceeding?"), + _("The '%s' project is already open."), app->project->name)) { project_close(FALSE); return TRUE; @@ -565,11 +568,11 @@ * Returns: FALSE if the user needs to change any data. */ static gboolean update_config(const PropertyDialogElements *e) { - const gchar *name, *file_name, *base_path; - gchar *locale_filename; - gint name_len; - gint err_code = 0; - gboolean new_project = FALSE; + const gchar *name, *file_name, *base_path; + gchar *locale_filename; + gint name_len; + gint err_code = 0; + gboolean new_project = FALSE; GeanyProject *p; g_return_val_if_fail(e != NULL, TRUE); @@ -600,11 +603,11 @@ locale_filename = utils_get_locale_from_utf8(file_name); base_path = gtk_entry_get_text(GTK_ENTRY(e->base_path)); if (NZV(base_path)) - { /* check whether the given directory actually exists */ + { /* check whether the given directory actually exists */ gchar *locale_path = utils_get_locale_from_utf8(base_path); if (! g_path_is_absolute(locale_path)) - { /* relative base path, so add base dir of project file name */ + { /* relative base path, so add base dir of project file name */ gchar *dir = g_path_get_dirname(locale_filename); setptr(locale_path, g_strconcat(dir, G_DIR_SEPARATOR_S, locale_path, NULL)); g_free(dir); @@ -615,9 +618,9 @@ gboolean create_dir; create_dir = dialogs_show_question_full(NULL, GTK_STOCK_OK, GTK_STOCK_CANCEL, - _("Create the project's base path directory?"), - _("The path \"%s\" does not exist."), - base_path); + _("Create the project's base path directory?"), + _("The path \"%s\" does not exist."), + base_path); if (create_dir) err_code = utils_mkdir(locale_path, TRUE); @@ -626,7 +629,7 @@ { if (err_code != 0) SHOW_ERR1(_("Project base directory could not be created (%s)."), - g_strerror(err_code)); + g_strerror(err_code)); gtk_widget_grab_focus(e->base_path); utils_free_pointers(locale_path, locale_filename, NULL); return FALSE; @@ -656,7 +659,7 @@ /* use "." if base_path is empty */ setptr(p->base_path, g_strdup(NZV(base_path) ? base_path : "./")); - if (! new_project) /* save properties specific fields */ + if (! new_project) /* save properties specific fields */ { GtkTextIter start, end; /*gchar *tmp;*/ @@ -700,7 +703,7 @@ { /* set filename in the file chooser dialog */ const gchar *utf8_filename = gtk_entry_get_text(GTK_ENTRY(entry)); - gchar *locale_filename = utils_get_locale_from_utf8(utf8_filename); + gchar *locale_filename = utils_get_locale_from_utf8(utf8_filename); if (g_path_is_absolute(locale_filename)) { @@ -747,6 +750,8 @@ } gtk_widget_destroy(dialog); } + + #endif @@ -754,7 +759,8 @@ { #ifdef G_OS_WIN32 gchar *path = win32_show_project_open_dialog(e->dialog, _("Choose Project Filename"), - gtk_entry_get_text(GTK_ENTRY(e->file_name)), TRUE, TRUE); + gtk_entry_get_text(GTK_ENTRY( + e->file_name)), TRUE, TRUE); if (path != NULL) { gtk_entry_set_text(GTK_ENTRY(e->file_name), path); @@ -765,9 +771,9 @@ /* initialise the dialog */ dialog = gtk_file_chooser_dialog_new(_("Choose Project Filename"), NULL, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gtk_widget_set_name(dialog, "GeanyDialogProject"); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), TRUE); @@ -783,7 +789,8 @@ { #ifdef G_OS_WIN32 gchar *path = win32_show_project_open_dialog(e->dialog, _("Choose Project Run Command"), - gtk_entry_get_text(GTK_ENTRY(e->run_cmd)), FALSE, FALSE); + gtk_entry_get_text(GTK_ENTRY( + e->run_cmd)), FALSE, FALSE); if (path != NULL) { gtk_entry_set_text(GTK_ENTRY(e->run_cmd), path); @@ -794,9 +801,9 @@ /* initialise the dialog */ dialog = gtk_file_chooser_dialog_new(_("Choose Project Run Command"), NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), TRUE); @@ -811,9 +818,9 @@ /* sets the project base path and the project file name according to the project name */ static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e) { - gchar *base_path; - gchar *file_name; - gchar *name; + gchar *base_path; + gchar *file_name; + gchar *name; const gchar *project_dir = local_prefs.project_file_path; if (entries_modified) @@ -823,13 +830,13 @@ if (name != NULL && strlen(name) > 0) { base_path = g_strconcat(project_dir, G_DIR_SEPARATOR_S, - name, G_DIR_SEPARATOR_S, NULL); + name, G_DIR_SEPARATOR_S, NULL); if (project_prefs.project_file_in_basedir) file_name = g_strconcat(project_dir, G_DIR_SEPARATOR_S, name, G_DIR_SEPARATOR_S, - name, "." GEANY_PROJECT_EXT, NULL); + name, "." GEANY_PROJECT_EXT, NULL); else file_name = g_strconcat(project_dir, G_DIR_SEPARATOR_S, - name, "." GEANY_PROJECT_EXT, NULL); + name, "." GEANY_PROJECT_EXT, NULL); } else { @@ -880,7 +887,7 @@ * The filename is expected in the locale encoding. */ static gboolean load_config(const gchar *filename) { - GKeyFile *config; + GKeyFile *config; GeanyProject *p; /* there should not be an open project */ @@ -902,14 +909,14 @@ p->make_in_base_path = utils_get_setting_boolean(config, "project", "make_in_base_path", TRUE); p->run_cmd = utils_get_setting_string(config, "project", "run_cmd", ""); p->file_patterns = g_key_file_get_string_list(config, "project", "file_patterns", NULL, NULL); - - p->build_1_cmd = utils_get_setting_string(config, "build_menu", "cmd_1", NULL ); - p->build_2_cmd = utils_get_setting_string(config, "build_menu", "cmd_2", NULL ); - p->build_3_cmd = utils_get_setting_string(config, "build_menu", "cmd_3", NULL ); - p->build_1_label = utils_get_setting_string(config, "build_menu", "label_1", NULL ); - p->build_2_label = utils_get_setting_string(config, "build_menu", "label_2", NULL ); - p->build_3_label = utils_get_setting_string(config, "build_menu", "label_3", NULL ); + p->build_1_cmd = utils_get_setting_string(config, "build_menu", "cmd_1", NULL); + p->build_2_cmd = utils_get_setting_string(config, "build_menu", "cmd_2", NULL); + p->build_3_cmd = utils_get_setting_string(config, "build_menu", "cmd_3", NULL); + p->build_1_label = utils_get_setting_string(config, "build_menu", "label_1", NULL); + p->build_2_label = utils_get_setting_string(config, "build_menu", "label_2", NULL); + p->build_3_label = utils_get_setting_string(config, "build_menu", "label_3", NULL); + if (project_prefs.project_session) { /* save current (non-project) session (it could has been changed since program startup) */ @@ -939,10 +946,10 @@ static gboolean write_config(gboolean emit_signal) { GeanyProject *p; - GKeyFile *config; - gchar *filename; - gchar *data; - gboolean ret = FALSE; + GKeyFile *config; + gchar *filename; + gchar *data; + gboolean ret = FALSE; g_return_val_if_fail(app->project != NULL, FALSE); @@ -975,7 +982,7 @@ g_key_file_set_string(config, "build_menu", "label_3", p->build_3_label); if (p->file_patterns) g_key_file_set_string_list(config, "project", "file_patterns", - (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); /* store the session files into the project too */ if (project_prefs.project_session) @@ -1011,7 +1018,8 @@ if (g_path_is_absolute(project->base_path)) return g_strdup(project->base_path); else - { /* build base_path out of project file name's dir and base_path */ + { + /* build base_path out of project file name's dir and base_path */ gchar *path; gchar *dir = g_path_get_dirname(project->file_name); @@ -1049,7 +1057,7 @@ g_key_file_set_string(config, "project", "session_file", utf8_filename); } g_key_file_set_string(config, "project", "project_file_path", - NVL(local_prefs.project_file_path, "")); + NVL(local_prefs.project_file_path, "")); } @@ -1059,14 +1067,14 @@ { g_return_if_fail(project_prefs.session_file == NULL); project_prefs.session_file = utils_get_setting_string(config, "project", - "session_file", ""); + "session_file", ""); } local_prefs.project_file_path = utils_get_setting_string(config, "project", - "project_file_path", NULL); + "project_file_path", NULL); if (local_prefs.project_file_path == NULL) { local_prefs.project_file_path = g_strconcat(g_get_home_dir(), - G_DIR_SEPARATOR_S, PROJECT_DIR, NULL); + G_DIR_SEPARATOR_S, PROJECT_DIR, NULL); } } @@ -1080,14 +1088,14 @@ g_return_if_fail(local_prefs.project_file_path != NULL); gtk_entry_set_text(GTK_ENTRY(path_entry), local_prefs.project_file_path); ui_setup_open_button_callback(path_btn, NULL, - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(path_entry)); + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(path_entry)); } /* Update project-related preferences after using the Preferences dialog. */ void project_apply_prefs() { - GtkWidget *path_entry = lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry"); + GtkWidget *path_entry = lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry"); const gchar *str; str = gtk_entry_get_text(GTK_ENTRY(path_entry)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

08 Nov '08

Revision: 3194 http://geany.svn.sourceforge.net/geany/?rev=3194&view=rev Author: ntrel Date: 2008-11-08 13:32:55 +0000 (Sat, 08 Nov 2008) Log Message: ----------- Make Version Diff plugin set the indent type for diffs based on the current file's indent type. Add editor_set_indent_type() to the API. Note: uses editor.h plugindata.h include. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/vcdiff.c trunk/src/editor.c trunk/src/plugindata.h trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-08 13:14:09 UTC (rev 3193) +++ trunk/ChangeLog 2008-11-08 13:32:55 UTC (rev 3194) @@ -1,7 +1,12 @@ 2008-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - * src/editor.c: + * src/editor.c, doc/geany.txt, doc/geany.html: Make Ctrl-click go to matching brace if there's no current word. + * plugins/vcdiff.c, src/editor.c, src/plugindata.h, src/plugins.c: + Make Version Diff plugin set the indent type for diffs based on the + current file's indent type. + Add editor_set_indent_type() to the API. + Note: uses editor.h plugindata.h include. 2008-11-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/plugins/vcdiff.c =================================================================== --- trunk/plugins/vcdiff.c 2008-11-08 13:14:09 UTC (rev 3193) +++ trunk/plugins/vcdiff.c 2008-11-08 13:32:55 UTC (rev 3194) @@ -279,6 +279,9 @@ } if (text) { + GeanyIndentType indent_type = + p_document->get_current()->editor->indent_type; + doc = p_document->find_by_filename(filename); if (doc == NULL) { @@ -293,6 +296,7 @@ gtk_notebook_set_current_page(book, page); p_document->set_text_changed(doc, FALSE); } + p_editor->set_indent_type(doc->editor, indent_type); p_document->set_encoding(doc, force_encoding ? force_encoding : detect_enc); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-11-08 13:14:09 UTC (rev 3193) +++ trunk/src/editor.c 2008-11-08 13:32:55 UTC (rev 3194) @@ -3818,7 +3818,9 @@ } -/* Also sets indent width, tab width. */ +/** Set the indent type for @a editor. + * @param editor Editor. + * @param type Indent type. */ void editor_set_indent_type(GeanyEditor *editor, GeanyIndentType type) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-11-08 13:14:09 UTC (rev 3193) +++ trunk/src/plugindata.h 2008-11-08 13:32:55 UTC (rev 3194) @@ -35,13 +35,16 @@ #ifndef PLUGINDATA_H #define PLUGINDATA_H +#include "editor.h" /* GeanyIndentType */ + + /* Note: We use enum instead of 'static const gint' to allow its use in global variable * initializing, otherwise we get errors like: * error: initializer element is not constant */ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 105, + GEANY_API_VERSION = 106, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -476,12 +479,15 @@ const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor); struct _ScintillaObject* (*create_widget)(struct GeanyEditor *editor); - /* Remember to convert any GeanyDocument or ScintillaObject pointers in any - * appended functions to GeanyEditor pointers. */ void (*set_indicator_full) (struct GeanyEditor *editor, gint indic, gint start, gint end); void (*set_indicator_on_line_full) (struct GeanyEditor *editor, gint indic, gint line); void (*clear_indicators_full) (struct GeanyEditor *editor, gint indic); + + void (*set_indent_type)(struct GeanyEditor *editor, GeanyIndentType type); + + /* Remember to convert any GeanyDocument or ScintillaObject pointers in any + * appended functions to GeanyEditor pointers. */ } EditorFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-11-08 13:14:09 UTC (rev 3193) +++ trunk/src/plugins.c 2008-11-08 13:32:55 UTC (rev 3194) @@ -138,6 +138,7 @@ &editor_set_indicator_full, &editor_set_indicator_on_line_full, &editor_clear_indicators_full, + &editor_set_indent_type }; static ScintillaFuncs sci_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:[3193] trunk
by ntrel＠users.sourceforge.net 08 Nov '08

08 Nov '08

Revision: 3193 http://geany.svn.sourceforge.net/geany/?rev=3193&view=rev Author: ntrel Date: 2008-11-08 13:14:09 +0000 (Sat, 08 Nov 2008) Log Message: ----------- Make Ctrl-click go to matching brace if there's no current word. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-07 15:55:40 UTC (rev 3192) +++ trunk/ChangeLog 2008-11-08 13:14:09 UTC (rev 3193) @@ -1,3 +1,9 @@ +2008-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Make Ctrl-click go to matching brace if there's no current word. + + 2008-11-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/editor.c: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-11-07 15:55:40 UTC (rev 3192) +++ trunk/doc/geany.html 2008-11-08 13:14:09 UTC (rev 3193) @@ -3,10 +3,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" /> +<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="$Date$" /> +<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>$Date$</td></tr> +<td>2008-10-27</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.16</td></tr> </tbody> @@ -149,254 +149,255 @@ License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code -of this program, and also in the chapter <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> -<div class="contents topic" id="contents"> -<p class="topic-title first">Contents</p> +of this program, and also in the chapter <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> +<div class="contents topic"> +<p class="topic-title first"><a id="contents" name="contents">Contents</a></p> <ul class="simple"> -<li><a class="reference internal" href="#introduction" id="id9">Introduction</a><ul> -<li><a class="reference internal" href="#about-geany" id="id10">About Geany</a></li> -<li><a class="reference internal" href="#where-to-get-it" id="id11">Where to get it</a></li> -<li><a class="reference internal" href="#license" id="id12">License</a></li> -<li><a class="reference internal" href="#about-this-document" id="id13">About this document</a></li> +<li><a class="reference" href="#introduction" id="id9" name="id9">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id10" name="id10">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id11" name="id11">Where to get it</a></li> +<li><a class="reference" href="#license" id="id12" name="id12">License</a></li> +<li><a class="reference" href="#about-this-document" id="id13" name="id13">About this document</a></li> </ul> </li> -<li><a class="reference internal" href="#installation" id="id14">Installation</a><ul> -<li><a class="reference internal" href="#requirements" id="id15">Requirements</a></li> -<li><a class="reference internal" href="#binary-packages" id="id16">Binary packages</a></li> -<li><a class="reference internal" href="#source-compilation" id="id17">Source compilation</a><ul> -<li><a class="reference internal" href="#custom-installation" id="id18">Custom installation</a></li> -<li><a class="reference internal" href="#dynamic-linking-loader-support" id="id19">Dynamic linking loader support</a></li> -<li><a class="reference internal" href="#build-problems" id="id20">Build problems</a></li> +<li><a class="reference" href="#installation" id="id14" name="id14">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id15" name="id15">Requirements</a></li> +<li><a class="reference" href="#binary-packages" id="id16" name="id16">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id17" name="id17">Source compilation</a><ul> +<li><a class="reference" href="#custom-installation" id="id18" name="id18">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support" id="id19" name="id19">Dynamic linking loader support</a></li> +<li><a class="reference" href="#build-problems" id="id20" name="id20">Build problems</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#usage" id="id21">Usage</a><ul> -<li><a class="reference internal" href="#getting-started" id="id22">Getting started</a></li> -<li><a class="reference internal" href="#command-line-options" id="id23">Command line options</a></li> -<li><a class="reference internal" href="#general" id="id24">General</a><ul> -<li><a class="reference internal" href="#startup" id="id25">Startup</a></li> -<li><a class="reference internal" href="#opening-files-from-the-command-line-in-a-running-instance" id="id26">Opening files from the command-line in a running instance</a></li> -<li><a class="reference internal" href="#virtual-terminal-emulator-widget-vte" id="id27">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference internal" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id28">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id21" name="id21">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id22" name="id22">Getting started</a></li> +<li><a class="reference" href="#command-line-options" id="id23" name="id23">Command line options</a></li> +<li><a class="reference" href="#general" id="id24" name="id24">General</a><ul> +<li><a class="reference" href="#startup" id="id25" name="id25">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id26" name="id26">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id27" name="id27">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id28" name="id28">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference internal" href="#documents" id="id29">Documents</a><ul> -<li><a class="reference internal" href="#switching-between-documents" id="id30">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id29" name="id29">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id30" name="id30">Switching between documents</a></li> </ul> </li> -<li><a class="reference internal" href="#character-sets-and-unicode-byte-order-mark-bom" id="id31">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference internal" href="#using-character-sets" id="id32">Using character sets</a></li> -<li><a class="reference internal" href="#in-file-encoding-specification" id="id33">In-file encoding specification</a></li> -<li><a class="reference internal" href="#special-encoding-none" id="id34">Special encoding "None"</a></li> -<li><a class="reference internal" href="#unicode-byte-order-mark-bom" id="id35">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id31" name="id31">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id32" name="id32">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id33" name="id33">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id34" name="id34">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id35" name="id35">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference internal" href="#editing" id="id36">Editing</a><ul> -<li><a class="reference internal" href="#folding" id="id37">Folding</a></li> -<li><a class="reference internal" href="#column-mode-editing" id="id38">Column mode editing</a></li> -<li><a class="reference internal" href="#drag-and-drop-of-text" id="id39">Drag and drop of text</a></li> -<li><a class="reference internal" href="#indentation" id="id40">Indentation</a></li> -<li><a class="reference internal" href="#auto-indentation" id="id41">Auto-indentation</a></li> -<li><a class="reference internal" href="#bookmarks" id="id42">Bookmarks</a></li> -<li><a class="reference internal" href="#code-navigation-history" id="id43">Code Navigation History</a></li> -<li><a class="reference internal" href="#send-text-through-definable-commands" id="id44">Send text through definable commands</a></li> -<li><a class="reference internal" href="#context-actions" id="id45">Context actions</a></li> -<li><a class="reference internal" href="#user-definable-snippets" id="id46">User-definable snippets</a></li> -<li><a class="reference internal" href="#inserting-unicode-characters" id="id47">Inserting unicode characters</a></li> +<li><a class="reference" href="#editing" id="id36" name="id36">Editing</a><ul> +<li><a class="reference" href="#folding" id="id37" name="id37">Folding</a></li> +<li><a class="reference" href="#column-mode-editing" id="id38" name="id38">Column mode editing</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id39" name="id39">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id40" name="id40">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id41" name="id41">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id42" name="id42">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id43" name="id43">Code Navigation History</a></li> +<li><a class="reference" href="#send-text-through-definable-commands" id="id44" name="id44">Send text through definable commands</a></li> +<li><a class="reference" href="#context-actions" id="id45" name="id45">Context actions</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id46" name="id46">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id47" name="id47">Inserting unicode characters</a></li> </ul> </li> -<li><a class="reference internal" href="#search-replace-and-go-to" id="id48">Search, replace and go to</a><ul> -<li><a class="reference internal" href="#find" id="id49">Find</a><ul> -<li><a class="reference internal" href="#matching-options" id="id50">Matching options</a></li> -<li><a class="reference internal" href="#find-all" id="id51">Find all</a></li> -<li><a class="reference internal" href="#change-font-in-search-dialog-text-fields" id="id52">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id48" name="id48">Search, replace and go to</a><ul> +<li><a class="reference" href="#find" id="id49" name="id49">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id50" name="id50">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id51" name="id51">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id52" name="id52">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference internal" href="#find-usage" id="id53">Find usage</a></li> -<li><a class="reference internal" href="#find-in-files" id="id54">Find in files</a><ul> -<li><a class="reference internal" href="#filtering-out-version-control-files" id="id55">Filtering out version control files</a></li> +<li><a class="reference" href="#find-usage" id="id53" name="id53">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id54" name="id54">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id55" name="id55">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference internal" href="#replace" id="id56">Replace</a><ul> -<li><a class="reference internal" href="#replace-all" id="id57">Replace all</a></li> +<li><a class="reference" href="#replace" id="id56" name="id56">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id57" name="id57">Replace all</a></li> </ul> </li> -<li><a class="reference internal" href="#go-to-tag-definition" id="id58">Go to tag definition</a></li> -<li><a class="reference internal" href="#go-to-tag-declaration" id="id59">Go to tag declaration</a></li> -<li><a class="reference internal" href="#go-to-line" id="id60">Go to line</a></li> -<li><a class="reference internal" href="#regular-expressions" id="id61">Regular expressions</a><ul> -<li><a class="reference internal" href="#partial-posix-compatibility" id="id62">Partial POSIX compatibility</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id58" name="id58">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id59" name="id59">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id60" name="id60">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id61" name="id61">Regular expressions</a><ul> +<li><a class="reference" href="#partial-posix-compatibility" id="id62" name="id62">Partial POSIX compatibility</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#tags" id="id63">Tags</a><ul> -<li><a class="reference internal" href="#workspace-tags" id="id64">Workspace tags</a></li> -<li><a class="reference internal" href="#global-tags" id="id65">Global tags</a><ul> -<li><a class="reference internal" href="#default-global-tags-files" id="id66">Default global tags files</a></li> -<li><a class="reference internal" href="#generating-a-global-tags-file" id="id67">Generating a global tags file</a></li> +<li><a class="reference" href="#tags" id="id63" name="id63">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id64" name="id64">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id65" name="id65">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id66" name="id66">Default global tags files</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id67" name="id67">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference internal" href="#ignore-tags" id="id68">Ignore tags</a></li> +<li><a class="reference" href="#ignore-tags" id="id68" name="id68">Ignore tags</a></li> </ul> </li> -<li><a class="reference internal" href="#preferences" id="id69">Preferences</a><ul> -<li><a class="reference internal" href="#general-tab-in-preferences-dialog" id="id70">General tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#id1" id="id71">Startup</a></li> -<li><a class="reference internal" href="#shutdown" id="id72">Shutdown</a></li> -<li><a class="reference internal" href="#projects" id="id73">Projects</a></li> -<li><a class="reference internal" href="#miscellaneous" id="id74">Miscellaneous</a></li> +<li><a class="reference" href="#preferences" id="id69" name="id69">Preferences</a><ul> +<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id70" name="id70">General tab in preferences dialog</a><ul> +<li><a class="reference" href="#id1" id="id71" name="id71">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id72" name="id72">Shutdown</a></li> +<li><a class="reference" href="#projects" id="id73" name="id73">Projects</a></li> +<li><a class="reference" href="#miscellaneous" id="id74" name="id74">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#interface-tab-in-preferences-dialog" id="id75">Interface tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#sidebar" id="id76">Sidebar</a></li> -<li><a class="reference internal" href="#fonts" id="id77">Fonts</a></li> -<li><a class="reference internal" href="#editor-tabs" id="id78">Editor tabs</a></li> -<li><a class="reference internal" href="#tab-positions" id="id79">Tab positions</a></li> -<li><a class="reference internal" href="#id2" id="id80">Miscellaneous</a></li> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id75" name="id75">Interface tab in preferences dialog</a><ul> +<li><a class="reference" href="#sidebar" id="id76" name="id76">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id77" name="id77">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id78" name="id78">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id79" name="id79">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id80" name="id80">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#toolbar-tab-in-preferences-dialog" id="id81">Toolbar tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#toolbar" id="id82">Toolbar</a></li> -<li><a class="reference internal" href="#items" id="id83">Items</a></li> -<li><a class="reference internal" href="#appearance" id="id84">Appearance</a></li> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id81" name="id81">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference" href="#toolbar" id="id82" name="id82">Toolbar</a></li> +<li><a class="reference" href="#items" id="id83" name="id83">Items</a></li> +<li><a class="reference" href="#appearance" id="id84" name="id84">Appearance</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-features-tab-in-preferences-dialog" id="id85">Editor Features tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#indentation-group" id="id86">Indentation group</a></li> -<li><a class="reference internal" href="#features" id="id87">Features</a></li> +<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id85" name="id85">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference" href="#indentation-group" id="id86" name="id86">Indentation group</a></li> +<li><a class="reference" href="#features" id="id87" name="id87">Features</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-completions-tab-in-preferences-dialog" id="id88">Editor Completions tab in preferences dialog</a></li> -<li><a class="reference internal" href="#editor-display-tab-in-preferences-dialog" id="id89">Editor Display tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#display" id="id90">Display</a></li> -<li><a class="reference internal" href="#long-line-marker" id="id91">Long line marker</a></li> +<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id88" name="id88">Editor Completions tab in preferences dialog</a></li> +<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id89" name="id89">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference" href="#display" id="id90" name="id90">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id91" name="id91">Long line marker</a></li> </ul> </li> -<li><a class="reference internal" href="#files-tab-in-preferences-dialog" id="id92">Files tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#new-files" id="id93">New files</a></li> -<li><a class="reference internal" href="#saving-files" id="id94">Saving files</a></li> -<li><a class="reference internal" href="#id3" id="id95">Miscellaneous</a></li> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id92" name="id92">Files tab in preferences dialog</a><ul> +<li><a class="reference" href="#new-files" id="id93" name="id93">New files</a></li> +<li><a class="reference" href="#saving-files" id="id94" name="id94">Saving files</a></li> +<li><a class="reference" href="#id3" id="id95" name="id95">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#search-tab-in-preferences-dialog" id="id96">Search tab in preferences dialog</a></li> -<li><a class="reference internal" href="#tools-tab-in-preferences-dialog" id="id97">Tools tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#tool-paths" id="id98">Tool paths</a></li> -<li><a class="reference internal" href="#commands" id="id99">Commands</a></li> +<li><a class="reference" href="#search-tab-in-preferences-dialog" id="id96" name="id96">Search tab in preferences dialog</a></li> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id97" name="id97">Tools tab in preferences dialog</a><ul> +<li><a class="reference" href="#tool-paths" id="id98" name="id98">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id99" name="id99">Commands</a></li> </ul> </li> -<li><a class="reference internal" href="#template-tab-in-preferences-dialog" id="id100">Template tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#template-data" id="id101">Template data</a></li> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id100" name="id100">Template tab in preferences dialog</a><ul> +<li><a class="reference" href="#template-data" id="id101" name="id101">Template data</a></li> </ul> </li> -<li><a class="reference internal" href="#keybinding-tab-in-preferences-dialog" id="id102">Keybinding tab in preferences dialog</a></li> -<li><a class="reference internal" href="#printing-tab-in-preferences-dialog" id="id103">Printing tab in preferences dialog</a></li> -<li><a class="reference internal" href="#vte-tab-in-preferences-dialog" id="id104">VTE tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#terminal-widget" id="id105">Terminal widget</a></li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id102" name="id102">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id103" name="id103">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id104" name="id104">VTE tab in preferences dialog</a><ul> +<li><a class="reference" href="#terminal-widget" id="id105" name="id105">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#project-management" id="id106">Project Management</a><ul> -<li><a class="reference internal" href="#new-project" id="id107">New Project</a></li> -<li><a class="reference internal" href="#project-properties" id="id108">Project Properties</a><ul> -<li><a class="reference internal" href="#make-in-base-path" id="id109">Make in base path</a></li> -<li><a class="reference internal" href="#run-command" id="id110">Run command</a></li> +<li><a class="reference" href="#project-management" id="id106" name="id106">Project Management</a><ul> +<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 internal" href="#open-project" id="id111">Open Project</a></li> -<li><a class="reference internal" href="#close-project" id="id112">Close Project</a></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> </ul> </li> -<li><a class="reference internal" href="#build-system" id="id113">Build system</a><ul> -<li><a class="reference internal" href="#compile" id="id114">Compile</a></li> -<li><a class="reference internal" href="#build" id="id115">Build</a></li> -<li><a class="reference internal" href="#make-all" id="id116">Make all</a></li> -<li><a class="reference internal" href="#make-custom-target" id="id117">Make custom target</a></li> -<li><a class="reference internal" href="#make-object" id="id118">Make object</a></li> -<li><a class="reference internal" href="#execute" id="id119">Execute</a></li> -<li><a class="reference internal" href="#stopping-running-processes" id="id120">Stopping running processes</a><ul> -<li><a class="reference internal" href="#terminal-emulators" id="id121">Terminal emulators</a></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> </ul> </li> -<li><a class="reference internal" href="#set-includes-and-arguments" id="id122">Set Includes and Arguments</a><ul> -<li><a class="reference internal" href="#one-step-compilation" id="id123">One step compilation</a></li> +<li><a class="reference" href="#set-includes-and-arguments" id="id122" name="id122">Set Includes and Arguments</a><ul> +<li><a class="reference" href="#one-step-compilation" id="id123" name="id123">One step compilation</a></li> </ul> </li> -<li><a class="reference internal" href="#indicators" id="id124">Indicators</a></li> +<li><a class="reference" href="#indicators" id="id124" name="id124">Indicators</a></li> </ul> </li> -<li><a class="reference internal" href="#printing-support" id="id125">Printing support</a></li> -<li><a class="reference internal" href="#plugins" id="id126">Plugins</a></li> -<li><a class="reference internal" href="#keybindings" id="id127">Keybindings</a><ul> -<li><a class="reference internal" href="#switching-documents" id="id128">Switching documents</a></li> -<li><a class="reference internal" href="#configurable-keybindings" id="id129">Configurable keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id125" name="id125">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id126" name="id126">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id127" name="id127">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id128" name="id128">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id129" name="id129">Configurable keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#configuration-files" id="id130">Configuration files</a><ul> -<li><a class="reference internal" href="#global-configuration-file" id="id131">Global configuration file</a></li> -<li><a class="reference internal" href="#filetype-definition-files" id="id132">Filetype definition files</a><ul> -<li><a class="reference internal" href="#format" id="id133">Format</a><ul> -<li><a class="reference internal" href="#styling-section" id="id134">[styling] Section</a></li> -<li><a class="reference internal" href="#keywords-section" id="id135">[keywords] Section</a></li> -<li><a class="reference internal" href="#settings-section" id="id136">[settings] Section</a></li> -<li><a class="reference internal" href="#build-settings-section" id="id137">[build_settings] Section</a></li> +<li><a class="reference" href="#configuration-files" id="id130" name="id130">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id131" name="id131">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id132" name="id132">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id133" name="id133">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id134" name="id134">[styling] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id135" name="id135">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id136" name="id136">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id137" name="id137">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference internal" href="#special-file-filetypes-common" id="id138">Special file filetypes.common</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id138" name="id138">Special file filetypes.common</a></li> </ul> </li> -<li><a class="reference internal" href="#filetype-extensions" id="id139">Filetype extensions</a></li> -<li><a class="reference internal" href="#templates" id="id140">Templates</a><ul> -<li><a class="reference internal" href="#template-metadata" id="id141">Template metadata</a></li> -<li><a class="reference internal" href="#file-templates" id="id142">File templates</a><ul> -<li><a class="reference internal" href="#custom-file-templates" id="id143">Custom file templates</a></li> -<li><a class="reference internal" href="#filetype-templates" id="id144">Filetype templates</a></li> +<li><a class="reference" href="#filetype-extensions" id="id139" name="id139">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id140" name="id140">Templates</a><ul> +<li><a class="reference" href="#template-metadata" id="id141" name="id141">Template metadata</a></li> +<li><a class="reference" href="#file-templates" id="id142" name="id142">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id143" name="id143">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id144" name="id144">Filetype templates</a></li> </ul> </li> -<li><a class="reference internal" href="#customizing-templates" id="id145">Customizing templates</a><ul> -<li><a class="reference internal" href="#template-wildcards" id="id146">Template wildcards</a></li> +<li><a class="reference" href="#customizing-templates" id="id145" name="id145">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id146" name="id146">Template wildcards</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#plugin-documentation" id="id147">Plugin documentation</a><ul> -<li><a class="reference internal" href="#instant-save" id="id148">Instant Save</a></li> -<li><a class="reference internal" href="#backup-copy" id="id149">Backup Copy</a></li> +<li><a class="reference" href="#plugin-documentation" id="id147" name="id147">Plugin documentation</a><ul> +<li><a class="reference" href="#instant-save" id="id148" name="id148">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id149" name="id149">Backup Copy</a></li> </ul> </li> -<li><a class="reference internal" href="#contributing-to-this-document" id="id150">Contributing to this document</a></li> -<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id151">Scintilla keyboard commands</a><ul> -<li><a class="reference internal" href="#keyboard-commands" id="id152">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id150" name="id150">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id151" name="id151">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id152" name="id152">Keyboard commands</a></li> </ul> </li> -<li><a class="reference internal" href="#tips-and-tricks" id="id153">Tips and tricks</a><ul> -<li><a class="reference internal" href="#document-notebook" id="id154">Document notebook</a></li> -<li><a class="reference internal" href="#symbols" id="id155">Symbols</a></li> -<li><a class="reference internal" href="#gtk-related" id="id156">GTK-related</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id153" name="id153">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id154" name="id154">Document notebook</a></li> +<li><a class="reference" href="#editor" id="id155" name="id155">Editor</a></li> +<li><a class="reference" href="#interface" id="id156" name="id156">Interface</a></li> +<li><a class="reference" href="#gtk-related" id="id157" name="id157">GTK-related</a></li> </ul> </li> -<li><a class="reference internal" href="#hidden-preferences" id="id157">Hidden preferences</a></li> -<li><a class="reference internal" href="#compile-time-options" id="id158">Compile-time options</a><ul> -<li><a class="reference internal" href="#src-geany-h" id="id159">src/geany.h</a></li> -<li><a class="reference internal" href="#project-h" id="id160">project.h</a></li> -<li><a class="reference internal" href="#editor-h" id="id161">editor.h</a></li> -<li><a class="reference internal" href="#keyfile-c" id="id162">keyfile.c</a></li> +<li><a class="reference" href="#hidden-preferences" id="id158" name="id158">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id159" name="id159">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id160" name="id160">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id161" name="id161">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id162" name="id162">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id163" name="id163">keyfile.c</a></li> </ul> </li> -<li><a class="reference internal" href="#gnu-general-public-license" id="id163">GNU General Public License</a></li> -<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id164">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id164" name="id164">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id165" name="id165">License for Scintilla and SciTE</a></li> </ul> </div> -<div class="section" id="introduction"> -<h1><a class="toc-backref" href="#id9">Introduction</a></h1> -<div class="section" id="about-geany"> -<h2><a class="toc-backref" href="#id10">About Geany</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id9" id="introduction" name="introduction">Introduction</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id10" id="about-geany" name="about-geany">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent @@ -419,50 +420,50 @@ <li>Plugin interface</li> </ul> </div> -<div class="section" id="where-to-get-it"> -<h2><a class="toc-backref" href="#id11">Where to get it</a></h2> -<p>You can obtain Geany from <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from +<div class="section"> +<h2><a class="toc-backref" href="#id11" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> +<p>You can obtain Geany from <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from your distributor. For a list of available packages, please see -<a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +<a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section" id="license"> -<h2><a class="toc-backref" href="#id12">License</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id12" id="license" name="license">License</a></h2> <p>Geany is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source -code of this program and in the chapter, <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> +code of this program and in the chapter, <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> <p>The included Scintilla library (found in the subdirectory <tt class="docutils literal"><span class="pre">scintilla/</span></tt>) has its own license, which can be found in the chapter, -<a class="reference internal" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> +<a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> -<div class="section" id="about-this-document"> -<h2><a class="toc-backref" href="#id13">About this document</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id13" id="about-this-document" name="about-this-document">About this document</a></h2> <p>This documentation is available in HTML and text formats. -The latest version can always be found at <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a>.</p> -<p>If you want to contribute to it, see <a class="reference internal" href="#contributing-to-this-document">Contributing to this document</a>.</p> +The latest version can always be found at <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a>.</p> +<p>If you want to contribute to it, see <a class="reference" href="#contributing-to-this-document">Contributing to this document</a>.</p> </div> </div> -<div class="section" id="installation"> -<h1><a class="toc-backref" href="#id14">Installation</a></h1> -<div class="section" id="requirements"> -<h2><a class="toc-backref" href="#id15">Requirements</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id14" id="installation" name="installation">Installation</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id15" id="requirements" name="requirements">Requirements</a></h2> <p>You will need the GTK (>= 2.6.0) libraries and their dependencies (Pango, GLib and ATK). Your distro should provide packages for these, usually installed by default. For Windows, you can download an installer which bundles these libraries from the website.</p> </div> -<div class="section" id="binary-packages"> -<h2><a class="toc-backref" href="#id16">Binary packages</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id16" id="binary-packages" name="binary-packages">Binary packages</a></h2> <p>There are many binary packages available. For an up-to-date but maybe -incomplete list see <a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +incomplete list see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section" id="source-compilation"> -<h2><a class="toc-backref" href="#id17">Source compilation</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id17" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>For compiling Geany yourself, you will need the GTK (>= 2.6.0) libraries and header files. You will also need the Pango, GLib and ATK libraries and header files. All these files are available at -<a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development +<a class="reference" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development packages to save the trouble of building these yourself.</p> <p>Furthermore you need, of course, a C compiler and the Make tool; a C++ compiler is also required (for the included Scintilla library). The @@ -476,8 +477,8 @@ <pre class="literal-block"> % make install </pre> -<div class="section" id="custom-installation"> -<h3><a class="toc-backref" href="#id18">Custom installation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id18" id="custom-installation" name="custom-installation">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> @@ -486,18 +487,18 @@ <p>You may also want to read the INSTALL file for advanced installation options.</p> <ul class="simple"> -<li>See also <a class="reference internal" href="#compile-time-options">Compile-time options</a>.</li> +<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li> </ul> </div> -<div class="section" id="dynamic-linking-loader-support"> -<h3><a class="toc-backref" href="#id19">Dynamic linking loader support</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id19" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> <p>In the case that your system lacks dynamic linking loader support, you probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> script. This prevents compiling Geany with dynamic linking loader support to automatically load <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> </div> -<div class="section" id="build-problems"> -<h3><a class="toc-backref" href="#id20">Build problems</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id20" id="build-problems" name="build-problems">Build problems</a></h3> <p>If there are any errors during compilation, check your build environment and try to find the error, otherwise contact the mailing list or one the authors. Sometimes you might need to ask for specific @@ -505,10 +506,10 @@ </div> </div> </div> -<div class="section" id="usage"> -<h1><a class="toc-backref" href="#id21">Usage</a></h1> -<div class="section" id="getting-started"> -<h2><a class="toc-backref" href="#id22">Getting started</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id21" id="usage" name="usage">Usage</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id22" id="getting-started" name="getting-started">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -524,8 +525,8 @@ </li> </ul> </div> -<div class="section" id="command-line-options"> -<h2><a class="toc-backref" href="#id23">Command line options</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id23" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -569,7 +570,7 @@ <tr><td>-g</td> <td>--generate-tags</td> <td>Generate a global tags file (see -<a class="reference internal" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> +<a class="reference" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> </tr> <tr><td>-P</td> <td>--no-preprocessing</td> @@ -657,13 +658,13 @@ <p>Geany supports all generic GTK options, a list is available on the help screen.</p> </div> -<div class="section" id="general"> -<h2><a class="toc-backref" href="#id24">General</a></h2> -<div class="section" id="startup"> -<h3><a class="toc-backref" href="#id25">Startup</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id24" id="general" name="general">General</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id25" id="startup" name="startup">Startup</a></h3> <p>At startup, Geany loads all files from the last time Geany was launched. You can disable this feature in the preferences dialog -(see <a class="reference internal" href="#general-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some +(see <a class="reference" href="#general-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some files on the command line, only these files will be opened, but you can find the files from the last session in the file menu under the "Recent files" item. By default this contains the last 10 recently @@ -674,8 +675,8 @@ do not specify any filenames on the command-line, or disable opening files in a running instance using the appropriate command line option.</p> </div> -<div class="section" id="opening-files-from-the-command-line-in-a-running-instance"> -<h3><a class="toc-backref" href="#id26">Opening files from the command-line in a running instance</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id26" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> <p>Geany detects an already running instance of itself and opens files from the command-line in the already running instance. So, Geany can be used to view and edit files by opening them from other programs @@ -688,10 +689,10 @@ column 4.</p> <p>If you do not like this for some reason, you can disable using the first instance by using the appropriate command line option -- see the section -called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> +called <a class="reference" href="#command-line-options">Command line options</a>.</p> </div> -<div class="section" id="virtual-terminal-emulator-widget-vte"> -<h3><a class="toc-backref" href="#id27">Virtual terminal emulator widget (VTE)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id27" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> <p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> in your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> @@ -699,7 +700,7 @@ will not be loaded. So there is no need to install the package containing this file in order to run Geany. Additionally, you can disable the use of the terminal widget by command line option, for more information -see the section called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> +see the section called <a class="reference" href="#command-line-options">Command line options</a>.</p> <p>You can use this terminal (from now on called VTE) nearly as an usual terminal program like xterm. There is basic clipboard support. You can paste the contents of the clipboard by pressing the right mouse @@ -730,12 +731,12 @@ <p>Obviously, you have to adjust the paths and set X to the number of your <tt class="docutils literal"><span class="pre">libvte.so</span></tt>.</p> <p>You can also specify the filename of the VTE library to use on the command -line (see the section called <a class="reference internal" href="#command-line-options">Command line options</a>) or at compile time +line (see the section called <a class="reference" href="#command-line-options">Command line options</a>) or at compile time by specifying the command line option <tt class="docutils literal"><span class="pre">--with-vte-module-path</span></tt> to ./configure.</p> </div> -<div class="section" id="defining-own-widget-styles-using-gtkrc-2-0"> -<h3><a class="toc-backref" href="#id28">Defining own widget styles using .gtkrc-2.0</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id28" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> <p>You can define your widget style for many of Geany's GUI parts. To do this, just edit your <tt class="docutils literal"><span class="pre">.gtkrc-2.0</span></tt> (usually found in your home directory on UNIX-like systems and in the etc subdirectory of your @@ -773,10 +774,10 @@ </pre> </div> </div> -<div class="section" id="documents"> -<h2><a class="toc-backref" href="#id29">Documents</a></h2> -<div class="section" id="switching-between-documents"> -<h3><a class="toc-backref" href="#id30">Switching between documents</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id29" id="documents" name="documents">Documents</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id30" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab @@ -784,10 +785,10 @@ of whether or not editor tabs are visible).</p> </div> </div> -<div class="section" id="character-sets-and-unicode-byte-order-mark-bom"> -<h2><a class="toc-backref" href="#id31">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> -<div class="section" id="using-character-sets"> -<h3><a class="toc-backref" href="#id32">Using character sets</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id31" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id32" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets and even can convert a file from a character set to another one. To do this, @@ -832,8 +833,8 @@ </li> </ul> </div> -<div class="section" id="in-file-encoding-specification"> -<h3><a class="toc-backref" href="#id33">In-file encoding specification</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id33" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -874,8 +875,8 @@ Anything after the first 512 bytes will not be recognised.</p> </div> </div> -<div class="section" id="special-encoding-none"> -<h3><a class="toc-backref" href="#id34">Special encoding "None"</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id34" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -884,10 +885,10 @@ of the first NUL-byte. Using this encoding opens the file as it is without any character conversion.</p> </div> -<div class="section" id="unicode-byte-order-mark-bom"> -<h3><a class="toc-backref" href="#id35">Unicode Byte-Order-Mark (BOM)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id35" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects an Unicode Byte Order Mark (see -<a class="reference external" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, +<a class="reference" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, this feature is only available if the opened file is in an unicode encoding. The Byte Order Mark helps to detect the encoding of a file, e.g. whether it is UTF-16LE or UTF-16BE and so on. On Unix-like systems @@ -905,10 +906,10 @@ </div> </div> </div> -<div class="section" id="editing"> -<h2><a class="toc-backref" href="#id36">Editing</a></h2> -<div class="section" id="folding"> -<h3><a class="toc-backref" href="#id37">Folding</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id36" id="editing" name="editing">Editing</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id37" id="folding" name="folding">Folding</a></h3> <p>Geany provides basic code folding support. Folding means the ability to show and hide parts of the text in the current file. You can hide unimportant code sections and concentrate on the parts you are working on @@ -931,8 +932,8 @@ children of a fold point" option is enabled, pressing Shift will disable it for this click and vice versa.</p> </div> -<div class="section" id="column-mode-editing"> -<h3><a class="toc-backref" href="#id38">Column mode editing</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id38" id="column-mode-editing" name="column-mode-editing">Column mode editing</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control and Shift key while selecting some text. It is also possible to create a zero-column selection @@ -941,18 +942,18 @@ this selection and the modifications will be done for every line in the selection.</p> </div> -<div class="section" id="drag-and-drop-of-text"> -<h3><a class="toc-backref" href="#id39">Drag and drop of text</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id39" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> <p>If you drag selected text in the editor widget of Geany the text is moved to the position where the mouse pointer is when releasing the mouse button. Holding Control when releasing the mouse button will copy the text instead. This behaviour was changed in Geany 0.11 - before the selected text was copied to the new position.</p> </div> -<div class="section" id="indentation"> -<h3><a class="toc-backref" href="#id40">Indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id40" id="indentation" name="indentation">Indentation</a></h3> <p>Geany allows each document to indent either with a tab character or -multiple spaces. The default indent mode is set in the <a class="reference internal" href="#editor-features-tab-in-preferences-dialog">Editor Features +multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a> (see the link for more information). But this can be overridden using either the <em>Document->Indent Type</em> menu, or by using the <em>Detect from file</em> indentation preference. When enabled, @@ -970,8 +971,8 @@ on a line.</dd> </dl> </div> -<div class="section" id="auto-indentation"> -<h3><a class="toc-backref" href="#id41">Auto-indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id41" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> <p>When enabled, auto-indentation happens when pressing <em>Enter</em> in the Editor. It adds a certain amount of indentation to the new line so the user doesn't always have to indent each line manually.</p> @@ -991,8 +992,8 @@ match the indentation of the line with the opening brace.</dd> </dl> </div> -<div class="section" id="bookmarks"> -<h3><a class="toc-backref" href="#id42">Bookmarks</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id42" id="bookmarks" name="bookmarks">Bookmarks</a></h3> <p>Geany provides a handy bookmarking feature that lets you mark one or more lines in a document, and return the cursor to them using a key combination.</p> @@ -1009,14 +1010,14 @@ (Ctrl-PgUp/PgDn and Ctrl-Tab) provides a particularly fast way to navigate around multiple files.</p> </div> -<div class="section" id="code-navigation-history"> -<h3><a class="toc-backref" href="#id43">Code Navigation History</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id43" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation points. Currently, this works for the following:</p> <ul class="simple"> -<li><a class="reference internal" href="#go-to-tag-declaration">Go to tag declaration</a></li> -<li><a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-tag-definition">Go to tag definition</a></li> <li>Symbol list items</li> <li>Build errors</li> <li>Message items</li> @@ -1028,8 +1029,8 @@ location". This makes it easier to navigate in e.g. foreign code and between different files.</p> </div> -<div class="section" id="send-text-through-definable-commands"> -<h3><a class="toc-backref" href="#id44">Send text through definable commands</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id44" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands. The output of the command will be used to replace the current selection. So, it is possible to use text @@ -1045,18 +1046,18 @@ some command line options. To delete a command, just clear the text entry and press OK. It will be deleted automatically.</p> </div> -<div class="section" id="context-actions"> -<h3><a class="toc-backref" href="#id45">Context actions</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id45" id="context-actions" name="context-actions">Context actions</a></h3> <p>You can execute a specified command on the current word near the cursor position or an available selection and this word is passed as an argument to this command. It can be used for example to open some API documentation in a browser window or open any other external program. To do this, there is an menu entry in the popup menu of the editor widget and also a keyboard shortcut(see the section called -<a class="reference internal" href="#keybindings">Keybindings</a>).</p> +<a class="reference" href="#keybindings">Keybindings</a>).</p> <p>The command can be specified in the preferences dialog and additionally for each filetype (see "context_action_cmd" in the section called -<a class="reference internal" href="#format">Format</a>). At executing, the filetype specific command is used if +<a class="reference" href="#format">Format</a>). At executing, the filetype specific command is used if available otherwise the command specified in the preferences dialog is executed.</p> <p>The passed word can be referred with the wildcard "%s" everywhere @@ -1069,10 +1070,10 @@ <p>when executing the command, the %s is substituted by the word near the cursor position or by the current selection. If the cursor is at the word "echo", a browser window will open(assumed your browser is -called firefox) and it will open the address: <a class="reference external" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> +called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> -<div class="section" id="user-definable-snippets"> -<h3><a class="toc-backref" href="#id46">User-definable snippets</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id46" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> <p>Snippets are small strings or code constructs which can be replaced or completed to a more complex string. So you can save a lot of time by not typing often used strings and letting Geany do the work for you. @@ -1152,7 +1153,7 @@ with "Enrico Tröger". The key to start auto completion can be changed in the preferences dialog, by default it is TAB.</p> <p>Since Geany 0.15 you can also use most of the available templates wildcards -listed in <a class="reference internal" href="#template-wildcards">Template wildcards</a>. All wildcards which are listed as +listed in <a class="reference" href="#template-wildcards">Template wildcards</a>. All wildcards which are listed as <cite>available in snippets</cite> can be used. For instance to improve the above example:</p> <pre class="literal-block"> [Default] @@ -1167,14 +1168,14 @@ default characters or define it to add or remove characters to fit your needs.</p> </div> -<div class="section" id="inserting-unicode-characters"> -<h3><a class="toc-backref" href="#id47">Inserting unicode characters</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id47" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting unicode characters</a></h3> <p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want, then let go of Ctrl-Shift and hit a key such as the right arrow.</p> <p>For this to work in Geany, you'll need to first unbind Ctrl-Shift-u -in the <a class="reference internal" href="#keybinding-tab-in-preferences-dialog">keybinding tab in preferences dialog</a>, then restart Geany. +in the <a class="reference" href="#keybinding-tab-in-preferences-dialog">keybinding tab in preferences dialog</a>, then restart Geany. Note that it works slightly differently from other GTK applications, in that you'll need to continue to hold down the Ctrl and Shift keys while typing the code point hex digits.</p> @@ -1183,8 +1184,8 @@ keys conflict with other Geany keybindings.</p> </div> </div> -<div class="section" id="search-replace-and-go-to"> -<h2><a class="toc-backref" href="#id48">Search, replace and go to</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id48" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> <p>This section describes search-related commands from the Search menu and the editor window's popup menu:</p> <ul class="simple"> @@ -1197,22 +1198,22 @@ <li>Go to line</li> </ul> <p>* These items are available from the editor window's popup menu, or by -using a keyboard shortcut (see the section called <a class="reference internal" href="#keybindings">Keybindings</a>).</p> -<div class="section" id="find"> -<h3><a class="toc-backref" href="#id49">Find</a></h3> +using a keyboard shortcut (see the section called <a class="reference" href="#keybindings">Keybindings</a>).</p> +<div class="section"> +<h3><a class="toc-backref" href="#id49" id="find" name="find">Find</a></h3> <p>The Find dialog is used for finding text in one or more open documents.</p> <img alt="./images/find_dialog.png" src="./images/find_dialog.png" /> -<div class="section" id="matching-options"> -<h4><a class="toc-backref" href="#id50">Matching options</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id50" id="matching-options" name="matching-options">Matching options</a></h4> <p>The syntax for the Use regular expressions option is shown in -<a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> +<a class="reference" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters into their UTF-8 equivalent. For example, \t will be transformed into a tab character. Other recognised symbols are: \\, \n, \r, \uXXXX (Unicode chararacters).</p> </div> -<div class="section" id="find-all"> -<h4><a class="toc-backref" href="#id51">Find all</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id51" id="find-all" name="find-all">Find all</a></h4> <p>To find all matches, click on the Find All expander. This will reveal several options:</p> <ul class="simple"> @@ -1227,8 +1228,8 @@ coloured box. These markers can be removed by selecting the Remove Markers command from the Document menu.</p> </div> -<div class="section" id="change-font-in-search-dialog-text-fields"> -<h4><a class="toc-backref" href="#id52">Change font in search dialog text fields</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id52" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> <p>All search related dialogs use a Monospace for the text input fields to increase the readibility of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which @@ -1249,8 +1250,8 @@ for the search dialogs.</p> </div> </div> -<div class="section" id="find-usage"> -<h3><a class="toc-backref" href="#id53">Find usage</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id53" id="find-usage" name="find-usage">Find usage</a></h3> <p>Find usage searches all open files. It is similar to the Find All In Session Find dialog command.</p> <p>If there is a selection, then it is used as the search text; otherwise @@ -1259,8 +1260,8 @@ click position when the popup menu is used. The search results are shown in the Messages tab of the Message Window.</p> </div> -<div class="section" id="find-in-files"> -<h3><a class="toc-backref" href="#id54">Find in files</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id54" id="find-in-files" name="find-in-files">Find in files</a></h3> <p>Find in files is a more powerful version of Find usage that searches all files in a certain directory using the Grep tool. The Grep tool must be correctly set in Preferences to the path of the system's Grep @@ -1268,8 +1269,8 @@ <img alt="./images/find_in_files_dialog.png" src="./images/find_in_files_dialog.png" /> <p>The Extra options field is used to pass any additional arguments to the grep tool.</p> -<div class="section" id="filtering-out-version-control-files"> -<h4><a class="toc-backref" href="#id55">Filtering out version control files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id55" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> <p>When using the <em>Recurse in subfolders</em> option with a directory that's under version control, you can set the <em>Extra options</em> field to use grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> @@ -1280,18 +1281,18 @@ <p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.*</span> <span class="pre">--exclude-dir=CVS</span></tt></p> </div> </div> -<div class="section" id="replace"> -<h3><a class="toc-backref" href="#id56">Replace</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id56" id="replace" name="replace">Replace</a></h3> <p>The Replace dialog is used for replacing text in one or more open documents.</p> <img alt="./images/replace_dialog.png" src="./images/replace_dialog.png" /> <p>The Replace dialog has the same options for matching text as the Find -dialog. See the section called <a class="reference internal" href="#matching-options">Matching options</a>.</p> +dialog. See the section called <a class="reference" href="#matching-options">Matching options</a>.</p> <p>The <em>Use regular expressions</em> option applies both to the search string and to the replacement text; for the latter back references can be -used -- see the entry for '\n' in <a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> -<div class="section" id="replace-all"> -<h4><a class="toc-backref" href="#id57">Replace all</a></h4> +used -- see the entry for '\n' in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> +<div class="section"> +<h4><a class="toc-backref" href="#id57" id="replace-all" name="replace-all">Replace all</a></h4> <p>To replace several matches, click on the <em>Replace All</em> expander. This will reveal several options:</p> <ul class="simple"> @@ -1305,8 +1306,8 @@ in the current selection of the current document.</p> </div> </div> -<div class="section" id="go-to-tag-definition"> -<h3><a class="toc-backref" href="#id58">Go to tag definition</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id58" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> <p>If the current word is the name of a tag definition (like a function body) and the file containing the tag definition is open, this command will switch to that file and go to the corresponding line number. The @@ -1314,18 +1315,18 @@ or the word underneath the popup menu click position when the popup menu is used.</p> </div> -<div class="section" id="go-to-tag-declaration"> -<h3><a class="toc-backref" href="#id59">Go to tag declaration</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id59" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function body.</p> </div> -<div class="section" id="go-to-line"> -<h3><a class="toc-backref" href="#id60">Go to line</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id60" id="go-to-line" name="go-to-line">Go to line</a></h3> <p>Go to a particular line number in the current file.</p> </div> -<div class="section" id="regular-expressions"> -<h3><a class="toc-backref" href="#id61">Regular expressions</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id61" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> <p>You can use regular expressions in the Find and Replace dialogs by selecting the Use regular expressions check box. The syntax is POSIX-like, as described in the table below.</p> @@ -1397,15 +1398,15 @@ </tr> </tbody> </table> -<div class="section" id="partial-posix-compatibility"> -<h4><a class="toc-backref" href="#id62">Partial POSIX compatibility</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id62" id="partial-posix-compatibility" name="partial-posix-compatibility">Partial POSIX compatibility</a></h4> <p>Note that the POSIX '?' regular expression character for optional matching is not supported by the Find and Replace dialogs.</p> </div> </div> </div> -<div class="section" id="tags"> -<h2><a class="toc-backref" href="#id63">Tags</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id63" id="tags" name="tags">Tags</a></h2> <p>Geany has built-in functionality for generating tag information (aka "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global @@ -1414,17 +1415,17 @@ <p>Geany uses its own tag file format, similar to what <tt class="docutils literal"><span class="pre">ctags</span></tt> uses (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> -<div class="section" id="workspace-tags"> -<h3><a class="toc-backref" href="#id64">Workspace tags</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id64" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> <p>Tags for each document are parsed whenever a file is loaded or saved. These are shown in the Symbol list in the Sidebar. These tags are also used for autocompletion of symbols and calltips for all documents open in the current session that have the same filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See -<a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> +<a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> -<div class="section" id="global-tags"> -<h3><a class="toc-backref" href="#id65">Global tags</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id65" id="global-tags" name="global-tags">Global tags</a></h3> <p>Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade @@ -1441,10 +1442,10 @@ name.lang_ext.tags </pre> <p><em>lang_ext</em> is one of the extensions set for the filetype associated -with the tags. See the section called <a class="reference internal" href="#filetype-extensions">Filetype extensions</a> for +with the tags. See the section called <a class="reference" href="#filetype-extensions">Filetype extensions</a> for more information.</p> -<div class="section" id="default-global-tags-files"> -<h4><a class="toc-backref" href="#id66">Default global tags files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id66" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> <p>For some languages, a list of global tags is loaded when the corresponding filetype is first used. Currently these are for:</p> <ul class="simple"> @@ -1455,8 +1456,8 @@ <li>LaTeX</li> </ul> </div> -<div class="section" id="generating-a-global-tags-file"> -<h4><a class="toc-backref" href="#id67">Generating a global tags file</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id67" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> <p><em>Filetypes support:</em></p> <p>Currently this is not yet supported for Pascal, PHP and LaTeX filetypes.</p> @@ -1467,7 +1468,7 @@ </pre> <ul class="simple"> <li>Tag File should be in the format described earlier -- see the -section called <a class="reference internal" href="#global-tags">Global tags</a>.</li> +section called <a class="reference" href="#global-tags">Global tags</a>.</li> <li>File list is a list of filenames, each with a full path (unless you are generating C/C++ tags and have set the CFLAGS environment variable appropriately).</li> @@ -1503,8 +1504,8 @@ upgrading Geany.</p> </div> </div> -<div class="section" id="ignore-tags"> -<h3><a class="toc-backref" href="#id68">Ignore tags</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id68" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> <p>You can also ignore certain tags if they would lead to wrong parsing of the code. Simply create a file called "ignore.tags" in your Geany configuration directory (usually <tt class="docutils literal"><span class="pre">~/.geany/</span></tt>). Then list all tags @@ -1527,8 +1528,8 @@ Exuberant Ctags.</p> </div> </div> -<div class="section" id="preferences"> -<h2><a class="toc-backref" href="#id69">Preferences</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id69" id="preferences" name="preferences">Preferences</a></h2> <p>You may adjust Geany's settings using the Edit --> Preferences dialog. Any changes you make there can be applied by hitting either the Apply or the OK button. These settings will persist between Geany @@ -1539,17 +1540,17 @@ persist between Geany sessions. The settings under the Document menu, however, are only for the current document and revert to defaults when restarting Geany.</p> -<p>There are also some rarer <a class="reference internal" href="#hidden-preferences">Hidden preferences</a>.</p> +<p>There are also some rarer <a class="reference" href="#hidden-preferences">Hidden preferences</a>.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">In the paragraphs that follow, the text describing a dialog tab comes after the screenshot of that tab.</p> </div> -<div class="section" id="general-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id70">General tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id70" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen.png" src="./images/pref_dialog_gen.png" /> -<div class="section" id="id1"> -<h4><a class="toc-backref" href="#id71">Startup</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id71" id="id1" name="id1">Startup</a></h4> <dl class="docutils"> <dt>Load files from the last session</dt> <dd>On startup, load the same files you had open the last time you @@ -1560,8 +1561,8 @@ <dd>Allow plugins to be used in Geany.</dd> </dl> </div> -<div class="section" id="shutdown"> -<h4><a class="toc-backref" href="#id72">Shutdown</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id72" id="shutdown" name="shutdown">Shutdown</a></h4> <dl class="docutils"> <dt>Save window position and geometry</dt> <dd>Save the current position and size of the main window so next time @@ -1570,8 +1571,8 @@ <dd>Have a dialog pop up to confirm that you really want to quit Geany.</dd> </dl> </div> -<div class="section" id="projects"> -<h4><a class="toc-backref" href="#id73">Projects</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id73" id="projects" name="projects">Projects</a></h4> <dl class="docutils"> <dt>Use project-based session files</dt> <dd>Save your current session when closing projects. You will be able to @@ -1585,8 +1586,8 @@ dialog. This option is just for your convenience to get a proper default path.</dd> </dl> </div> -<div class="section" id="miscellaneous"> -<h4><a class="toc-backref" href="#id74">Miscellaneous</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id74" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> <dl class="docutils"> <dt>Beep on errors when compilation has finished</dt> <dd>Have the computer make a beeping sound when compilation of your program @@ -1603,26 +1604,26 @@ </dl> </div> </div> -<div class="section" id="interface-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id75">Interface tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id75" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_interface.png" src="./images/pref_dialog_interface.png" /> -<div class="section" id="sidebar"> -<h4><a class="toc-backref" href="#id76">Sidebar</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id76" id="sidebar" name="sidebar">Sidebar</a></h4> <dl class="docutils"> <dt>Show symbol list</dt> <dd>Show the list of functions, variables, and other information in the current document you are editing.</dd> <dt>Show documents list</dt> <dd>Show all the documents you have open currently. This can be used to -change between documents (see <a class="reference internal" href="#switching-between-documents">Switching between documents</a>) and +change between documents (see <a class="reference" href="#switching-between-documents">Switching between documents</a>) and to perform some common operations such as saving, closing and reloading.</dd> <dt>Show full path name in documents list</dt> <dd>Show the full directory path of the files you are editing in the <em>Documents</em> list.</dd> </dl> </div> -<div class="section" id="fonts"> -<h4><a class="toc-backref" href="#id77">Fonts</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id77" id="fonts" name="fonts">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1632,8 +1633,8 @@ <dd>Change the font used for the message window area.</dd> </dl> </div> -<div class="section" id="editor-tabs"> -<h4><a class="toc-backref" href="#id78">Editor tabs</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id78" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> <dl class="docutils"> <dt>Show editor tabs</dt> <dd>Show a notebook tab for all documents so you can switch between them @@ -1646,8 +1647,8 @@ right of all existing tabs.</dd> </dl> </div> -<div class="section" id="tab-positions"> -<h4><a class="toc-backref" href="#id79">Tab positions</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id79" id="tab-positions" name="tab-positions">Tab positions</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Set the positioning of the editor's notebook tabs to the right, @@ -1660,8 +1661,8 @@ right, left, top, or bottom of the message window.</dd> </dl> </div> -<div class="section" id="id2"> -<h4><a class="toc-backref" href="#id80">Miscellaneous</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id80" id="id2" name="id2">Miscellaneous</a></h4> <dl class="docutils"> <dt>Show status bar</dt> <dd>Show the status bar at the bottom of the main window. It gives information about @@ -1670,19 +1671,19 @@ </dl> </div> </div> -<div class="section" id="toolbar-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id81">Toolbar tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id81" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> <p>Affects the main toolbar underneath the menu bar.</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> -<div class="section" id="toolbar"> -<h4><a class="toc-backref" href="#id82">Toolbar</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id82" id="toolbar" name="toolbar">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> </dl> </div> -<div class="section" id="items"> -<h4><a class="toc-backref" href="#id83">Items</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id83" id="items" name="items">Items</a></h4> <dl class="docutils"> <dt>Show File Operation buttons</dt> <dd>Show the buttons to open a new file, open an existing file, save a file, @@ -1715,8 +1716,8 @@ <dd>Show a button to quit geany.</dd> </dl> </div> -<div class="section" id="appearance"> -<h4><a class="toc-backref" href="#id84">Appearance</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id84" id="appearance" name="appearance">Appearance</a></h4> <dl class="docutils"> <dt>Icon Style</dt> <dd>Select the toolbar icon style to use - either icons and text, just @@ -1726,12 +1727,12 @@ </dl> </div> </div> -<div class="section" id="editor-features-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id85">Editor Features tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id85" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_features.png" src="./images/pref_dialog_edit_features.png" /> -<div class="section" id="indentation-group"> -<h4><a class="toc-backref" href="#id86">Indentation group</a></h4> -<p>See <a class="reference internal" href="#indentation">Indentation</a> for more information.</p> +<div class="section"> +<h4><a class="toc-backref" href="#id86" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> <dt>Type</dt> <dd><p class="first">When Geany inserts indentation, whether to use:</p> @@ -1772,7 +1773,7 @@ unindent when pressing Shift-tab. Otherwise, the tab key will insert a tab character into the document (which can be different from indentation, depending on the indent type).</p> -<div class="note last"> +<div class="last note"> <p class="first admonition-title">Note</p> <p class="last">There are also separate configurable keybindings for indent & unindent, but this pref allows the tab key to have different @@ -1781,8 +1782,8 @@ </dd> </dl> </div> -<div class="section" id="features"> -<h4><a class="toc-backref" href="#id87">Features</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id87" id="features" name="features">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> @@ -1813,14 +1814,14 @@ </dl> </div> </div> -<div class="section" id="editor-completions-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id88">Editor Completions tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id88" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_completions.png" src="./images/pref_dialog_edit_completions.png" /> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a pre-defined text snippet. -See <a class="reference internal" href="#user-definable-snippets">User-definable snippets</a>.</dd> +See <a class="reference" href="#user-definable-snippets">User-definable snippets</a>.</dd> <dt>XML tag autocompletion</dt> <dd>When you open an XML tag automatically generate its completion tag.</dd> <dt>Automatic continuation multi-line comments</dt> @@ -1852,12 +1853,12 @@ <dd>The maximum number of entries to display in the auto completion list.</dd> </dl> </div> -<div class="section" id="editor-display-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id89">Editor Display tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id89" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_edit_display.png" src="./images/pref_dialog_edit_display.png" /> -<div class="section" id="display"> -<h4><a class="toc-backref" href="#id90">Display</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id90" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Show indendation guides</dt> <dd>Show vertical lines to help show how much leading indentation there @@ -1873,8 +1874,8 @@ Otherwise you can scroll one more page even if there are no real lines.</dd> </dl> </div> -<div class="section" id="long-line-marker"> -<h4><a class="toc-backref" href="#id91">Long line marker</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id91" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint to the user for when to break the line.</p> <dl class="docutils"> @@ -1899,11 +1900,11 @@ </dl> </div> </div> -<div class="section" id="files-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id92">Files tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id92" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> -<div class="section" id="new-files"> -<h4><a class="toc-backref" href="#id93">New files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id93" id="new-files" name="new-files">New files</a></h4> <dl class="docutils"> <dt>Open new documents from the command-line</dt> <dd>Whether to create new documents when passing filenames that don't @@ -1922,8 +1923,8 @@ On Unix-like systems, LF is default and CR is used on MAC systems.</dd> </dl> </div> -<div class="section" id="saving-files"> -<h4><a class="toc-backref" href="#id94">Saving files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id94" id="saving-files" name="saving-files">Saving files</a></h4> <p>Perform special formatting operations when a document is saved. These can each be undone with the Undo command as usual.</p> <dl class="docutils"> @@ -1933,16 +1934,16 @@ <dd>Remove the trailing spaces on each line of the document.</dd> <dt>Replace tabs by space</dt> <dd><p class="first">Replace all tabs in the document with the equivalent number of spaces.</p> -<div class="note last"> +<div class="last note"> <p class="first admonition-title">Note</p> <p class="last">It is better to use spaces to indent than use this preference - see -<a class="reference internal" href="#indentation">Indentation</a>.</p> +<a class="reference" href="#indentation">Indentation</a>.</p> </div> </dd> </dl> </div> -<div class="section" id="id3"> -<h4><a class="toc-backref" href="#id95">Miscellaneous</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id95" id="id3" name="id3">Miscellaneous</a></h4> <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> @@ -1952,8 +1953,8 @@ </dl> </div> </div> -<div class="section" id="search-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id96">Search tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id96" id="search-tab-in-preferences-dialog" name="search-tab-in-preferences-dialog">Search tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_search.png" src="./images/pref_dialog_search.png" /> <dl class="docutils"> <dt>Always wrap search and hide the Find dialog</dt> @@ -1969,11 +1970,11 @@ dialog is used.</dd> </dl> </div> -<div class="section" id="tools-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id97">Tools tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id97" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> -<div class="section" id="tool-paths"> -<h4><a class="toc-backref" href="#id98">Tool paths</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id98" id="tool-paths" name="tool-paths">Tool paths</a></h4> <dl class="docutils"> <dt>Make</dt> <dd>The location of the make executable.</dd> @@ -1988,12 +1989,12 @@ <p class="first admonition-title">Note</p> <p class="last">For Windows users: at the time of writing it is recommended to use the grep.exe from the UnxUtils project -(<a class="reference external" href="http://sourceforge.net/projects/unxutils">http://sourceforge.net/projects/unxutils</a>). The grep.exe from the +(<a class="reference" href="http://sourceforge.net/projects/unxutils">http://sourceforge.net/projects/unxutils</a>). The grep.exe from the Mingw project for instance might not work with Geany at the moment.</p> </div> </div> -<div class="section" id="commands"> -<h4><a class="toc-backref" href="#id99">Commands</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id99" id="commands" name="commands">Commands</a></h4> <dl class="docutils"> <dt>Context action</dt> <dd>Set this to a command to execute on the current word. @@ -2002,8 +2003,8 @@ </dl> </div> </div> -<div class="section" id="template-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id100">Template tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id100" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> <p>This data is used as metadata for various template text to insert into a document, such as the file header. You only need to set fields that you want to use in your template files.</p> @@ -2012,8 +2013,8 @@ <p class="last">For changes made here to take effect a restart of geany is required.</p> </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> -<div class="section" id="template-data"> -<h4><a class="toc-backref" href="#id101">Template data</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id101" id="template-data" name="template-data">Template data</a></h4> <dl class="docutils"> <dt>Developer</dt> <dd>The name of the developer who will be creating files.</dd> @@ -2021,7 +2022,7 @@ <dd>The initials of the developer.</dd> <dt>Mail address</dt> <dd><p class="first">The email address of the developer.</p> -<div class="note last"> +<div class="last note"> <p class="first admonition-title">Note</p> <p class="last">You may wish to add anti-spam markup, e.g. <tt class="docutils literal"><span class="pre">name<at>site<dot>ext</span></tt>.</p> </div> @@ -2033,30 +2034,30 @@ <dt>Year</dt> <dd>Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> <dt>Date</dt> <dd>Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> <dt>Date & Time</dt> <dd>Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> </div> -<div class="section" id="keybinding-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id102">Keybinding tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id102" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some handy commands in here that are not, by default, bound to a key combination, and may not be available as a menu item.</p> <div class="note"> <p class="first admonition-title">Note</p> -<p class="last">For more information see the section called <a class="reference internal" href="#keybindings">Keybindings</a>.</p> +<p class="last">For more information see the section called <a class="reference" href="#keybindings">Keybindings</a>.</p> </div> </div> -<div class="section" id="printing-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id103">Printing tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id103" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> <dl class="docutils"> <dt>Use external command for printing</dt> @@ -2074,15 +2075,15 @@ <dt>Date format</dt> <dd>How the date should be printed. You can use the same format specifiers as in the ANSI C function strftime(). For details please -see <a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +see <a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> -<div class="section" id="vte-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id104">VTE tab in preferences dialog</a></h3> -<p>See also: <a class="reference internal" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> +<div class="section"> +<h3><a class="toc-backref" href="#id104" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> +<p>See also: <a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> -<div class="section" id="terminal-widget"> -<h4><a class="toc-backref" href="#id105">Terminal widget</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id105" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> <dl class="docutils"> <dt>Terminal font</dt> <dd>Select the font that will be used in the terminal emulation control.</dd> @@ -2122,8 +2123,8 @@ </div> </div> </div> -<div class="section" id="project-management"> -<h2><a class="toc-backref" href="#id106">Project Management</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id106" id="project-management" name="project-management">Project Management</a></h2> <p>Project Management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> @@ -2132,7 +2133,7 @@ </ul> <p>A list of session files can be stored and opened with the project when the <em>Use project-based session files</em> preference is enabled, -in the <em>Project</em> group of the <a class="reference internal" href="#preferences">Preferences</a> dialog.</p> +in the <em>Project</em> group of the <a class="reference" href="#preferences">Preferences</a> dialog.</p> <p>As long as a project is open, the Make and Run commands will use the project's settings, instead of the defaults. These will be used whichever document is currently displayed.</p> @@ -2140,8 +2141,8 @@ Geany is shutdown. When restarting Geany, the previously opened project file that was in use at the end of the last session will be reopened.</p> <p>Below are the commands used to create, modify, open and close projects.</p> -<div class="section" id="new-project"> -<h3><a class="toc-backref" href="#id107">New Project</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id107" id="new-project" name="new-project">New Project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -2150,8 +2151,8 @@ can safely be set to any existing path -- it will not touch the file structure contained in it.</p> </div> -<div class="section" id="project-properties"> -<h3><a class="toc-backref" href="#id108">Project Properties</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id108" id="project-properties" name="project-properties">Project Properties</a></h3> <p>You can set an optional description for the project, but it is not used elsewhere by Geany.</p> <p>The <em>Base path</em> field is used as the directory to run the Make and Make @@ -2159,14 +2160,14 @@ specific <em>Run command</em>. The specified path can be an absolute path or relative to the project's file name.</p> -<div class="section" id="make-in-base-path"> -<h4><a class="toc-backref" href="#id109">Make in base path</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id109" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> <p>This setting makes the <em>Build->Make</em> command use the project's base path. Uncheck this if you want to use the current file's directory instead.</p> </div> -<div class="section" id="run-command"> -<h4><a class="toc-backref" href="#id110">Run command</a></h4> +<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> @@ -2175,26 +2176,26 @@ <li>%f -- complete filename without path</li> <li>%e -- filename without path and without extension</li> </ul> -<p>See <a class="reference internal" href="#build-settings-section">[build_settings] Section</a> for details.</p> +<p>See <a class="reference" href="#build-settings-section">[build_settings] Section</a> for details.</p> </div> </div> -<div class="section" id="open-project"> -<h3><a class="toc-backref" href="#id111">Open Project</a></h3> +<div class="section"> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3192] trunk
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3192 http://geany.svn.sourceforge.net/geany/?rev=3192&view=rev Author: eht16 Date: 2008-11-07 15:55:40 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Set SVN file properties Property Changed: ---------------- trunk/data/filetypes.matlab trunk/scintilla/LexMatlab.cxx Property changes on: trunk/data/filetypes.matlab ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/scintilla/LexMatlab.cxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3191] trunk
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3191 http://geany.svn.sourceforge.net/geany/?rev=3191&view=rev Author: eht16 Date: 2008-11-07 14:40:06 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Don't auto close <hr> tags in HTML (closes #2226117). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-07 14:39:45 UTC (rev 3190) +++ trunk/ChangeLog 2008-11-07 14:40:06 UTC (rev 3191) @@ -1,3 +1,35 @@ +2008-11-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c: + Don't auto close <hr> tags in HTML (closes #2226117). + * THANKS, data/filetype_extensions.conf, data/filetypes.matlab, + scintilla/KeyWords.cxx, scintilla/LexMatlab.cxx, + scintilla/Makefile.am, scintilla/makefile.win32, src/editor.c, + src/filetypes.c, src/filetypes.h, src/highlighting.c, + src/plugindata.h, src/symbols.c, src/templates.c, + tagmanager/Makefile.am, tagmanager/makefile.win32, + tagmanager/matlab.c, tagmanager/parsers.h, wscript: + Add new filetype 'Matlab' (closes #1938631, patch by Roland + Baudin, thanks). + * src/dialogs.c: + Allow showing remote locations in the file open dialog with + GTK >= 2.14 since it works with Gvfs/FUSE mounts, too. + * src/prefs.c: + Plug a little memory leak. + * src/document.c, tagmanager/c.c, tagmanager/entry.c, + tagmanager/entry.h, tagmanager/fortran.c, tagmanager/get.c, + tagmanager/get.h, tagmanager/include/tm_source_file.h, + tagmanager/include/tm_project.h, tagmanager/js.c, + tagmanager/read.c, tagmanager/read, tagmanager/sql.c, + tagmanager/tm_source_file.c, tagmanager/tm_tag.c: + Add support for updating tags from a memory buffer (code merged from + Anjuta). + This still doesn't work and is currently disabled. It would only work + for a few filetypes like C, Fortran and JavaScript. The current + implementation is still buggy, e.g. function signature parsing is + broken. + + 2008-11-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/search.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-11-07 14:39:45 UTC (rev 3190) +++ trunk/src/editor.c 2008-11-07 14:40:06 UTC (rev 3191) @@ -1918,6 +1918,7 @@ /* when found string is something like br, img or another short tag, quit */ if (utils_str_equal(str_found, "br") + || utils_str_equal(str_found, "hr") || utils_str_equal(str_found, "img") || utils_str_equal(str_found, "base") || utils_str_equal(str_found, "basefont") /* < or not < */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3190] trunk
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3190 http://geany.svn.sourceforge.net/geany/?rev=3190&view=rev Author: eht16 Date: 2008-11-07 14:39:45 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Add new filetype 'Matlab' (closes #1938631, patch by Roland Baudin, thanks). Modified Paths: -------------- trunk/THANKS trunk/data/filetype_extensions.conf trunk/scintilla/KeyWords.cxx trunk/scintilla/Makefile.am trunk/scintilla/makefile.win32 trunk/src/editor.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/plugindata.h trunk/src/symbols.c trunk/src/templates.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h trunk/wscript Added Paths: ----------- trunk/data/filetypes.matlab trunk/scintilla/LexMatlab.cxx trunk/tagmanager/matlab.c Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/THANKS 2008-11-07 14:39:45 UTC (rev 3190) @@ -50,6 +50,7 @@ Jason Oster <parasytic(at)users(dot)sourceforge(dot)net> - various patches Andrew Rowland <weibullguy(at)charter(dot)net> - R filetype patch Bronisław Białek <after89(at)gmail(dot)com> - CSS parser update +Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - Matlab filetype patch Translators: ------------ Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/data/filetype_extensions.conf 2008-11-07 14:39:45 UTC (rev 3190) @@ -23,6 +23,7 @@ Javascript=*.js; Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; +Matlab=*.m; O-Matrix=*.oms; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; Added: trunk/data/filetypes.matlab =================================================================== --- trunk/data/filetypes.matlab (rev 0) +++ trunk/data/filetypes.matlab 2008-11-07 14:39:45 UTC (rev 3190) @@ -0,0 +1,38 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0x808080;0xffffff;false;false +command=0x111199;0xffffff;true;false +number=0x007f00;0xffffff;false;false +keyword=0x001a7f;0xffffff;true;false +string=0xff901e;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +doublequotedstring=0xff901e;0xffffff;false;false + +[keywords] +# all items must be in one line +primary=break case catch continue else elseif end for function global if otherwise persistent return switch try while + +[settings] +# default extension used when saving files +#extension=m + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=% +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/scintilla/KeyWords.cxx 2008-11-07 14:39:45 UTC (rev 3190) @@ -160,6 +160,7 @@ LINK_LEXER(lmLatex); LINK_LEXER(lmLua); LINK_LEXER(lmMake); + LINK_LEXER(lmMatlab); LINK_LEXER(lmNncrontab); LINK_LEXER(lmNull); LINK_LEXER(lmOMS); Added: trunk/scintilla/LexMatlab.cxx =================================================================== --- trunk/scintilla/LexMatlab.cxx (rev 0) +++ trunk/scintilla/LexMatlab.cxx 2008-11-07 14:39:45 UTC (rev 3190) @@ -0,0 +1,236 @@ +// Scintilla source code edit control +/** @file LexMatlab.cxx + ** Lexer for Matlab. + ** Written by Jos\xE9 Fonseca + ** + ** Changes by Christoph Dalitz 2003/12/04: + ** - added support for Octave + ** - Strings can now be included both in single or double quotes + **/ +// Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdio.h> +#include <stdarg.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static bool IsMatlabCommentChar(int c) { + return (c == '%') ; +} + +static bool IsOctaveCommentChar(int c) { + return (c == '%' || c == '#') ; +} + +static bool IsMatlabComment(Accessor &styler, int pos, int len) { + return len > 0 && IsMatlabCommentChar(styler[pos]) ; +} + +static bool IsOctaveComment(Accessor &styler, int pos, int len) { + return len > 0 && IsOctaveCommentChar(styler[pos]) ; +} + +static inline bool IsAWordChar(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_'); +} + +static inline bool IsAWordStart(const int ch) { + return (ch < 0x80) && (isalnum(ch) || ch == '_'); +} + +static void ColouriseMatlabOctaveDoc( + unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler, + bool (*IsCommentChar)(int)) { + + WordList &keywords = *keywordlists[0]; + + styler.StartAt(startPos); + + bool transpose = false; + + StyleContext sc(startPos, length, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + if (sc.state == SCE_MATLAB_OPERATOR) { + if (sc.chPrev == '.') { + if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') { + sc.ForwardSetState(SCE_MATLAB_DEFAULT); + transpose = false; + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_MATLAB_DEFAULT); + transpose = true; + } else { + sc.SetState(SCE_MATLAB_DEFAULT); + } + } else { + sc.SetState(SCE_MATLAB_DEFAULT); + } + } else if (sc.state == SCE_MATLAB_KEYWORD) { + if (!isalnum(sc.ch) && sc.ch != '_') { + char s[100]; + sc.GetCurrentLowered(s, sizeof(s)); + if (keywords.InList(s)) { + sc.SetState(SCE_MATLAB_DEFAULT); + transpose = false; + } else { + sc.ChangeState(SCE_MATLAB_IDENTIFIER); + sc.SetState(SCE_MATLAB_DEFAULT); + transpose = true; + } + } + } else if (sc.state == SCE_MATLAB_NUMBER) { + if (!isdigit(sc.ch) && sc.ch != '.' + && !(sc.ch == 'e' || sc.ch == 'E') + && !((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E'))) { + sc.SetState(SCE_MATLAB_DEFAULT); + transpose = true; + } + } else if (sc.state == SCE_MATLAB_STRING) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_MATLAB_DEFAULT); + } + } else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_MATLAB_DEFAULT); + } + } else if (sc.state == SCE_MATLAB_COMMENT || sc.state == SCE_MATLAB_COMMAND) { + if (sc.atLineEnd) { + sc.SetState(SCE_MATLAB_DEFAULT); + transpose = false; + } + } + + if (sc.state == SCE_MATLAB_DEFAULT) { + if (IsCommentChar(sc.ch)) { + sc.SetState(SCE_MATLAB_COMMENT); + } else if (sc.ch == '!' && sc.chNext != '=' ) { + sc.SetState(SCE_MATLAB_COMMAND); + } else if (sc.ch == '\'') { + if (transpose) { + sc.SetState(SCE_MATLAB_OPERATOR); + } else { + sc.SetState(SCE_MATLAB_STRING); + } + } else if (sc.ch == '"') { + sc.SetState(SCE_MATLAB_DOUBLEQUOTESTRING); + } else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) { + sc.SetState(SCE_MATLAB_NUMBER); + } else if (isalpha(sc.ch)) { + sc.SetState(SCE_MATLAB_KEYWORD); + } else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '\\') { + if (sc.ch == ')' || sc.ch == ']') { + transpose = true; + } else { + transpose = false; + } + sc.SetState(SCE_MATLAB_OPERATOR); + } else { + transpose = false; + } + } + } + sc.Complete(); +} + +static void ColouriseMatlabDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar); +} + +static void ColouriseOctaveDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar); +} + +static void FoldMatlabOctaveDoc(unsigned int startPos, int length, int, + WordList *[], Accessor &styler, + bool (*IsComment)(Accessor&, int, int)) { + + int endPos = startPos + length; + + // Backtrack to previous line in case need to fix its fold status + int lineCurrent = styler.GetLine(startPos); + if (startPos > 0) { + if (lineCurrent > 0) { + lineCurrent--; + startPos = styler.LineStart(lineCurrent); + } + } + int spaceFlags = 0; + int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsComment); + char chNext = styler[startPos]; + for (int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + + if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) { + int lev = indentCurrent; + int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsComment); + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + // Only non whitespace lines can be headers + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) { + lev |= SC_FOLDLEVELHEADERFLAG; + } else if (indentNext & SC_FOLDLEVELWHITEFLAG) { + // Line after is blank so check the next - maybe should continue further? + int spaceFlags2 = 0; + int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsComment); + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + } + } + indentCurrent = indentNext; + styler.SetLevel(lineCurrent, lev); + lineCurrent++; + } + } +} + +static void FoldMatlabDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabComment); +} + +static void FoldOctaveDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler) { + FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveComment); +} + +static const char * const matlabWordListDesc[] = { + "Keywords", + 0 +}; + +static const char * const octaveWordListDesc[] = { + "Keywords", + 0 +}; + +LexerModule lmMatlab(SCLEX_MATLAB, ColouriseMatlabDoc, "matlab", FoldMatlabDoc, matlabWordListDesc); + +LexerModule lmOctave(SCLEX_OCTAVE, ColouriseOctaveDoc, "octave", FoldOctaveDoc, octaveWordListDesc); Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/scintilla/Makefile.am 2008-11-07 14:39:45 UTC (rev 3190) @@ -19,6 +19,7 @@ LexHTML.cxx \ LexLua.cxx \ LexOMS.cxx \ +LexMatlab.cxx \ LexOthers.cxx \ LexPascal.cxx \ LexPerl.cxx \ Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/scintilla/makefile.win32 2008-11-07 14:39:45 UTC (rev 3190) @@ -61,7 +61,7 @@ #**LEXOBJS=\\\n$\*.o $ LEXOBJS=\ LexBash.o LexAsm.o LexCSS.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ -LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o \ +LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o LexMatlab.o \ LexD.o LexLua.o LexHaskell.o LexBasic.o LexR.o #--Autogenerated -- end of automatically generated section Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/editor.c 2008-11-07 14:39:45 UTC (rev 3190) @@ -2763,6 +2763,10 @@ case SCLEX_FREEBASIC: return (style == SCE_B_STRING); + case SCLEX_MATLAB: + return (style == SCE_MATLAB_STRING || + style == SCE_MATLAB_DOUBLEQUOTESTRING); + case SCLEX_HTML: return (style == SCE_HPHP_SIMPLESTRING || style == SCE_HPHP_HSTRING || /* HSTRING is a heredoc */ @@ -2846,6 +2850,9 @@ style == SCE_TCL_COMMENT_BOX || style == SCE_TCL_BLOCK_COMMENT); + case SCLEX_MATLAB: + return (style == SCE_MATLAB_COMMENT); + case SCLEX_LUA: return (style == SCE_LUA_COMMENT || style == SCE_LUA_COMMENTLINE || @@ -4095,6 +4102,7 @@ case SCLEX_FREEBASIC: case SCLEX_D: case SCLEX_OMS: + case SCLEX_MATLAB: mode = SC_IV_LOOKBOTH; break; Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/filetypes.c 2008-11-07 14:39:45 UTC (rev 3190) @@ -495,6 +495,17 @@ ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; +#define MATLAB + ft = filetypes[GEANY_FILETYPES_MATLAB]; + ft->lang = 32; + ft->name = g_strdup("Matlab"); + ft->title = g_strdup_printf(_("%s source file"), "Matlab"); + ft->extension = g_strdup("m"); + ft->pattern = utils_strv_new("*.m", NULL); + ft->comment_open = g_strdup("%"); + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; + #define ALL ft = filetypes[GEANY_FILETYPES_NONE]; ft->lang = -2; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/filetypes.h 2008-11-07 14:39:45 UTC (rev 3190) @@ -57,6 +57,7 @@ GEANY_FILETYPES_JS, GEANY_FILETYPES_LUA, GEANY_FILETYPES_MAKE, + GEANY_FILETYPES_MATLAB, GEANY_FILETYPES_OMS, GEANY_FILETYPES_PERL, GEANY_FILETYPES_PHP, Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/highlighting.c 2008-11-07 14:39:45 UTC (rev 3190) @@ -2579,6 +2579,52 @@ set_sci_style(sci, SCE_TCL_WORD5, GEANY_FILETYPES_TCL, 15); } + +static void styleset_matlab_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_style_array(GEANY_FILETYPES_MATLAB, 9); + get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[0]); + get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[1]); + get_keyfile_hex(config, config_home, "styling", "command", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_MATLAB].styling[2]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[3]); + get_keyfile_hex(config, config_home, "styling", "keyword", "0x001a7f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_MATLAB].styling[4]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[5]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[6]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[7]); + get_keyfile_hex(config, config_home, "styling", "doublequotedstring", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_MATLAB].styling[8]); + + style_sets[GEANY_FILETYPES_MATLAB].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_MATLAB, 0, "break case catch continue else elseif end for function global if otherwise persistent return switch try while"); + style_sets[GEANY_FILETYPES_MATLAB].keywords[1] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_MATLAB].wordchars); +} + + +static void styleset_matlab(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_MATLAB; + + styleset_common(sci); + + apply_filetype_properties(sci, SCLEX_MATLAB, ft_id); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_MATLAB].keywords[0]); + + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_MATLAB, 0); + set_sci_style(sci, SCE_MATLAB_DEFAULT, GEANY_FILETYPES_MATLAB, 0); + set_sci_style(sci, SCE_MATLAB_COMMENT, GEANY_FILETYPES_MATLAB, 1); + set_sci_style(sci, SCE_MATLAB_COMMAND, GEANY_FILETYPES_MATLAB, 2); + set_sci_style(sci, SCE_MATLAB_NUMBER, GEANY_FILETYPES_MATLAB, 3); + set_sci_style(sci, SCE_MATLAB_KEYWORD, GEANY_FILETYPES_MATLAB, 4); + set_sci_style(sci, SCE_MATLAB_STRING, GEANY_FILETYPES_MATLAB, 5); + set_sci_style(sci, SCE_MATLAB_OPERATOR, GEANY_FILETYPES_MATLAB, 6); + set_sci_style(sci, SCE_MATLAB_IDENTIFIER, GEANY_FILETYPES_MATLAB, 7); + set_sci_style(sci, SCE_MATLAB_DOUBLEQUOTESTRING, GEANY_FILETYPES_MATLAB, 8); +} + + static void styleset_d_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_style_array(GEANY_FILETYPES_D, 18); @@ -3087,6 +3133,7 @@ init_styleset_case(GEANY_FILETYPES_LATEX, latex); init_styleset_case(GEANY_FILETYPES_LUA, lua); init_styleset_case(GEANY_FILETYPES_MAKE, makefile); + init_styleset_case(GEANY_FILETYPES_MATLAB, matlab); init_styleset_case(GEANY_FILETYPES_OMS, oms); init_styleset_case(GEANY_FILETYPES_PASCAL, pascal); init_styleset_case(GEANY_FILETYPES_PERL, perl); @@ -3143,6 +3190,7 @@ styleset_case(GEANY_FILETYPES_LATEX, latex); styleset_case(GEANY_FILETYPES_LUA, lua); styleset_case(GEANY_FILETYPES_MAKE, makefile); + styleset_case(GEANY_FILETYPES_MATLAB, matlab); styleset_case(GEANY_FILETYPES_OMS, oms); styleset_case(GEANY_FILETYPES_PASCAL, pascal); styleset_case(GEANY_FILETYPES_PERL, perl); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/plugindata.h 2008-11-07 14:39:45 UTC (rev 3190) @@ -41,13 +41,13 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 104, + GEANY_API_VERSION = 105, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ /* This should usually stay the same if fields are only appended, assuming only pointers to * structs and not structs themselves are declared by plugins. */ - GEANY_ABI_VERSION = 47 + GEANY_ABI_VERSION = 48 }; /** Check the plugin can be loaded by Geany. Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/symbols.c 2008-11-07 14:39:45 UTC (rev 3190) @@ -623,6 +623,14 @@ NULL); break; } + case GEANY_FILETYPES_MATLAB: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_function), _("Functions"), "classviewer-method", + &(tv_iters.tag_struct), _("Structures"), "classviewer-struct", + NULL); + break; + } case GEANY_FILETYPES_PERL: { tag_list_add_groups(tag_store, Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/src/templates.c 2008-11-07 14:39:45 UTC (rev 3190) @@ -548,6 +548,7 @@ } case GEANY_FILETYPES_LATEX: + case GEANY_FILETYPES_MATLAB: { line_prefix = "%"; break; Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/tagmanager/Makefile.am 2008-11-07 14:39:45 UTC (rev 3190) @@ -49,6 +49,7 @@ asm.c\ latex.c\ lregex.c\ + matlab.c\ pascal.c\ perl.c\ rest.c\ Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/tagmanager/makefile.win32 2008-11-07 14:39:45 UTC (rev 3190) @@ -41,7 +41,7 @@ $(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o options.o \ -parse.o basic.o read.o sort.o strlist.o latex.o docbook.o tcl.o ruby.o asm.o sql.o css.o \ +parse.o basic.o read.o sort.o strlist.o latex.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o css.o \ vstring.o regex.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ tm_symbol.o tm_file_entry.o tm_tagmanager.o $(AR) rc $@ $^ Added: trunk/tagmanager/matlab.c =================================================================== --- trunk/tagmanager/matlab.c (rev 0) +++ trunk/tagmanager/matlab.c 2008-11-07 14:39:45 UTC (rev 3190) @@ -0,0 +1,150 @@ +/* +* +* Copyright (c) 2000-2001, Darren Hiebert +* +* 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 Matlab scripts. +* The tags 'function' and 'struct' are parsed. +* Author Roland Baudin <roland65(a)free.fr> +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_FUNCTION, + K_STRUCT +} MatlabKind; + +static kindOption MatlabKinds [] = { + { TRUE, 'f', "function", "Functions" }, + { TRUE, 's', "struct", "Structures" }, +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static void findMatlabTags (void) +{ + vString *name = vStringNew (); + const unsigned char *line; + const unsigned char *p; + + while ((line = fileReadLine ()) != NULL) + { + int i, ic; + + if (line [0] == '\0' || line [0] == '%') + continue; + + /* search if the line has a comment */ + for (ic = 0 ; line [ic] != '\0' && line [ic]!='%' ; ++ic) + ; + + /* function tag */ + + /* read first word */ + for (i = 0 ; line [i] != '\0' && ! isspace (line [i]) ; ++i) + ; + + if (strncmp ((const char *) line, "function", (size_t) 8) == 0) + { + const unsigned char *cp = line + i; + const unsigned char *ptr = cp; + boolean eq=FALSE; + + while (isspace ((int) *cp)) + ++cp; + + /* search for '=' character in the line */ + while (*ptr != '\0') + { + if (*ptr == '=') + { + eq=TRUE; + break; + } + ptr++; + } + + /* '=' was found => get the right most part of the line after '=' and before '%' */ + if (eq) + { + ptr++; + while (isspace ((int) *ptr)) + ++ptr; + + while (*ptr != '\0' && *ptr != '%') + { + vStringPut (name, (int) *ptr); + ++ptr; + } + } + + /* '=' was not found => get the right most part of the line after + * 'function' and before '%' */ + else + { + while (*cp != '\0' && *cp != '%') + { + vStringPut (name, (int) *cp); + ++cp; + } + } + + vStringTerminate (name); + makeSimpleTag (name, MatlabKinds, K_FUNCTION); + vStringClear (name); + } + + /* struct tag */ + + /* search if the line contains the keyword 'struct' */ + p=(const unsigned char*) strstr ((const char*) line, "struct"); + + /* and avoid the part after the '%' if any */ + if ( p != NULL && ic>0 && p < line+ic) + { + const unsigned char *cp = line; + + /* get the left most part of the line before '=' */ + while (*cp != '\0' && !isspace(*cp) && *cp != '=' ) + { + vStringPut (name, (int) *cp); + ++cp; + } + + vStringTerminate (name); + makeSimpleTag (name, MatlabKinds, K_STRUCT); + vStringClear (name); + } + } + vStringDelete (name); +} + +extern parserDefinition* MatlabParser (void) +{ + static const char *const extensions [] = { "m", NULL }; + parserDefinition* def = parserNew ("Matlab"); + def->kinds = MatlabKinds; + def->kindCount = KIND_COUNT (MatlabKinds); + def->extensions = extensions; + def->parser = findMatlabTags; + return def; +} + +/* vi:set tabstop=8 shiftwidth=4: */ Property changes on: trunk/tagmanager/matlab.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/tagmanager/parsers.h 2008-11-07 14:39:45 UTC (rev 3190) @@ -46,7 +46,8 @@ RestParser, \ HtmlParser, \ F77Parser, \ - GLSLParser + GLSLParser, \ + MatlabParser /* langType of each parser @@ -82,6 +83,7 @@ 29 HtmlParser 30 F77Parser 31 GLSLParser +32 MatlabParser */ #endif /* _PARSERS_H */ Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-11-07 14:38:51 UTC (rev 3189) +++ trunk/wscript 2008-11-07 14:39:45 UTC (rev 3190) @@ -56,7 +56,8 @@ 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', - 'tagmanager/make.c', 'tagmanager/options.c', 'tagmanager/parse.c', 'tagmanager/pascal.c', + 'tagmanager/make.c', 'tagmanager/matlab.c', 'tagmanager/options.c', 'tagmanager/parse.c', + 'tagmanager/pascal.c', 'tagmanager/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', 'tagmanager/sql.c', 'tagmanager/strlist.c', 'tagmanager/tcl.c', 'tagmanager/tm_file_entry.c', @@ -75,7 +76,7 @@ 'scintilla/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx', 'scintilla/LexLua.cxx', 'scintilla/LexOMS.cxx', 'scintilla/LexOthers.cxx', 'scintilla/LexPascal.cxx', 'scintilla/LexPerl.cxx', 'scintilla/LexPython.cxx', - 'scintilla/LexR.cxx', + 'scintilla/LexR.cxx', 'scintilla/LexMatlab.cxx', 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', 'scintilla/LexTCL.cxx', 'scintilla/LexVHDL.cxx', 'scintilla/LineMarker.cxx', 'scintilla/PlatGTK.cxx', 'scintilla/PositionCache.cxx', 'scintilla/PropSet.cxx', 'scintilla/RESearch.cxx', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3189] trunk/tagmanager/read.c
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3189 http://geany.svn.sourceforge.net/geany/?rev=3189&view=rev Author: eht16 Date: 2008-11-07 14:38:51 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Again, oops: this line got lost while merging. Modified Paths: -------------- trunk/tagmanager/read.c Modified: trunk/tagmanager/read.c =================================================================== --- trunk/tagmanager/read.c 2008-11-07 14:38:38 UTC (rev 3188) +++ trunk/tagmanager/read.c 2008-11-07 14:38:51 UTC (rev 3189) @@ -418,6 +418,7 @@ File.eof = TRUE; else if (c == NEWLINE) { + File.newLine = TRUE; if (File.fp != NULL) /* we have a file */ fgetpos (File.fp, &StartOfLine); else /* it's a buffer */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
8
9
10
11
12
13
14
Older →

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