Commits July 2012

commits@lists.geany.org

1 participants
381 discussions

[geany/geany] 1a9451: Fix NULL tags array warning in document_highlight_tags
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 23 Apr 2012 15:17:40 Commit: 1a9451bfc4915ada3ab2d0743293532f574cad00 https://github.com/geany/geany/commit/1a9451bfc4915ada3ab2d0743293532f574ca… Log Message: ----------- Fix NULL tags array warning in document_highlight_tags Modified Paths: -------------- src/document.c Modified: src/document.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2312,6 +2312,8 @@ void document_highlight_tags(GeanyDocument *doc) default: return; /* early out if type keywords are not supported */ } + if (!app->tm_workspace->work_object.tags_array) + return; /* get any type keywords and tell scintilla about them * this will cause the type keywords to be colourized in scintilla */ @@ -2895,7 +2897,7 @@ gboolean document_check_disk_status(GeanyDocument *doc, gboolean force) g_return_val_if_fail(doc != NULL, FALSE); /* ignore remote files and documents that have never been saved to disk */ - if (notebook_switch_in_progress() || file_prefs.disk_check_timeout == 0 + if (notebook_switch_in_progress() || file_prefs.disk_check_timeout == 0 || doc->real_path == NULL || doc->priv->is_remote) return FALSE; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 3275d5: Remove unportable pipe-to-grep tag generation hack
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 23 Apr 2012 15:58:55 Commit: 3275d510d8a64ce0d1be91aa8b11b3e845ff02fd https://github.com/geany/geany/commit/3275d510d8a64ce0d1be91aa8b11b3e845ff0… Log Message: ----------- Remove unportable pipe-to-grep tag generation hack Instead always ignore G_BEGIN_DECLS and G_END_DECLS tags. Modified Paths: -------------- src/symbols.c tagmanager/tm_workspace.c Modified: src/symbols.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -117,6 +117,9 @@ static void load_c_ignore_tags(void) if (g_file_get_contents(path, &content, NULL, NULL)) { + /* historically we ignore the glib _DECLS for tag generation */ + SETPTR(content, g_strconcat("G_BEGIN_DECLS G_END_DECLS\n", content, NULL)); + g_strfreev(c_tags_ignore); c_tags_ignore = g_strsplit_set(content, " \n\r", -1); g_free(content); Modified: tagmanager/tm_workspace.c 8 files changed, 1 insertions(+), 7 deletions(-) =================================================================== @@ -376,16 +376,10 @@ gboolean tm_workspace_create_global_tags(const char *pre_process, const char **i includes_files = NULL; fclose(fp); - /* FIXME: The following grep command removes the lines - * G_BEGIN_DECLS and G_END_DECLS from the header files. The reason is - * that in tagmanager, the files are not correctly parsed and the typedefs - * following these lines are incorrectly parsed. The real fix should, - * of course be in tagmanager (c) parser. This is just a temporary fix. - */ if (pre_process != NULL) { gint ret; - command = g_strdup_printf("%s %s | grep -v -E '^\\s*(G_BEGIN_DECLS|G_END_DECLS)\\s*$' > %s", + command = g_strdup_printf("%s %s > %s", pre_process, temp_file, temp_file2); #ifdef TM_DEBUG g_message("Executing: %s", command); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 243599: Show selected line count on status bar when whole lines are selected
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Sun, 22 Apr 2012 16:32:53 Commit: 24359942bfe96d37c76cccfc3e9993ec83e912d1 https://github.com/geany/geany/commit/24359942bfe96d37c76cccfc3e9993ec83e91… Log Message: ----------- Show selected line count on status bar when whole lines are selected Modified Paths: -------------- src/ui_utils.c Modified: src/ui_utils.c 15 files changed, 13 insertions(+), 2 deletions(-) =================================================================== @@ -178,6 +178,7 @@ static void add_statusbar_statistics(GString *stats_str, const gchar *fmt; const gchar *expos; /* % expansion position */ const gchar sp[] = " "; + ScintillaObject *sci = doc->editor->sci; fmt = NZV(statusbar_template) ? statusbar_template : /* Status bar statistics: col = column, sel = selection. */ @@ -206,9 +207,19 @@ static void add_statusbar_statistics(GString *stats_str, g_string_append_printf(stats_str, "%d", col + 1); break; case 's': - g_string_append_printf(stats_str, "%d", - sci_get_selected_text_length(doc->editor->sci) - 1); + { + gint len = sci_get_selected_text_length(sci) - 1; + /* check if whole lines are selected */ + if (!len || sci_get_col_from_position(sci, + sci_get_selection_start(sci)) != 0 || + sci_get_col_from_position(sci, + sci_get_selection_end(sci)) != 0) + g_string_append_printf(stats_str, "%d", len); + else /* L = lines */ + g_string_append_printf(stats_str, _("%dL"), + sci_get_lines_selected(doc->editor->sci) - 1); break; + } case 'w': /* RO = read-only */ g_string_append(stats_str, (doc->readonly) ? _("RO ") : @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] d2d4f0: Enforce filetype extension for user tag files
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 23 Apr 2012 12:44:22 Commit: d2d4f0b6233a80cbe6294d0fb68695f35d0a62a3 https://github.com/geany/geany/commit/d2d4f0b6233a80cbe6294d0fb68695f35d0a6… Log Message: ----------- Enforce filetype extension for user tag files Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 13 files changed, 7 insertions(+), 6 deletions(-) =================================================================== @@ -1681,17 +1681,18 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) static GeanyFiletype *detect_global_tags_filetype(const gchar *utf8_filename) { gchar *tags_ext; - gchar *shortname = g_strdup(utf8_filename); + gchar *shortname = utils_strdupa(utf8_filename); GeanyFiletype *ft = NULL; - tags_ext = strstr(shortname, ".tags"); + tags_ext = g_strrstr(shortname, ".tags"); if (tags_ext) { *tags_ext = '\0'; /* remove .tags extension */ ft = filetypes_detect_from_extension(shortname); + if (ft->id != GEANY_FILETYPES_NONE) + return ft; } - g_free(shortname); - return ft; + return NULL; } @@ -1772,8 +1773,8 @@ void symbols_show_load_tags_dialog(void) NULL); gtk_widget_set_name(dialog, "GeanyDialog"); filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter, _("Geany tag files (*.tags)")); - gtk_file_filter_add_pattern(filter, "*.tags"); + gtk_file_filter_set_name(filter, _("Geany tag files (*.*.tags)")); + gtk_file_filter_add_pattern(filter, "*.*.tags"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 6b22ab: Adding it into THANKS for Giuliano
by Frank Lanitz 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 21 Apr 2012 07:14:19 Commit: 6b22ab908c825cf30bae4b5468dd632e46a2b23a https://github.com/geany/geany/commit/6b22ab908c825cf30bae4b5468dd632e46a2b… Log Message: ----------- Adding it into THANKS for Giuliano Modified Paths: -------------- THANKS Modified: THANKS 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -121,7 +121,7 @@ José Manuel Castroagudín Silva <chavescesures(at)mail(dot)com> - gl Gabor Kmetyko aka kilo <kg_kilo(at)freemail(dot)hu> - hu M.Baldinelli <m(dot)baldinelli(at)agora(dot)it> - it Dario Santomarco <dariello(at)yahoo(dot)it> - it -Giuliano Manzitti <gmanzitti(at)yahoo.it> +Giuliano Manzitti <gmanzitti(at)yahoo.it> - it Tarot Osuji <tarot(at)sdf(dot)lonestar(dot)org> - ja Chikahiro Masami <cmasa(dot)z321(at)gmail(dot)com> - ja Park Jang-heon <dotkabi(at)gmail(dot)com> - ko @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 4bd962: Remove hard coded option that prevents 64 bit tag generation.
by Lex Trotman 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Lex Trotman <elextr(a)gmail.com> Committer: Lex Trotman <elextr(a)gmail.com> Date: Sun, 22 Apr 2012 00:54:41 Commit: 4bd962ee8dde25b4ce5605ce7b4bf43d79d066f6 https://github.com/geany/geany/commit/4bd962ee8dde25b4ce5605ce7b4bf43d79d06… Log Message: ----------- Remove hard coded option that prevents 64 bit tag generation. On GNU X86-64 systems the predefined macros are required to choose the correct headers, so tag definition fails with -undef. Removed it from hardcoded, systems that need it can add it to CFLAGS. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 7 files changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -1296,7 +1296,7 @@ static void free_iter_slice_list(gpointer data) /* inserts a @data in @table on key @tag. * previous data is not overwritten if the key is duplicated, but rather the * two values are kept in a list - * + * * table is: GHashTable<TMTag, GList<GList<TMTag>>> */ static void tags_table_insert(GHashTable *table, TMTag *tag, GList *data) { @@ -1702,9 +1702,8 @@ static GeanyFiletype *detect_global_tags_filetype(const gchar *utf8_filename) * CFLAGS=-I/home/user/libname-1.x geany -g libname.d.tags libname.h */ int symbols_generate_global_tags(int argc, char **argv, gboolean want_preprocess) { - /* -E pre-process, -dD output user macros, -p prof info (?), - * -undef remove builtin macros (seems to be needed with FC5 gcc 4.1.1) */ - const char pre_process[] = "gcc -E -dD -p -undef"; + /* -E pre-process, -dD output user macros, -p prof info (?) */ + const char pre_process[] = "gcc -E -dD -p"; if (argc > 2) { @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 712cdd: Merge global tags in order rather than resorting the whole array
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 20 Apr 2012 12:13:16 Commit: 712cdd6aa0005f65bd77b15c34cd29067864628d https://github.com/geany/geany/commit/712cdd6aa0005f65bd77b15c34cd290678646… Log Message: ----------- Merge global tags in order rather than resorting the whole array This is much faster than resorting, especially when there are many global tags files loaded. Modified Paths: -------------- tagmanager/include/tm_tag.h tagmanager/tm_tag.c tagmanager/tm_workspace.c Modified: tagmanager/include/tm_tag.h 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -225,6 +225,9 @@ */ int tm_tag_compare(const void *ptr1, const void *ptr2); +gboolean tm_tags_merge(GPtrArray *tags_array, gsize orig_len, + TMTagAttrType *sort_attributes, gboolean dedup); + /*! Sort an array of tags on the specified attribuites using the inbuilt comparison function. Modified: tagmanager/tm_tag.c 45 files changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -569,6 +569,51 @@ gboolean tm_tags_custom_dedup(GPtrArray *tags_array, TMTagCompareFunc compare_fu return TRUE; } +/* Sorts newly-added tags and merges them in order with existing tags. + * This is much faster than resorting the whole array. + * Note: Having the caller append to the existing array should be faster + * than creating a new array which would likely get resized more than once. + * tags_array: array with new (perhaps unsorted) tags appended. + * orig_len: number of existing tags. */ +gboolean tm_tags_merge(GPtrArray *tags_array, gsize orig_len, + TMTagAttrType *sort_attributes, gboolean dedup) +{ + TMTag **copy, **a, **b; + gsize copy_len, i; + + if ((!tags_array) || (!tags_array->len) || orig_len >= tags_array->len) + return TRUE; + if (!orig_len) + return tm_tags_sort(tags_array, sort_attributes, dedup); + copy_len = tags_array->len - orig_len; + copy = g_memdup(tags_array->pdata + orig_len, copy_len * sizeof(gpointer)); + s_sort_attrs = sort_attributes; + s_partial = FALSE; + /* enforce copy sorted with same attributes for merge */ + qsort(copy, copy_len, sizeof(gpointer), tm_tag_compare); + a = tags_array->pdata + orig_len - 1; + b = copy + copy_len - 1; + for (i = tags_array->len - 1;; i--) + { + gint cmp = tm_tag_compare(a, b); + + tags_array->pdata[i] = (cmp >= 0) ? *a-- : *b--; + if (a < tags_array->pdata) + { + memcpy(tags_array->pdata, copy, b - copy); + break; + } + if (b < copy) + break; /* remaining elements of 'a' are in place already */ + g_assert(i != 0); + } + s_sort_attrs = NULL; + g_free(copy); + if (dedup) + tm_tags_dedup(tags_array, sort_attributes); + return TRUE; +} + gboolean tm_tags_sort(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean dedup) { if ((!tags_array) || (!tags_array->len)) Modified: tagmanager/tm_workspace.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -142,6 +142,7 @@ gboolean tm_workspace_remove_object(TMWorkObject *w, gboolean do_free, gboolean gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode) { + gsize orig_len; guchar buf[BUFSIZ]; FILE *fp; TMTag *tag; @@ -153,6 +154,7 @@ gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode) return FALSE; if (NULL == theWorkspace->global_tags) theWorkspace->global_tags = g_ptr_array_new(); + orig_len = theWorkspace->global_tags->len; if ((NULL == fgets((gchar*) buf, BUFSIZ, fp)) || ('\0' == *buf)) { fclose(fp); @@ -182,10 +184,8 @@ gboolean tm_workspace_load_global_tags(const char *tags_file, gint mode) g_ptr_array_add(theWorkspace->global_tags, tag); fclose(fp); - /* resort the whole array, because tm_tags_find expects a sorted array and it is not sorted - * when c99.tags, php.tags and latex.tags are loaded at the same time */ - tm_tags_sort(theWorkspace->global_tags, global_tags_sort_attrs, TRUE); - + /* reorder the whole array, because tm_tags_find expects a sorted array */ + tm_tags_merge(theWorkspace->global_tags, orig_len, global_tags_sort_attrs, TRUE); return TRUE; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 06d02e: Indent with tabs
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 18 Apr 2012 12:29:40 Commit: 06d02e29db6694ff19ab47f39c7899fc96c9f6ba https://github.com/geany/geany/commit/06d02e29db6694ff19ab47f39c7899fc96c9f… Log Message: ----------- Indent with tabs Modified Paths: -------------- tagmanager/docbook.c Modified: tagmanager/docbook.c 54 files changed, 27 insertions(+), 27 deletions(-) =================================================================== @@ -25,21 +25,21 @@ * DATA DEFINITIONS */ typedef enum { - K_CHAPTER, - K_SECTION, - K_SECT1, - K_SECT2, - K_SECT3, - K_APPENDIX + K_CHAPTER, + K_SECTION, + K_SECT1, + K_SECT2, + K_SECT3, + K_APPENDIX } docbookKind; static kindOption DocBookKinds [] = { - { TRUE, 'f', "function", "chapters"}, - { TRUE, 'c', "class", "sections"}, - { TRUE, 'm', "member", "sect1"}, - { TRUE, 'd', "macro", "sect2"}, - { TRUE, 'v', "variable", "sect3"}, - { TRUE, 's', "struct", "appendix"} + { TRUE, 'f', "function", "chapters"}, + { TRUE, 'c', "class", "sections"}, + { TRUE, 'm', "member", "sect1"}, + { TRUE, 'd', "macro", "sect2"}, + { TRUE, 'v', "variable", "sect3"}, + { TRUE, 's', "struct", "appendix"} }; /* @@ -48,14 +48,14 @@ static int getWord(const char *ref, const char **ptr) { - const char *p = *ptr; + const char *p = *ptr; - while ((*ref != '\0') && (*p != '\0') && (*ref == *p)) ref++, p++; + while ((*ref != '\0') && (*p != '\0') && (*ref == *p)) ref++, p++; - if (*ref) return FALSE; + if (*ref) return FALSE; - *ptr = p; - return TRUE; + *ptr = p; + return TRUE; } @@ -83,10 +83,10 @@ static void createTag(docbookKind kind, const char *buf) static void findDocBookTags(void) { - const char *line; + const char *line; - while ((line = (const char*)fileReadLine()) != NULL) - { + while ((line = (const char*)fileReadLine()) != NULL) + { const char *cp = line; for (; *cp != '\0'; cp++) @@ -135,17 +135,17 @@ static void findDocBookTags(void) } } } - } + } } extern parserDefinition* DocBookParser (void) { static const char *const extensions [] = { "sgml", "docbook", NULL }; - parserDefinition* def = parserNew ("Docbook"); - def->extensions = extensions; - def->kinds = DocBookKinds; - def->kindCount = KIND_COUNT (DocBookKinds); - def->parser = findDocBookTags; - return def; + parserDefinition* def = parserNew ("Docbook"); + def->extensions = extensions; + def->kinds = DocBookKinds; + def->kindCount = KIND_COUNT (DocBookKinds); + def->parser = findDocBookTags; + return def; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] d3aed9: Adding a first version of Slovakian translation provided by Tomáš Vadina
by Frank Lanitz 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 19 Apr 2012 15:03:28 Commit: d3aed9f08b843ea8df7dc39c26e00deb59813845 https://github.com/geany/geany/commit/d3aed9f08b843ea8df7dc39c26e00deb59813… Log Message: ----------- Adding a first version of Slovakian translation provided by Tomáš Vadina Modified Paths: -------------- po/sk.po Modified: po/sk.po 5381 files changed, 5381 insertions(+), 0 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] ac34a1: Show SGML entity completion on first typing '&' again
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 16 Apr 2012 11:05:18 Commit: ac34a19abe60def11a821d54fe2fbb0b9b6ca845 https://github.com/geany/geany/commit/ac34a19abe60def11a821d54fe2fbb0b9b6ca… Log Message: ----------- Show SGML entity completion on first typing '&' again Modified Paths: -------------- src/editor.c Modified: src/editor.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2188,6 +2188,7 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc return FALSE; autocomplete_scope(editor); + ret = autocomplete_check_html(editor, style, pos); if (ft->id == GEANY_FILETYPES_LATEX) wordchars = GEANY_WORDCHARS"\\"; /* add \ to word chars if we are in a LaTeX file */ @@ -2198,13 +2199,12 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc root = cword; rootlen = strlen(root); - if (rootlen > 0) + if (!ret && rootlen > 0) { - ret = autocomplete_check_html(editor, style, pos); - if (ret || (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && + if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 && sci_get_char_at(sci, pos - 5) == '<' && - sci_get_char_at(sci, pos - 4) == '?')) + sci_get_char_at(sci, pos - 4) == '?') { /* nothing, don't complete PHP open tags */ } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2012