Commits August 2009

commits@lists.geany.org

5 participants
106 discussions

SF.net SVN: geany:[4143] trunk
by ntrel＠users.sourceforge.net 31 Aug '09

31 Aug '09

Revision: 4143 http://geany.svn.sourceforge.net/geany/?rev=4143&view=rev Author: ntrel Date: 2009-08-31 16:11:46 +0000 (Mon, 31 Aug 2009) Log Message: ----------- Merge custom-filetypes branch: Support adding custom filetype files e.g. filetypes.Foo.conf. - Code: Allow GeanyFiletype::extension to be NULL. Add note about using GeanyFiletype pointer instead of filetype_id for filetypes.c function arguments. Replace styleset_none() with styleset_default(). Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/src/dialogs.c trunk/src/document.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/main.c trunk/src/symbols.c trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/ChangeLog 2009-08-31 16:11:46 UTC (rev 4143) @@ -3,6 +3,16 @@ * src/plugins.c: Add warning if only one of the plugin_key_group[_info] symbols is defined for a plugin. + * src/templates.c, src/highlighting.c, src/dialogs.c, src/filetypes.c, + src/filetypes.h, src/document.c, src/main.c, src/symbols.c, + TODO: + Merge custom-filetypes branch: + Support adding custom filetype files e.g. filetypes.Foo.conf. + - Code: + Allow GeanyFiletype::extension to be NULL. + Add note about using GeanyFiletype pointer instead of filetype_id + for filetypes.c function arguments. + Replace styleset_none() with styleset_default(). 2009-08-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/TODO 2009-08-31 16:11:46 UTC (rev 4143) @@ -13,7 +13,7 @@ filetypes.common named styles) o configurable filetype and project make commands (e.g. using bud for D) - see the build-system SVN branch - o (custom filetypes) + o (better custom filetype support) o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) o (selectable menu of arguments to use for Make, from Make Custom) o (DBUS) Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/dialogs.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -88,7 +88,7 @@ gboolean ro = (response == GEANY_RESPONSE_VIEW); /* View clicked */ /* ignore detect from file item */ - if (filetype_idx > 0 && filetype_idx < GEANY_MAX_BUILT_IN_FILETYPES) + if (filetype_idx > 0) ft = g_slist_nth_data(filetypes_by_title, filetype_idx); if (encoding_idx >= 0 && encoding_idx < GEANY_ENCODINGS_MAX) charset = encodings[encoding_idx].charset; @@ -511,8 +511,7 @@ { gchar *fname = NULL; - if (doc->file_type != NULL && doc->file_type->id != GEANY_FILETYPES_NONE && - doc->file_type->extension != NULL) + if (doc->file_type != NULL && doc->file_type->extension != NULL) fname = g_strconcat(GEANY_STRING_UNTITLED, ".", doc->file_type->extension, NULL); else Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/document.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -1464,7 +1464,11 @@ g_return_if_fail(doc != NULL); g_return_if_fail(doc->file_type != NULL); - filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc->file_type)->extension, NULL); + if (doc->file_type->extension) + filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", doc->file_type->extension, NULL); + else + filebase = g_strdup(GEANY_STRING_UNTITLED); + filename = g_path_get_basename(doc->file_name); /* only search the first 3 lines */ Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/filetypes.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -26,6 +26,9 @@ * Filetype detection, file extensions and filetype menu items. */ +/* Note: we use filetype_id for some function arguments, but GeanyFiletype is better; we should + * only use GeanyFiletype for API functions. */ + #include <string.h> #include <glib/gstdio.h> @@ -62,6 +65,7 @@ gboolean error_regex_compiled; gchar *last_string; /* last one compiled */ #endif + gboolean custom; } GeanyFiletypePrivate; @@ -113,7 +117,7 @@ ft->lang = -2; ft->name = g_strdup(_("None")); ft->title = g_strdup(_("None")); - ft->extension = g_strdup("*"); + ft->extension = NULL; ft->pattern = utils_strv_new("*", NULL); ft->comment_open = NULL; ft->comment_close = NULL; @@ -658,6 +662,57 @@ } +static void add_custom_filetype(const gchar *filename) +{ + gchar *fn = utils_strdupa(strstr(filename, ".") + 1); + gchar *dot = g_strrstr(fn, ".conf"); + GeanyFiletype *ft; + + g_return_if_fail(dot); + + *dot = 0x0; + + if (g_hash_table_lookup(filetypes_hash, fn)) + return; + + geany_debug("Adding filetype %s.", fn); + ft = filetype_new(); + ft->name = g_strdup(fn); + filetype_make_title(ft, TITLE_FILE); + ft->pattern = g_new0(gchar*, 1); + ft->priv->custom = TRUE; + filetype_add(ft); +} + + +static void init_custom_filetypes(const gchar *path) +{ + GDir *dir; + + g_return_if_fail(path); + + dir = g_dir_open(path, 0, NULL); + if (dir == NULL) + return; + + while (1) + { + const gchar prefix[] = "filetypes."; + const gchar *filename = g_dir_read_name(dir); + + if (filename == NULL) + break; + + if (g_str_has_prefix(filename, prefix) && + g_str_has_suffix(filename + strlen(prefix), ".conf")) + { + add_custom_filetype(filename); + } + } + g_dir_close(dir); +} + + /* Create the filetypes array and fill it with the known filetypes. */ void filetypes_init_types() { @@ -681,6 +736,8 @@ { filetype_add(filetypes[ft_id]); } + init_custom_filetypes(app->datadir); + init_custom_filetypes(utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL)); } @@ -747,16 +804,18 @@ { GeanyFiletype *ft = node->data; - if (ft->id != GEANY_FILETYPES_NONE) + if (ft->group != GEANY_FILETYPE_GROUP_NONE) create_radio_menu_item(group_menus[ft->group], ft); + else + create_radio_menu_item(filetype_menu, ft); } - create_radio_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_NONE]); } void filetypes_init() { filetypes_init_types(); + create_set_filetype_menu(); setup_config_file_menus(); } @@ -1168,13 +1227,16 @@ /* simple wrapper function to print file errors in DEBUG mode */ static void load_system_keyfile(GKeyFile *key_file, const gchar *file, GKeyFileFlags flags, - G_GNUC_UNUSED GError **just_for_compatibility) + GeanyFiletype *ft) { GError *error = NULL; gboolean done = g_key_file_load_from_file(key_file, file, flags, &error); - if (G_UNLIKELY(! done) && G_UNLIKELY(error != NULL)) + + if (error != NULL) { - geany_debug("Failed to open %s (%s)", file, error->message); + if (!done && !ft->priv->custom) + geany_debug("Failed to open %s (%s)", file, error->message); + g_error_free(error); error = NULL; } @@ -1188,10 +1250,12 @@ { GKeyFile *config, *config_home; GeanyFiletypePrivate *pft; + GeanyFiletype *ft; g_return_if_fail(ft_id >= 0 && ft_id < (gint) filetypes_array->len); - pft = filetypes[ft_id]->priv; + ft = filetypes[ft_id]; + pft = ft->priv; /* when reloading, proceed only if the settings were already loaded */ if (reload && G_UNLIKELY(! pft->keyfile_loaded)) @@ -1212,7 +1276,7 @@ gchar *f = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", ext, NULL); - load_system_keyfile(config, f0, G_KEY_FILE_KEEP_COMMENTS, NULL); + load_system_keyfile(config, f0, G_KEY_FILE_KEEP_COMMENTS, ft); g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); g_free(ext); @@ -1231,14 +1295,18 @@ gchar *filetypes_get_conf_extension(gint filetype_idx) { gchar *result; + GeanyFiletype *ft = filetypes[filetype_idx]; + if (ft->priv->custom) + return g_strconcat(ft->name, ".conf", NULL); + /* Handle any special extensions different from lowercase filetype->name */ switch (filetype_idx) { case GEANY_FILETYPES_CPP: result = g_strdup("cpp"); break; case GEANY_FILETYPES_CS: result = g_strdup("cs"); break; case GEANY_FILETYPES_MAKE: result = g_strdup("makefile"); break; - default: result = g_ascii_strdown(filetypes[filetype_idx]->name, -1); break; + default: result = g_ascii_strdown(ft->name, -1); break; } return result; } @@ -1248,9 +1316,9 @@ { gchar *conf_prefix = g_strconcat(app->configdir, G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", NULL); - gint i; + guint i; - for (i = 1; i < GEANY_MAX_BUILT_IN_FILETYPES; i++) + for (i = 1; i < filetypes_array->len; i++) { GKeyFile *config_home; gchar *fname, *ext, *data; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/filetypes.h 2009-08-31 16:11:46 UTC (rev 4143) @@ -109,7 +109,7 @@ langType lang; gchar *name; /**< Used as name for tagmanager. E.g. "C". */ gchar *title; /**< Shown in the file open dialog. E.g. "C source file". */ - gchar *extension; /**< Default file extension for new files. */ + gchar *extension; /**< Default file extension for new files, or @c NULL. */ gchar **pattern; /**< Array of filename-matching wildcard strings. */ gchar *context_action_cmd; gchar *comment_open; Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/highlighting.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -62,7 +62,7 @@ } StyleSet; /* each filetype has a styleset except GEANY_FILETYPES_NONE, which uses common_style_set */ -static StyleSet style_sets[GEANY_MAX_BUILT_IN_FILETYPES] = {{0, NULL, NULL, NULL}}; +static StyleSet *style_sets = NULL; enum /* Geany common styling */ @@ -123,7 +123,7 @@ static GeanyLexerStyle gsd_default = {0x000000, 0xffffff, FALSE, FALSE}; -static void new_style_array(gint file_type_id, gint styling_count) +static void new_styleset(gint file_type_id, gint styling_count) { StyleSet *set = &style_sets[file_type_id]; @@ -132,7 +132,7 @@ } -static void styleset_free(gint file_type_id) +static void free_styleset(gint file_type_id) { StyleSet *style_ptr; style_ptr = &style_sets[file_type_id]; @@ -402,7 +402,7 @@ static GeanyLexerStyle *get_style(guint ft_id, guint styling_index) { - g_assert(ft_id < GEANY_MAX_BUILT_IN_FILETYPES); + g_assert(ft_id < filetypes_array->len); if (G_UNLIKELY(ft_id == GEANY_FILETYPES_NONE)) { @@ -432,13 +432,16 @@ void highlighting_free_styles() { - gint i; + guint i; - for (i = 0; i < GEANY_MAX_BUILT_IN_FILETYPES; i++) - styleset_free(i); + for (i = 0; i < filetypes_array->len; i++) + free_styleset(i); if (named_style_hash) g_hash_table_destroy(named_style_hash); + + if (style_sets) + g_free(style_sets); } @@ -600,10 +603,15 @@ } -static void styleset_common(ScintillaObject *sci) +static void styleset_common(ScintillaObject *sci, filetype_id ft_id) { SSM(sci, SCI_STYLECLEARALL, 0, 0); + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) (ft_id == GEANY_FILETYPES_NONE ? + common_style_set.wordchars : style_sets[ft_id].wordchars)); + /* have to set whitespace after setting wordchars */ + SSM(sci, SCI_SETWHITESPACECHARS, 0, (sptr_t) whitespace_chars); + /* caret colour, style and width */ SSM(sci, SCI_SETCARETFORE, invert(common_style_set.styling[GCS_CARET].foreground), 0); SSM(sci, SCI_SETCARETWIDTH, common_style_set.styling[GCS_CARET].background, 0); @@ -793,13 +801,7 @@ SSM(sci, SCI_SETLEXER, lexer, 0); - SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[ft_id].wordchars); - /* have to set whitespace after setting wordchars */ - SSM(sci, SCI_SETWHITESPACECHARS, 0, (sptr_t) whitespace_chars); - - SSM(sci, SCI_AUTOCSETMAXHEIGHT, editor_prefs.symbolcompletion_max_height, 0); - - styleset_common(sci); + styleset_common(sci, ft_id); } @@ -832,7 +834,7 @@ } -/* call new_style_array(filetype_idx, >= 20) before using this. */ +/* call new_styleset(filetype_idx, >= 20) before using this. */ static void styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, gint filetype_idx) { @@ -896,7 +898,7 @@ static void styleset_c_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_C, 21); + new_styleset(GEANY_FILETYPES_C, 21); styleset_c_like_init(config, config_home, GEANY_FILETYPES_C); get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_C].styling[20]); @@ -935,7 +937,7 @@ static void styleset_cpp_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CPP, 21); + new_styleset(GEANY_FILETYPES_CPP, 21); styleset_c_like_init(config, config_home, GEANY_FILETYPES_CPP); get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_CPP].styling[20]); @@ -975,7 +977,7 @@ static void styleset_glsl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_GLSL, 21); + new_styleset(GEANY_FILETYPES_GLSL, 21); styleset_c_like_init(config, config_home, GEANY_FILETYPES_GLSL); get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_GLSL].styling[20]); @@ -1025,7 +1027,7 @@ static void styleset_cs_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CS, 21); + new_styleset(GEANY_FILETYPES_CS, 21); styleset_c_like_init(config, config_home, GEANY_FILETYPES_CS); get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_CS].styling[20]); @@ -1067,7 +1069,7 @@ static void styleset_vala_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_VALA, 21); + new_styleset(GEANY_FILETYPES_VALA, 21); styleset_c_like_init(config, config_home, GEANY_FILETYPES_VALA); get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_VALA].styling[20]); @@ -1124,7 +1126,7 @@ static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PASCAL, 15); + new_styleset(GEANY_FILETYPES_PASCAL, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[0]); get_keyfile_hex(config, config_home, "identifier", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[1]); get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PASCAL].styling[2]); @@ -1180,7 +1182,7 @@ static void styleset_makefile_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_MAKE, 7); + new_styleset(GEANY_FILETYPES_MAKE, 7); get_keyfile_hex(config, config_home, "default", 0x00002f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[0]); get_keyfile_named_style(config, config_home, "comment", "comment", &style_sets[GEANY_FILETYPES_MAKE].styling[1]); get_keyfile_hex(config, config_home, "preprocessor", 0x007f7f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MAKE].styling[2]); @@ -1212,7 +1214,7 @@ static void styleset_diff_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_DIFF, 8); + new_styleset(GEANY_FILETYPES_DIFF, 8); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[1]); get_keyfile_hex(config, config_home, "command", 0x7f7f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DIFF].styling[2]); @@ -1246,7 +1248,7 @@ static void styleset_latex_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_LATEX, 5); + new_styleset(GEANY_FILETYPES_LATEX, 5); get_keyfile_hex(config, config_home, "default", 0x00002f, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LATEX].styling[0]); get_keyfile_hex(config, config_home, "command", 0xff0000, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_LATEX].styling[1]); get_keyfile_hex(config, config_home, "tag", 0x007f7f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_LATEX].styling[2]); @@ -1316,7 +1318,7 @@ static void styleset_markup_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_XML, 56); + new_styleset(GEANY_FILETYPES_XML, 56); get_keyfile_hex(config, config_home, "html_default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[0]); get_keyfile_hex(config, config_home, "html_tag", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[1]); get_keyfile_hex(config, config_home, "html_tagunknown", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_XML].styling[2]); @@ -1546,7 +1548,7 @@ static void styleset_java_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_JAVA, 20); + new_styleset(GEANY_FILETYPES_JAVA, 20); styleset_c_like_init(config, config_home, GEANY_FILETYPES_JAVA); style_sets[GEANY_FILETYPES_JAVA].keywords = g_new(gchar*, 5); @@ -1581,7 +1583,7 @@ static void styleset_perl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PERL, 35); + new_styleset(GEANY_FILETYPES_PERL, 35); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[0]); get_keyfile_hex(config, config_home, "error", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PERL].styling[1]); get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_PERL].styling[2]); @@ -1703,7 +1705,7 @@ static void styleset_python_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PYTHON, 16); + new_styleset(GEANY_FILETYPES_PYTHON, 16); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[0]); get_keyfile_hex(config, config_home, "commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[1]); get_keyfile_hex(config, config_home, "number", 0x400080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PYTHON].styling[2]); @@ -1762,7 +1764,7 @@ static void styleset_cmake_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CMAKE, 15); + new_styleset(GEANY_FILETYPES_CMAKE, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[1]); get_keyfile_hex(config, config_home, "stringdq", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CMAKE].styling[2]); @@ -1818,7 +1820,7 @@ static void styleset_r_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_R, 12); + new_styleset(GEANY_FILETYPES_R, 12); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_R].styling[1]); @@ -1869,7 +1871,7 @@ static void styleset_ruby_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_RUBY, 35); + new_styleset(GEANY_FILETYPES_RUBY, 35); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[0]); get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_RUBY].styling[1]); get_keyfile_hex(config, config_home, "number", 0x400080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_RUBY].styling[2]); @@ -1961,7 +1963,7 @@ static void styleset_sh_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_SH, 14); + new_styleset(GEANY_FILETYPES_SH, 14); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[0]); get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_SH].styling[1]); get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SH].styling[2]); @@ -2022,7 +2024,7 @@ static void styleset_docbook_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_DOCBOOK, 29); + new_styleset(GEANY_FILETYPES_DOCBOOK, 29); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[0]); get_keyfile_hex(config, config_home, "tag", 0x000099, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[1]); get_keyfile_hex(config, config_home, "tagunknown", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_DOCBOOK].styling[2]); @@ -2164,23 +2166,20 @@ } -static void styleset_none(ScintillaObject *sci) +static void styleset_default(ScintillaObject *sci, gint ft_id) { SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0); /* we need to set STYLE_DEFAULT before we call SCI_STYLECLEARALL in styleset_common() */ set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_NONE, GCS_DEFAULT); - styleset_common(sci); - - SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) common_style_set.wordchars); - SSM(sci, SCI_SETWHITESPACECHARS, 0, (sptr_t) whitespace_chars); + styleset_common(sci, ft_id); } static void styleset_css_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CSS, 22); + new_styleset(GEANY_FILETYPES_CSS, 22); get_keyfile_hex(config, config_home, "default", 0x003399, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CSS].styling[1]); get_keyfile_hex(config, config_home, "tag", 0x2166a4, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CSS].styling[2]); @@ -2257,7 +2256,7 @@ static void styleset_nsis_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_NSIS, 19); + new_styleset(GEANY_FILETYPES_NSIS, 19); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[1]); get_keyfile_hex(config, config_home, "stringdq", 0xff901e, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_NSIS].styling[2]); @@ -2326,7 +2325,7 @@ static void styleset_po_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_PO, 9); + new_styleset(GEANY_FILETYPES_PO, 9); get_keyfile_hex(config, config_home, "default", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_PO].styling[1]); get_keyfile_hex(config, config_home, "msgid", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_PO].styling[2]); @@ -2362,7 +2361,7 @@ static void styleset_conf_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CONF, 6); + new_styleset(GEANY_FILETYPES_CONF, 6); get_keyfile_hex(config, config_home, "default", 0x7f0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CONF].styling[1]); get_keyfile_hex(config, config_home, "section", 0x000090, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_CONF].styling[2]); @@ -2394,7 +2393,7 @@ static void styleset_asm_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_ASM, 15); + new_styleset(GEANY_FILETYPES_ASM, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[1]); get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ASM].styling[2]); @@ -2452,7 +2451,7 @@ static void styleset_f77_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_F77, 15); + new_styleset(GEANY_FILETYPES_F77, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[1]); get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_F77].styling[2]); @@ -2508,7 +2507,7 @@ static void styleset_fortran_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_FORTRAN, 15); + new_styleset(GEANY_FILETYPES_FORTRAN, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[1]); get_keyfile_hex(config, config_home, "number", 0x007f00, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_FORTRAN].styling[2]); @@ -2564,7 +2563,7 @@ static void styleset_sql_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_SQL, 15); + new_styleset(GEANY_FILETYPES_SQL, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[1]); get_keyfile_hex(config, config_home, "commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_SQL].styling[2]); @@ -2643,7 +2642,7 @@ static void styleset_markdown_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_MARKDOWN, 17); + new_styleset(GEANY_FILETYPES_MARKDOWN, 17); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[0]); get_keyfile_hex(config, config_home, "strong", 0xff0000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MARKDOWN].styling[1]); @@ -2699,7 +2698,7 @@ static void styleset_haskell_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_HASKELL, 17); + new_styleset(GEANY_FILETYPES_HASKELL, 17); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[0]); get_keyfile_hex(config, config_home, "commentline", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_HASKELL].styling[1]); @@ -2757,7 +2756,7 @@ static void styleset_caml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CAML, 14); + new_styleset(GEANY_FILETYPES_CAML, 14); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_CAML].styling[1]); @@ -2814,7 +2813,7 @@ static void styleset_tcl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_TCL, 16); + new_styleset(GEANY_FILETYPES_TCL, 16); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_TCL].styling[0]); get_keyfile_named_style(config, config_home, "comment", "comment", &style_sets[GEANY_FILETYPES_TCL].styling[1]); get_keyfile_named_style(config, config_home, "commentline", "comment", &style_sets[GEANY_FILETYPES_TCL].styling[2]); @@ -2876,7 +2875,7 @@ static void styleset_matlab_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_MATLAB, 9); + new_styleset(GEANY_FILETYPES_MATLAB, 9); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_MATLAB].styling[1]); get_keyfile_hex(config, config_home, "command", 0x111199, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_MATLAB].styling[2]); @@ -2897,8 +2896,6 @@ { 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]); @@ -2918,7 +2915,7 @@ static void styleset_d_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_D, 18); + new_styleset(GEANY_FILETYPES_D, 18); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[0]); get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_D].styling[1]); @@ -2999,7 +2996,7 @@ static void styleset_ferite_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_FERITE, 20); + new_styleset(GEANY_FILETYPES_FERITE, 20); styleset_c_like_init(config, config_home, GEANY_FILETYPES_FERITE); style_sets[GEANY_FILETYPES_FERITE].keywords = g_new(gchar*, 4); @@ -3026,7 +3023,7 @@ static void styleset_vhdl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_VHDL, 15); + new_styleset(GEANY_FILETYPES_VHDL, 15); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[0]); get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_VHDL].styling[1]); @@ -3112,7 +3109,7 @@ static void styleset_yaml_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_YAML, 10); + new_styleset(GEANY_FILETYPES_YAML, 10); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_YAML].styling[1]); @@ -3155,7 +3152,7 @@ static void styleset_js_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_JS, 20); + new_styleset(GEANY_FILETYPES_JS, 20); styleset_c_like_init(config, config_home, GEANY_FILETYPES_JS); style_sets[GEANY_FILETYPES_JS].keywords = g_new(gchar*, 2); @@ -3191,7 +3188,7 @@ static void styleset_lua_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_LUA, 20); + new_styleset(GEANY_FILETYPES_LUA, 20); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[0]); get_keyfile_hex(config, config_home, "comment", 0xd00000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_LUA].styling[1]); @@ -3295,7 +3292,7 @@ static void styleset_basic_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_BASIC, 19); + new_styleset(GEANY_FILETYPES_BASIC, 19); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[0]); get_keyfile_hex(config, config_home, "comment", 0x808080, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_BASIC].styling[1]); @@ -3374,7 +3371,7 @@ static void styleset_actionscript_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_AS, 20); + new_styleset(GEANY_FILETYPES_AS, 20); styleset_c_like_init(config, config_home, GEANY_FILETYPES_AS); style_sets[GEANY_FILETYPES_AS].keywords = g_new(gchar *, 4); @@ -3400,7 +3397,7 @@ static void styleset_haxe_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_HAXE, 20); + new_styleset(GEANY_FILETYPES_HAXE, 20); styleset_c_like_init(config, config_home, GEANY_FILETYPES_HAXE); style_sets[GEANY_FILETYPES_HAXE].keywords = g_new(gchar*, 4); @@ -3443,7 +3440,7 @@ static void styleset_ada_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_ADA, 12); + new_styleset(GEANY_FILETYPES_ADA, 12); get_keyfile_hex(config, config_home, "default", 0x000000, 0xffffff, FALSE, &style_sets[GEANY_FILETYPES_ADA].styling[0]); get_keyfile_hex(config, config_home, "word", 0x00007f, 0xffffff, TRUE, &style_sets[GEANY_FILETYPES_ADA].styling[1]); @@ -3497,9 +3494,12 @@ /* Called by filetypes_load_config(). */ void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh) { - /* Clear old information if necessary - e.g. reloading config */ - styleset_free(filetype_idx); + if (!style_sets) + style_sets = g_new0(StyleSet, filetypes_array->len); + /* Clear old information if necessary - e.g. when reloading config */ + free_styleset(filetype_idx); + /* All stylesets depend on filetypes.common */ if (filetype_idx != GEANY_FILETYPES_NONE) filetypes_load_config(GEANY_FILETYPES_NONE, FALSE); @@ -3616,8 +3616,9 @@ styleset_case(GEANY_FILETYPES_VHDL, styleset_vhdl); styleset_case(GEANY_FILETYPES_XML, styleset_xml); styleset_case(GEANY_FILETYPES_YAML, styleset_yaml); + case GEANY_FILETYPES_NONE: default: - styleset_case(GEANY_FILETYPES_NONE, styleset_none); + styleset_default(sci, filetype_idx); } } @@ -3632,7 +3633,7 @@ * @see Scintilla messages @c SCI_STYLEGETFORE, etc, for use with ScintillaFuncs::send_message(). */ const GeanyLexerStyle *highlighting_get_style(gint ft_id, gint style_id) { - if (ft_id < 0 || ft_id > GEANY_MAX_BUILT_IN_FILETYPES) + if (ft_id < 0 || ft_id >= (gint)filetypes_array->len) return NULL; /* ensure filetype loaded */ Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/main.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -1078,7 +1078,6 @@ navqueue_free(); keybindings_free(); filetypes_save_commands(); - filetypes_free_types(); highlighting_free_styles(); templates_free_templates(); msgwin_finalize(); @@ -1093,6 +1092,7 @@ toolbar_finalize(); treeviews_finalize(); configuration_finalize(); + filetypes_free_types(); log_finalize(); tm_workspace_free(TM_WORK_OBJECT(app->tm_workspace)); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/symbols.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -1487,15 +1487,16 @@ static void load_user_tags(filetype_id ft_id) { - static guchar tags_loaded[GEANY_MAX_BUILT_IN_FILETYPES] = {0}; + static guchar *tags_loaded = NULL; static GHashTable *lang_hash = NULL; GList *fnames; const GList *node; GeanyFiletype *ft = filetypes[ft_id]; g_return_if_fail(ft_id > 0); - g_return_if_fail(ft_id < GEANY_MAX_BUILT_IN_FILETYPES); + if (!tags_loaded) + tags_loaded = g_new0(guchar, filetypes_array->len); if (tags_loaded[ft_id]) return; tags_loaded[ft_id] = TRUE; /* prevent reloading */ Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2009-08-31 15:46:19 UTC (rev 4142) +++ trunk/src/templates.c 2009-08-31 16:11:46 UTC (rev 4143) @@ -242,6 +242,8 @@ "; static gchar *templates[GEANY_MAX_TEMPLATES]; + +/* TODO: remove filetype templates, use custom file templates instead. */ static gchar *ft_templates[GEANY_MAX_BUILT_IN_FILETYPES] = {NULL}; @@ -686,7 +688,7 @@ if (fname == NULL) { - if (ft_id == GEANY_FILETYPES_NONE) + if (!ft->extension) shortname = g_strdup(GEANY_STRING_UNTITLED); else shortname = g_strconcat(GEANY_STRING_UNTITLED, ".", ft->extension, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4142] branches/custom-filetypes
by ntrel＠users.sourceforge.net 31 Aug '09

31 Aug '09

Revision: 4142 http://geany.svn.sourceforge.net/geany/?rev=4142&view=rev Author: ntrel Date: 2009-08-31 15:46:19 +0000 (Mon, 31 Aug 2009) Log Message: ----------- Merge trunk changes. Modified Paths: -------------- branches/custom-filetypes/HACKING branches/custom-filetypes/NEWS branches/custom-filetypes/configure.in branches/custom-filetypes/data/filetype_extensions.conf branches/custom-filetypes/data/filetypes.latex branches/custom-filetypes/doc/Doxyfile.in branches/custom-filetypes/doc/geany.1.in branches/custom-filetypes/doc/geany.html branches/custom-filetypes/doc/geany.txt branches/custom-filetypes/doc/images/pref_dialog_edit_completions.png branches/custom-filetypes/doc/images/pref_dialog_toolbar.png branches/custom-filetypes/doc/plugins.dox branches/custom-filetypes/doc/pluginsymbols.c branches/custom-filetypes/geany.glade branches/custom-filetypes/geany.nsi branches/custom-filetypes/geany_private.rc branches/custom-filetypes/plugins/geanyfunctions.h branches/custom-filetypes/plugins/genapi.py branches/custom-filetypes/plugins/splitwindow.c branches/custom-filetypes/scripts/changelist.pl branches/custom-filetypes/src/Makefile.am branches/custom-filetypes/src/build.c branches/custom-filetypes/src/build.h branches/custom-filetypes/src/callbacks.c branches/custom-filetypes/src/document.c branches/custom-filetypes/src/editor.c branches/custom-filetypes/src/filetypes.c branches/custom-filetypes/src/filetypes.h branches/custom-filetypes/src/geany.h branches/custom-filetypes/src/interface.c branches/custom-filetypes/src/keybindings.c branches/custom-filetypes/src/keybindings.h branches/custom-filetypes/src/keyfile.c branches/custom-filetypes/src/keyfile.h branches/custom-filetypes/src/main.c branches/custom-filetypes/src/makefile.win32 branches/custom-filetypes/src/msgwindow.c branches/custom-filetypes/src/plugindata.h branches/custom-filetypes/src/pluginprivate.h branches/custom-filetypes/src/plugins.c branches/custom-filetypes/src/pluginutils.c branches/custom-filetypes/src/pluginutils.h branches/custom-filetypes/src/prefs.c branches/custom-filetypes/src/prefs.h branches/custom-filetypes/src/project.c branches/custom-filetypes/src/project.h branches/custom-filetypes/src/templates.c branches/custom-filetypes/src/utils.c branches/custom-filetypes/src/win32.c branches/custom-filetypes/tagmanager/php.c branches/custom-filetypes/tagmanager/python.c branches/custom-filetypes/win32-config.h branches/custom-filetypes/wscript Added Paths: ----------- branches/custom-filetypes/data/filetypes.markdown Property Changed: ---------------- branches/custom-filetypes/ branches/custom-filetypes/doc/images/pref_dialog_edit_completions.png branches/custom-filetypes/doc/images/pref_dialog_edit_display.png branches/custom-filetypes/doc/images/pref_dialog_edit_features.png Property changes on: branches/custom-filetypes ___________________________________________________________________ Added: svn:mergeinfo + /branches/build-system:3867-4119 Modified: branches/custom-filetypes/HACKING =================================================================== --- branches/custom-filetypes/HACKING 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/HACKING 2009-08-31 15:46:19 UTC (rev 4142) @@ -72,7 +72,7 @@ .. warning:: - Some structs like GeanyKeyGroup and GeanyCallback cannot be + Some structs like GeanyKeyGroupInfo and GeanyCallback cannot be appended to without breaking the ABI because they are used to declare structs by plugins, not just for accessing struct members through a pointer. @@ -82,7 +82,7 @@ not load and they must be rebuilt. An API change means that some plugins might not build correctly. -When reordering or changing existing elements of structs that are +If you're reordering or changing existing elements of structs that are used as part of the plugin API, you should increment GEANY_ABI_VERSION in plugindata.h. This is usually not needed if you're just appending fields to structs. The GEANY_API_VERSION value should be incremented @@ -90,6 +90,15 @@ If you're in any doubt when making changes to plugin API code, just ask us. +Plugin API/ABI design +--------------------- +You should not make plugins rely on the size of a struct. This means: + +* Don't let plugins allocate any structs (stack or heap). +* Don't let plugins index any arrays of structs. +* Don't add any array fields to structs in case we want to change the + array size later. + Glade ----- Use the code generation features of Glade instead of editing interface.c @@ -192,18 +201,8 @@ * Add GEANY_FILETYPES_FOO to filetypes.h. * Initialize GEANY_FILETYPES_FOO in init_builtin_filetypes() of filetypes.c. -* Rebuild Geany. -* From your geany/ directory, run:: +* Update data/filetype_extensions.conf. - src/geany --generate-data-files - -(The src/ prefix may be different, depending on where the binary is -generated.) -This will update data/filetype_extensions.conf. Note that -you need GEANY_DEBUG to be defined when building Geany for the ---generate-data-files argument to work - this is always defined in the -SVN version. Alternatively, edit the file by hand. - filetypes.* configuration file ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ All languages need a data/filetypes.foo configuration file. See Modified: branches/custom-filetypes/NEWS =================================================================== --- branches/custom-filetypes/NEWS 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/NEWS 2009-08-31 15:46:19 UTC (rev 4142) @@ -1,3 +1,96 @@ +Geany 0.18 (August 16, 2009) + + General: + * Fix scrolling horizontally after finding a search match with the + search bar or Find Next/Previous which is off-screen. + * Remove relative/untidy path elements from filenames when opening + documents (#2823998). + * Create initial template files with proper platform-specific line + ending characters. + * Improve inserting of comment templates like File header or licence + notices. + + Interface: + * Add 'Show Paths' documents list popup item. + * Add filetypes.common to 'Configuration Files' menu. + * Implement a graphical toolbar editor. + * Add 'Build' toolbar button to the default layout. + * Add 'Replace' toolbar button (closes #2798225). + * Use a more Tango like icon for 'Save All' (by Jesse Mayes, thanks). + * Add a popup menu for the keybinding list in the preferences dialog + to easily expand and collapse all groups. + + Keybindings: + * Implement Most-Recently-Used document switching when pressing + 'Switch to last used document' keybinding (Ctrl-Tab). + * Add 'Mark All' keybinding (Ctrl-Shift-M). + * Add 'Reflow lines/block' keybinding, (Ctrl-J; thanks to + Eugene Arshinov). + * Make the Scintilla keybindings 'Delete to end of line' and + 'Go to end of display line' configurable. + * Switching notebook tabs now works for the currently used notebook + widget instead of always using the documents notebook. + + Editor: + * Fix a redraw when documents were first drawn uncolourised. + * Delay highlighting matching braces by 100ms to speed up scrolling + with the arrow keys. + * Support 'tab indents, space aligns' style when indenting (#2789109). + * Add 'Autocomplete all words in document' pref; also used when forcing + autocompletion and there's no symbol names to show. + * Add 'Drop rest of word on completion' pref. + * Update Scintilla to version 1.79. + * Improve displaying and reshowing of calltips. + + Syntax highlighting: + * Reload color schemes via Tools menu (thanks to Eugene Arshinov). + * Implement named styles support for filetypes.* using a + filetypes.common [named_styles] section; used as + "style=named_style,bold". (See the manual for details). + * Allow style definitions with missing fields to use the + filetypes.common default style's fields. + * Make C-like filetype styles use named styles & default background + color. (Anyone who wants to likewise update any other filetype's + styles, please let us know ;-)). + * Allow indentation of wrapped lines (see style 'line_wrap_indent'). + * Add new styles 'line_height' and 'marker_mark'. + + Filetypes: + * Add Markdown filetype (thanks to Jon Strait). + * Highlight D WYSIWYG backtick `strings` and r"strings" (#1895745). + * Minor improvements for filetypes: Fortran, Haxe, HTML, Lua, + Matlab, Pascal, Python, Tcl. + + Tags: + * Read custom system global tags files from $prefix/share/geany/tags + (#2778923). + * Autocomplete scoped fields like struct members when typing '.' (and + also '->' or '::' in C/C++) if the language's tag parser supports it. + * Save field tags for C/C++ when generating a global tags file (you may + want to regenerate your tag files). + * Parse Python calltips. + * Show relative paths in Diff filename tags. + * Group reStructuredText symbol list items by scope level. + + Plugin API: + * Add geanyplugin.h single include. + * Add plugin_signal_connect() for connecting plugin signals at + runtime and also for connecting to any GObject signal. + * Add documents_foreach(), filetypes[], documents[], utils_strdupa() + and various foreach_type() macros. + * Make GeanyDocument::file_type always be non-NULL. + + Windows: + * Fix quoting the build command string on Windows (closes #2791769). + * Fix LaTeX view commands on Windows (part of #2807688). + * Expand system environment variables (%variableName%) on Windows when + running Build commands. + + Internationalisation: + * Added translations: lb, sl, pt_PT + * Updated translations: ca, cs, de, en_GB, fi, fr, ja, pt_BR, ru, tr + + Geany 0.17 (May 02, 2009) Bug fixes: @@ -299,7 +392,7 @@ * Add translucency settings to filetypes.common for semi-transparency. * Add HTML parser to get h1, h2, h3 symbols as well as link anchors and JavaScript functions (fixes #1896068). - * Update Javascript, TCL and Assembler parser. + * Update Javascript, Tcl and Assembler parser. Interface: * When closing a tab when using left-to-right tabs, focus the next @@ -613,7 +706,7 @@ Tab. * Add MimeType associatiations for: C++ header, Pascal, Perl, Python, httpd-PHP and XML files (thanks to Iñaki Rodriguez). - * Add brace indenting support for Perl and TCL. + * Add brace indenting support for Perl and Tcl. * Make backspace unindent when using spaces for indentation. * Wrap notebook pages when switching tabs. * Speed up loading multiple C-like files slightly. Modified: branches/custom-filetypes/configure.in =================================================================== --- branches/custom-filetypes/configure.in 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/configure.in 2009-08-31 15:46:19 UTC (rev 4142) @@ -2,7 +2,7 @@ dnl $Id$ AC_INIT(configure.in) -AM_INIT_AUTOMAKE(geany, 0.18) +AM_INIT_AUTOMAKE(geany, 0.19) AM_CONFIG_HEADER(config.h) Modified: branches/custom-filetypes/data/filetype_extensions.conf =================================================================== --- branches/custom-filetypes/data/filetype_extensions.conf 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/data/filetype_extensions.conf 2009-08-31 15:46:19 UTC (rev 4142) @@ -1,13 +1,11 @@ -#*** This file generated by: geany --generate-data-files *** - -#Filetype extension configuration file for Geany -#Insert as many items as you want, seperate them with a ";". -#See Geany's main documentation for details. +# Filetype extension configuration file for Geany +# Insert as many items as you want, seperate them with a ";". +# See Geany's main documentation for details. [Extensions] ASM=*.asm; Ada=*.adb;*.ads; C=*.c;*.h; -C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; +C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; C#=*.cs; CAML=*.ml;*.mli; D=*.d;*.di; Modified: branches/custom-filetypes/data/filetypes.latex =================================================================== --- branches/custom-filetypes/data/filetypes.latex 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/data/filetypes.latex 2009-08-31 15:46:19 UTC (rev 4142) @@ -43,3 +43,17 @@ linker=pdflatex --file-line-error-style "%f" run_cmd=xdvi "%f" run_cmd2=xpdf "%f" + +[build-menu] +FT_00_LB=LaTeX -> _DVI +FT_00_CM=latex --file-line-error-style "%f" +FT_00_BD=false +FT_01_LB=LaTeX -> _PDF +FT_01_CM=pdflatex --file-line-error-style "%f" +FT_01_BD=false +EX_00_LB=V_iew PDF File +EX_00_CM=xpdf "%f" +EX_00_BD=false +EX_01_LB=_View DVI File +EX_01_CM=xdvi "%f" +EX_01_BD=false Copied: branches/custom-filetypes/data/filetypes.markdown (from rev 4141, trunk/data/filetypes.markdown) =================================================================== --- branches/custom-filetypes/data/filetypes.markdown (rev 0) +++ branches/custom-filetypes/data/filetypes.markdown 2009-08-31 15:46:19 UTC (rev 4142) @@ -0,0 +1,26 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +# default=0x000000;0xffffff;false;false +# strong=0xff0000;0xffffff;false;false +# emphasis=0xff0000;0xffffff;false;false +# header1=0x0000bb;0xffffff;false;false +# header2=0x0000bb;0xffffff;false;false +# header3=0x0000bb;0xffffff;false;false +# header4=0x0000bb;0xffffff;false;false +# header5=0x0000bb;0xffffff;false;false +# header6=0x0000bb;0xffffff;false;false +# ulist_item=0x007f00;0xffffff;false;false +# olist_item=0x007f00;0xffffff;false;false +# blockquote=0xff0000;0xffffff;false;false +# strikeout=0xaa00ff;0xffffff;false;false +# hrule=0xff901e;0xffffff;false;false +# link=0x0000ff;0xffffff;false;false +# code=0x009f00;0xffffff;false;false +# codebk=0x005f00;0xffffff;false;false + +[settings] +# default extension used when saving files +extension=mdml + + Modified: branches/custom-filetypes/doc/Doxyfile.in =================================================================== --- branches/custom-filetypes/doc/Doxyfile.in 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/doc/Doxyfile.in 2009-08-31 15:46:19 UTC (rev 4142) @@ -94,7 +94,8 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/ ./ ../plugins/pluginmacros.h ../plugins/geanyplugin.h \ +INPUT = ../src/ ./ \ + ../plugins/pluginmacros.h ../plugins/geanyplugin.h ../plugins/geanyfunctions.h \ ../tagmanager/tm_source_file.c ../tagmanager/include/tm_source_file.h \ ../tagmanager/tm_work_object.c ../tagmanager/include/tm_work_object.h \ ../tagmanager/tm_workspace.c ../tagmanager/include/tm_workspace.h @@ -228,7 +229,7 @@ INCLUDE_PATH = INCLUDE_FILE_PATTERNS = # make G_GNUC_PRINTF a no-op unless doxygen would ignore functions with varargs -PREDEFINED = "G_GNUC_PRINTF(x,y)=" GEANY_DISABLE_DEPRECATED HAVE_PLUGINS +PREDEFINED = "G_GNUC_PRINTF(x,y)=" GEANY_DISABLE_DEPRECATED HAVE_PLUGINS GEANY_FUNCTIONS_H EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = NO #--------------------------------------------------------------------------- Modified: branches/custom-filetypes/doc/geany.1.in =================================================================== --- branches/custom-filetypes/doc/geany.1.in 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/doc/geany.1.in 2009-08-31 15:46:19 UTC (rev 4142) @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "May 02, 2009" "geany @VERSION@" "" +.TH "GEANY" "1" "August 16, 2009" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: branches/custom-filetypes/doc/geany.html =================================================================== --- branches/custom-filetypes/doc/geany.html 2009-08-31 15:25:35 UTC (rev 4141) +++ branches/custom-filetypes/doc/geany.html 2009-08-31 15:46:19 UTC (rev 4142) @@ -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="2009-07-25" /> +<meta name="date" content="2009-08-19" /> <style type="text/css"> /* @@ -139,9 +139,9 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-07-25</td></tr> +<td>2009-08-19</td></tr> <tr><th class="docinfo-name">Version:</th> -<td>0.18</td></tr> +<td>0.19</td></tr> </tbody> </table> <p>Copyright © 2005-2009</p> @@ -153,285 +153,306 @@ <div class="contents topic"> <p class="topic-title first"><a id="contents" name="contents">Contents</a></p> <ul class="simple"> -<li><a class="reference" href="#introduction" id="id11" name="id11">Introduction</a><ul> -<li><a class="reference" href="#about-geany" id="id12" name="id12">About Geany</a></li> -<li><a class="reference" href="#where-to-get-it" id="id13" name="id13">Where to get it</a></li> -<li><a class="reference" href="#license" id="id14" name="id14">License</a></li> -<li><a class="reference" href="#about-this-document" id="id15" name="id15">About this document</a></li> +<li><a class="reference" href="#introduction" id="id12" name="id12">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id13" name="id13">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id14" name="id14">Where to get it</a></li> +<li><a class="reference" href="#license" id="id15" name="id15">License</a></li> +<li><a class="reference" href="#about-this-document" id="id16" name="id16">About this document</a></li> </ul> </li> -<li><a class="reference" href="#installation" id="id16" name="id16">Installation</a><ul> -<li><a class="reference" href="#requirements" id="id17" name="id17">Requirements</a></li> -<li><a class="reference" href="#binary-packages" id="id18" name="id18">Binary packages</a></li> -<li><a class="reference" href="#source-compilation" id="id19" name="id19">Source compilation</a><ul> -<li><a class="reference" href="#autotools-based-build-system" id="id20" name="id20">Autotools based build system</a></li> -<li><a class="reference" href="#waf-based-build-system" id="id21" name="id21">Waf based build system</a><ul> -<li><a class="reference" href="#waf-cache" id="id22" name="id22">Waf Cache</a><ul> -<li><a class="reference" href="#cleaning-the-cache" id="id23" name="id23">Cleaning the Cache</a></li> +<li><a class="reference" href="#installation" id="id17" name="id17">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id18" name="id18">Requirements</a></li> +<li><a class="reference" href="#binary-packages" id="id19" name="id19">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id20" name="id20">Source compilation</a><ul> +<li><a class="reference" href="#autotools-based-build-system" id="id21" name="id21">Autotools based build system</a></li> +<li><a class="reference" href="#waf-based-build-system" id="id22" name="id22">Waf based build system</a><ul> +<li><a class="reference" href="#waf-cache" id="id23" name="id23">Waf Cache</a><ul> +<li><a class="reference" href="#cleaning-the-cache" id="id24" name="id24">Cleaning the Cache</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#custom-installation" id="id24" name="id24">Custom installation</a></li> -<li><a class="reference" href="#dynamic-linking-loader-support" id="id25" name="id25">Dynamic linking loader support</a></li> -<li><a class="reference" href="#build-problems" id="id26" name="id26">Build problems</a></li> +<li><a class="reference" href="#custom-installation" id="id25" name="id25">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support" id="id26" name="id26">Dynamic linking loader support</a></li> +<li><a class="reference" href="#build-problems" id="id27" name="id27">Build problems</a></li> </ul> </li> -<li><a class="reference" href="#installation-prefix" id="id27" name="id27">Installation prefix</a></li> +<li><a class="reference" href="#installation-prefix" id="id28" name="id28">Installation prefix</a></li> </ul> </li> -<li><a class="reference" href="#usage" id="id28" name="id28">Usage</a><ul> -<li><a class="reference" href="#getting-started" id="id29" name="id29">Getting started</a></li> -<li><a class="reference" href="#command-line-options" id="id30" name="id30">Command line options</a></li> -<li><a class="reference" href="#general" id="id31" name="id31">General</a><ul> -<li><a class="reference" href="#startup" id="id32" name="id32">Startup</a></li> -<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id33" name="id33">Opening files from the command-line in a running instance</a></li> -<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id34" name="id34">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id35" name="id35">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id29" name="id29">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id30" name="id30">Getting started</a></li> +<li><a class="reference" href="#command-line-options" id="id31" name="id31">Command line options</a></li> +<li><a class="reference" href="#general" id="id32" name="id32">General</a><ul> +<li><a class="reference" href="#startup" id="id33" name="id33">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id34" name="id34">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id35" name="id35">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id36" name="id36">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference" href="#documents" id="id36" name="id36">Documents</a><ul> -<li><a class="reference" href="#switching-between-documents" id="id37" name="id37">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id37" name="id37">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id38" name="id38">Switching between documents</a></li> </ul> </li> -<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id38" name="id38">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference" href="#using-character-sets" id="id39" name="id39">Using character sets</a></li> -<li><a class="reference" href="#in-file-encoding-specification" id="id40" name="id40">In-file encoding specification</a></li> -<li><a class="reference" href="#special-encoding-none" id="id41" name="id41">Special encoding "None"</a></li> -<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id42" name="id42">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id39" name="id39">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id40" name="id40">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id41" name="id41">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id42" name="id42">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id43" name="id43">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference" href="#editing" id="id43" name="id43">Editing</a><ul> -<li><a class="reference" href="#folding" id="id44" name="id44">Folding</a></li> -<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id45" name="id45">Column mode editing (rectangular selections)</a></li> -<li><a class="reference" href="#drag-and-drop-of-text" id="id46" name="id46">Drag and drop of text</a></li> -<li><a class="reference" href="#indentation" id="id47" name="id47">Indentation</a></li> -<li><a class="reference" href="#auto-indentation" id="id48" name="id48">Auto-indentation</a></li> -<li><a class="reference" href="#bookmarks" id="id49" name="id49">Bookmarks</a></li> -<li><a class="reference" href="#code-navigation-history" id="id50" name="id50">Code Navigation History</a></li> -<li><a class="reference" href="#send-text-through-definable-commands" id="id51" name="id51">Send text through definable commands</a></li> -<li><a class="reference" href="#context-actions" id="id52" name="id52">Context actions</a></li> -<li><a class="reference" href="#autocompletion" id="id53" name="id53">Autocompletion</a></li> -<li><a class="reference" href="#user-definable-snippets" id="id54" name="id54">User-definable snippets</a></li> -<li><a class="reference" href="#inserting-unicode-characters" id="id55" name="id55">Inserting Unicode characters</a></li> +<li><a class="reference" href="#editing" id="id44" name="id44">Editing</a><ul> +<li><a class="reference" href="#folding" id="id45" name="id45">Folding</a></li> +<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id46" name="id46">Column mode editing (rectangular selections)</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id47" name="id47">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id48" name="id48">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id49" name="id49">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id50" name="id50">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id51" name="id51">Code Navigation History</a></li> +<li><a class="reference" href="#send-text-through-definable-commands" id="id52" name="id52">Send text through definable commands</a></li> +<li><a class="reference" href="#context-actions" id="id53" name="id53">Context actions</a></li> +<li><a class="reference" href="#autocompletion" id="id54" name="id54">Autocompletion</a><ul> +<li><a class="reference" href="#scope-autocompletion" id="id55" name="id55">Scope autocompletion</a></li> </ul> </li> -<li><a class="reference" href="#search-replace-and-go-to" id="id56" name="id56">Search, replace and go to</a><ul> -<li><a class="reference" href="#find" id="id57" name="id57">Find</a><ul> -<li><a class="reference" href="#matching-options" id="id58" name="id58">Matching options</a></li> -<li><a class="reference" href="#find-all" id="id59" name="id59">Find all</a></li> -<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id60" name="id60">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id56" name="id56">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id57" name="id57">Inserting Unicode characters</a></li> </ul> </li> -<li><a class="reference" href="#find-usage" id="id61" name="id61">Find usage</a></li> -<li><a class="reference" href="#find-in-files" id="id62" name="id62">Find in files</a><ul> -<li><a class="reference" href="#filtering-out-version-control-files" id="id63" name="id63">Filtering out version control files</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id58" name="id58">Search, replace and go to</a><ul> +<li><a class="reference" href="#find" id="id59" name="id59">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id60" name="id60">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id61" name="id61">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id62" name="id62">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference" href="#replace" id="id64" name="id64">Replace</a><ul> -<li><a class="reference" href="#replace-all" id="id65" name="id65">Replace all</a></li> +<li><a class="reference" href="#find-usage" id="id63" name="id63">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id64" name="id64">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id65" name="id65">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference" href="#go-to-tag-definition" id="id66" name="id66">Go to tag definition</a></li> -<li><a class="reference" href="#go-to-tag-declaration" id="id67" name="id67">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-line" id="id68" name="id68">Go to line</a></li> -<li><a class="reference" href="#regular-expressions" id="id69" name="id69">Regular expressions</a></li> +<li><a class="reference" href="#replace" id="id66" name="id66">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id67" name="id67">Replace all</a></li> </ul> </li> -<li><a class="reference" href="#tags" id="id70" name="id70">Tags</a><ul> -<li><a class="reference" href="#workspace-tags" id="id71" name="id71">Workspace tags</a></li> -<li><a class="reference" href="#global-tags" id="id72" name="id72">Global tags</a><ul> -<li><a class="reference" href="#default-global-tags-files" id="id73" name="id73">Default global tags files</a></li> -<li><a class="reference" href="#global-tags-file-format" id="id74" name="id74">Global tags file format</a></li> -<li><a class="reference" href="#generating-a-global-tags-file" id="id75" name="id75">Generating a global tags file</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id68" name="id68">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id69" name="id69">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id70" name="id70">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id71" name="id71">Regular expressions</a></li> </ul> </li> -<li><a class="reference" href="#ignore-tags" id="id76" name="id76">Ignore tags</a></li> +<li><a class="reference" href="#tags" id="id72" name="id72">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id73" name="id73">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id74" name="id74">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id75" name="id75">Default global tags files</a></li> +<li><a class="reference" href="#global-tags-file-format" id="id76" name="id76">Global tags file format</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id77" name="id77">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference" href="#preferences" id="id77" name="id77">Preferences</a><ul> -<li><a class="reference" href="#general-startup-tab-in-preferences-dialog" id="id78" name="id78">General Startup tab in preferences dialog</a><ul> -<li><a class="reference" href="#id1" id="id79" name="id79">Startup</a></li> -<li><a class="reference" href="#shutdown" id="id80" name="id80">Shutdown</a></li> -<li><a class="reference" href="#paths" id="id81" name="id81">Paths</a></li> +<li><a class="reference" href="#ignore-tags" id="id78" name="id78">Ignore tags</a></li> </ul> </li> -<li><a class="reference" href="#general-miscellaneous-tab-in-preferences-dialog" id="id82" name="id82">General Miscellaneous tab in preferences dialog</a><ul> -<li><a class="reference" href="#miscellaneous" id="id83" name="id83">Miscellaneous</a></li> +<li><a class="reference" href="#preferences" id="id79" name="id79">Preferences</a><ul> +<li><a class="reference" href="#general-startup-tab-in-preferences-dialog" id="id80" name="id80">General Startup tab in preferences dialog</a><ul> +<li><a class="reference" href="#id1" id="id81" name="id81">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id82" name="id82">Shutdown</a></li> +<li><a class="reference" href="#paths" id="id83" name="id83">Paths</a></li> </ul> </li> -<li><a class="reference" href="#search" id="id84" name="id84">Search</a><ul> -<li><a class="reference" href="#projects" id="id85" name="id85">Projects</a></li> +<li><a class="reference" href="#general-miscellaneous-tab-in-preferences-dialog" id="id84" name="id84">General Miscellaneous tab in preferences dialog</a><ul> +<li><a class="reference" href="#miscellaneous" id="id85" name="id85">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id86" name="id86">Interface tab in preferences dialog</a><ul> -<li><a class="reference" href="#sidebar" id="id87" name="id87">Sidebar</a></li> -<li><a class="reference" href="#fonts" id="id88" name="id88">Fonts</a></li> -<li><a class="reference" href="#editor-tabs" id="id89" name="id89">Editor tabs</a></li> -<li><a class="reference" href="#tab-positions" id="id90" name="id90">Tab positions</a></li> -<li><a class="reference" href="#id2" id="id91" name="id91">Miscellaneous</a></li> +<li><a class="reference" href="#search" id="id86" name="id86">Search</a><ul> +<li><a class="reference" href="#projects" id="id87" name="id87">Projects</a></li> </ul> </li> -<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id92" name="id92">Toolbar tab in preferences dialog</a><ul> -<li><a class="reference" href="#toolbar" id="id93" name="id93">Toolbar</a></li> -<li><a class="reference" href="#appearance" id="id94" name="id94">Appearance</a></li> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id88" name="id88">Interface tab in preferences dialog</a><ul> +<li><a class="reference" href="#sidebar" id="id89" name="id89">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id90" name="id90">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id91" name="id91">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id92" name="id92">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id93" name="id93">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id95" name="id95">Editor Features tab in preferences dialog</a><ul> -<li><a class="reference" href="#features" id="id96" name="id96">Features</a></li> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id94" name="id94">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference" href="#toolbar" id="id95" name="id95">Toolbar</a></li> +<li><a class="reference" href="#appearance" id="id96" name="id96">Appearance</a></li> </ul> </li> -<li><a class="reference" href="#editor-indentation-tab-in-preferences-dialog" id="id97" name="id97">Editor Indentation tab in preferences dialog</a><ul> -<li><a class="reference" href="#indentation-group" id="id98" name="id98">Indentation group</a></li> +<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id97" name="id97">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference" href="#features" id="id98" name="id98">Features</a></li> </ul> </li> -<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id99" name="id99">Editor Completions tab in preferences dialog</a><ul> -<li><a class="reference" href="#completions" id="id100" name="id100">Completions</a></li> -<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id101" name="id101">Auto-close quotes and brackets</a></li> +<li><a class="reference" href="#editor-indentation-tab-in-preferences-dialog" id="id99" name="id99">Editor Indentation tab in preferences dialog</a><ul> +<li><a class="reference" href="#indentation-group" id="id100" name="id100">Indentation group</a></li> </ul> </li> -<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id102" name="id102">Editor Display tab in preferences dialog</a><ul> -<li><a class="reference" href="#display" id="id103" name="id103">Display</a></li> -<li><a class="reference" href="#long-line-marker" id="id104" name="id104">Long line marker</a></li> +<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id101" name="id101">Editor Completions tab in preferences dialog</a><ul> +<li><a class="reference" href="#completions" id="id102" name="id102">Completions</a></li> +<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id103" name="id103">Auto-close quotes and brackets</a></li> </ul> </li> -<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id105" name="id105">Files tab in preferences dialog</a><ul> -<li><a class="reference" href="#new-files" id="id106" name="id106">New files</a></li> -<li><a class="reference" href="#saving-files" id="id107" name="id107">Saving files</a></li> -<li><a class="reference" href="#id3" id="id108" name="id108">Miscellaneous</a></li> +<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id104" name="id104">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference" href="#display" id="id105" name="id105">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id106" name="id106">Long line marker</a></li> </ul> </li> -<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id109" name="id109">Tools tab in preferences dialog</a><ul> -<li><a class="reference" href="#tool-paths" id="id110" name="id110">Tool paths</a></li> -<li><a class="reference" href="#commands" id="id111" name="id111">Commands</a></li> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id107" name="id107">Files tab in preferences dialog</a><ul> +<li><a class="reference" href="#new-files" id="id108" name="id108">New files</a></li> +<li><a class="reference" href="#saving-files" id="id109" name="id109">Saving files</a></li> +<li><a class="reference" href="#id3" id="id110" name="id110">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id112" name="id112">Template tab in preferences dialog</a><ul> -<li><a class="reference" href="#template-data" id="id113" name="id113">Template data</a></li> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id111" name="id111">Tools tab in preferences dialog</a><ul> +<li><a class="reference" href="#tool-paths" id="id112" name="id112">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id113" name="id113">Commands</a></li> </ul> </li> -<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id114" name="id114">Keybinding tab in preferences dialog</a></li> -<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id115" name="id115">Printing tab in preferences dialog</a></li> -<li><a class="reference" href="#terminal-vte-tab-in-preferences-dialog" id="id116" name="id116">Terminal (VTE) tab in preferences dialog</a><ul> -<li><a class="reference" href="#terminal-widget" id="id117" name="id117">Terminal widget</a></li> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id114" name="id114">Template tab in preferences dialog</a><ul> +<li><a class="reference" href="#template-data" id="id115" name="id115">Template data</a></li> </ul> </li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id116" name="id116">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id117" name="id117">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#terminal-vte-tab-in-preferences-dialog" id="id118" name="id118">Terminal (VTE) tab in preferences dialog</a><ul> +<li><a class="reference" href="#terminal-widget" id="id119" name="id119">Terminal widget</a></li> </ul> </li> -<li><a class="reference" href="#project-management" id="id118" name="id118">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id119" name="id119">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id120" name="id120">Project Properties</a><ul> -<li><a class="reference" href="#make-in-base-path" id="id121" name="id121">Make in base path</a></li> -<li><a class="reference" href="#run-command" id="id122" name="id122">Run command</a></li> </ul> </li> -<li><a class="reference" href="#open-project" id="id123" name="id123">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id124" name="id124">Close Project</a></li> +<li><a class="reference" href="#project-management" id="id120" name="id120">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id121" name="id121">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id122" name="id122">Project Properties</a><ul> +<li><a class="reference" href="#set-base-path-button" id="id123" name="id123">Set Base Path Button</a></li> </ul> </li> -<li><a class="reference" href="#build-system" id="id125" name="id125">Build system</a><ul> -<li><a class="reference" href="#compile" id="id126" name="id126">Compile</a></li> -<li><a class="reference" href="#build" id="id127" name="id127">Build</a></li> -<li><a class="reference" href="#make-all" id="id128" name="id128">Make all</a></li> -<li><a class="reference" href="#make-custom-target" id="id129" name="id129">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id130" name="id130">Make object</a></li> -<li><a class="reference" href="#execute" id="id131" name="id131">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id132" name="id132">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id133" name="id133">Terminal emulators</a></li> +<li><a class="reference" href="#open-project" id="id124" name="id124">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id125" name="id125">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#set-includes-and-arguments" id="id134" name="id134">Set Includes and Arguments</a><ul> -<li><a class="reference" href="#one-step-compilation" id="id135" name="id135">One step compilation</a></li> +<li><a class="reference" href="#build-menu" id="id126" name="id126">Build Menu</a><ul> +<li><a class="reference" href="#indicators" id="id127" name="id127">Indicators</a></li> +<li><a class="reference" href="#default-build-menu-items" id="id128" name="id128">Default Build Menu Items</a><ul> +<li><a class="reference" href="#compile" id="id129" name="id129">Compile</a></li> +<li><a class="reference" href="#build" id="id130" name="id130">Build</a></li> +<li><a class="reference" href="#make" id="id131" name="id131">Make</a></li> +<li><a class="reference" href="#make-custom-target" id="id132" name="id132">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id133" name="id133">Make object</a></li> +<li><a class="reference" href="#next-error" id="id134" name="id134">Next Error</a></li> +<li><a class="reference" href="#previous-error" id="id135" name="id135">Previous Error</a></li> +<li><a class="reference" href="#execute" id="id136" name="id136">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id137" name="id137">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id138" name="id138">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#indicators" id="id136" name="id136">Indicators</a></li> +<li><a class="reference" href="#set-build-commands" id="id139" name="id139">Set Build Commands</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id137" name="id137">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id138" name="id138">Plugins</a></li> -<li><a class="reference" href="#keybindings" id="id139" name="id139">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id140" name="id140">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id141" name="id141">Configurable keybindings</a></li> +<li><a class="reference" href="#build-menu-configuration" id="id140" name="id140">Build Menu Configuration</a></li> +<li><a class="reference" href="#build-menu-commands-dialog" id="id141" name="id141">Build Menu Commands Dialog</a><ul> +<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id142" name="id142">Substitutions in Commands and Working Directories</a></li> +<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id143" name="id143">Build Menu Keyboard Shortcuts</a></li> +<li><a class="reference" href="#configuration-files" id="id144" name="id144">Configuration Files</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id142" name="id142">Configuration files</a><ul> -<li><a class="reference" href="#global-configuration-file" id="id143" name="id143">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id144" name="id144">Filetype definition files</a><ul> -<li><a class="reference" href="#format" id="id145" name="id145">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id146" name="id146">[styling] Section</a><ul> -<li><a class="reference" href="#using-a-named-style" id="id147" name="id147">Using a named style</a></li> +<li><a class="reference" href="#printing-support" id="id145" name="id145">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id146" name="id146">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id147" name="id147">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id148" name="id148">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id149" name="id149">Configurable keybindings</a></li> </ul> </li> -<li><a class="reference" href="#keywords-section" id="id148" name="id148">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id149" name="id149">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id150" name="id150">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id151" name="id151">Special file filetypes.common</a><ul> -<li><a class="reference" href="#named-styles-section" id="id152" name="id152">[named_styles] Section</a></li> -<li><a class="reference" href="#id4" id="id153" name="id153">[styling] Section</a></li> -<li><a class="reference" href="#id5" id="id154" name="id154">[settings] Section</a></li> +<li><a class="reference" href="#id4" id="id150" name="id150">Configuration files</a><ul> +<li><a class="reference" href="#tools-menu-items" id="id151" name="id151">Tools menu items</a></li> +<li><a class="reference" href="#global-configuration-file" id="id152" name="id152">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id153" name="id153">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id154" name="id154">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id155" name="id155">[styling] Section</a><ul> +<li><a class="reference" href="#using-a-named-style" id="id156" name="id156">Using a named style</a></li> </ul> </li> +<li><a class="reference" href="#keywords-section" id="id157" name="id157">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id158" name="id158">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id159" name="id159">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id155" name="id155">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id156" name="id156">Templates</a><ul> -<li><a class="reference" href="#template-meta-data" id="id157" name="id157">Template meta data</a></li> -<li><a class="reference" href="#file-templates" id="id158" name="id158">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id159" name="id159">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id160" name="id160">Filetype templates</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id160" name="id160">Special file filetypes.common</a><ul> +<li><a class="reference" href="#named-styles-section" id="id161" name="id161">[named_styles] Section</a></li> +<li><a class="reference" href="#id5" id="id162" name="id162">[styling] Section</a></li> +<li><a class="reference" href="#id6" id="id163" name="id163">[settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id161" name="id161">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id162" name="id162">Template wildcards</a></li> </ul> </li> +<li><a class="reference" href="#filetype-extensions" id="id164" name="id164">Filetype extensions</a></li> +<li><a class="reference" href="#preferences-file-format" id="id165" name="id165">Preferences File Format</a><ul> +<li><a class="reference" href="#hidden-preferences" id="id166" name="id166">Hidden preferences</a></li> +<li><a class="reference" href="#build-menu-section" id="id167" name="id167">[build-menu] Section</a></li> </ul> </li> -<li><a class="reference" href="#customizing-the-toolbar" id="id163" name="id163">Customizing the toolbar</a><ul> -<li><a class="reference" href="#manually-editing-of-the-toolbar-layout" id="id164" name="id164">Manually editing of the toolbar layout</a></li> -<li><a class="reference" href="#available-toolbar-elements" id="id165" name="id165">Available toolbar elements</a></li> +<li><a class="reference" href="#project-file-format" id="id168" name="id168">Project File Format</a><ul> +<li><a class="reference" href="#build-menu-additions" id="id169" name="id169">[build-menu] Additions</a></li> </ul> </li> +<li><a class="reference" href="#templates" id="id170" name="id170">Templates</a><ul> +<li><a class="reference" href="#template-meta-data" id="id171" name="id171">Template meta data</a></li> +<li><a class="reference" href="#file-templates" id="id172" name="id172">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id173" name="id173">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id174" name="id174">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#plugin-documentation" id="id166" name="id166">Plugin documentation</a><ul> -<li><a class="reference" href="#instant-save" id="id167" name="id167">Instant Save</a></li> -<li><a class="reference" href="#backup-copy" id="id168" name="id168">Backup Copy</a></li> +<li><a class="reference" href="#customizing-templates" id="id175" name="id175">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id176" name="id176">Template wildcards</a></li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id169" name="id169">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id170" name="id170">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id171" name="id171">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#tips-and-tricks" id="id172" name="id172">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id173" name="id173">Document notebook</a></li> -<li><a class="reference" href="#editor" id="id174" name="id174">Editor</a></li> -<li><a class="reference" href="#interface" id="id175" name="id175">Interface</a></li> -<li><a class="reference" href="#gtk-related" id="id176" name="id176">GTK-related</a></li> +<li><a class="reference" href="#customizing-the-toolbar" id="id177" name="id177">Customizing the toolbar</a><ul> +<li><a class="reference" href="#manually-editing-of-the-toolbar-layout" id="id178" name="id178">Manually editing of the toolbar layout</a></li> +<li><a class="reference" href="#available-toolbar-elements" id="id179" name="id179">Available toolbar elements</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id177" name="id177">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id178" name="id178">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id179" name="id179">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id180" name="id180">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id181" name="id181">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id182" name="id182">keyfile.c</a></li> -<li><a class="reference" href="#build-h" id="id183" name="id183">build.h</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id184" name="id184">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id185" name="id185">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#plugin-documentation" id="id180" name="id180">Plugin documentation</a><ul> +<li><a class="reference" href="#instant-save" id="id181" name="id181">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id182" name="id182">Backup Copy</a></li> </ul> +</li> +<li><a class="reference" href="#contributing-to-this-document" id="id183" name="id183">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id184" name="id184">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id185" name="id185">Keyboard commands</a></li> +</ul> +</li> +<li><a class="reference" href="#tips-and-tricks" id="id186" name="id186">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id187" name="id187">Document notebook</a></li> +<li><a class="reference" href="#editor" id="id188" name="id188">Editor</a></li> +<li><a class="reference" href="#interface" id="id189" name="id189">Interface</a></li> +<li><a class="reference" href="#gtk-related" id="id190" name="id190">GTK-related</a></li> +</ul> +</li> +<li><a class="reference" href="#compile-time-options" id="id191" name="id191">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id192" name="id192">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id193" name="id193">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id194" name="id194">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id195" name="id195">keyfile.c</a></li> +<li><a class="reference" href="#build-h" id="id196" name="id196">build.h</a></li> +<li><a class="reference" href="#build-c" id="id197" name="id197">build.c</a></li> +</ul> +</li> +<li><a class="reference" href="#gnu-general-public-license" id="id198" name="id198">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id199" name="id199">License for Scintilla and SciTE</a></li> +</ul> </div> <div class="section"> -<h1><a class="toc-backref" href="#id11" id="introduction" name="introduction">Introduction</a></h1> +<h1><a class="toc-backref" href="#id12" id="introduction" name="introduction">Introduction</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id12" id="about-geany" name="about-geany">About Geany</a></h2> +<h2><a class="toc-backref" href="#id13" 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 @@ -441,10 +462,10 @@ <ul class="simple"> <li>Syntax highlighting</li> <li>Code folding</li> -<li>Symbol name autocompletion</li> +<li>Autocompletion of symbols/words</li> <li>Construct completion/snippets</li> <li>Auto-closing of XML and HTML tags</li> -<li>Call tips</li> +<li>Calltips</li> <li>Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal, and others</li> <li>Symbol lists</li> @@ -455,13 +476,13 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id13" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> +<h2><a class="toc-backref" href="#id14" 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" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id14" id="license" name="license">License</a></h2> +<h2><a class="toc-backref" href="#id15" 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 @@ -472,28 +493,28 @@ <a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id15" id="about-this-document" name="about-this-document">About this document</a></h2> +<h2><a class="toc-backref" href="#id16" 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" 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"> -<h1><a class="toc-backref" href="#id16" id="installation" name="installation">Installation</a></h1> +<h1><a class="toc-backref" href="#id17" id="installation" name="installation">Installation</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id17" id="requirements" name="requirements">Requirements</a></h2> +<h2><a class="toc-backref" href="#id18" id="requirements" name="requirements">Requirements</a></h2> <p>You will need the GTK (>= 2.8.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"> -<h2><a class="toc-backref" href="#id18" id="binary-packages" name="binary-packages">Binary packages</a></h2> +<h2><a class="toc-backref" href="#id19" 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" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id19" id="source-compilation" name="source-compilation">Source compilation</a></h2> +<h2><a class="toc-backref" href="#id20" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>Compiling Geany is quite easy. To do so, you need the GTK (>= 2.8.0) libraries and header files. You also need the Pango, GLib and ATK libraries and header files. @@ -503,7 +524,7 @@ <p>Furthermore you need, of course, a C and C++ compiler. The GNU versions of these tools are recommended.</p> <div class="section"> -<h3><a class="toc-backref" href="#id20" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> +<h3><a class="toc-backref" href="#id21" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> <p>The Autotools based build system is very mature and has been well tested. To use it, you just need the Make tool, preferably GNU Make.</p> <p>Then run the following commands:</p> @@ -517,7 +538,7 @@ </pre> </div> <div class="section"> -<h3><a class="toc-backref" href="#id21" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> +<h3><a class="toc-backref" href="#id22" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> <p>The Waf build system is still quite young and under heavy development but already in an usable state. In contrary to the Autotools, Waf needs Python. So before using Waf, you need to install Python on your system. @@ -536,7 +557,7 @@ % ./waf install </pre> <div class="section"> -<h4><a class="toc-backref" href="#id22" id="waf-cache" name="waf-cache">Waf Cache</a></h4> +<h4><a class="toc-backref" href="#id23" id="waf-cache" name="waf-cache">Waf Cache</a></h4> <p>The Waf build system has a nice and interesting feature which can help a lot to avoid unnecessary rebuilding of unchanged code. This often happens when developing new features or trying to debug something. @@ -556,7 +577,7 @@ <p>More information about the Waf cache feature are available at <a class="reference" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> <div class="section"> -<h5><a class="toc-backref" href="#id23" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> +<h5><a class="toc-backref" href="#id24" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> <p>You should take care about the size of the cache directory as it may grow rapidly by time. Waf doesn't do any cleaning or other house-keeping of the cache yet so you need to keep it clean by yourself. @@ -571,7 +592,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id24" id="custom-installation" name="custom-installation">Custom installation</a></h3> +<h3><a class="toc-backref" href="#id25" 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"> @@ -589,14 +610,14 @@ </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id25" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> +<h3><a class="toc-backref" href="#id26" 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"> -<h3><a class="toc-backref" href="#id26" id="build-problems" name="build-problems">Build problems</a></h3> +<h3><a class="toc-backref" href="#id27" 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 @@ -604,7 +625,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id27" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> +<h2><a class="toc-backref" href="#id28" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> <p>If you want to edit any of Geany's system configuration files after installation you will need to know the installation prefix. Usually this is not necessary as you can just use user configuration files.</p> @@ -615,9 +636,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id28" id="usage" name="usage">Usage</a></h1> +<h1><a class="toc-backref" href="#id29" id="usage" name="usage">Usage</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id29" id="getting-started" name="getting-started">Getting started</a></h2> +<h2><a class="toc-backref" href="#id30" 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> @@ -634,7 +655,7 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id30" id="command-line-options" name="command-line-options">Command line options</a></h2> +<h2><a class="toc-backref" href="#id31" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -766,9 +787,9 @@ help screen.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id31" id="general" name="general">General</a></h2> +<h2><a class="toc-backref" href="#id32" id="general" name="general">General</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id32" id="startup" name="startup">Startup</a></h3> +<h3><a class="toc-backref" href="#id33" 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" href="#general-startup-tab-in-preferences-dialog">General Startup tab in preferences dialog</a>). If you specify some @@ -783,7 +804,7 @@ files in a running instance using the appropriate command line option.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id33" 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> +<h3><a class="toc-backref" href="#id34" 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 @@ -799,7 +820,7 @@ called <a class="reference" href="#command-line-options">Command line options</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id34" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> +<h3><a class="toc-backref" href="#id35" 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> @@ -843,7 +864,7 @@ ./configure.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id35" 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> +<h3><a class="toc-backref" href="#id36" 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 @@ -884,9 +905,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id36" id="documents" name="documents">Documents</a></h2> +<h2><a class="toc-backref" href="#id37" id="documents" name="documents">Documents</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id37" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> +<h3><a class="toc-backref" href="#id38" 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 @@ -897,9 +918,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id38" 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> +<h2><a class="toc-backref" href="#id39" 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="#id39" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> +<h3><a class="toc-backref" href="#id40" 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, @@ -945,7 +966,7 @@ </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id40" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> +<h3><a class="toc-backref" href="#id41" 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"> @@ -987,7 +1008,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id41" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> +<h3><a class="toc-backref" href="#id42" 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 @@ -997,7 +1018,7 @@ without any character conversion.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id42" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> +<h3><a class="toc-backref" href="#id43" 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" 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 @@ -1018,9 +1039,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id43" id="editing" name="editing">Editing</a></h2> +<h2><a class="toc-backref" href="#id44" id="editing" name="editing">Editing</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id44" id="folding" name="folding">Folding</a></h3> +<h3><a class="toc-backref" href="#id45" 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 @@ -1044,7 +1065,7 @@ it for this click and vice versa.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id45" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</a></h3> +<h3><a class="toc-backref" href="#id46" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</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 keys (or Control and Alt if it doesn't work) while @@ -1055,7 +1076,7 @@ selection.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id46" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> +<h3><a class="toc-backref" href="#id47" 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 @@ -1063,7 +1084,7 @@ before the selected text was copied to the new position.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id47" id="indentation" name="indentation">Indentation</a></h3> +<h3><a class="toc-backref" href="#id48" 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" href="#editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a> (see the link for more information). But @@ -1084,7 +1105,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id48" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> +<h3><a class="toc-backref" href="#id49" 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> @@ -1105,7 +1126,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id49" id="bookmarks" name="bookmarks">Bookmarks</a></h3> +<h3><a class="toc-backref" href="#id50" 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> @@ -1123,7 +1144,7 @@ navigate around multiple files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id50" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> +<h3><a class="toc-backref" href="#id51" 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> @@ -1142,7 +1163,7 @@ and between different files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id51" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> +<h3><a class="toc-backref" href="#id52" 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 @@ -1159,7 +1180,7 @@ entry and press OK. It will be deleted automatically.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id52" id="context-actions" name="context-actions">Context actions</a></h3> +<h3><a class="toc-backref" href="#id53" 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 @@ -1185,7 +1206,7 @@ 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"> -<h3><a class="toc-backref" href="#id53" id="autocompletion" name="autocompletion">Autocompletion</a></h3> +<h3><a class="toc-backref" href="#id54" id="autocompletion" name="autocompletion">Autocompletion</a></h3> <p>Geany can offer a list of possible completions for symbols defined in the tags and for all words in a document.</p> <p>The autocompletion list for symbols is presented when the first few @@ -1209,9 +1230,26 @@ word on completion</em> preference is set (in <a class="reference" href="#editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a>) then any characters after the cursor that match a symbol or word are deleted.</p> +<div class="section"> +<h4><a class="toc-backref" href="#id55" id="scope-autocompletion" name="scope-autocompletion">Scope autocompletion</a></h4> +<p>E.g.:</p> +<pre class="literal-block"> +struct +{ + int i; + char c; +} foo; +</pre> +<p>When you type <tt class="docutils literal"><span class="pre">foo.</span></tt> it will show an autocompletion list with 'i' and +'c' symbols.</p> +<p>It only works for languages that set parent scope names for e.g. struct +members. Currently this means C-like languages. The C tag parser only +parses global scopes, so this won't work for structs or objects declared +in local scope.</p> </div> +</div> <div class="section"> -<h3><a class="toc-backref" href="#id54" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> +<h3><a class="toc-backref" href="#id56" 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. @@ -1311,7 +1349,7 @@ needs.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id55" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting Unicode characters</a></h3> +<h3><a class="toc-backref" href="#id57" 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 @@ -1327,7 +1365,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id56" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> +<h2><a class="toc-backref" href="#id58" 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"> @@ -1342,11 +1380,11 @@ <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" href="#keybindings">Keybindings</a>).</p> <div class="section"> -<h3><a class="toc-backref" href="#id57" id="find" name="find">Find</a></h3> +<h3><a class="toc-backref" href="#id59" 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"> -<h4><a class="toc-backref" href="#id58" id="matching-options" name="matching-options">Matching options</a></h4> +<h4><a class="toc-backref" href="#id60" 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" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters @@ -1355,7 +1393,7 @@ (Unicode characters).</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id59" id="find-all" name="find-all">Find all</a></h4> +<h4><a class="toc-backref" href="#id61" 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"> @@ -1371,7 +1409,7 @@ Remove Markers command from the Document menu.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id60" 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> +<h4><a class="toc-backref" href="#id62" 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 readability of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which @@ -1393,7 +1431,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id61" id="find-usage" name="find-usage">Find usage</a></h3> +<h3><a class="toc-backref" href="#id63" 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 @@ -1403,7 +1441,7 @@ shown in the Messages tab of the Message Window.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id62" id="find-in-files" name="find-in-files">Find in files</a></h3> +<h3><a class="toc-backref" href="#id64" 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 @@ -1415,7 +1453,7 @@ The Extra options field is used to pass any additional arguments to the grep tool.</p> <div class="section"> -<h4><a class="toc-backref" href="#id63" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> +<h4><a class="toc-backref" href="#id65" 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> @@ -1427,7 +1465,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id64" id="replace" name="replace">Replace</a></h3> +<h3><a class="toc-backref" href="#id66" 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" /> @@ -1437,7 +1475,7 @@ and to the replacement text; for the latter back references can be 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="#id65" id="replace-all" name="replace-all">Replace all</a></h4> +<h4><a class="toc-backref" href="#id67" 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"> @@ -1452,7 +1490,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id66" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> +<h3><a class="toc-backref" href="#id68" 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 @@ -1461,17 +1499,17 @@ menu is used.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id67" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> +<h3><a class="toc-backref" href="#id69" 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"> -<h3><a class="toc-backref" href="#id68" id="go-to-line" name="go-to-line">Go to line</a></h3> +<h3><a class="toc-backref" href="#id70" 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"> -<h3><a class="toc-backref" href="#id69" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> +<h3><a class="toc-backref" href="#id71" 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> @@ -1581,7 +1619,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id70" id="tags" name="tags">Tags</a></h2> +<h2><a class="toc-backref" href="#id72" 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 @@ -1590,7 +1628,7 @@ (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> <div class="section"> -<h3><a class="toc-backref" href="#id71" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> +<h3><a class="toc-backref" href="#id73" 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 @@ -1599,7 +1637,7 @@ <a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id72" id="global-tags" name="global-tags">Global tags</a></h3> +<h3><a class="toc-backref" href="#id74" 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 @@ -1622,7 +1660,7 @@ with the tags. See the section called <a class="reference" href="#filetype-extensions">Filetype extensions</a> for more information.</p> <div class="section"> -<h4><a class="toc-backref" href="#id73" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> +<h4><a class="toc-backref" href="#id75" 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"> @@ -1635,7 +1673,7 @@ </ul> </div> <div class="section"> -<h4><a class="toc-backref" href="#id74" id="global-tags-file-format" name="global-tags-file-format">Global tags file format</a></h4> +<h4><a class="toc-backref" href="#id76" id="global-tags-file-format" name="global-tags-file-format">Global tags file format</a></h4> <p>Global tags files can have two different formats:</p> <ul class="simple"> <li>Tagmanager format</li> @@ -1672,7 +1710,7 @@ section <a class="reference" href="#global-tags">Global tags</a>.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id75" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> +<h4><a class="toc-backref" href="#id77" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> <p>You can generate your own global tags files by parsing a list of source files. The command is:</p> <pre class="literal-block"> @@ -1717,7 +1755,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id76" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> +<h3><a class="toc-backref" href="#id78" 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">~/.config/geany/</span></tt>). Then list all tags @@ -1741,7 +1779,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id77" id="preferences" name="preferences">Preferences</a></h2> +<h2><a class="toc-backref" href="#id79" 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 @@ -1759,10 +1797,10 @@ comes after the screenshot of that tab.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id78" id="general-startup-tab-in-preferences-dialog" name="general-startup-tab-in-preferences-dialog">General Startup tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id80" id="general-startup-tab-in-preferences-dialog" name="general-startup-tab-in-preferences-dialog">General Startup tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen_startup.png" src="./images/pref_dialog_gen_startup.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id79" id="id1" name="id1">Startup</a></h4> +<h4><a class="toc-backref" href="#id81" 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 @@ -1774,7 +1812,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id80" id="shutdown" name="shutdown">Shutdown</a></h4> +<h4><a class="toc-backref" href="#id82" 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 @@ -1784,7 +1822,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id81" id="paths" name="paths">Paths</a></h4> +<h4><a class="toc-backref" href="#id83" id="paths" name="paths">Paths</a></h4> <dl class="docutils"> <dt>Startup path</dt> <dd>Path to start in when opening or saving files. @@ -1803,10 +1841,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id82" id="general-miscellaneous-tab-in-preferences-dialog" name="general-miscellaneous-tab-in-preferences-dialog">General Miscellaneous tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id84" id="general-miscellaneous-tab-in-preferences-dialog" name="general-miscellaneous-tab-in-preferences-dialog">General Miscellaneous tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen_misc.png" src="./images/pref_dialog_gen_misc.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id83" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id85" 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 @@ -1825,7 +1863,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id84" id="search" name="search">Search</a></h3> +<h3><a class="toc-backref" href="#id86" id="search" name="search">Search</a></h3> <dl class="docutils"> <dt>Always wrap search and hide the Find dialog</dt> <dd>Always wrap search around the document and hide the Find dialog after clicking @@ -1840,7 +1878,7 @@ dialog is used.</dd> </dl> <div class="section"> -<h4><a class="toc-backref" href="#id85" id="projects" name="projects">Projects</a></h4> +<h4><a class="toc-backref" href="#id87" 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 @@ -1857,10 +1895,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id86" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id88" 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"> -<h4><a class="toc-backref" href="#id87" id="sidebar" name="sidebar">Sidebar</a></h4> +<h4><a class="toc-backref" href="#id89" 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 @@ -1869,13 +1907,10 @@ <dd>Show all the documents you have open currently. This can be used to 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"> -<h4><a class="toc-backref" href="#id88" id="fonts" name="fonts">Fonts</a></h4> +<h4><a class="toc-backref" href="#id90" id="fonts" name="fonts">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1886,7 +1921,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id89" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<h4><a class="toc-backref" href="#id91" 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 @@ -1903,7 +1938,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id90" id="tab-positions" name="tab-positions">Tab positions</a></h4> +<h4><a class="toc-backref" href="#id92" 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, @@ -1917,7 +1952,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id91" id="id2" name="id2">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id93" 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 @@ -1927,11 +1962,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id92" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id94" 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"> -<h4><a class="toc-backref" href="#id93" id="toolbar" name="toolbar">Toolbar</a></h4> +<h4><a class="toc-backref" href="#id95" id="toolbar" name="toolbar">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> @@ -1941,7 +1976,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id94" id="appearance" name="appearance">Appearance</a></h4> +<h4><a class="toc-backref" href="#id96" 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 @@ -1952,10 +1987,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id95" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id97" 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"> -<h4><a class="toc-backref" href="#id96" id="features" name="features">Features</a></h4> +<h4><a class="toc-backref" href="#id98" 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> @@ -1987,10 +2022,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id97" id="editor-indentation-tab-in-preferences-dialog" name="editor-indentation-tab-in-preferences-dialog">Editor Indentation tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id99" id="editor-indentation-tab-in-preferences-dialog" name="editor-indentation-tab-in-preferences-dialog">Editor Indentation tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_indentation.png" src="./images/pref_dialog_edit_indentation.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id98" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<h4><a class="toc-backref" href="#id100" 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> @@ -2043,10 +2078,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id99" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id101" 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" /> <div class="section"> -<h4><a class="toc-backref" href="#id100" id="completions" name="completions">Completions</a></h4> +<h4><a class="toc-backref" href="#id102" id="completions" name="completions">Completions</a></h4> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a @@ -2091,7 +2126,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id101" id="auto-close-quotes-and-brackets" name="auto-close-quotes-and-brackets">Auto-close quotes and brackets</a></h4> +<h4><a class="toc-backref" href="#id103" id="auto-close-quotes-and-brackets" name="auto-close-quotes-and-brackets">Auto-close quotes and brackets</a></h4> <p>Geany can automatically insert a closing bracket and quote characters when you open them. For instance, you type a <tt class="docutils literal"><span class="pre">(</span></tt> and Geany will automatically insert <tt class="docutils literal"><span class="pre">)</span></tt>. With the following options, you can define for which @@ -2111,11 +2146,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id102" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id104" 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"> -<h4><a class="toc-backref" href="#id103" id="display" name="display">Display</a></h4> +<h4><a class="toc-backref" href="#id105" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Invert syntax highlighting colors</dt> <dd><p class="first">Use white text on a black background and invert all colors. @@ -2144,7 +2179,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id104" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> +<h4><a class="toc-backref" href="#id106" 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"> @@ -2170,10 +2205,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id105" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id107" 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"> -<h4><a class="toc-backref" href="#id106" id="new-files" name="new-files">New files</a></h4> +<h4><a class="toc-backref" href="#id108" 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 @@ -2193,7 +2228,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id107" id="saving-files" name="saving-files">Saving files</a></h4> +<h4><a class="toc-backref" href="#id109" 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"> @@ -2212,7 +2247,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id108" id="id3" name="id3">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id110" id="id3" name="id3">Miscellaneous</a></h4> @@ 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:[4141] trunk
by ntrel＠users.sourceforge.net 31 Aug '09

31 Aug '09

Revision: 4141 http://geany.svn.sourceforge.net/geany/?rev=4141&view=rev Author: ntrel Date: 2009-08-31 15:25:35 +0000 (Mon, 31 Aug 2009) Log Message: ----------- Add warning if only one of the plugin_key_group[_info] symbols is defined for a plugin. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-30 12:09:54 UTC (rev 4140) +++ trunk/ChangeLog 2009-08-31 15:25:35 UTC (rev 4141) @@ -1,3 +1,10 @@ +2009-08-31 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/plugins.c: + Add warning if only one of the plugin_key_group[_info] symbols is + defined for a plugin. + + 2009-08-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/prefs.c: Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-08-30 12:09:54 UTC (rev 4140) +++ trunk/src/plugins.c 2009-08-31 15:25:35 UTC (rev 4141) @@ -479,6 +479,10 @@ plugin->info.name); } } + else if (p_key_info || p_key_group) + geany_debug("Ignoring only one of plugin_key_group[_info] symbols defined for plugin '%s'. " + "Maybe use plugin_set_key_group() instead?", + plugin->info.name); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4140] trunk
by eht16＠users.sourceforge.net 30 Aug '09

30 Aug '09

Revision: 4140 http://geany.svn.sourceforge.net/geany/?rev=4140&view=rev Author: eht16 Date: 2009-08-30 12:09:54 +0000 (Sun, 30 Aug 2009) Log Message: ----------- Show the sidebar if either the documents or the symbols list are enabled (related to #1876107). Modified Paths: -------------- trunk/ChangeLog trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-29 19:06:19 UTC (rev 4139) +++ trunk/ChangeLog 2009-08-30 12:09:54 UTC (rev 4140) @@ -1,3 +1,10 @@ +2009-08-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/prefs.c: + Show the sidebar if either the documents or the symbols list are + enabled (related to #1876107). + + 2009-08-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/build.c, src/filetypes.c: Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2009-08-29 19:06:19 UTC (rev 4139) +++ trunk/src/prefs.c 2009-08-30 12:09:54 UTC (rev 4140) @@ -1104,6 +1104,8 @@ toolbar_apply_settings(); toolbar_update_ui(); toolbar_show_hide(); + if (interface_prefs.sidebar_openfiles_visible || interface_prefs.sidebar_symbol_visible) + ui_prefs.sidebar_visible = TRUE; ui_sidebar_show_hide(); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(main_widgets.notebook), interface_prefs.show_notebook_tabs); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4139] trunk
by eht16＠users.sourceforge.net 29 Aug '09

29 Aug '09

Revision: 4139 http://geany.svn.sourceforge.net/geany/?rev=4139&view=rev Author: eht16 Date: 2009-08-29 19:06:19 +0000 (Sat, 29 Aug 2009) Log Message: ----------- Fix removing leading double slashes in filenames which are used for network resources on Windows (closes #2844085). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-29 18:44:14 UTC (rev 4138) +++ trunk/ChangeLog 2009-08-29 19:06:19 UTC (rev 4139) @@ -2,6 +2,9 @@ * src/build.c, src/filetypes.c: Fix compiler warnings. + * src/utils.c: + Fix removing leading double slashes in filenames which are used for + network resources on Windows (closes #2844085). 2009-08-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-08-29 18:44:14 UTC (rev 4138) +++ trunk/src/utils.c 2009-08-29 19:06:19 UTC (rev 4139) @@ -1719,13 +1719,20 @@ const gchar *c, *needle; gchar *tmp; gssize pos; + gboolean preserve_double_backslash = FALSE; g_return_if_fail(g_path_is_absolute(filename)); + if (str->len >= 2 && strncmp(str->str, "\\\\", 2) == 0) + preserve_double_backslash = TRUE; + /* replace "/./" and "//" */ utils_string_replace_all(str, G_DIR_SEPARATOR_S "." G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); utils_string_replace_all(str, G_DIR_SEPARATOR_S G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + if (preserve_double_backslash) + g_string_prepend(str, "\\"); + /* replace "/.." */ needle = G_DIR_SEPARATOR_S ".."; while (1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4138] trunk
by eht16＠users.sourceforge.net 29 Aug '09

29 Aug '09

Revision: 4138 http://geany.svn.sourceforge.net/geany/?rev=4138&view=rev Author: eht16 Date: 2009-08-29 18:44:14 +0000 (Sat, 29 Aug 2009) Log Message: ----------- Fix compiler warnings. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-27 16:31:53 UTC (rev 4137) +++ trunk/ChangeLog 2009-08-29 18:44:14 UTC (rev 4138) @@ -1,3 +1,9 @@ +2009-08-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/build.c, src/filetypes.c: + Fix compiler warnings. + + 2009-08-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keybindings.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-08-27 16:31:53 UTC (rev 4137) +++ trunk/src/build.c 2009-08-29 18:44:14 UTC (rev 4138) @@ -1392,7 +1392,7 @@ else { GtkWidget *image; - exec_running = run_info[cmd].pid>1; + exec_running = run_info[cmd].pid > (GPid) 1; cmd_sensitivity = bc!=NULL || exec_running; gtk_widget_set_sensitive(menu_item, cmd_sensitivity); if (cmd==GBO_TO_CMD(GEANY_GBO_EXEC)) run_sensitivity = cmd_sensitivity; Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-08-27 16:31:53 UTC (rev 4137) +++ trunk/src/filetypes.c 2009-08-29 18:44:14 UTC (rev 4138) @@ -1375,21 +1375,26 @@ gchar *regstr; gchar **tmp; GeanyDocument *doc; - if(ft==NULL) +#ifdef HAVE_REGCOMP + regex_t *regex; + regmatch_t pmatch[3]; +#endif + if (ft == NULL) { doc = document_get_current(); - if(doc!=NULL)ft = doc->file_type; + if (doc != NULL) + ft = doc->file_type; } tmp = build_get_regex(build_info.grp, ft, NULL); - if (tmp==NULL) return FALSE; + if (tmp == NULL) + return FALSE; regstr = *tmp; #ifndef HAVE_REGCOMP if (!NZV(regstr)) geany_debug("No regex support - maybe you should configure with --enable-gnu-regex!"); return FALSE; #else - regex_t *regex = &ft->priv->error_regex; - regmatch_t pmatch[3]; + regex = &ft->priv->error_regex; *filename = NULL; *line = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Geany GTK 2.8 build test
by nightly.geany.org 29 Aug '09

29 Aug '09

Geany GTK 2.8 build test failed at: waf build See http://nightly.geany.org/misc/build_gtk28_stderr.log for details. Last error message: Interrupted http://nightly.geany.org/

2 1

Nightly build failed: Plugins GTK 2.8 build test
by nightly.geany.org 28 Aug '09

28 Aug '09

Plugins GTK 2.8 build test failed at: waf build See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details. Last error message: ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned ../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0' ../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code Build failed -> task failed (err #1): {task: cc codenavigation.c -> codenavigation_2.o} http://nightly.geany.org/

1 0

Nightly build failed: Plugins Windows build
by nightly.geany.org 28 Aug '09

28 Aug '09

Plugins Windows build failed at: waf build See http://nightly.geany.org/win32/build_win32_plugins_stderr.log for details. Last error message: ../../plugins_svn/geanylua/glspi_init.c:166: error: dereferencing pointer to incomplete type ../../plugins_svn/geanylua/glspi_init.c:170: error: dereferencing pointer to incomplete type ../../plugins_svn/geanylua/glspi_init.c:172: error: dereferencing pointer to incomplete type ../../plugins_svn/geanylua/glspi_init.c:177: error: dereferencing pointer to incomplete type ../../plugins_svn/geanylua/glspi_init.c:177: error: dereferencing pointer to incomplete type Build failed -> task failed (err #1): {task: cc glspi_init.c -> glspi_init_9.o} http://nightly.geany.org/

1 0

SF.net SVN: geany:[4137] trunk
by ntrel＠users.sourceforge.net 27 Aug '09

27 Aug '09

Revision: 4137 http://geany.svn.sourceforge.net/geany/?rev=4137&view=rev Author: ntrel Date: 2009-08-27 16:31:53 +0000 (Thu, 27 Aug 2009) Log Message: ----------- Remove --generate-data-files argument & code - just edit filetype_extensions.conf by hand (filetype order was broken anyway). Add *.H extension for C++ (useful for non-Windows systems). Modified Paths: -------------- trunk/ChangeLog trunk/HACKING trunk/data/filetype_extensions.conf trunk/src/keyfile.c trunk/src/keyfile.h trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-27 16:13:20 UTC (rev 4136) +++ trunk/ChangeLog 2009-08-27 16:31:53 UTC (rev 4137) @@ -7,6 +7,12 @@ * doc/plugins.dox: Mention Files link at top for header files; demoplugin.c. Minor edits; remove 'far from being complete'. + * src/keyfile.c, src/keyfile.h, src/main.c, + data/filetype_extensions.conf, HACKING: + Remove --generate-data-files argument & code - just edit + filetype_extensions.conf by hand (filetype order was broken + anyway). + Add *.H extension for C++ (useful for non-Windows systems). 2009-08-27 Lex Trotman <elextr(at)gmail(dot)com> Modified: trunk/HACKING =================================================================== --- trunk/HACKING 2009-08-27 16:13:20 UTC (rev 4136) +++ trunk/HACKING 2009-08-27 16:31:53 UTC (rev 4137) @@ -201,18 +201,8 @@ * Add GEANY_FILETYPES_FOO to filetypes.h. * Initialize GEANY_FILETYPES_FOO in init_builtin_filetypes() of filetypes.c. -* Rebuild Geany. -* From your geany/ directory, run:: +* Update data/filetype_extensions.conf. - src/geany --generate-data-files - -(The src/ prefix may be different, depending on where the binary is -generated.) -This will update data/filetype_extensions.conf. Note that -you need GEANY_DEBUG to be defined when building Geany for the ---generate-data-files argument to work - this is always defined in the -SVN version. Alternatively, edit the file by hand. - filetypes.* configuration file ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ All languages need a data/filetypes.foo configuration file. See Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2009-08-27 16:13:20 UTC (rev 4136) +++ trunk/data/filetype_extensions.conf 2009-08-27 16:31:53 UTC (rev 4137) @@ -1,13 +1,11 @@ -#*** This file generated by: geany --generate-data-files *** - -#Filetype extension configuration file for Geany -#Insert as many items as you want, seperate them with a ";". -#See Geany's main documentation for details. +# Filetype extension configuration file for Geany +# Insert as many items as you want, seperate them with a ";". +# See Geany's main documentation for details. [Extensions] ASM=*.asm; Ada=*.adb;*.ads; C=*.c;*.h; -C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; +C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; C#=*.cs; CAML=*.ml;*.mli; D=*.d;*.di; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-08-27 16:13:20 UTC (rev 4136) +++ trunk/src/keyfile.c 2009-08-27 16:31:53 UTC (rev 4137) @@ -408,7 +408,7 @@ /* build menu */ build_save_menu( config, NULL, GEANY_BCS_PREF ); - + /* printing */ g_key_file_set_string(config, "printing", "print_cmd", printing_prefs.external_print_cmd ? printing_prefs.external_print_cmd : ""); g_key_file_set_boolean(config, "printing", "use_gtk_printing", printing_prefs.use_gtk_printing); @@ -1068,74 +1068,6 @@ } -#ifdef GEANY_DEBUG -/* Geany data file generation is only available with a debug build of Geany. */ - -static void generate_filetype_extensions(const gchar *output_dir); - - -/* Generate the config files in "data/" from defaults */ -void configuration_generate_data_files(void) -{ - gchar *cur_dir, *gen_dir; - - cur_dir = g_get_current_dir(); - gen_dir = g_strconcat(cur_dir, G_DIR_SEPARATOR_S, "data", NULL); - g_free(cur_dir); - - if (! g_file_test(gen_dir, G_FILE_TEST_IS_DIR)) - { - g_print("%s does not exist!\n", gen_dir); - return; - } - g_print("Generating system files in %s:\n", gen_dir); - /* currently only filetype extensions are auto-generated. */ - generate_filetype_extensions(gen_dir); - g_free(gen_dir); -} - - -/* This will write the default settings for the system filetype_extensions.conf */ -static void generate_filetype_extensions(const gchar *output_dir) -{ - guint i; - gchar *configfile = g_strconcat(output_dir, G_DIR_SEPARATOR_S, "filetype_extensions.conf", NULL); - gchar *data, *basename; - GKeyFile *config; - - config = g_key_file_new(); - g_key_file_set_comment(config, NULL, NULL, - "*** This file generated by: geany --generate-data-files ***", NULL); - /* add filetype keys */ - for (i = 0; i < filetypes_array->len; i++) - { - g_key_file_set_string_list(config, "Extensions", filetypes[i]->name, - (const gchar**) filetypes[i]->pattern, g_strv_length(filetypes[i]->pattern)); - } - /* add comment */ - g_key_file_set_comment(config, "Extensions", NULL, - "Filetype extension configuration file for Geany\n" - "Insert as many items as you want, seperate them with a \";\".\n" - "See Geany's main documentation for details.", NULL); - - /* write the file */ - g_print("%s: ", G_STRFUNC); - data = g_key_file_to_data(config, NULL, NULL); - basename = g_path_get_basename(configfile); - - if (utils_write_file(configfile, data) == 0) - g_print("wrote file %s.\n", basename); - else - g_print("*** ERROR: error writing file %s\n", basename); - g_free(basename); - - g_free(data); - g_key_file_free(config); -} - -#endif - - void configuration_init(void) { keyfile_groups = g_ptr_array_new(); Modified: trunk/src/keyfile.h =================================================================== --- trunk/src/keyfile.h 2009-08-27 16:13:20 UTC (rev 4136) +++ trunk/src/keyfile.h 2009-08-27 16:31:53 UTC (rev 4137) @@ -55,9 +55,4 @@ * realisation of the main window */ void configuration_apply_settings(void); -#ifdef GEANY_DEBUG -/* Generate the config files in "data/" from defaults */ -void configuration_generate_data_files(void); #endif - -#endif Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-08-27 16:13:20 UTC (rev 4136) +++ trunk/src/main.c 2009-08-27 16:31:53 UTC (rev 4137) @@ -108,7 +108,6 @@ static gboolean no_vte = FALSE; static gchar *lib_vte = NULL; #endif -static gboolean generate_datafiles = FALSE; static gboolean generate_tags = FALSE; static gboolean no_preprocessing = FALSE; static gboolean ft_names = FALSE; @@ -127,7 +126,6 @@ { "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("Print internal filetype names"), NULL }, { "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("Generate global tags file (see documentation)"), NULL }, { "no-preprocessing", 'P', 0, G_OPTION_ARG_NONE, &no_preprocessing, N_("Don't preprocess C/C++ files when generating tags"), NULL }, - { "generate-data-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, NULL, NULL }, #ifdef HAVE_SOCKET { "new-instance", 'i', 0, G_OPTION_ARG_NONE, &cl_options.new_instance, N_("Don't open files in a running instance, force opening a new instance"), NULL }, #endif @@ -523,14 +521,6 @@ app->configdir = g_build_filename(g_get_user_config_dir(), "geany", NULL); } -#ifdef GEANY_DEBUG - if (generate_datafiles) - { - filetypes_init_types(); - configuration_generate_data_files(); /* currently only filetype_extensions.conf */ - exit(0); - } -#endif if (generate_tags) { gboolean ret; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2009