Commits May 2011

commits@lists.geany.org

5 participants
73 discussions

SF.net SVN: geany:[5817] branches/0.20.1
by eht16＠users.sourceforge.net 22 May '11

22 May '11

Revision: 5817 http://geany.svn.sourceforge.net/geany/?rev=5817&view=rev Author: eht16 Date: 2011-05-22 15:22:50 +0000 (Sun, 22 May 2011) Log Message: ----------- Replace escape character '\' by slash '/' in paths in the Windows Makefiles (patch by Matthew Brush, thanks). Modified Paths: -------------- branches/0.20.1/ChangeLog branches/0.20.1/tagmanager/makefile.win32 Modified: branches/0.20.1/ChangeLog =================================================================== --- branches/0.20.1/ChangeLog 2011-05-22 11:08:06 UTC (rev 5816) +++ branches/0.20.1/ChangeLog 2011-05-22 15:22:50 UTC (rev 5817) @@ -1,3 +1,10 @@ +2011-05-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/makefile.win32: + Replace escape character '\' by slash '/' in paths in the + Windows Makefiles (patch by Matthew Brush, thanks). + + 2011-05-09 Colomban Wendling <colomban(at)geany(dot)org> * src/sidebar.c: Modified: branches/0.20.1/tagmanager/makefile.win32 =================================================================== --- branches/0.20.1/tagmanager/makefile.win32 2011-05-22 11:08:06 UTC (rev 5816) +++ branches/0.20.1/tagmanager/makefile.win32 2011-05-22 15:22:50 UTC (rev 5817) @@ -3,7 +3,7 @@ CC = gcc AR = ar RANLIB = ranlib -PREFIX = C:\libs +PREFIX = C:/libs RM = del -include ../localwin32.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5816] trunk
by eht16＠users.sourceforge.net 22 May '11

22 May '11

Revision: 5816 http://geany.svn.sourceforge.net/geany/?rev=5816&view=rev Author: eht16 Date: 2011-05-22 11:08:06 +0000 (Sun, 22 May 2011) Log Message: ----------- Add 'enum' to secondary keywords (closes #3305737, patch by Matthew Brush, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.java Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-22 10:32:31 UTC (rev 5815) +++ trunk/ChangeLog 2011-05-22 11:08:06 UTC (rev 5816) @@ -7,6 +7,9 @@ * src/ui_utils.c, doc/geany.txt, doc/geany.html: Do not allow 'Save All' even if 'allow_always_save' is set (patch by Dimitar Zhekov, thanks). + * data/filetypes.java: + Add 'enum' to secondary keywords + (closes #3305737, patch by Matthew Brush, thanks). 2011-05-12 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2011-05-22 10:32:31 UTC (rev 5815) +++ trunk/data/filetypes.java 2011-05-22 11:08:06 UTC (rev 5816) @@ -26,7 +26,7 @@ [keywords] primary=abstract assert break case catch class const continue default do else extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null -secondary=boolean byte char double float int long short void +secondary=boolean byte char double enum float int long short void # documentation keywords for javadoc doccomment=author deprecated exception param return see serial serialData serialField since throws todo version typedefs= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5815] trunk
by eht16＠users.sourceforge.net 22 May '11

22 May '11

Revision: 5815 http://geany.svn.sourceforge.net/geany/?rev=5815&view=rev Author: eht16 Date: 2011-05-22 10:32:31 +0000 (Sun, 22 May 2011) Log Message: ----------- Do not allow 'Save All' even if 'allow_always_save' is set (patch by Dimitar Zhekov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-22 10:00:53 UTC (rev 5814) +++ trunk/ChangeLog 2011-05-22 10:32:31 UTC (rev 5815) @@ -4,6 +4,9 @@ Remove unused variables (patch by Eugene Arshinov, thanks). * src/stash.c: Remove unused variables (suggested by Eugene Arshinov). + * src/ui_utils.c, doc/geany.txt, doc/geany.html: + Do not allow 'Save All' even if 'allow_always_save' is set + (patch by Dimitar Zhekov, thanks). 2011-05-12 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-05-22 10:00:53 UTC (rev 5814) +++ trunk/doc/geany.html 2011-05-22 10:32:31 UTC (rev 5815) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="$Date$" /> +<meta name="date" content="2011-05-03" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ Nick Treleaven Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>$Date$</td></tr> +<td>2011-05-03</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.21</td></tr> </tbody> @@ -5082,11 +5082,11 @@ <tr><td>allow_always_save</td> <td>Whether files can be saved always, even if they don't have any changes. By default, -the Save buttons and menu items are -disabled when a file is unchanged. When -setting this option to true, the Save -buttons and menu items are always active -and files can be saved.</td> +the Save button and menu item are disabled +when a file is unchanged. When setting +this option to true, the Save button and +menu item are always active and files can +be saved.</td> <td>false</td> </tr> <tr><td>compiler_tab_autoscroll</td> @@ -6580,7 +6580,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-05-03 18:39 UTC. +Generated on: 2011-05-22 10:30 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-05-22 10:00:53 UTC (rev 5814) +++ trunk/doc/geany.txt 2011-05-22 10:32:31 UTC (rev 5815) @@ -4373,11 +4373,11 @@ available with GTK 2.12 or above). allow_always_save Whether files can be saved always, even if false they don't have any changes. By default, - the Save buttons and menu items are - disabled when a file is unchanged. When - setting this option to true, the Save - buttons and menu items are always active - and files can be saved. + the Save button and menu item are disabled + when a file is unchanged. When setting + this option to true, the Save button and + menu item are always active and files can + be saved. compiler_tab_autoscroll Whether to automatically scroll to the true last line of the output in the Compiler tab. Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2011-05-22 10:00:53 UTC (rev 5814) +++ trunk/src/ui_utils.c 2011-05-22 10:32:31 UTC (rev 5815) @@ -661,7 +661,7 @@ gboolean dirty_tabs = FALSE; if (ui_prefs.allow_always_save) - return; + enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) > 0 ? TRUE : FALSE; ui_widget_set_sensitive(widgets.save_buttons[0], enable); ui_widget_set_sensitive(widgets.save_buttons[1], enable); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5814] trunk
by eht16＠users.sourceforge.net 22 May '11

22 May '11

Revision: 5814 http://geany.svn.sourceforge.net/geany/?rev=5814&view=rev Author: eht16 Date: 2011-05-22 10:00:53 +0000 (Sun, 22 May 2011) Log Message: ----------- Remove unused variables (suggested by Eugene Arshinov). Modified Paths: -------------- trunk/ChangeLog trunk/src/stash.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-22 09:59:30 UTC (rev 5813) +++ trunk/ChangeLog 2011-05-22 10:00:53 UTC (rev 5814) @@ -2,6 +2,8 @@ * src/about.c, src/build.c, tagmanager/tm_workspace.c: Remove unused variables (patch by Eugene Arshinov, thanks). + * src/stash.c: + Remove unused variables (suggested by Eugene Arshinov). 2011-05-12 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2011-05-22 09:59:30 UTC (rev 5813) +++ trunk/src/stash.c 2011-05-22 10:00:53 UTC (rev 5814) @@ -777,11 +777,9 @@ va_start(args, enum_id); while (1) { - gint dummy; - if (!va_arg(args, gpointer)) break; - dummy = va_arg(args, gint); + va_arg(args, gint); count++; } va_end(args); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5813] trunk/ChangeLog
by eht16＠users.sourceforge.net 22 May '11

22 May '11

Revision: 5813 http://geany.svn.sourceforge.net/geany/?rev=5813&view=rev Author: eht16 Date: 2011-05-22 09:59:30 +0000 (Sun, 22 May 2011) Log Message: ----------- Add old, missed ChangeLog entry, oops Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-22 09:58:06 UTC (rev 5812) +++ trunk/ChangeLog 2011-05-22 09:59:30 UTC (rev 5813) @@ -29,6 +29,13 @@ Enable SplitWindow build on Windows again (re-apply Enrico's patch). +2011-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * HACKING: + Add note about patching Glade 2.12 to compile it with + newer GTK versions. + + 2011-05-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/callbacks.c: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5812] trunk
by eht16＠users.sourceforge.net 22 May '11

22 May '11

Revision: 5812 http://geany.svn.sourceforge.net/geany/?rev=5812&view=rev Author: eht16 Date: 2011-05-22 09:58:06 +0000 (Sun, 22 May 2011) Log Message: ----------- Remove unused variables (patch by Eugene Arshinov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/about.c trunk/src/build.c trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-21 09:01:55 UTC (rev 5811) +++ trunk/ChangeLog 2011-05-22 09:58:06 UTC (rev 5812) @@ -1,3 +1,9 @@ +2011-05-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/about.c, src/build.c, tagmanager/tm_workspace.c: + Remove unused variables (patch by Eugene Arshinov, thanks). + + 2011-05-12 Colomban Wendling <colomban(at)geany(dot)org> * src/encodings.c: Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2011-05-21 09:01:55 UTC (rev 5811) +++ trunk/src/about.c 2011-05-22 09:58:06 UTC (rev 5812) @@ -137,7 +137,6 @@ GtkWidget *table; GtkWidget *license_scrollwin; GtkWidget *info_box; - GtkWidget *button; GtkWidget *header_hbox; GtkWidget *header_eventbox; GdkPixbuf *icon; @@ -154,7 +153,7 @@ gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_title(GTK_WINDOW(dialog), _("About Geany")); gtk_widget_set_name(dialog, "GeanyDialog"); - button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); + gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); g_signal_connect(dialog, "key-press-event", G_CALLBACK(gb_on_key_pressed), NULL); Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2011-05-21 09:01:55 UTC (rev 5811) +++ trunk/src/build.c 2011-05-22 09:58:06 UTC (rev 5812) @@ -1654,11 +1654,8 @@ static void on_toolbutton_make_activate(GtkWidget *menuitem, gpointer user_data) { gchar *msg; - gint grp, cmd; last_toolbutton_action = user_data; - grp = GPOINTER_TO_GRP(user_data); - cmd = GPOINTER_TO_CMD(user_data); if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_MAKE_ALL)) msg = _("Build the current file with Make and the default target"); else if (last_toolbutton_action == GBO_TO_POINTER(GEANY_GBO_CUSTOM)) @@ -2116,11 +2113,8 @@ { gchar *entries[GEANY_BC_CMDENTRIES_COUNT]; gboolean changed = FALSE; - GeanyBuildSource src; enum GeanyBuildCmdEntries i; - src = table_data->rows[drow]->src; - for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { entries[i] = g_strdup(get_build_command_entry_text(table_data->rows[drow]->entries[i])); Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2011-05-21 09:01:55 UTC (rev 5811) +++ trunk/tagmanager/tm_workspace.c 2011-05-22 09:58:06 UTC (rev 5812) @@ -223,11 +223,10 @@ { char *str = g_strdup_printf("#include \"%s\"\n", (char*)node->data); int str_len = strlen(str); - size_t size; - size = fwrite(str, str_len, 1, fp); + fwrite(str, str_len, 1, fp); g_free(str); - node = g_list_next (node); + node = g_list_next(node); } } @@ -251,9 +250,8 @@ } else { - size_t size; - size = fwrite(contents, length, 1, fp); - size = fwrite("\n", 1, 1, fp); /* in case file doesn't end in newline (e.g. windows). */ + fwrite(contents, length, 1, fp); + fwrite("\n", 1, 1, fp); /* in case file doesn't end in newline (e.g. windows). */ g_free(contents); } node = g_list_next (node); @@ -376,13 +374,12 @@ */ if (pre_process != NULL) { - int ret; command = g_strdup_printf("%s %s | grep -v -E '^\\s*(G_BEGIN_DECLS|G_END_DECLS)\\s*$' > %s", pre_process, temp_file, temp_file2); #ifdef TM_DEBUG g_message("Executing: %s", command); #endif - ret = system(command); + system(command); g_free(command); g_unlink(temp_file); g_free(temp_file); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5811] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5811 http://geany.svn.sourceforge.net/geany/?rev=5811&view=rev Author: statc Date: 2011-05-21 09:01:55 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5727..5737) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/plugins/geanyfunctions.h branches/sm/po/ChangeLog branches/sm/po/sv.po branches/sm/src/document.c branches/sm/src/document.h branches/sm/src/editor.c branches/sm/src/filetypes.c branches/sm/src/plugindata.h branches/sm/src/plugins.c branches/sm/src/templates.c branches/sm/src/ui_utils.c branches/sm/src/utils.c branches/sm/src/utils.h Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/ChangeLog 2011-05-21 09:01:55 UTC (rev 5811) @@ -1,3 +1,44 @@ +2011-04-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c: + Fix warning in utils_find_open_xml_tag() with malformed tags like + <~foo> (oops). + + +2011-04-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/utils.h, src/plugindata.h, src/plugins.c, + plugins/geanyfunctions.h: + Add utils_find_open_xml_tag_pos() API function (patch by Eugene + Arshinov, thanks). + * src/templates.c: + Replace dates on template insertion, not when loading templates. + + +2011-04-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Fix multiple snippet cursor positions for Tabs + Spaces mode. + Simplify editor_insert_snippet() code now we use cursor marker + strings. + * src/utils.c, src/utils.h, src/editor.c: + Add utils_string_find() to search in a fixed range. + Change utils_string_replace() to just replace a fixed number of + characters. + + +2011-04-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/plugindata.h, src/document.c, src/plugins.c, src/document.h, + plugins/geanyfunctions.h: + Add document_compare_by_tab_order() and + document_compare_by_tab_order_reverse() to the plugin API. + * src/ui_utils.c: + Use document_compare_by_tab_order() as default compare function + to sort the document list in the document notebook tab menu, this + fixes the currently broken default ordering. + + 2011-04-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/utils.c, src/utils.h, src/editor.c: Modified: branches/sm/plugins/geanyfunctions.h =================================================================== --- branches/sm/plugins/geanyfunctions.h 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/plugins/geanyfunctions.h 2011-05-21 09:01:55 UTC (rev 5811) @@ -74,6 +74,10 @@ geany_functions->p_document->document_get_notebook_page #define document_compare_by_display_name \ geany_functions->p_document->document_compare_by_display_name +#define document_compare_by_tab_order \ + geany_functions->p_document->document_compare_by_tab_order +#define document_compare_by_tab_order_reverse \ + geany_functions->p_document->document_compare_by_tab_order_reverse #define editor_get_indent_prefs \ geany_functions->p_editor->editor_get_indent_prefs #define editor_create_widget \ @@ -258,6 +262,8 @@ geany_functions->p_utils->utils_copy_environment #define utils_find_open_xml_tag \ geany_functions->p_utils->utils_find_open_xml_tag +#define utils_find_open_xml_tag_pos \ + geany_functions->p_utils->utils_find_open_xml_tag_pos #define ui_dialog_vbox_new \ geany_functions->p_ui->ui_dialog_vbox_new #define ui_frame_new_with_alignment \ Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/po/ChangeLog 2011-05-21 09:01:55 UTC (rev 5811) @@ -1,3 +1,9 @@ +2011-04-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sv.po: Update of Swedish translation. Thanks to Tony Mattsson for + providing the update. + + 2011-04-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Update of German translation. Modified: branches/sm/po/sv.po =================================================================== --- branches/sm/po/sv.po 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/po/sv.po 2011-05-21 09:01:55 UTC (rev 5811) @@ -8,7 +8,7 @@ "Project-Id-Version: Geany 0.20\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-11-01 10:53+0100\n" -"PO-Revision-Date: 2010-12-08 08:05+0100\n" +"PO-Revision-Date: 2011-04-20 12:21+0100\n" "Last-Translator: Tony Mattsson <superxorn(a)gmail.com>\n" "Language-Team: Swedish <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" @@ -236,7 +236,7 @@ #: ../src/build.c:1980 #: ../src/build.c:2015 msgid "Error Regular Expression:" -msgstr "Fel på \"Regular Expression\"" +msgstr "Fel på reguljärt uttryck" #: ../src/build.c:2008 msgid "Non-Filetype Commands" @@ -1344,7 +1344,7 @@ #: ../src/interface.c:805 msgid "_More" -msgstr "_More" +msgstr "_Mer" #: ../src/interface.c:812 #: ../src/keybindings.c:398 @@ -3820,11 +3820,11 @@ #: ../src/search.c:227 #: ../src/search.c:826 msgid "_Use regular expressions" -msgstr "Använd regular expressions" +msgstr "Använd reguljära uttryck" #: ../src/search.c:230 msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." -msgstr "Använd POSIX Regular Expressions. För mer information, se dokumentationen." +msgstr "Använd POSIX Reguljära uttryck. För mer information, se dokumentationen." #: ../src/search.c:237 msgid "Search _backwards" @@ -3854,7 +3854,7 @@ #: ../src/search.c:271 msgid "Match from s_tart of word" -msgstr "Sök från början av ord" +msgstr "Sök i början av ord" #: ../src/search.c:405 msgid "_Previous" @@ -3886,7 +3886,7 @@ #: ../src/search.c:455 #: ../src/search.c:632 msgid "In Sessi_on" -msgstr "I Session" +msgstr "I öppna dokument" #: ../src/search.c:460 #: ../src/search.c:637 Modified: branches/sm/src/document.c =================================================================== --- branches/sm/src/document.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/document.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -3055,3 +3055,63 @@ return result; } + + +/** Compares documents by their tab order. + * This matches @c GCompareFunc for use with e.g. @c g_ptr_array_sort(). + * + * @param a @c GeanyDocument**. + * @param b @c GeanyDocument**. + * @warning The arguments take the address of each document pointer. + * @return Negative value if a < b; zero if a = b; positive value if a > b. + * + * @since 0.21 (GEANY_API_VERSION 209) + */ +gint document_compare_by_tab_order(gconstpointer a, gconstpointer b) +{ + GeanyDocument *doc_a = *((GeanyDocument**) a); + GeanyDocument *doc_b = *((GeanyDocument**) b); + gint notebook_position_doc_a; + gint notebook_position_doc_b; + + notebook_position_doc_a = document_get_notebook_page(doc_a); + notebook_position_doc_b = document_get_notebook_page(doc_b); + + if (notebook_position_doc_a < notebook_position_doc_b) + return -1; + if (notebook_position_doc_a > notebook_position_doc_b) + return 1; + /* equality */ + return 0; +} + + +/** Compares documents by their tab order, in reverse order. + * This matches @c GCompareFunc for use with e.g. @c g_ptr_array_sort(). + * + * @param a @c GeanyDocument**. + * @param b @c GeanyDocument**. + * @warning The arguments take the address of each document pointer. + * @return Negative value if a < b; zero if a = b; positive value if a > b. + * + * @since 0.21 (GEANY_API_VERSION 209) + */ +gint document_compare_by_tab_order_reverse(gconstpointer a, gconstpointer b) +{ + GeanyDocument *doc_a = *((GeanyDocument**) a); + GeanyDocument *doc_b = *((GeanyDocument**) b); + gint notebook_position_doc_a; + gint notebook_position_doc_b; + + notebook_position_doc_a = document_get_notebook_page(doc_a); + notebook_position_doc_b = document_get_notebook_page(doc_b); + + if (notebook_position_doc_a < notebook_position_doc_b) + return 1; + if (notebook_position_doc_a > notebook_position_doc_b) + return -1; + /* equality */ + return 0; +} + + Modified: branches/sm/src/document.h =================================================================== --- branches/sm/src/document.h 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/document.h 2011-05-21 09:01:55 UTC (rev 5811) @@ -264,4 +264,8 @@ gint document_compare_by_display_name(gconstpointer a, gconstpointer b); +gint document_compare_by_tab_order(gconstpointer a, gconstpointer b); + +gint document_compare_by_tab_order_reverse(gconstpointer a, gconstpointer b); + #endif Modified: branches/sm/src/editor.c =================================================================== --- branches/sm/src/editor.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/editor.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -86,7 +86,7 @@ static gchar current_word[GEANY_MAX_WORD_LENGTH]; /* whether there is a tag list update pending */ -static gboolean document_tags_update_pending = FALSE; +static guint document_tags_update_source = 0; /* Initialised in keyfile.c. */ GeanyEditorPrefs editor_prefs; @@ -117,8 +117,8 @@ const gchar *wc, gboolean stem); static gsize count_indent_size(GeanyEditor *editor, const gchar *base_indent); static const gchar *snippets_find_completion_by_name(const gchar *type, const gchar *name); -static gssize snippets_make_replacements(GeanyEditor *editor, GString *pattern, - gsize indent_size); +static void snippets_make_replacements(GeanyEditor *editor, GString *pattern); +static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern); void editor_snippets_free(void) @@ -1008,19 +1008,17 @@ if (!main_status.quitting && DOC_VALID(doc)) document_update_tag_list(doc, TRUE); - document_tags_update_pending = FALSE; + document_tags_update_source = 0; return FALSE; } static void request_tag_list_update(GeanyDocument *doc) { - if (!document_tags_update_pending) - { - document_tags_update_pending = TRUE; - g_timeout_add_full(G_PRIORITY_LOW, editor_prefs.autocompletion_update_freq, - on_document_update_tags_idle, doc, NULL); - } + if (document_tags_update_source) + g_source_remove(document_tags_update_source); + document_tags_update_source = g_timeout_add_full(G_PRIORITY_LOW, + editor_prefs.autocompletion_update_freq, on_document_update_tags_idle, doc, NULL); } @@ -2289,76 +2287,98 @@ } -/* This is very ugly but passing the pattern to ac_replace_specials() doesn't work because it is - * modified when replacing a completion but the foreach function still passes the old pointer - * to ac_replace_specials, so we use a global pointer outside of ac_replace_specials and - * ac_complete_constructs. Any hints to improve this are welcome. */ -static GString *snippets_global_pattern = NULL; - static void snippets_replace_specials(gpointer key, gpointer value, gpointer user_data) { gchar *needle; + GString *pattern = user_data; g_return_if_fail(key != NULL); g_return_if_fail(value != NULL); needle = g_strconcat("%", (gchar*) key, "%", NULL); - utils_string_replace_all(snippets_global_pattern, needle, (gchar*) value); + utils_string_replace_all(pattern, needle, (gchar*) value); g_free(needle); } -/* this only works with spaces only indentation on the lines */ -static void fix_line_indents(GeanyEditor *editor, gint line_start, gint line_end) +static gboolean utils_regex_find(regex_t *regex, const gchar *haystack, gsize start, + gsize nmatches, regmatch_t *matches) { - ScintillaObject *sci = editor->sci; - gint line, cur_line, cur_col, pos; + gint eflags = 0; - /* get the line, col position as fixing indentation will move cursor to start of line */ - pos = sci_get_current_position(sci); - cur_col = sci_get_col_from_position(sci, pos); - cur_line = sci_get_current_line(sci); - - for (line = line_start; line <= line_end; line++) + if (start > 0) { - gint size = sci_get_line_indentation(sci, line); + gchar c = haystack[start - 1]; - /* set to 0 first to trigger proper indent creation */ - sci_set_line_indentation(sci, line, 0); - sci_set_line_indentation(sci, line, size); + if (c == '\n' || c == '\r') + eflags = REG_NOTBOL; } - pos = scintilla_send_message(sci, SCI_FINDCOLUMN, cur_line, cur_col); - sci_set_current_position(sci, pos, FALSE); + return regexec(regex, haystack + start, nmatches, matches, eflags) == 0; } -static void replace_leading_tabs(GString *str, const gchar *whitespace) +/* match_index: which match to replace, 0 for whole regex. + * note: this doesn't support backreferences in replacements */ +static guint utils_string_regex_replace_all(GString *haystack, + regex_t *regex, guint match_index, const gchar *replace) { - regex_t regex; gssize pos; - regmatch_t matches[2]; - gchar *ptr; + regmatch_t matches[10]; + guint ret = 0; - if (regcomp(&regex, "^ *(\t)", 0) != 0) + g_return_val_if_fail(match_index < 10, 0); + + /* ensure haystack->str is not null */ + if (haystack->len == 0) + return 0; + + pos = 0; + while (utils_regex_find(regex, haystack->str, pos, G_N_ELEMENTS(matches), matches)) { - g_return_if_fail(FALSE); + regmatch_t *match = &matches[match_index]; + + g_return_val_if_fail(match->rm_so >= 0, FALSE); + pos += match->rm_so; + pos = utils_string_replace(haystack, pos, match->rm_eo - match->rm_so, replace); + ret++; } - ptr = str->str; - while (ptr) + return ret; +} + + +static void fix_indentation(GeanyEditor *editor, GString *buf) +{ + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); + gchar *whitespace; + regex_t regex; + gint cflags = REG_EXTENDED | REG_NEWLINE; + + /* transform leading tabs into indent widths (in spaces) */ + whitespace = g_strnfill(iprefs->width, ' '); + regcomp(&regex, "^ *(\t)", cflags); + while (utils_string_regex_replace_all(buf, &regex, 1, whitespace)); + regfree(&regex); + + /* remaining tabs are for alignment */ + if (iprefs->type != GEANY_INDENT_TYPE_TABS) + utils_string_replace_all(buf, "\t", whitespace); + + /* use leading tabs */ + if (iprefs->type != GEANY_INDENT_TYPE_SPACES) { - if (regexec(&regex, ptr, - G_N_ELEMENTS(matches), matches, 0) != 0) - break; + gchar *str; - pos = matches[1].rm_so; - g_return_if_fail(pos >= 0); - pos += ptr - str->str; - g_string_erase(str, pos, 1); - g_string_insert(str, pos, whitespace); - ptr = str->str + pos + strlen(whitespace); + /* for tabs+spaces mode we want the real tab width, not indent width */ + setptr(whitespace, g_strnfill(sci_get_tab_width(editor->sci), ' ')); + str = g_strdup_printf("^\t*(%s)", whitespace); + + regcomp(&regex, str, cflags); + while (utils_string_regex_replace_all(buf, &regex, 1, "\t")); + regfree(&regex); + g_free(str); } - regfree(&regex); + g_free(whitespace); } @@ -2385,11 +2405,10 @@ { ScintillaObject *sci = editor->sci; gint line_start = sci_get_line_from_position(sci, insert_pos); - gint line_end; gchar *whitespace; GString *buf; const gchar *eol = editor_get_eol_char(editor); - const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); + gint idx; g_return_if_fail(text); g_return_if_fail(editor != NULL); @@ -2405,7 +2424,8 @@ /* count indent size up to insert_pos instead of asking sci * because there may be spaces after it */ gchar *tmp = sci_get_line(sci, line_start); - gint idx = insert_pos - sci_get_position_from_line(sci, line_start); + + idx = insert_pos - sci_get_position_from_line(sci, line_start); tmp[idx] = '\0'; newline_indent_size = count_indent_size(editor, tmp); g_free(tmp); @@ -2424,32 +2444,19 @@ if (replace_newlines) utils_string_replace_all(buf, "\n", eol); - /* transform leading tabs into indent widths (in spaces) */ - whitespace = g_strnfill(iprefs->width, ' '); - replace_leading_tabs(buf, whitespace); - /* remaining tabs are for alignment */ - if (iprefs->type != GEANY_INDENT_TYPE_TABS) - utils_string_replace_all(buf, "\t", whitespace); - g_free(whitespace); + fix_indentation(editor, buf); - sci_start_undo_action(sci); - - if (cursor_index >= 0) + idx = replace_cursor_markers(editor, buf); + if (idx >= 0) { - gint idx = utils_string_replace(buf, 0, -1, geany_cursor_marker, NULL); - sci_insert_text(sci, insert_pos, buf->str); sci_set_current_position(sci, insert_pos + idx, FALSE); } else sci_insert_text(sci, insert_pos, buf->str); - /* fixup indentation (very useful for Tabs & Spaces indent type) */ - line_end = sci_get_line_from_position(sci, insert_pos + buf->len); - fix_line_indents(editor, line_start, line_end); snippet_cursor_insert_pos = sci_get_current_position(sci); - sci_end_undo_action(sci); g_string_free(buf, TRUE); } @@ -2480,38 +2487,21 @@ } -static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern, gsize indent_size); - -static gssize snippets_make_replacements(GeanyEditor *editor, GString *pattern, gsize indent_size) +static void snippets_make_replacements(GeanyEditor *editor, GString *pattern) { - gchar *whitespace; GHashTable *specials; - const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); /* replace 'special' completions */ specials = g_hash_table_lookup(snippet_hash, "Special"); if (G_LIKELY(specials != NULL)) { - /* ugly hack using global_pattern */ - snippets_global_pattern = pattern; - g_hash_table_foreach(specials, snippets_replace_specials, NULL); + g_hash_table_foreach(specials, snippets_replace_specials, pattern); } /* now transform other wildcards */ - utils_string_replace_all(pattern, "%newline%", "\n"); + utils_string_replace_all(pattern, "%ws%", "\t"); - /* if spaces are used, replace tabs with spaces - * otherwise replace all %ws% by \t */ - if (iprefs->type == GEANY_INDENT_TYPE_SPACES) - utils_string_replace_all(pattern, "\t", "%ws%"); - else - utils_string_replace_all(pattern, "%ws%", "\t"); - - whitespace = g_strnfill(iprefs->width, ' '); /* use spaces for indentation, will be fixed up */ - utils_string_replace_all(pattern, "%ws%", whitespace); - g_free(whitespace); - /* replace %cursor% by a very unlikely string marker */ utils_string_replace_all(pattern, "%cursor%", geany_cursor_marker); @@ -2520,62 +2510,38 @@ /* replace any template {foo} wildcards */ templates_replace_common(pattern, editor->document->file_name, editor->document->file_type, NULL); - - return replace_cursor_markers(editor, pattern, indent_size); } -static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern, gsize indent_size) +static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern) { gssize cur_index = -1; - gint i, idx, nl_count = 0; + gint i; GList *temp_list = NULL; - gint cursor_steps, old_cursor = 0; + gint cursor_steps = 0, old_cursor = 0; i = 0; - idx = 0; - while ((cursor_steps = utils_strpos(pattern->str, geany_cursor_marker)) >= 0) + while (1) { - /* replace every newline (up to next cursor) with EOL, - * count newlines and update cursor_steps after */ - while (1) - { - idx = utils_string_replace(pattern, idx, cursor_steps, "\n", editor_get_eol_char(editor)); - if (idx == -1) - break; + cursor_steps = utils_string_find(pattern, cursor_steps, -1, geany_cursor_marker); + if (cursor_steps == -1) + break; - nl_count++; - idx += editor_get_eol_char_len(editor); + g_string_erase(pattern, cursor_steps, strlen(geany_cursor_marker)); - cursor_steps = utils_strpos(pattern->str, geany_cursor_marker); - } - utils_string_replace_first(pattern, geany_cursor_marker, ""); - idx = cursor_steps; - if (i++ > 0) { /* save the relative offset to each cursor position */ - cursor_steps += (nl_count * indent_size); temp_list = g_list_prepend(temp_list, GINT_TO_POINTER(cursor_steps - old_cursor)); } else { /* first cursor already includes newline positions */ - nl_count = 0; cur_index = cursor_steps; } old_cursor = cursor_steps; } - /* replace remaining \n which may occur after the last cursor */ - while (1) - { - idx = utils_string_replace(pattern, idx, -1, "\n", editor_get_eol_char(editor)); - if (idx == -1) - break; - idx += editor_get_eol_char_len(editor); - } - /* put the cursor positions for the most recent * parsed snippet first, followed by any remaining positions */ i = 0; @@ -5110,12 +5076,10 @@ */ void editor_insert_snippet(GeanyEditor *editor, gint pos, const gchar *snippet) { - gint cursor_pos; GString *pattern; pattern = g_string_new(snippet); - read_indent(editor, pos); - cursor_pos = snippets_make_replacements(editor, pattern, strlen(indent)); - editor_insert_text_block(editor, pattern->str, pos, cursor_pos, -1, FALSE); + snippets_make_replacements(editor, pattern); + editor_insert_text_block(editor, pattern->str, pos, -1, -1, FALSE); g_string_free(pattern, TRUE); } Modified: branches/sm/src/filetypes.c =================================================================== --- branches/sm/src/filetypes.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/filetypes.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -1248,22 +1248,30 @@ static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft) { - GKeyFile *src = g_key_file_new(); - gchar *f; + gchar *files[2]; + gboolean loaded = FALSE; + guint i; - f = filetypes_get_filename(ft, FALSE); - if (!g_file_test(f, G_FILE_TEST_EXISTS)) - f = filetypes_get_filename(ft, TRUE); + files[0] = filetypes_get_filename(ft, FALSE); + files[1] = filetypes_get_filename(ft, TRUE); - if (!g_key_file_load_from_file(src, f, G_KEY_FILE_NONE, NULL)) + for (i = 0; i < G_N_ELEMENTS(files); i++) { - geany_debug("Could not read config file %s for [%s=%s]!", f, group, ft->name); - g_free(f); - return; + GKeyFile *src = g_key_file_new(); + + if (g_key_file_load_from_file(src, files[i], G_KEY_FILE_NONE, NULL)) + { + add_keys(kf, group, src); + loaded = TRUE; + } + g_key_file_free(src); } - g_free(f); - add_keys(kf, group, src); + if (!loaded) + geany_debug("Could not read config file %s for [%s=%s]!", files[0], group, ft->name); + + g_free(files[0]); + g_free(files[1]); } Modified: branches/sm/src/plugindata.h =================================================================== --- branches/sm/src/plugindata.h 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/plugindata.h 2011-05-21 09:01:55 UTC (rev 5811) @@ -54,7 +54,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 208 +#define GEANY_API_VERSION 210 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ -311,6 +311,8 @@ gchar* (*document_get_basename_for_display) (struct GeanyDocument *doc, gint length); gint (*document_get_notebook_page) (struct GeanyDocument *doc); gint (*document_compare_by_display_name) (gconstpointer a, gconstpointer b); + gint (*document_compare_by_tab_order) (gconstpointer a, gconstpointer b); + gint (*document_compare_by_tab_order_reverse) (gconstpointer a, gconstpointer b); } DocumentFuncs; @@ -437,6 +439,7 @@ GError **error); gchar** (*utils_copy_environment)(const gchar **exclude_vars, const gchar *first_varname, ...); gchar* (*utils_find_open_xml_tag) (const gchar sel[], gint size); + const gchar* (*utils_find_open_xml_tag_pos) (const gchar sel[], gint size); } UtilsFuncs; Modified: branches/sm/src/plugins.c =================================================================== --- branches/sm/src/plugins.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/plugins.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -112,7 +112,9 @@ &document_get_status_color, &document_get_basename_for_display, &document_get_notebook_page, - &document_compare_by_display_name + &document_compare_by_display_name, + &document_compare_by_tab_order, + &document_compare_by_tab_order_reverse }; static EditorFuncs editor_funcs = { @@ -223,7 +225,8 @@ &utils_str_remove_chars, &utils_get_file_list_full, &utils_copy_environment, - &utils_find_open_xml_tag + &utils_find_open_xml_tag, + &utils_find_open_xml_tag_pos }; static UIUtilsFuncs uiutils_funcs = { Modified: branches/sm/src/templates.c =================================================================== --- branches/sm/src/templates.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/templates.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -104,27 +104,6 @@ } -/* TODO the callers should use GStrings instead of char arrays */ -static gchar *replace_all(gchar *text, const gchar *year, const gchar *date, const gchar *datetime) -{ - GString *str; - - if (text == NULL) - return NULL; - - str = g_string_new(text); - - g_free(text); - templates_replace_valist(str, - "{year}", year, - "{date}", date, - "{datetime}", datetime, - NULL); - - return g_string_free(str, FALSE); -} - - /* called when inserting templates into an existing document */ static void convert_eol_characters(GString *template, GeanyDocument *doc) { @@ -140,20 +119,14 @@ } -static void init_general_templates(const gchar *year, const gchar *date, const gchar *datetime) +static void init_general_templates(void) { - guint id; - /* read the contents */ read_template("fileheader", GEANY_TEMPLATE_FILEHEADER); read_template("gpl", GEANY_TEMPLATE_GPL); read_template("bsd", GEANY_TEMPLATE_BSD); read_template("function", GEANY_TEMPLATE_FUNCTION); read_template("changelog", GEANY_TEMPLATE_CHANGELOG); - - /* FIXME: we should replace the dates on insertion, not on loading */ - for (id = 0; id < GEANY_MAX_TEMPLATES; id++) - templates[id] = replace_all(templates[id], year, date, datetime); } @@ -344,17 +317,10 @@ /* warning: also called when reloading template settings */ void templates_init(void) { - gchar *year = utils_get_date_time(template_prefs.year_format, NULL); - gchar *date = utils_get_date_time(template_prefs.date_format, NULL); - gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); static gboolean init_done = FALSE; - init_general_templates(year, date, datetime); + init_general_templates(); - g_free(date); - g_free(datetime); - g_free(year); - create_file_template_menu(); /* we hold our own ref for the menu as it has no parent whilst being moved */ g_object_ref(new_with_template_menu); Modified: branches/sm/src/ui_utils.c =================================================================== --- branches/sm/src/ui_utils.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/ui_utils.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -2482,9 +2482,11 @@ { g_ptr_array_add(sorted_documents, documents[i]); } + if (compare_func == NULL) + compare_func = document_compare_by_tab_order; + /* and now sort it */ - if (compare_func != NULL) - g_ptr_array_sort(sorted_documents, compare_func); + g_ptr_array_sort(sorted_documents, compare_func); for (i = 0; i < sorted_documents->len; i++) { Modified: branches/sm/src/utils.c =================================================================== --- branches/sm/src/utils.c 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/utils.c 2011-05-21 09:01:55 UTC (rev 5811) @@ -288,13 +288,37 @@ } -/** Searches backward through @a size bytes looking for a '<', then returns the tag, if any. +/** Searches backward through @a size bytes looking for a '<'. * @param sel . * @param size . - * @return The tag name. + * @return The tag name (newly allocated) or @c NULL if no opening tag was found. */ gchar *utils_find_open_xml_tag(const gchar sel[], gint size) { + const gchar *cur, *begin; + gint len; + + cur = utils_find_open_xml_tag_pos(sel, size); + if (cur == NULL) + return NULL; + + cur++; /* skip the bracket */ + begin = cur; + while (strchr(":_-.", *cur) || isalnum(*cur)) + cur++; + + len = cur - begin; + return len ? g_strndup(begin, len) : NULL; +} + + +/** Searches backward through @a size bytes looking for a '<'. + * @param sel . + * @param size . + * @return pointer to '<' of the found opening tag within @a sel, or @c NULL if no opening tag was found. + */ +const gchar *utils_find_open_xml_tag_pos(const gchar sel[], gint size) +{ /* stolen from anjuta and modified */ const gchar *begin, *cur; @@ -322,28 +346,16 @@ { if (*cur == '<') break; + /* exit immediately if such non-valid XML/HTML is detected, e.g. "<script>if a >" */ else if (*cur == '>') break; --cur; } - if (*cur == '<') - { - GString *result; + /* if the found tag is an opening, not a closing tag or empty <> */ + if (*cur == '<' && *(cur + 1) != '/' && *(cur + 1) != '>') + return cur; - cur++; - if (*cur == '/') - return NULL; /* we found a closing tag */ - - result = g_string_sized_new(64); - while (strchr(":_-.", *cur) || isalnum(*cur)) - { - g_string_append_c(result, *cur); - cur++; - } - return g_string_free(result, FALSE); - } - return NULL; } @@ -1533,11 +1545,9 @@ } -/* Replaces needle if in range. - * end can be -1 for haystack->len. - * returns: position of replaced text or -1. */ -gint utils_string_replace(GString *haystack, gint start, gint end, - const gchar *needle, const gchar *replace) +/* end can be -1 for haystack->len. + * returns: position of found text or -1. */ +gint utils_string_find(GString *haystack, gint start, gint end, const gchar *needle) { gint pos; @@ -1561,14 +1571,22 @@ pos += start; if (pos >= end) return -1; - - g_string_erase(haystack, pos, strlen(needle)); - if (G_LIKELY(replace)) - g_string_insert(haystack, pos, replace); return pos; } +/* Replaces @len characters from offset @a pos. + * len can be -1 for str->len. + * returns: pos + strlen(replace). */ +gint utils_string_replace(GString *str, gint pos, gint len, const gchar *replace) +{ + g_string_erase(str, pos, len); + g_string_insert(str, pos, replace); + + return pos + strlen(replace); +} + + /** * Replaces all occurrences of @a needle in @a haystack with @a replace. * As of Geany 0.16, @a replace can match @a needle, so the following will work: @@ -1587,13 +1605,12 @@ while (1) { - pos = utils_string_replace(haystack, pos, -1, needle, replace); + pos = utils_string_find(haystack, pos, -1, needle); if (pos == -1) break; - if (replace) - pos += strlen(replace); + pos = utils_string_replace(haystack, pos, strlen(needle), replace); count++; } return count; @@ -1615,7 +1632,13 @@ */ guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace) { - return utils_string_replace(haystack, 0, -1, needle, replace) == -1 ? 0 : 1; + gint pos = utils_string_find(haystack, 0, -1, needle); + + if (pos == -1) + return 0; + + utils_string_replace(haystack, pos, strlen(needle), replace); + return 1; } Modified: branches/sm/src/utils.h =================================================================== --- branches/sm/src/utils.h 2011-05-21 09:00:53 UTC (rev 5810) +++ branches/sm/src/utils.h 2011-05-21 09:01:55 UTC (rev 5811) @@ -146,6 +146,8 @@ gchar *utils_find_open_xml_tag(const gchar sel[], gint size); +const gchar *utils_find_open_xml_tag_pos(const gchar sel[], gint size); + gboolean utils_is_short_html_tag(const gchar *tag_name); void utils_ensure_same_eol_characters(GString *string, gint target_eol_mode); @@ -172,9 +174,10 @@ gchar *utils_get_hostname(void); -gint utils_string_replace(GString *haystack, gint start, gint end, - const gchar *needle, const gchar *replace); +gint utils_string_find(GString *haystack, gint start, gint end, const gchar *needle); +gint utils_string_replace(GString *str, gint pos, gint len, const gchar *replace); + guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace); guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5810] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5810 http://geany.svn.sourceforge.net/geany/?rev=5810&view=rev Author: statc Date: 2011-05-21 09:00:53 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5708..5726) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/doc/pluginsignals.c branches/sm/plugins/geanyfunctions.h branches/sm/po/ChangeLog branches/sm/po/de.po branches/sm/src/document.c branches/sm/src/document.h branches/sm/src/editor.c branches/sm/src/filetypes.c branches/sm/src/keybindings.c branches/sm/src/keyfile.c branches/sm/src/plugindata.h branches/sm/src/plugins.c branches/sm/src/symbols.c branches/sm/src/templates.c branches/sm/src/toolbar.c branches/sm/src/ui_utils.c branches/sm/src/utils.c branches/sm/src/utils.h Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/ChangeLog 2011-05-21 09:00:53 UTC (rev 5810) @@ -1,3 +1,54 @@ +2011-04-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/utils.h, src/editor.c: + Add function utils_string_replace() to replace in a fixed range. + Remove utils_string_replace_helper() and update cursor marker code. + + +2011-04-14 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Fix snippets bug: {ob}pc{cb} replaced by '%' instead of {pc}. + Refactor snippets_make_replacements() using geany_cursor_marker. + + +2011-04-13 Colomban Wendling <colomban(at)geany(dot)org> + + * src/editor.c: + Avoid triggering autocompletion on PHP open tags (closes #3199442). + + +2011-04-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Update dox for document_compare_by_display_name() with warning + about parameter addresses. + * src/document.h: + Use brackets for DOC_FILENAME() macro 'doc' argument. + * src/templates.c, src/utils.c, src/toolbar.c, src/utils.h, + src/keyfile.c, src/filetypes.c, src/editor.c, src/symbols.c: + Make utils_build_path() return a copy for safety. + * src/keybindings.c: + Fix Ctrl-Shift-[CV] keybindings to work outside the VTE. + + +2011-04-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Fix wrong casting of array pointers, thanks Nick. + * src/plugindata.h, src/callbacks.c, src/document.c, src/plugins.c, + src/document.h: + Rename document_sort_by_display_name() into + document_compare_by_display_name(), thanks again Nick. + + +2011-04-11 Colomban Wendling <colomban(at)geany(dot)org> + + * src/document.c, src/document.h, src/editor.c, src/keybindings.c: + Revert r5642 "Don't update parent WorkObjects when updating one in + real-time" because it broke calltips. + + 2011-04-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/filebrowser.c: @@ -11,6 +62,8 @@ * src/filetypes.c, src/filetypes.h: Refactor with filetypes_get_filename(). Make filetypes_get_conf_extension() static. + * src/utils.c, src/utils.h, src/filetypes.c: + Make utils_make_filename() return a copy for safety. 2011-04-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> @@ -31,7 +84,7 @@ 2011-04-08 Colomban Wendling <colomban(at)geany(dot)org> * scintilla/lexers/LexCPP.cxx: - Make hightlighting of triple-quoted verbatim an option (Backport + Make highlighting of triple-quoted verbatim an option (Backport from Scintilla HG 3602:5536ed81a85b). * src/highlighting.c: Add highlight for triple-quoted verbatims. Modified: branches/sm/doc/pluginsignals.c =================================================================== --- branches/sm/doc/pluginsignals.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/doc/pluginsignals.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -64,8 +64,6 @@ /** Sent when a new document is created. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the new document. * @param user_data user data. @@ -74,8 +72,6 @@ /** Sent when a new document is opened. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the opened document. * @param user_data user data. @@ -84,8 +80,6 @@ /** Sent when an existing document is reloaded. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the re-opened document. * @param user_data user data. @@ -96,8 +90,6 @@ /** Sent before a document is saved. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the document to be saved. * @param user_data user data. @@ -106,8 +98,6 @@ /** Sent when a new document is saved. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the saved document. * @param user_data user data. @@ -130,8 +120,6 @@ /** Sent when switching notebook pages. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the current document. * @param user_data user data. @@ -140,8 +128,6 @@ /** Sent before closing a document. * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param doc the document about to be closed. * @param user_data user data. @@ -215,8 +201,6 @@ * @note You can add menu items from @c plugin_init() using @c geany->main_widgets->editor_menu, * remembering to destroy them in @c plugin_cleanup(). * - * You need to include "document.h" for the declaration of GeanyDocument. - * * @param obj a GeanyObject instance, should be ignored. * @param word the current word (in UTF-8 encoding) below the cursor position where the popup menu will be opened. @@ -250,9 +234,6 @@ * care about the return value; make sure to return TRUE only if it is necessary * and in the correct situations. * - * You need to include "editor.h" for the declaration of GeanyEditor and "Scintilla.h" for - * SCNotification. - * * @param obj a GeanyObject instance, should be ignored. * @param editor The current GeanyEditor. * @param nt A pointer to the SCNotification struct which holds additional information for Modified: branches/sm/plugins/geanyfunctions.h =================================================================== --- branches/sm/plugins/geanyfunctions.h 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/plugins/geanyfunctions.h 2011-05-21 09:00:53 UTC (rev 5810) @@ -72,8 +72,8 @@ geany_functions->p_document->document_get_basename_for_display #define document_get_notebook_page \ geany_functions->p_document->document_get_notebook_page -#define document_sort_by_display_name \ - geany_functions->p_document->document_sort_by_display_name +#define document_compare_by_display_name \ + geany_functions->p_document->document_compare_by_display_name #define editor_get_indent_prefs \ geany_functions->p_editor->editor_get_indent_prefs #define editor_create_widget \ Modified: branches/sm/po/ChangeLog =================================================================== --- branches/sm/po/ChangeLog 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/po/ChangeLog 2011-05-21 09:00:53 UTC (rev 5810) @@ -1,3 +1,8 @@ +2011-04-12 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of German translation. + + 2011-04-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Update of German translation. Modified: branches/sm/po/de.po =================================================================== --- branches/sm/po/de.po 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/po/de.po 2011-05-21 09:00:53 UTC (rev 5810) @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-03 12:46+0200\n" -"PO-Revision-Date: 2011-04-03 12:49+0100\n" +"POT-Creation-Date: 2011-04-12 23:12+0200\n" +"PO-Revision-Date: 2011-04-12 23:13+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -38,67 +38,67 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" -#: ../src/about.c:154 +#: ../src/about.c:155 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:204 +#: ../src/about.c:205 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:225 +#: ../src/about.c:226 #, c-format msgid "(built on or after %s)" msgstr "(kompiliert am %s oder später)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:256 +#: ../src/about.c:257 msgid "Info" msgstr "Info" -#: ../src/about.c:272 +#: ../src/about.c:273 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:281 +#: ../src/about.c:282 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:289 -#: ../src/about.c:297 +#: ../src/about.c:290 +#: ../src/about.c:298 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:305 +#: ../src/about.c:306 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:314 +#: ../src/about.c:315 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:334 +#: ../src/about.c:335 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:355 +#: ../src/about.c:356 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:365 +#: ../src/about.c:366 #, c-format msgid "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:391 +#: ../src/about.c:392 msgid "Credits" msgstr "Credits" -#: ../src/about.c:405 +#: ../src/about.c:406 msgid "License" msgstr "Lizenz" -#: ../src/about.c:414 +#: ../src/about.c:415 msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." @@ -119,7 +119,7 @@ #: ../src/build.c:739 #: ../src/build.c:961 -#: ../src/search.c:1542 +#: ../src/search.c:1522 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -212,7 +212,7 @@ #: ../src/build.c:1846 #: ../src/symbols.c:732 -#: ../src/tools.c:509 +#: ../src/tools.c:534 msgid "Command" msgstr "Kommando" @@ -317,7 +317,7 @@ msgstr[1] "%d Dateien gespeichert." #: ../src/callbacks.c:490 -#: ../src/document.c:2900 +#: ../src/document.c:2903 #: ../src/interface.c:381 #: ../src/sidebar.c:687 msgid "_Reload" @@ -516,24 +516,24 @@ msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter." #: ../src/dialogs.c:660 -#: ../src/win32.c:681 +#: ../src/win32.c:679 msgid "Error" msgstr "Fehler" #: ../src/dialogs.c:663 #: ../src/dialogs.c:1546 -#: ../src/win32.c:687 -#: ../src/win32.c:746 +#: ../src/win32.c:685 +#: ../src/win32.c:744 msgid "Question" msgstr "Frage" #: ../src/dialogs.c:666 -#: ../src/win32.c:693 +#: ../src/win32.c:691 msgid "Warning" msgstr "Warnung" #: ../src/dialogs.c:669 -#: ../src/win32.c:699 +#: ../src/win32.c:697 msgid "Information" msgstr "Information" @@ -564,9 +564,9 @@ #: ../src/dialogs.c:1185 #: ../src/dialogs.c:1186 #: ../src/dialogs.c:1187 -#: ../src/symbols.c:1980 -#: ../src/symbols.c:2001 -#: ../src/symbols.c:2053 +#: ../src/symbols.c:1993 +#: ../src/symbols.c:2014 +#: ../src/symbols.c:2066 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "unbekannt" @@ -664,7 +664,7 @@ msgstr "Neue Datei »%s« geöffnet." #: ../src/document.c:845 -#: ../src/document.c:1370 +#: ../src/document.c:1373 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." @@ -713,11 +713,11 @@ msgstr "Setze Einrückungsbreite auf %d für »%s«." #: ../src/document.c:1145 -#: ../src/document.c:1743 +#: ../src/document.c:1746 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1260 +#: ../src/document.c:1259 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." @@ -725,25 +725,25 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1265 +#: ../src/document.c:1267 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1267 +#: ../src/document.c:1269 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1464 +#: ../src/document.c:1467 msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1551 +#: ../src/document.c:1554 #, c-format msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird nicht gespeichert." -#: ../src/document.c:1573 +#: ../src/document.c:1576 #, c-format msgid "" "Error message: %s\n" @@ -752,33 +752,33 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1578 +#: ../src/document.c:1581 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1628 +#: ../src/document.c:1631 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" -#: ../src/document.c:1646 +#: ../src/document.c:1649 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" -#: ../src/document.c:1660 +#: ../src/document.c:1663 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1743 -#: ../src/document.c:1808 +#: ../src/document.c:1746 +#: ../src/document.c:1811 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1813 +#: ../src/document.c:1816 #, c-format msgid "" "%s\n" @@ -789,76 +789,76 @@ "\n" "Die Datei ist möglicherweise nicht vollständig auf der Festplatte gespeichert" -#: ../src/document.c:1815 +#: ../src/document.c:1818 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1839 +#: ../src/document.c:1842 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1916 -#: ../src/document.c:1973 -#: ../src/document.c:1981 +#: ../src/document.c:1919 +#: ../src/document.c:1976 +#: ../src/document.c:1984 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:1981 +#: ../src/document.c:1984 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2060 -#: ../src/search.c:1203 -#: ../src/search.c:1247 -#: ../src/search.c:1938 -#: ../src/search.c:1939 +#: ../src/document.c:2063 +#: ../src/search.c:1183 +#: ../src/search.c:1227 +#: ../src/search.c:1918 +#: ../src/search.c:1919 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2071 -#: ../src/document.c:2080 +#: ../src/document.c:2074 +#: ../src/document.c:2083 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:2901 +#: ../src/document.c:2904 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2902 +#: ../src/document.c:2905 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." -#: ../src/document.c:2920 +#: ../src/document.c:2923 msgid "Close _without saving" msgstr "Schließen _ohne Speichern" -#: ../src/document.c:2923 +#: ../src/document.c:2926 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2924 +#: ../src/document.c:2927 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4382 +#: ../src/editor.c:4387 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4383 +#: ../src/editor.c:4388 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen." -#: ../src/editor.c:4533 +#: ../src/editor.c:4534 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -1017,87 +1017,87 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:81 -#: ../src/filetypes.c:163 -#: ../src/filetypes.c:177 -#: ../src/filetypes.c:185 -#: ../src/filetypes.c:199 +#: ../src/filetypes.c:83 +#: ../src/filetypes.c:165 +#: ../src/filetypes.c:179 +#: ../src/filetypes.c:187 +#: ../src/filetypes.c:201 #, c-format msgid "%s source file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:82 +#: ../src/filetypes.c:84 #, c-format msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:100 -#: ../src/filetypes.c:1669 +#: ../src/filetypes.c:102 +#: ../src/filetypes.c:1682 #: ../src/interface.c:3874 #: ../src/interface.c:5524 msgid "None" msgstr "Keiner" -#: ../src/filetypes.c:300 +#: ../src/filetypes.c:302 msgid "Shell script file" msgstr "Shellskript Datei" -#: ../src/filetypes.c:308 +#: ../src/filetypes.c:310 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:315 +#: ../src/filetypes.c:317 msgid "XML document" msgstr "XML-Dokument" -#: ../src/filetypes.c:339 +#: ../src/filetypes.c:341 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:347 +#: ../src/filetypes.c:349 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: ../src/filetypes.c:406 +#: ../src/filetypes.c:408 msgid "Config file" msgstr "Konfigurationsdatei" -#: ../src/filetypes.c:412 +#: ../src/filetypes.c:414 msgid "Gettext translation file" msgstr "Gettext-Übersetzungsdatei" -#: ../src/filetypes.c:435 +#: ../src/filetypes.c:437 #, c-format msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:691 +#: ../src/filetypes.c:693 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:692 +#: ../src/filetypes.c:694 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:693 +#: ../src/filetypes.c:695 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:694 +#: ../src/filetypes.c:696 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:695 +#: ../src/filetypes.c:697 msgid "_Custom Filetypes" msgstr "_Benutzerdefinierte Dateitypen" -#: ../src/filetypes.c:1397 +#: ../src/filetypes.c:1410 #: ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1422 +#: ../src/filetypes.c:1435 #: ../src/project.c:293 #: ../src/win32.c:95 #: ../src/win32.c:143 @@ -1105,7 +1105,7 @@ msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1480 +#: ../src/filetypes.c:1493 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1114,19 +1114,19 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:3621 +#: ../src/highlighting.c:3623 #: ../src/main.c:818 #: ../src/socket.c:165 -#: ../src/templates.c:258 +#: ../src/templates.c:253 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." -#: ../src/highlighting.c:3641 +#: ../src/highlighting.c:3643 msgid "_Default" msgstr "_Standard" -#: ../src/highlighting.c:3682 +#: ../src/highlighting.c:3684 msgid "_Color Schemes" msgstr "_Farbschemata" @@ -1350,7 +1350,7 @@ msgstr "In _Dateien suchen" #: ../src/interface.c:768 -#: ../src/search.c:620 +#: ../src/search.c:619 msgid "_Replace" msgstr "_Ersetzen" @@ -1443,7 +1443,7 @@ #: ../src/interface.c:4310 #: ../src/interface.c:5654 #: ../src/keybindings.c:253 -#: ../src/prefs.c:1557 +#: ../src/prefs.c:1560 msgid "Editor" msgstr "Editor" @@ -1619,11 +1619,11 @@ msgid "_Close" msgstr "S_chließen" -#: ../src/interface.c:1218 +#: ../src/interface.c:1209 msgid "_Apply Default Indentation" msgstr "_Standardeinrückung anwenden" -#: ../src/interface.c:1221 +#: ../src/interface.c:1212 msgid "Apply the default indentation settings to all documents" msgstr "Wende die Standardeinreckü" @@ -1889,7 +1889,7 @@ #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. #: ../src/interface.c:3206 -#: ../src/prefs.c:1551 +#: ../src/prefs.c:1554 msgid "General" msgstr "Allgemein" @@ -1977,7 +1977,7 @@ #: ../src/interface.c:3376 #: ../src/interface.c:3711 -#: ../src/prefs.c:1553 +#: ../src/prefs.c:1556 msgid "Interface" msgstr "Schnittstelle" @@ -2111,7 +2111,7 @@ msgstr "Werkzeugleiste" #: ../src/interface.c:3707 -#: ../src/prefs.c:1555 +#: ../src/prefs.c:1558 msgid "Toolbar" msgstr "Werkzeugleiste" @@ -2484,7 +2484,7 @@ #: ../src/interface.c:4223 #: ../src/toolbar.c:72 -#: ../src/tools.c:916 +#: ../src/tools.c:941 #: ../src/vte.c:794 #: ../src/vte.c:801 msgid "Color Chooser" @@ -2650,9 +2650,9 @@ msgstr "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 deaktiviert die Funktion." #: ../src/interface.c:4525 -#: ../src/prefs.c:1559 +#: ../src/prefs.c:1562 #: ../src/symbols.c:682 -#: ../plugins/filebrowser.c:1118 +#: ../plugins/filebrowser.c:1130 msgid "Files" msgstr "Dateien" @@ -2695,7 +2695,7 @@ #: ../src/interface.c:4679 #: ../src/keybindings.c:559 -#: ../src/prefs.c:1561 +#: ../src/prefs.c:1564 msgid "Tools" msgstr "Werkzeuge" @@ -2768,7 +2768,7 @@ msgstr "Daten für Vorlagen:" #: ../src/interface.c:4829 -#: ../src/prefs.c:1563 +#: ../src/prefs.c:1566 msgid "Templates" msgstr "Vorlagen" @@ -2781,7 +2781,7 @@ msgstr "Tastaturkürzel" #: ../src/interface.c:4876 -#: ../src/prefs.c:1565 +#: ../src/prefs.c:1568 msgid "Keybindings" msgstr "Tastenkürzel" @@ -2856,7 +2856,7 @@ msgstr "Drucken" #: ../src/interface.c:5007 -#: ../src/prefs.c:1567 +#: ../src/prefs.c:1570 msgid "Printing" msgstr "Drucken" @@ -2877,7 +2877,7 @@ msgstr "Benutze globale Einstellungen" #: ../src/keybindings.c:220 -#: ../src/plugins.c:1212 +#: ../src/plugins.c:1214 #: ../src/symbols.c:709 msgid "File" msgstr "Datei" @@ -3106,7 +3106,7 @@ msgstr "Suchen" #: ../src/keybindings.c:392 -#: ../src/search.c:453 +#: ../src/search.c:452 msgid "Find" msgstr "Suchen" @@ -3119,12 +3119,12 @@ msgstr "Vorheriges" #: ../src/keybindings.c:403 -#: ../src/search.c:610 +#: ../src/search.c:609 msgid "Replace" msgstr "Ersetzen" #: ../src/keybindings.c:405 -#: ../src/search.c:783 +#: ../src/search.c:782 msgid "Find in Files" msgstr "In Dateien suchen" @@ -3407,11 +3407,11 @@ msgid "Switch to Document" msgstr "Zum Dokument wechseln" -#: ../src/keyfile.c:860 +#: ../src/keyfile.c:883 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1065 +#: ../src/keyfile.c:1088 msgid "Failed to load one or more session files." msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." @@ -3537,17 +3537,17 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:1069 +#: ../src/main.c:1068 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:1071 +#: ../src/main.c:1070 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1285 +#: ../src/main.c:1288 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." @@ -3572,16 +3572,16 @@ msgid "Could not find file '%s' - trying the current document path." msgstr "Konnte die Datei »%s« nicht finden - Versuche den aktuellen Dokumentenpfad." -#: ../src/plugins.c:482 +#: ../src/plugins.c:484 #, c-format msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." msgstr "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu kompilieren." -#: ../src/plugins.c:960 +#: ../src/plugins.c:962 msgid "_Plugin Manager" msgstr "_Plugin-Verwaltung" -#: ../src/plugins.c:1124 +#: ../src/plugins.c:1126 #, c-format msgid "" "Plugin: %s %s\n" @@ -3592,27 +3592,27 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:1200 +#: ../src/plugins.c:1202 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1206 +#: ../src/plugins.c:1208 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1230 +#: ../src/plugins.c:1232 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1310 +#: ../src/plugins.c:1312 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1330 +#: ../src/plugins.c:1332 msgid "Choose which plugins should be loaded at startup:" msgstr "Plugins, die beim Starten geladen werden sollen:" -#: ../src/plugins.c:1342 +#: ../src/plugins.c:1344 msgid "Plugin details:" msgstr "Plugindetails" @@ -3620,51 +3620,51 @@ msgid "Configure Plugins" msgstr "Plugins konfigurieren" -#: ../src/prefs.c:163 +#: ../src/prefs.c:165 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:169 +#: ../src/prefs.c:171 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:209 -#: ../src/symbols.c:2122 +#: ../src/prefs.c:211 +#: ../src/symbols.c:2135 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:214 -#: ../src/symbols.c:2127 +#: ../src/prefs.c:216 +#: ../src/symbols.c:2140 msgid "_Collapse All" msgstr "Alle _einklappen" -#: ../src/prefs.c:273 +#: ../src/prefs.c:275 msgid "Action" msgstr "Aktion" -#: ../src/prefs.c:278 +#: ../src/prefs.c:279 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1435 +#: ../src/prefs.c:1438 msgid "_Allow" msgstr "_Zulassen" -#: ../src/prefs.c:1437 +#: ../src/prefs.c:1440 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1438 +#: ../src/prefs.c:1441 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1439 +#: ../src/prefs.c:1442 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für »%s« verwendet." -#: ../src/prefs.c:1569 +#: ../src/prefs.c:1572 #: ../src/vte.c:283 #: ../src/vte.c:752 #: ../src/vte.c:757 @@ -3673,33 +3673,33 @@ #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1642 +#: ../src/prefs.c:1645 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an. Programme die nicht benötigt werden, können freigelassen werden." #. page Templates -#: ../src/prefs.c:1647 +#: ../src/prefs.c:1650 msgid "Set the information to be used in templates. See the documentation for details." msgstr "" "Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" "Konsultieren Sie die Dokumentation, um mehr über die Funktionsweise von Vorlagen zu erfahren." -#: ../src/prefs.c:1651 +#: ../src/prefs.c:1654 msgid "Notice: For all changes you make here to take effect, you need to restart Geany or force the reload of the settings using Tools->Reload Configuration." msgstr "Damit die hier gemachten Änderungen an den Einstellungen wirksam werden, muss Geany neu gestartet werden oder rufen Sie »Werkzeuge->Einstellungen erneut laden« auf." #. page Keybindings -#: ../src/prefs.c:1657 +#: ../src/prefs.c:1660 msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." msgstr "Hier können die Tastenkombinationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können Sie die Tastenkombinationen auch direkt eingeben." #. page Printing -#: ../src/prefs.c:1662 +#: ../src/prefs.c:1665 msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." msgstr "GTK-Druckunterstützung ist nur verfügbar wenn Geany mit GTK 2.10 (oder neuer) kompiliert wurde und Geany mit GTK 2.10 (oder neuer) ausgeführt wird." #. page Editor->Indentation -#: ../src/prefs.c:1668 +#: ../src/prefs.c:1671 msgid "Warning: these settings are overridden by the current project. See Project->Properties." msgstr "Hinweis: Diese Einstellungen werden überschrieben mit denen des aktuellen Projekts. Siehe Projekt->Einstellungen." @@ -3906,24 +3906,24 @@ msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." -#: ../src/search.c:282 -#: ../src/search.c:885 +#: ../src/search.c:281 +#: ../src/search.c:884 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke _benutzen" -#: ../src/search.c:285 +#: ../src/search.c:284 msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke konsultieren Sie bitte die Dokumentation." -#: ../src/search.c:292 +#: ../src/search.c:291 msgid "Search _backwards" msgstr "_Rückwärts suchen" -#: ../src/search.c:305 +#: ../src/search.c:304 msgid "Use _escape sequences" msgstr "S_onderzeichen maskieren" -#: ../src/search.c:309 +#: ../src/search.c:308 msgid "" "Replace \\\\, \\t, \\n" ", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters" @@ -3931,186 +3931,186 @@ "Ersetzt \\\\, \\t, \\n" ", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Sonderzeichen" -#: ../src/search.c:318 -#: ../src/search.c:894 +#: ../src/search.c:317 +#: ../src/search.c:893 msgid "C_ase sensitive" msgstr "_Groß-/Kleinschreibung beachten" -#: ../src/search.c:322 -#: ../src/search.c:899 +#: ../src/search.c:321 +#: ../src/search.c:898 msgid "Match only a _whole word" msgstr "N_ur ganze Wörter finden" -#: ../src/search.c:326 +#: ../src/search.c:325 msgid "Match from s_tart of word" msgstr "_Wortanfänge finden" -#: ../src/search.c:460 +#: ../src/search.c:459 msgid "_Previous" msgstr "_Vorheriges" -#: ../src/search.c:465 +#: ../src/search.c:464 msgid "_Next" msgstr "_Nächstes" -#: ../src/search.c:469 -#: ../src/search.c:631 -#: ../src/search.c:793 +#: ../src/search.c:468 +#: ../src/search.c:630 +#: ../src/search.c:792 msgid "_Search for:" msgstr "Suc_he nach:" #. Now add the multiple match options -#: ../src/search.c:499 +#: ../src/search.c:498 msgid "_Find All" msgstr "_Alle finden" -#: ../src/search.c:506 +#: ../src/search.c:505 msgid "_Mark" msgstr "_Markieren" -#: ../src/search.c:508 +#: ../src/search.c:507 msgid "Mark all matches in the current document" msgstr "Markiert alle Treffer innerhalb des aktuellen Dokumentes" -#: ../src/search.c:513 -#: ../src/search.c:690 +#: ../src/search.c:512 +#: ../src/search.c:689 msgid "In Sessi_on" msgstr "In Sit_zung" -#: ../src/search.c:518 -#: ../src/search.c:695 +#: ../src/search.c:517 +#: ../src/search.c:694 msgid "_In Document" msgstr "_Im Dokument" #. close window checkbox -#: ../src/search.c:524 -#: ../src/search.c:708 +#: ../src/search.c:523 +#: ../src/search.c:707 msgid "Close _dialog" msgstr "_Diesen Dialog schließen" -#: ../src/search.c:528 -#: ../src/search.c:712 +#: ../src/search.c:527 +#: ../src/search.c:711 msgid "Disable this option to keep the dialog open" msgstr "Deaktivieren Sie diese Option um das Dialogfenster offen zu halten." -#: ../src/search.c:625 +#: ../src/search.c:624 msgid "Replace & Fi_nd" msgstr "Ersetzen und _Finden" -#: ../src/search.c:634 +#: ../src/search.c:633 msgid "Replace wit_h:" msgstr "Erse_tzen durch:" #. Now add the multiple replace options -#: ../src/search.c:683 +#: ../src/search.c:682 msgid "Re_place All" msgstr "_Alle ersetzen" -#: ../src/search.c:700 +#: ../src/search.c:699 msgid "In Se_lection" msgstr "I_n Auswahl" -#: ../src/search.c:702 +#: ../src/search.c:701 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: ../src/search.c:813 +#: ../src/search.c:812 msgid "Fi_les:" msgstr "Fi_lter:" -#: ../src/search.c:827 +#: ../src/search.c:826 msgid "File patterns, e.g. *.c *.h" msgstr "Dateinamensmuster, z.B. *.c *.h" -#: ../src/search.c:839 +#: ../src/search.c:838 msgid "_Directory:" msgstr "_Verzeichnis:" -#: ../src/search.c:858 +#: ../src/search.c:857 msgid "E_ncoding:" msgstr "_Kodierung" -#: ../src/search.c:888 +#: ../src/search.c:887 msgid "See grep's manual page for more information" msgstr "Für mehr Informationen konsultieren Sie bitte die Dokumentation von »grep«" -#: ../src/search.c:890 +#: ../src/search.c:889 msgid "_Recurse in subfolders" msgstr "_In Unterverzeichnissen" -#: ../src/search.c:903 +#: ../src/search.c:902 msgid "_Invert search results" msgstr "Su_chmuster umkehren" -#: ../src/search.c:907 +#: ../src/search.c:906 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Invertiert die Trefferliste" -#: ../src/search.c:924 +#: ../src/search.c:923 msgid "E_xtra options:" msgstr "_Zus. Optionen:" -#: ../src/search.c:931 +#: ../src/search.c:930 msgid "Other options to pass to Grep" msgstr "Andere Argumente, die an grep übergeben werden sollen" -#: ../src/search.c:1206 -#: ../src/search.c:1944 -#: ../src/search.c:1947 +#: ../src/search.c:1186 +#: ../src/search.c:1924 +#: ../src/search.c:1927 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "%d Treffer für »%s« gefunden." msgstr[1] "%d Treffer für »%s« gefunden." -#: ../src/search.c:1253 +#: ../src/search.c:1233 #, c-format msgid "Replaced %u matches in %u documents." msgstr "%u Treffer in %u Dokumenten ersetzt" -#: ../src/search.c:1434 +#: ../src/search.c:1414 msgid "Invalid directory for find in files." msgstr "Ungültiges Verzeichnis." -#: ../src/search.c:1455 +#: ../src/search.c:1435 msgid "No text to find." msgstr "Kein Text zum Suchen angegeben." -#: ../src/search.c:1482 +#: ../src/search.c:1462 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Konnte das grep Kommando »%s« nicht finden (Pfad zum Grep Kommando in den Einstellungen überprüfen)." -#: ../src/search.c:1550 +#: ../src/search.c:1530 msgid "Searching..." msgstr "Suchen..." -#: ../src/search.c:1561 +#: ../src/search.c:1541 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (im Verzeichnis: %s)" -#: ../src/search.c:1589 +#: ../src/search.c:1569 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: ../src/search.c:1664 +#: ../src/search.c:1644 msgid "Search failed." msgstr "Suche fehlgeschlagen." -#: ../src/search.c:1684 +#: ../src/search.c:1664 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Such mit %d Treffer abgeschlossen." msgstr[1] "Such mit %d Treffern abgeschlossen." -#: ../src/search.c:1692 +#: ../src/search.c:1672 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: ../src/search.c:1724 +#: ../src/search.c:1704 #, c-format msgid "Bad regex: %s" msgstr "Fehler in Ausdruck: %s" @@ -4163,13 +4163,14 @@ #: ../src/symbols.c:902 #: ../src/symbols.c:914 #: ../src/symbols.c:929 -#: ../src/symbols.c:974 +#: ../src/symbols.c:958 +#: ../src/symbols.c:987 msgid "Other" msgstr "Sonstiges" #: ../src/symbols.c:700 #: ../src/symbols.c:922 -#: ../src/symbols.c:954 +#: ../src/symbols.c:967 msgid "Module" msgstr "Modul" @@ -4197,7 +4198,8 @@ #: ../src/symbols.c:886 #: ../src/symbols.c:909 #: ../src/symbols.c:924 -#: ../src/symbols.c:961 +#: ../src/symbols.c:952 +#: ../src/symbols.c:974 msgid "Functions" msgstr "Funktionen" @@ -4235,7 +4237,7 @@ #: ../src/symbols.c:901 #: ../src/symbols.c:910 #: ../src/symbols.c:926 -#: ../src/symbols.c:973 +#: ../src/symbols.c:986 msgid "Variables" msgstr "Variablen" @@ -4293,7 +4295,7 @@ #: ../src/symbols.c:873 #: ../src/symbols.c:885 #: ../src/symbols.c:898 -#: ../src/symbols.c:960 +#: ../src/symbols.c:973 msgid "Classes" msgstr "Klassen" @@ -4339,11 +4341,12 @@ msgstr "Methoden" #: ../src/symbols.c:825 -#: ../src/symbols.c:957 +#: ../src/symbols.c:970 msgid "Namespaces" msgstr "Namensräume" #: ../src/symbols.c:828 +#: ../src/symbols.c:953 msgid "Procedures" msgstr "Prozeduren" @@ -4380,7 +4383,7 @@ msgstr "Funktionen" #: ../src/symbols.c:875 -#: ../src/symbols.c:962 +#: ../src/symbols.c:975 msgid "Members" msgstr "Instanzvariablen" @@ -4394,7 +4397,7 @@ #: ../src/symbols.c:937 #: ../src/symbols.c:946 -#: ../src/symbols.c:970 +#: ../src/symbols.c:983 msgid "Macros" msgstr "Makros" @@ -4406,25 +4409,41 @@ msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:963 +#: ../src/symbols.c:954 +msgid "Indexes" +msgstr "Indizies" + +#: ../src/symbols.c:955 +msgid "Tables" +msgstr "Tabellen" + +#: ../src/symbols.c:956 +msgid "Triggers" +msgstr "Trigger" + +#: ../src/symbols.c:957 +msgid "Views" +msgstr "Ansichten" + +#: ../src/symbols.c:976 msgid "Structs" msgstr "Strukturen" -#: ../src/symbols.c:964 +#: ../src/symbols.c:977 msgid "Typedefs / Enums" msgstr "Typendefinition und Enumerates" -#: ../src/symbols.c:1600 +#: ../src/symbols.c:1613 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateierweiterung für »%s«.\n" -#: ../src/symbols.c:1624 +#: ../src/symbols.c:1637 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Die Tag-Datei konnte nicht erstellt werden, möglicherweise konnten keine Tags gefunden werden.\n" -#: ../src/symbols.c:1631 +#: ../src/symbols.c:1644 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4433,7 +4452,7 @@ "Verwendung: %s -g <Tag-Datei> <Datei-Liste>\n" "\n" -#: ../src/symbols.c:1632 +#: ../src/symbols.c:1645 #, c-format msgid "" "Example:\n" @@ -4442,44 +4461,44 @@ "Beispiel:\n" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/gtk/gtk.h\n" -#: ../src/symbols.c:1646 +#: ../src/symbols.c:1659 msgid "Load Tags" msgstr "Tags laden" -#: ../src/symbols.c:1653 +#: ../src/symbols.c:1666 msgid "Geany tag files (*.tags)" msgstr "Geany Tag-Datei (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1673 +#: ../src/symbols.c:1686 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei »%s« geladen." -#: ../src/symbols.c:1676 +#: ../src/symbols.c:1689 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei »%s« nicht laden." -#: ../src/symbols.c:1829 +#: ../src/symbols.c:1842 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:1831 +#: ../src/symbols.c:1844 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:2137 +#: ../src/symbols.c:2150 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:2144 +#: ../src/symbols.c:2157 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" -#: ../src/templates.c:83 +#: ../src/templates.c:77 #, c-format msgid "Failed to convert template file \"%s\" to UTF-8" msgstr "Konnte die Vorlage »%s« nicht nach UTF-8 umwandeln." @@ -4627,73 +4646,78 @@ msgid "Displayed Items" msgstr "Angezeigte Einträge" -#: ../src/tools.c:98 +#: ../src/tools.c:116 #, c-format -msgid "Command cannot be parsed: %s" -msgstr "Kommando konnte nicht interpretiert werden: %s" +msgid "Command not found" +msgstr "Kommando konnte nicht gefunden werden" -#: ../src/tools.c:239 +#: ../src/tools.c:123 #, c-format +msgid "Invalid command: %s" +msgstr "Ungültiges Kommando: %s" + +#: ../src/tools.c:264 +#, c-format msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" msgstr "Das ausgeführte Kommando wurde mit einem Fehler beendet. Die Auswahl wurde nicht geändert. Fehlermeldung: %s" -#: ../src/tools.c:305 +#: ../src/tools.c:330 msgid "The executed custom command exited with an unsuccessful exit code." msgstr "Das ausgeführte Kommando wurde mit einem Fehler beendet." -#: ../src/tools.c:333 -#: ../src/tools.c:381 +#: ../src/tools.c:358 +#: ../src/tools.c:406 #, c-format msgid "Custom command failed: %s" msgstr "Benutzerdefiniertes Kommando war nicht erfolgreich: %s" -#: ../src/tools.c:337 +#: ../src/tools.c:362 #, c-format msgid "Passing data and executing custom command: %s" msgstr "Führe benutzerdefiniertes Kommando aus: %s" -#: ../src/tools.c:483 -#: ../src/tools.c:716 +#: ../src/tools.c:508 +#: ../src/tools.c:741 msgid "Set Custom Commands" msgstr "Benutzerdefiniertes Kommandos einstellen" -#: ../src/tools.c:491 +#: ../src/tools.c:516 msgid "You can send the current selection to any of these commands and the output of the command replaces the current selection." msgstr "Sie können die aktuelle Auswahl an ein benutzerdefiniertes Kommando senden. Die aktuelle Auswahl wird durch die Ausgabe des Kommandos ersetzt." -#: ../src/tools.c:505 +#: ../src/tools.c:530 msgid "ID" msgstr "ID" -#: ../src/tools.c:691 +#: ../src/tools.c:716 msgid "No custom commands defined." msgstr "Keine Kommandos definiert." -#: ../src/tools.c:785 +#: ../src/tools.c:810 msgid "Word Count" msgstr "Wörter zählen" -#: ../src/tools.c:795 +#: ../src/tools.c:820 msgid "selection" msgstr "Auswahl" -#: ../src/tools.c:801 +#: ../src/tools.c:826 msgid "whole document" msgstr "Vollständiges Dokument" -#: ../src/tools.c:810 +#: ../src/tools.c:835 msgid "Range:" msgstr "Bereich:" -#: ../src/tools.c:822 +#: ../src/tools.c:847 msgid "Lines:" msgstr "Zeilen:" -#: ../src/tools.c:836 +#: ../src/tools.c:861 msgid "Words:" msgstr "Wörter:" -#: ../src/tools.c:850 +#: ../src/tools.c:875 msgid "Characters:" msgstr "Buchstaben:" @@ -4710,12 +4734,12 @@ msgstr "_Dokumentenliste anzeigen" #: ../src/sidebar.c:606 -#: ../plugins/filebrowser.c:655 +#: ../plugins/filebrowser.c:656 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" #: ../src/sidebar.c:700 -#: ../plugins/filebrowser.c:626 +#: ../plugins/filebrowser.c:627 msgid "_Find in Files" msgstr "In _Dateien suchen" @@ -4919,7 +4943,7 @@ msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." #: ../src/vte.c:865 -#: ../plugins/filebrowser.c:1258 +#: ../plugins/filebrowser.c:1272 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" @@ -5111,7 +5135,7 @@ msgstr "Sonstige Zeichen" #: ../plugins/htmlchars.c:368 -#: ../plugins/filebrowser.c:1150 +#: ../plugins/filebrowser.c:1164 #: ../plugins/saveactions.c:473 msgid "Plugin configuration directory could not be created." msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." @@ -5230,64 +5254,64 @@ msgid "Adds a file browser tab to the sidebar." msgstr "Fügt einen Dateimanager in die Seitenleiste ein." -#: ../plugins/filebrowser.c:365 +#: ../plugins/filebrowser.c:366 msgid "Too many items selected!" msgstr "Zu viele Elemente ausgewählt!" -#: ../plugins/filebrowser.c:441 +#: ../plugins/filebrowser.c:442 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kann angegebenen externen Befehl »%s« nicht ausführen (%s)." -#: ../plugins/filebrowser.c:611 +#: ../plugins/filebrowser.c:612 msgid "Open _externally" msgstr "Mit _externer Anwendung öffnen" -#: ../plugins/filebrowser.c:636 +#: ../plugins/filebrowser.c:637 msgid "Show _Hidden Files" msgstr "V_ersteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:868 +#: ../plugins/filebrowser.c:869 msgid "Up" msgstr "Aufwärts" -#: ../plugins/filebrowser.c:873 +#: ../plugins/filebrowser.c:874 msgid "Refresh" msgstr "Neu laden" -#: ../plugins/filebrowser.c:878 +#: ../plugins/filebrowser.c:879 msgid "Home" msgstr "Persönliches Verzeichnis" -#: ../plugins/filebrowser.c:883 +#: ../plugins/filebrowser.c:884 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../plugins/filebrowser.c:893 +#: ../plugins/filebrowser.c:894 msgid "Clear the filter" msgstr "Filter löschen" -#: ../plugins/filebrowser.c:907 +#: ../plugins/filebrowser.c:908 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:918 +#: ../plugins/filebrowser.c:919 msgid "Filter your files with the usual wildcards. Separate multiple patterns with a space." msgstr "Filtern der Dateien mit den gewohnten Platzhaltern. Verschiedene Filter mittels Leerzeichen trennen." -#: ../plugins/filebrowser.c:1122 +#: ../plugins/filebrowser.c:1134 msgid "Focus File List" msgstr "Dateiliste in den Vordergrund" -#: ../plugins/filebrowser.c:1124 +#: ../plugins/filebrowser.c:1136 msgid "Focus Path Entry" msgstr "Pfad in den Vordergrund" -#: ../plugins/filebrowser.c:1215 +#: ../plugins/filebrowser.c:1229 msgid "External open command:" msgstr "Externes öffnen Kommando:" -#: ../plugins/filebrowser.c:1223 +#: ../plugins/filebrowser.c:1237 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d wildcards.\n" @@ -5298,19 +5322,19 @@ "%f wird durch den Dateinamen mit komplettem Pfad ersetzt.\n" "%d wird durch den Pfadnamen der ausgewählten Datei ersetzt (ohne den Dateinamen)." -#: ../plugins/filebrowser.c:1231 +#: ../plugins/filebrowser.c:1245 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:1239 +#: ../plugins/filebrowser.c:1253 msgid "Hide file extensions:" msgstr "Dateiendung für versteckte Dateien:" -#: ../plugins/filebrowser.c:1264 +#: ../plugins/filebrowser.c:1278 msgid "Use the project's base directory" msgstr "Das Projekt-Basisverzeichnis nutzen" -#: ../plugins/filebrowser.c:1268 +#: ../plugins/filebrowser.c:1282 msgid "Change the directory to the base directory of the currently opened project" msgstr "Das aktuelle Verzeichnis beim Öffnen eines Projekts dem Basisverzeichnis des Projekts anpassen" @@ -5446,6 +5470,9 @@ msgid "Split Vertically" msgstr "Vertikal teilen" +#~ msgid "Command cannot be parsed: %s" +#~ msgstr "Kommando konnte nicht interpretiert werden: %s" + #~ msgid "Clear" #~ msgstr "Leeren" @@ -5690,9 +5717,6 @@ #~ msgid "Make in base path" #~ msgstr "»Make« im Basispfad ausführen" -#~ msgid "Run command:" -#~ msgstr "Kommando ausführen:" - #~ msgid "" #~ "Command-line to run in the project base directory. Options can be " #~ "appended to the command. Leave blank to use the default run command." Modified: branches/sm/src/document.c =================================================================== --- branches/sm/src/document.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/document.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -110,7 +110,7 @@ static void document_undo_clear(GeanyDocument *doc); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); -static gboolean update_tags_from_buffer(GeanyDocument *doc, gboolean update_parent); +static gboolean update_tags_from_buffer(GeanyDocument *doc); /* ignore the case of filenames and paths under WIN32, causes errors if not */ @@ -772,7 +772,7 @@ ui_set_window_title(doc); build_menu_update(doc); - document_update_tag_list(doc, FALSE, TRUE); + document_update_tag_list(doc, FALSE); document_set_text_changed(doc, FALSE); ui_document_show_hide(doc); /* update the document menu */ @@ -2256,7 +2256,7 @@ } -static gboolean update_tags_from_buffer(GeanyDocument *doc, gboolean update_parent) +static gboolean update_tags_from_buffer(GeanyDocument *doc) { gboolean result; #if 0 @@ -2269,14 +2269,14 @@ /* we copy the whole text into memory instead using a direct char pointer from * Scintilla because tm_source_file_buffer_update() does modify the string slightly */ sci_get_text(doc->editor->sci, len, text); - result = tm_source_file_buffer_update(doc->tm_file, (guchar*) text, len, update_parent); + result = tm_source_file_buffer_update(doc->tm_file, (guchar*) text, len, TRUE); g_free(text); #endif return result; } -void document_update_tag_list(GeanyDocument *doc, gboolean update, gboolean update_parent) +void document_update_tag_list(GeanyDocument *doc, gboolean update) { /* We must call sidebar_update_tag_list() before returning, * to ensure that the symbol list is always updated properly (e.g. @@ -2312,14 +2312,14 @@ else { if (update) - update_tags_from_buffer(doc, update_parent); + update_tags_from_buffer(doc); success = TRUE; } } } else { - success = update_tags_from_buffer(doc, update_parent); + success = update_tags_from_buffer(doc); if (G_UNLIKELY(! success)) geany_debug("tag list updating failed"); } @@ -2455,7 +2455,7 @@ doc->priv->symbol_list_sort_mode = type->priv->symbol_list_sort_mode; } - document_update_tag_list(doc, TRUE, TRUE); + document_update_tag_list(doc, TRUE); /* Update session typename keywords. */ update_type_keywords(doc, type->lang); @@ -3027,20 +3027,21 @@ } -/** GCompareFunc-like sort function to sort documents, e.g. in a GPtrArray by - * their display names. - * Display names means the base name of the document's file. +/** Compares documents by their display names. + * This matches @c GCompareFunc for use with e.g. @c g_ptr_array_sort(). + * @note 'Display name' means the base name of the document's filename. * - * @param a @c document a. - * @param b @c document b. - * @return negative value if a < b; zero if a = b; positive value if a > b. + * @param a @c GeanyDocument**. + * @param b @c GeanyDocument**. + * @warning The arguments take the address of each document pointer. + * @return Negative value if a < b; zero if a = b; positive value if a > b. * - * @since 0.21 + * @since 0.21 */ -gint document_sort_by_display_name(gconstpointer a, gconstpointer b) +gint document_compare_by_display_name(gconstpointer a, gconstpointer b) { - GeanyDocument *doc_a = (GeanyDocument*) ((GPtrArray*) a)->pdata; - GeanyDocument *doc_b = (GeanyDocument*) ((GPtrArray*) b)->pdata; + GeanyDocument *doc_a = *((GeanyDocument**) a); + GeanyDocument *doc_b = *((GeanyDocument**) b); gchar *base_name_a, *base_name_b; gint result; Modified: branches/sm/src/document.h =================================================================== --- branches/sm/src/document.h 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/document.h 2011-05-21 09:00:53 UTC (rev 5810) @@ -149,7 +149,7 @@ * This macro never returns @c NULL. **/ #define DOC_FILENAME(doc) \ - (G_LIKELY(doc->file_name != NULL) ? (doc->file_name) : GEANY_STRING_UNTITLED) + (G_LIKELY((doc)->file_name != NULL) ? ((doc)->file_name) : GEANY_STRING_UNTITLED) @@ -232,7 +232,7 @@ void document_replace_sel(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, gint flags, gboolean escaped_chars); -void document_update_tag_list(GeanyDocument *doc, gboolean update, gboolean update_parent); +void document_update_tag_list(GeanyDocument *doc, gboolean update); void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding); @@ -262,6 +262,6 @@ void document_apply_indent_settings(GeanyDocument *doc); -gint document_sort_by_display_name(gconstpointer a, gconstpointer b); +gint document_compare_by_display_name(gconstpointer a, gconstpointer b); #endif Modified: branches/sm/src/editor.c =================================================================== --- branches/sm/src/editor.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/editor.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -80,6 +80,8 @@ static gint snippet_cursor_insert_pos; static GtkAccelGroup *snippet_accel_group = NULL; +static const gchar geany_cursor_marker[] = "__GEANY_CURSOR_MARKER__"; + /* holds word under the mouse or keyboard cursor */ static gchar current_word[GEANY_MAX_WORD_LENGTH]; @@ -1004,7 +1006,7 @@ GeanyDocument *doc = data; if (!main_status.quitting && DOC_VALID(doc)) - document_update_tag_list(doc, TRUE, FALSE); + document_update_tag_list(doc, TRUE); document_tags_update_pending = FALSE; return FALSE; @@ -2229,6 +2231,11 @@ } ret = autocomplete_html(sci, root, rootlen); } + else if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && + startword >= 2 && rootlen == 3 && strcmp(&root[-2], "<?php") == 0) + { + /* nothing, don't complete PHP open tags */ + } else { /* force is set when called by keyboard shortcut, otherwise start at the @@ -2381,7 +2388,6 @@ gint line_end; gchar *whitespace; GString *buf; - const gchar cur_marker[] = "__GEANY_CURSOR_MARKER__"; const gchar *eol = editor_get_eol_char(editor); const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); @@ -2392,7 +2398,7 @@ buf = g_string_new(text); if (cursor_index >= 0) - g_string_insert(buf, cursor_index, cur_marker); /* remember cursor pos */ + g_string_insert(buf, cursor_index, geany_cursor_marker); /* remember cursor pos */ if (newline_indent_size == -1) { @@ -2430,10 +2436,8 @@ if (cursor_index >= 0) { - gint idx = utils_strpos(buf->str, cur_marker); + gint idx = utils_string_replace(buf, 0, -1, geany_cursor_marker, NULL); - g_string_erase(buf, idx, strlen(cur_marker)); - sci_insert_text(sci, insert_pos, buf->str); sci_set_current_position(sci, insert_pos + idx, FALSE); } @@ -2476,16 +2480,13 @@ } -static gssize snippets_make_replacements(GeanyEditor *editor, GString *pattern, - gsize indent_size) +static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern, gsize indent_size); + +static gssize snippets_make_replacements(GeanyEditor *editor, GString *pattern, gsize indent_size) { - gssize cur_index = -1; gchar *whitespace; - gint i, tmp_pos, whitespace_len, nl_count = 0; GHashTable *specials; - GList *temp_list = NULL; const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); - gint cursor_steps, old_cursor = 0; /* replace 'special' completions */ specials = g_hash_table_lookup(snippet_hash, "Special"); @@ -2496,72 +2497,86 @@ g_hash_table_foreach(specials, snippets_replace_specials, NULL); } - /* replace any template {foo} wildcards */ - templates_replace_common(pattern, editor->document->file_name, editor->document->file_type, NULL); + /* now transform other wildcards */ - /* transform other wildcards */ - /* convert to %newlines%, else we get endless loops */ - utils_string_replace_all(pattern, "\n", "%newline%"); + utils_string_replace_all(pattern, "%newline%", "\n"); - /* if spaces are used, replaces all tabs with %ws%, which is later replaced - * by real whitespace characters - * otherwise replace all %ws% by \t, which will be replaced later by tab - * characters, - * this makes seperating between tab and spaces intentation pretty easy */ + /* if spaces are used, replace tabs with spaces + * otherwise replace all %ws% by \t */ if (iprefs->type == GEANY_INDENT_TYPE_SPACES) utils_string_replace_all(pattern, "\t", "%ws%"); else utils_string_replace_all(pattern, "%ws%", "\t"); whitespace = g_strnfill(iprefs->width, ' '); /* use spaces for indentation, will be fixed up */ - whitespace_len = strlen(whitespace); + utils_string_replace_all(pattern, "%ws%", whitespace); + g_free(whitespace); + + /* replace %cursor% by a very unlikely string marker */ + utils_string_replace_all(pattern, "%cursor%", geany_cursor_marker); + + /* unescape '%' after all %wildcards% */ + templates_replace_valist(pattern, "{pc}", "%", NULL); + + /* replace any template {foo} wildcards */ + templates_replace_common(pattern, editor->document->file_name, editor->document->file_type, NULL); + + return replace_cursor_markers(editor, pattern, indent_size); +} + + +static gssize replace_cursor_markers(GeanyEditor *editor, GString *pattern, gsize indent_size) +{ + gssize cur_index = -1; + gint i, idx, nl_count = 0; + GList *temp_list = NULL; + gint cursor_steps, old_cursor = 0; + i = 0; - while ((cursor_steps = utils_strpos(pattern->str, "%cursor%")) >= 0) + idx = 0; + while ((cursor_steps = utils_strpos(pattern->str, geany_cursor_marker)) >= 0) { - /* replace every %newline% (up to next %cursor%) with EOL, - * and update cursor_steps after */ - while ((tmp_pos = utils_strpos(pattern->str, "%newline%")) < cursor_steps && tmp_pos != -1) + /* replace every newline (up to next cursor) with EOL, + * count newlines and update cursor_steps after */ + while (1) { + idx = utils_string_replace(pattern, idx, cursor_steps, "\n", editor_get_eol_char(editor)); + if (idx == -1) + break; + nl_count++; - utils_string_replace_first(pattern, "%newline%", editor_get_eol_char(editor)); - cursor_steps = utils_strpos(pattern->str, "%cursor%"); + idx += editor_get_eol_char_len(editor); + + cursor_steps = utils_strpos(pattern->str, geany_cursor_marker); } - /* replace every %ws% (up to next %cursor%) with whitespaces, - * and update cursor_steps after */ - while ((tmp_pos = utils_strpos(pattern->str, "%ws%")) < cursor_steps && tmp_pos != -1) - { - utils_string_replace_first(pattern, "%ws%", whitespace); - cursor_steps = utils_strpos(pattern->str, "%cursor%"); - } - /* finally replace the next %cursor% */ - utils_string_replace_first(pattern, "%cursor%", ""); + utils_string_replace_first(pattern, geany_cursor_marker, ""); + idx = cursor_steps; - /* modify cursor_steps to take indentation count and type into account */ - - /* We're saving the relative offset to each cursor position in a simple - * linked list, including indentations between them. */ if (i++ > 0) { + /* save the relative offset to each cursor position */ cursor_steps += (nl_count * indent_size); temp_list = g_list_prepend(temp_list, GINT_TO_POINTER(cursor_steps - old_cursor)); } else { + /* first cursor already includes newline positions */ nl_count = 0; cur_index = cursor_steps; } old_cursor = cursor_steps; } - /* replace remaining %ws% and %newline% which may occur after the last %cursor% */ - utils_string_replace_all(pattern, "%newline%", editor_get_eol_char(editor)); - utils_string_replace_all(pattern, "%ws%", whitespace); - g_free(whitespace); + /* replace remaining \n which may occur after the last cursor */ + while (1) + { + idx = utils_string_replace(pattern, idx, -1, "\n", editor_get_eol_char(editor)); + if (idx == -1) + break; - /* escape % last */ - /* Bug: {ob}pc{cb} will be replaced by % too */ - templates_replace_valist(pattern, "{pc}", "%", NULL); + idx += editor_get_eol_char_len(editor); + } - /* We put the cursor positions for the most recent + /* put the cursor positions for the most recent * parsed snippet first, followed by any remaining positions */ i = 0; if (temp_list) @@ -2578,6 +2593,7 @@ g_list_free(temp_list); } + /* if there's no first cursor, skip whole snippet */ if (cur_index < 0) cur_index = pattern->len; @@ -4814,15 +4830,17 @@ static void on_document_save(GObject *obj, GeanyDocument *doc) { + gchar *f = utils_build_path(app->configdir, "snippets.conf", NULL); + g_return_if_fail(NZV(doc->real_path)); - if (utils_str_equal(doc->real_path, - utils_build_path(app->configdir, "snippets.conf", NULL))) + if (utils_str_equal(doc->real_path, f)) { /* reload snippets */ editor_snippets_free(); editor_snippets_init(); } + g_free(f); } @@ -4849,6 +4867,7 @@ void editor_init(void) { static GeanyIndentPrefs indent_prefs; + gchar *f; memset(&editor_prefs, 0, sizeof(GeanyEditorPrefs)); memset(&indent_prefs, 0, sizeof(GeanyIndentPrefs)); @@ -4858,8 +4877,9 @@ * handler (on_editor_notify) is called */ g_signal_connect_after(geany_object, "editor-notify", G_CALLBACK(on_editor_notify), NULL); - ui_add_config_file_menu_item(utils_build_path(app->configdir, "snippets.conf", NULL), - NULL, NULL); + f = utils_build_path(app->configdir, "snippets.conf", NULL); + ui_add_config_file_menu_item(f, NULL, NULL); + g_free(f); g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); } Modified: branches/sm/src/filetypes.c =================================================================== --- branches/sm/src/filetypes.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/filetypes.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -609,6 +609,7 @@ void filetypes_init_types() { filetype_id ft_id; + gchar *f; g_return_if_fail(filetypes_array == NULL); g_return_if_fail(filetypes_hash == NULL); @@ -629,7 +630,9 @@ filetype_add(filetypes[ft_id]); } init_custom_filetypes(app->datadir); - init_custom_filetypes(utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL)); + f = utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, NULL); + init_custom_filetypes(f); + g_free(f); /* sort last instead of on insertion to prevent exponential time */ filetypes_by_title = g_slist_sort_with_data(filetypes_by_title, @@ -639,13 +642,17 @@ static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) { + gchar *f; + g_return_if_fail(NZV(doc->real_path)); - if (utils_str_equal(doc->real_path, - utils_build_path(app->configdir, "filetype_extensions.conf", NULL))) + f = utils_build_path(app->configdir, "filetype_extensions.conf", NULL); + if (utils_str_equal(doc->real_path, f)) filetypes_read_extensions(); - else if (utils_str_equal(doc->real_path, - utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL))) + + g_free(f); + f = utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL); + if (utils_str_equal(doc->real_path, f)) { guint i; @@ -656,16 +663,20 @@ foreach_document(i) document_reload_config(documents[i]); } + g_free(f); } static void setup_config_file_menus(void) { - ui_add_config_file_menu_item( - utils_build_path(app->configdir, "filetype_extensions.conf", NULL), NULL, NULL); - ui_add_config_file_menu_item( - utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL), NULL, NULL); + gchar *f; + f = utils_build_path(app->configdir, "filetype_extensions.conf", NULL); + ui_add_config_file_menu_item(f, NULL, NULL); + setptr(f, utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL)); + ui_add_config_file_menu_item(f, NULL, NULL); + g_free(f); + g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); } @@ -770,7 +781,7 @@ static GeanyFiletype *check_builtin_filenames(const gchar *utf8_filename) { gchar *lfn = NULL; - const gchar *path; + gchar *path; gboolean found = FALSE; #ifdef G_OS_WIN32 @@ -785,10 +796,11 @@ if (g_str_has_prefix(lfn, path)) found = TRUE; - path = utils_build_path(app->datadir, "filetypes.", NULL); + setptr(path, utils_build_path(app->datadir, "filetypes.", NULL)); if (g_str_has_prefix(lfn, path)) found = TRUE; + g_free(path); g_free(lfn); return found ? filetypes[GEANY_FILETYPES_CONF] : NULL; } @@ -1221,7 +1233,7 @@ static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user) { gchar *ext = filetypes_get_conf_extension(ft->id); - const gchar *f; + gchar *f; if (user) f = utils_make_filename(app->configdir, @@ -1230,7 +1242,7 @@ f = utils_make_filename(app->datadir, "filetypes.", ext, NULL); g_free(ext); - return g_strdup(f); + return f; } Modified: branches/sm/src/keybindings.c =================================================================== --- branches/sm/src/keybindings.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/keybindings.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -1076,13 +1076,13 @@ GeanyKeyGroup *group; GtkWidget *widget; + if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte) + return FALSE; /* let VTE copy/paste override any user keybinding */ if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v)) return TRUE; if (! vc->enable_bash_keys) return FALSE; - if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte) - return FALSE; /* prevent menubar flickering: */ if (state == GDK_SHIFT_MASK && (keyval >= GDK_a && keyval <= GDK_z)) return FALSE; @@ -2532,7 +2532,7 @@ ui_document_show_hide(doc); break; case GEANY_KEYS_DOCUMENT_RELOADTAGLIST: - document_update_tag_list(doc, TRUE, TRUE); + document_update_tag_list(doc, TRUE); break; case GEANY_KEYS_DOCUMENT_FOLDALL: editor_fold_all(doc->editor); Modified: branches/sm/src/keyfile.c =================================================================== --- branches/sm/src/keyfile.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/keyfile.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -996,16 +996,17 @@ gboolean configuration_load(void) { - const gchar *configfile = utils_build_path(app->configdir, "geany.conf", NULL); + gchar *configfile = utils_build_path(app->configdir, "geany.conf", NULL); GKeyFile *config = g_key_file_new(); if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR)) { /* config file does not (yet) exist, so try to load a global config file which may be */ /* created by distributors */ geany_debug("No user config file found, trying to use global configuration."); - configfile = utils_build_path(app->datadir, "geany.conf", NULL); + setptr(configfile, utils_build_path(app->datadir, "geany.conf", NULL)); } g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); + g_free(configfile); load_dialog_prefs(config); load_ui_prefs(config); Modified: branches/sm/src/plugindata.h =================================================================== --- branches/sm/src/plugindata.h 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/plugindata.h 2011-05-21 09:00:53 UTC (rev 5810) @@ -54,7 +54,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 207 +#define GEANY_API_VERSION 208 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ -310,7 +310,7 @@ const GdkColor* (*document_get_status_color) (struct GeanyDocument *doc); gchar* (*document_get_basename_for_display) (struct GeanyDocument *doc, gint length); gint (*document_get_notebook_page) (struct GeanyDocument *doc); - gint (*document_sort_by_display_name) (gconstpointer a, gconstpointer b); + gint (*document_compare_by_display_name) (gconstpointer a, gconstpointer b); } DocumentFuncs; @@ -475,7 +475,7 @@ void (*ui_combo_box_add_to_history) (GtkComboBoxEntry *combo_entry, const gchar *text, gint history_len); void (*ui_menu_add_document_items_sorted) (GtkMenu *menu, struct GeanyDocument *active, - GCallback callback, GCompareFunc sort_func); + GCallback callback, GCompareFunc compare_func); } UIUtilsFuncs; Modified: branches/sm/src/plugins.c =================================================================== --- branches/sm/src/plugins.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/plugins.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -112,7 +112,7 @@ &document_get_status_color, &document_get_basename_for_display, &document_get_notebook_page, - &document_sort_by_display_name + &document_compare_by_display_name }; static EditorFuncs editor_funcs = { Modified: branches/sm/src/symbols.c =================================================================== --- branches/sm/src/symbols.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/symbols.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -1729,7 +1729,7 @@ { GSList *file_list = NULL, *list = NULL; GHashTable *lang_hash; - const gchar *dir; + gchar *dir; dir = utils_build_path(app->configdir, "tags", NULL); /* create the user tags dir for next time if it doesn't exist */ @@ -1739,8 +1739,10 @@ } file_list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); - dir = utils_build_path(app->datadir, "tags", NULL); - list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); + setptr(dir, utils_build_path(app->datadir, "tags", NULL)); + list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); + g_free(dir); + file_list = g_slist_concat(file_list, list); lang_hash = get_tagfile_hash(file_list); @@ -2168,20 +2170,27 @@ static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) { + gchar *f = utils_build_path(app->configdir, "ignore.tags", NULL); + g_return_if_fail(NZV(doc->real_path)); - if (utils_str_equal(doc->real_path, - utils_build_path(app->configdir, "ignore.tags", NULL))) + if (utils_str_equal(doc->real_path, f)) load_c_ignore_tags(); + + g_free(f); } void symbols_init(void) { + gchar *f; + create_taglist_popup_menu(); - ui_add_config_file_menu_item(utils_build_path(app->configdir, "ignore.tags", NULL), - NULL, NULL); + f = utils_build_path(app->configdir, "ignore.tags", NULL); + ui_add_config_file_menu_item(f, NULL, NULL); + g_free(f); + g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); } Modified: branches/sm/src/templates.c =================================================================== --- branches/sm/src/templates.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/templates.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -327,7 +327,7 @@ /* reload templates if any file in the templates path is saved */ static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc) { - const gchar *path = utils_build_path(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); + gchar *path = utils_build_path(app->configdir, GEANY_TEMPLATES_SUBDIR, NULL); g_return_if_fail(NZV(doc->real_path)); @@ -337,6 +337,7 @@ templates_free_templates(); templates_init(); } + g_free(path); } Modified: branches/sm/src/toolbar.c =================================================================== --- branches/sm/src/toolbar.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/toolbar.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -177,7 +177,7 @@ GSList *l; GtkWidget *entry; GError *error = NULL; - const gchar *filename; + gchar *filename; static guint merge_id = 0; GtkWidget *toolbar_new_file_menu = NULL; GtkWidget *toolbar_recent_files_menu = NULL; @@ -226,9 +226,10 @@ g_error_free(error); error = NULL; - filename = utils_build_path(app->datadir, "ui_toolbar.xml", NULL); + setptr(filename, utils_build_path(app->datadir, "ui_toolbar.xml", NULL)); merge_id = gtk_ui_manager_add_ui_from_file(uim, filename, &error); } + g_free(filename); } if (error != NULL) { @@ -890,7 +891,7 @@ A list of available actions can be found in the documentation included with Geany or\n\ at http://www.geany.org/manual/current/index.html#customizing-the-toolbar.\n-->\n\ \t<toolbar name='GeanyToolbar'>\n"; - const gchar *filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); + gchar *filename; GString *str = g_string_new(template); gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str); @@ -899,7 +900,9 @@ toolbar_reload(str->str); + filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); utils_write_file(filename, str->str); + g_free(filename); g_string_free(str, TRUE); } Modified: branches/sm/src/ui_utils.c =================================================================== --- branches/sm/src/ui_utils.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/ui_utils.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -2452,7 +2452,7 @@ /** Adds a list of document items to @a menu. * - * @a sort_func might be NULL to not sort the documents in the menu. In this case, + * @a compare_func might be NULL to not sort the documents in the menu. In this case, * the order of the document tabs is used. * * See document_sort_by_display_name() for an example sort function. @@ -2461,11 +2461,11 @@ * @param active Which document to highlight, or @c NULL. * @param callback is used for each menu item's @c "activate" signal and will be passed * the corresponding document pointer as @c user_data. - * @param sort_func is used to sort the list. Might be @c NULL to not sort the list. + * @param compare_func is used to sort the list. Might be @c NULL to not sort the list. * @warning You should check @c doc->is_valid in the callback. * @since 0.21 */ void ui_menu_add_document_items_sorted(GtkMenu *menu, GeanyDocument *active, - GCallback callback, GCompareFunc sort_func) + GCallback callback, GCompareFunc compare_func) { GtkWidget *menu_item, *menu_item_label, *image; const GdkColor *color; @@ -2483,14 +2483,12 @@ g_ptr_array_add(sorted_documents, documents[i]); } /* and now sort it */ - if (sort_func != NULL) - g_ptr_array_sort(sorted_documents, sort_func); + if (compare_func != NULL) + g_ptr_array_sort(sorted_documents, compare_func); - for (i = 0; i < GEANY(sorted_documents)->len; i++) + for (i = 0; i < sorted_documents->len; i++) { doc = g_ptr_array_index(sorted_documents, i); - if (! DOC_VALID(doc)) - continue; base_name = g_path_get_basename(DOC_FILENAME(doc)); menu_item = gtk_image_menu_item_new_with_label(base_name); Modified: branches/sm/src/utils.c =================================================================== --- branches/sm/src/utils.c 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/utils.c 2011-05-21 09:00:53 UTC (rev 5810) @@ -1533,39 +1533,39 @@ } -static guint utils_string_replace_helper(GString *haystack, const gchar *needle, - const gchar *replace, const guint max_replaces) +/* Replaces needle if in range. + * end can be -1 for haystack->len. + * returns: position of replaced text or -1. */ +gint utils_string_replace(GString *haystack, gint start, gint end, + const gchar *needle, const gchar *replace) { - const gchar *stack, *match; - guint ret = 0; - gssize pos; + gint pos; - g_return_val_if_fail(haystack != NULL, 0); + g_return_val_if_fail(haystack != NULL, -1); if (haystack->len == 0) - return FALSE; - g_return_val_if_fail(NZV(needle), 0); + return -1; - stack = haystack->str; - if (! (match = strstr(stack, needle))) - return 0; - do - { - pos = match - haystack->str; - g_string_erase(haystack, pos, strlen(needle)); + g_return_val_if_fail(start >= 0, -1); + if (start >= (gint)haystack->len) + return -1; - /* make next search after removed matching text. - * (we have to be careful to only use haystack->str as its address may change) */ - stack = haystack->str + pos; + g_return_val_if_fail(NZV(needle), -1); - if (G_LIKELY(replace)) - { - g_string_insert(haystack, pos, replace); - stack = haystack->str + pos + strlen(replace); /* skip past replacement */ - } - } - while (++ret != max_replaces && (match = strstr(stack, needle))); + if (end < 0) + end = haystack->len; - return ret; + pos = utils_strpos(haystack->str + start, needle); + if (pos == -1) + return -1; + + pos += start; + if (pos >= end) + return -1; + + g_string_erase(haystack, pos, strlen(needle)); + if (G_LIKELY(replace)) + g_string_insert(haystack, pos, replace); + return pos; } @@ -1582,7 +1582,21 @@ **/ guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace) { - return utils_string_replace_helper(haystack, needle, replace, 0); + guint count = 0; + gint pos = 0; + + while (1) + { + pos = utils_string_replace(haystack, pos, -1, needle, replace); + + if (pos == -1) + break; + + if (replace) + pos += strlen(replace); + count++; + } + return count; } @@ -1601,7 +1615,7 @@ */ guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace) { - return utils_string_replace_helper(haystack, needle, replace, 1); + return utils_string_replace(haystack, 0, -1, needle, replace) == -1 ? 0 : 1; } @@ -1744,12 +1758,8 @@ } -/* Similar to g_build_path() but (re)using a fixed buffer, so never free it. - * This assumes a small enough resulting string length to be kept without freeing, - * but this should be the case for filenames. - * @warning As the buffer is reused, you can't call this recursively, e.g. for a - * function argument and within the function called. */ -const gchar *utils_build_path(const gchar *first, ...) +/* Like g_build_path() but without first argument. */ +gchar *utils_build_path(const gchar *first, ...) { static GString *buffer = NULL; va_list args; @@ -1764,7 +1774,7 @@ va_start(args, first); utils_string_vappend(buffer, G_DIR_SEPARATOR_S, args); va_end(args); - return buffer->str; + return g_strdup(buffer->str); } @@ -1772,10 +1782,8 @@ * @param path A path, which will have a separator added before the other strings. * @param ... Strings to concatenate (no directory separators will be * inserted between them). - * @warning This returns temporary string contents only valid until the next call - * to this function. * E.g. filename = utils_make_filename(app->datadir, "filetypes.", ext, NULL); */ -const gchar *utils_make_filename(const gchar *path, ...) +gchar *utils_make_filename(const gchar *path, ...) { static GString *buffer = NULL; va_list args; @@ -1790,7 +1798,7 @@ va_start(args, path); utils_string_vappend(buffer, NULL, args); va_end(args); - return buffer->str; + return g_strdup(buffer->str); } Modified: branches/sm/src/utils.h =================================================================== --- branches/sm/src/utils.h 2011-05-21 08:59:27 UTC (rev 5809) +++ branches/sm/src/utils.h 2011-05-21 09:00:53 UTC (rev 5810) @@ -172,6 +172,9 @@ gchar *utils_get_hostname(void); +gint utils_string_replace(GString *haystack, gint start, gint end, + const gchar *needle, const gchar *replace); + guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace); guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace); @@ -251,9 +254,9 @@ gint utils_str_casecmp(const gchar *s1, const gchar *s2); -const gchar *utils_build_path(const gchar *first, ...) G_GNUC_NULL_TERMINATED; +gchar *utils_build_path(const gchar *first, ...) G_GNUC_NULL_TERMINATED; -const gchar *utils_make_filename(const gchar *path, ...) G_GNUC_NULL_TERMINATED; +gchar *utils_make_filename(const gchar *path, ...) G_GNUC_NULL_TERMINATED; gchar *utils_get_path_from_uri(const gchar *uri); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5809] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5809 http://geany.svn.sourceforge.net/geany/?rev=5809&view=rev Author: statc Date: 2011-05-21 08:59:27 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5701..5708) Conflicts: src/document.c src/filetypes.c src/keyfile.c Modified Paths: -------------- branches/sm/ChangeLog branches/sm/THANKS branches/sm/doc/pluginsignals.c branches/sm/plugins/filebrowser.c branches/sm/plugins/geanyfunctions.h branches/sm/src/about.c branches/sm/src/document.c branches/sm/src/document.h branches/sm/src/editor.c branches/sm/src/filetypes.c branches/sm/src/filetypes.h branches/sm/src/geanyobject.c branches/sm/src/geanyobject.h branches/sm/src/keyfile.c branches/sm/src/plugindata.h branches/sm/src/plugins.c branches/sm/src/search.c branches/sm/src/symbols.c branches/sm/src/ui_utils.c branches/sm/src/ui_utils.h branches/sm/tagmanager/sql.c Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/ChangeLog 2011-05-21 08:59:27 UTC (rev 5809) @@ -1,3 +1,33 @@ +2011-04-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/filebrowser.c: + Update path when saving a new document for the first time if the + follow path option is enabled. + * src/about.c, src/keyfile.c, THANKS: + Store VTE path with the session (based on patch by Nicolas + Sierro, thanks). + There's still a bug with loading a project at startup; closing the + project doesn't restore old VTE path. + * src/filetypes.c, src/filetypes.h: + Refactor with filetypes_get_filename(). + Make filetypes_get_conf_extension() static. + + +2011-04-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/editor.c: + Ignore scrolling events in on_update_ui(). + * src/geanyobject.c, src/plugindata.h, src/geanyobject.h, + src/document.c, doc/pluginsignals.c: + Add and use signal "document-reload" to the plugin API. + * src/symbols.c, tagmanager/sql.c: + Fix mapping of SQL tags for Geany's symbol list (closes #3216474). + * src/ui_utils.h, src/plugindata.h, src/document.c, src/plugins.c, + src/document.h, src/ui_utils.c, plugins/geanyfunctions.h: + Add ui_menu_add_document_items_sorted() and + document_sort_by_display_name() to the plugin API. + + 2011-04-08 Colomban Wendling <colomban(at)geany(dot)org> * scintilla/lexers/LexCPP.cxx: Modified: branches/sm/THANKS =================================================================== --- branches/sm/THANKS 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/THANKS 2011-05-21 08:59:27 UTC (rev 5809) @@ -88,6 +88,7 @@ Taylor Venable <taylor(at)metasyntax(dot)net> - Erlang filetype Manuel Bua <manuel(dot)bua(at)gmail(dot)com> - Ensure consistent line endings pref. Matthew Brush <codebrainz(at)users(dot)sourceforge(dot)net> - Various patches. +Nicolas Sierro <nicolas(a)sierro.net> - store VTE path with session patch Translators: ------------ Modified: branches/sm/doc/pluginsignals.c =================================================================== --- branches/sm/doc/pluginsignals.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/doc/pluginsignals.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -82,6 +82,18 @@ */ signal void (*document_open)(GObject *obj, GeanyDocument *doc, gpointer user_data); +/** Sent when an existing document is reloaded. + * + * You need to include "document.h" for the declaration of GeanyDocument. + * + * @param obj a GeanyObject instance, should be ignored. + * @param doc the re-opened document. + * @param user_data user data. + * + * @since 0.21 + */ +signal void (*document_reload)(GObject *obj, GeanyDocument *doc, gpointer user_data); + /** Sent before a document is saved. * * You need to include "document.h" for the declaration of GeanyDocument. Modified: branches/sm/plugins/filebrowser.c =================================================================== --- branches/sm/plugins/filebrowser.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/plugins/filebrowser.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -97,6 +97,7 @@ static void project_change_cb(GObject *obj, GKeyFile *config, gpointer data); +/* note: other callbacks connected in plugin_init */ PluginCallback plugin_callbacks[] = { { "project-open", (GCallback) &project_change_cb, TRUE, NULL }, @@ -1042,11 +1043,15 @@ } +static gpointer last_activate_path = NULL; + static void document_activate_cb(G_GNUC_UNUSED GObject *obj, GeanyDocument *doc, G_GNUC_UNUSED gpointer data) { gchar *new_dir; + last_activate_path = doc->real_path; + if (! fb_follow_path || doc->file_name == NULL || ! g_path_is_absolute(doc->file_name)) return; @@ -1063,6 +1068,13 @@ } +static void document_save_cb(GObject *obj, GeanyDocument *doc, gpointer user_data) +{ + if (!last_activate_path) + document_activate_cb(obj, doc, user_data); +} + + static void kb_activate(guint key_id) { gtk_notebook_set_current_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), page_number); @@ -1125,6 +1137,8 @@ plugin_signal_connect(geany_plugin, NULL, "document-activate", TRUE, (GCallback) &document_activate_cb, NULL); + plugin_signal_connect(geany_plugin, NULL, "document-save", TRUE, + (GCallback) &document_save_cb, NULL); } Modified: branches/sm/plugins/geanyfunctions.h =================================================================== --- branches/sm/plugins/geanyfunctions.h 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/plugins/geanyfunctions.h 2011-05-21 08:59:27 UTC (rev 5809) @@ -72,6 +72,8 @@ geany_functions->p_document->document_get_basename_for_display #define document_get_notebook_page \ geany_functions->p_document->document_get_notebook_page +#define document_sort_by_display_name \ + geany_functions->p_document->document_sort_by_display_name #define editor_get_indent_prefs \ geany_functions->p_editor->editor_get_indent_prefs #define editor_create_widget \ @@ -292,6 +294,8 @@ geany_functions->p_ui->ui_get_gtk_settings_integer #define ui_combo_box_add_to_history \ geany_functions->p_ui->ui_combo_box_add_to_history +#define ui_menu_add_document_items_sorted \ + geany_functions->p_ui->ui_menu_add_document_items_sorted #define dialogs_show_question \ geany_functions->p_dialogs->dialogs_show_question #define dialogs_show_msgbox \ Modified: branches/sm/src/about.c =================================================================== --- branches/sm/src/about.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/about.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -98,7 +98,8 @@ "John Gabriele, Jon Senior, Jon Strait, Josef Whiter, " "Jörn Reder, Kelvin Gardiner, Kevin Ellwood, Kristoffer A. Tjernås, Lex Trotman, " "Manuel Bua, Mário Silva, Marko Peric, Matthew Brush, Matti Mårds, " -"Moritz Barsnick, Ondrej Donek, Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, " +"Moritz Barsnick, Nicolas Sierro, Ondrej Donek, Peter Strand, Philipp Gildein, " +"Pierre Joye, Rob van der Linde, " "Robert McGinley, Roland Baudin, Ross McKay, S Jagannathan, Saleem Abdulrasool, " "Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Taylor Venable, " "Thomas Huth, Thomas Martitz, Tomás Vírseda, " Modified: branches/sm/src/document.c =================================================================== --- branches/sm/src/document.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/document.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -1255,18 +1255,21 @@ if (! main_status.opening_session_files) ui_add_recent_file(utf8_filename, update_recent_files_config); - if (! reload) - g_signal_emit_by_name(geany_object, "document-open", doc); - if (reload) + { + g_signal_emit_by_name(geany_object, "document-reload", doc); ui_set_statusbar(TRUE, _("File %s reloaded."), display_filename); + } else + { + g_signal_emit_by_name(geany_object, "document-open", doc); /* For translators: this is the status window message for opening a file. %d is the number * of the newly opened file, %s indicates whether the file is opened read-only * (it is replaced with the string ", read-only"). */ msgwin_status_add(_("File %s opened(%d%s)."), display_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)), (readonly) ? _(", read-only") : ""); + } } g_free(display_filename); @@ -3022,3 +3025,32 @@ } return ret; } + + +/** GCompareFunc-like sort function to sort documents, e.g. in a GPtrArray by + * their display names. + * Display names means the base name of the document's file. + * + * @param a @c document a. + * @param b @c document b. + * @return negative value if a < b; zero if a = b; positive value if a > b. + * + * @since 0.21 + */ +gint document_sort_by_display_name(gconstpointer a, gconstpointer b) +{ + GeanyDocument *doc_a = (GeanyDocument*) ((GPtrArray*) a)->pdata; + GeanyDocument *doc_b = (GeanyDocument*) ((GPtrArray*) b)->pdata; + gchar *base_name_a, *base_name_b; + gint result; + + base_name_a = g_path_get_basename(DOC_FILENAME(doc_a)); + base_name_b = g_path_get_basename(DOC_FILENAME(doc_b)); + + result = strcmp(base_name_a, base_name_b); + + g_free(base_name_a); + g_free(base_name_b); + + return result; +} Modified: branches/sm/src/document.h =================================================================== --- branches/sm/src/document.h 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/document.h 2011-05-21 08:59:27 UTC (rev 5809) @@ -262,4 +262,6 @@ void document_apply_indent_settings(GeanyDocument *doc); +gint document_sort_by_display_name(gconstpointer a, gconstpointer b); + #endif Modified: branches/sm/src/editor.c =================================================================== --- branches/sm/src/editor.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/editor.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -515,6 +515,11 @@ ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); + /* since Scintilla 2.24, SCN_UPDATEUI is also sent on scrolling though we don't need to handle + * this and so ignore every SCN_UPDATEUI events except for content and selection changes */ + if (! (nt->updated & SC_UPDATE_CONTENT) && ! (nt->updated & SC_UPDATE_SELECTION)) + return; + /* undo / redo menu update */ ui_update_popup_reundo_items(editor->document); Modified: branches/sm/src/filetypes.c =================================================================== --- branches/sm/src/filetypes.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/filetypes.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -63,7 +63,9 @@ static void create_radio_menu_item(GtkWidget *menu, GeanyFiletype *ftype); +static gchar *filetypes_get_conf_extension(gint filetype_idx); + enum TitleType { TITLE_SOURCE_FILE, @@ -1216,23 +1218,39 @@ } -static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft) +static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user) { - GKeyFile *src = g_key_file_new(); gchar *ext = filetypes_get_conf_extension(ft->id); const gchar *f; - f = utils_make_filename(app->datadir, "filetypes.", ext, NULL); - if (!g_file_test(f, G_FILE_TEST_EXISTS)) + if (user) f = utils_make_filename(app->configdir, GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S, "filetypes.", ext, NULL); + else + f = utils_make_filename(app->datadir, "filetypes.", ext, NULL); + g_free(ext); + return g_strdup(f); +} + +static void add_group_keys(GKeyFile *kf, const gchar *group, GeanyFiletype *ft) +{ + GKeyFile *src = g_key_file_new(); + gchar *f; + + f = filetypes_get_filename(ft, FALSE); + if (!g_file_test(f, G_FILE_TEST_EXISTS)) + f = filetypes_get_filename(ft, TRUE); + if (!g_key_file_load_from_file(src, f, G_KEY_FILE_NONE, NULL)) { geany_debug("Could not read config file %s for [%s=%s]!", f, group, ft->name); + g_free(f); return; } + g_free(f); + add_keys(kf, group, src); } @@ -1310,15 +1328,14 @@ config_home = g_key_file_new(); { /* highlighting uses GEANY_FILETYPES_NONE for common settings */ - gchar *ext = filetypes_get_conf_extension(ft_id); - const gchar *f; + gchar *f; - f = utils_make_filename(app->datadir, "filetypes.", ext, NULL); + f = filetypes_get_filename(ft, FALSE); load_system_keyfile(config, f, G_KEY_FILE_KEEP_COMMENTS, ft); - f = utils_make_filename(app->configdir, - GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S, "filetypes.", ext, NULL); + + setptr(f, filetypes_get_filename(ft, TRUE)); g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); - g_free(ext); + g_free(f); } /* Copy keys for any groups with [group=C] from system keyfile */ copy_ft_groups(config); @@ -1356,29 +1373,27 @@ } -gchar *filetypes_get_conf_extension(gint filetype_idx) +static gchar *filetypes_get_conf_extension(gint filetype_idx) { return get_filetype_conf_extension(filetypes[filetype_idx]); } -void filetypes_save_commands(const GeanyFiletype *ft) +void filetypes_save_commands(GeanyFiletype *ft) { - gchar *ext = get_filetype_conf_extension(ft); - gchar *fname = g_strconcat(app->configdir, - G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", ext, NULL); + gchar *fname; GKeyFile *config_home; gchar *data; + fname = filetypes_get_filename(ft, TRUE); config_home = g_key_file_new(); g_key_file_load_from_file(config_home, fname, G_KEY_FILE_KEEP_COMMENTS, NULL); - build_save_menu(config_home, (gpointer)(ft), GEANY_BCS_HOME_FT); + build_save_menu(config_home, ft, GEANY_BCS_HOME_FT); data = g_key_file_to_data(config_home, NULL, NULL); utils_write_file(fname, data); g_free(data); g_key_file_free(config_home); g_free(fname); - g_free(ext); } Modified: branches/sm/src/filetypes.h =================================================================== --- branches/sm/src/filetypes.h 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/filetypes.h 2011-05-21 08:59:27 UTC (rev 5809) @@ -195,7 +195,7 @@ void filetypes_load_config(gint ft_id, gboolean reload); -void filetypes_save_commands(const GeanyFiletype *ft); +void filetypes_save_commands(GeanyFiletype *ft); void filetypes_select_radio_item(const GeanyFiletype *ft); @@ -203,8 +203,6 @@ GtkFileFilter *filetypes_create_file_filter_all_source(void); -gchar *filetypes_get_conf_extension(gint filetype_idx); - gboolean filetype_has_tags(GeanyFiletype *ft); gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message, Modified: branches/sm/src/geanyobject.c =================================================================== --- branches/sm/src/geanyobject.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/geanyobject.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -189,6 +189,15 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + geany_object_signals[GCB_DOCUMENT_RELOAD] = g_signal_new ( + "document-reload", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, document_reload), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); geany_object_signals[GCB_DOCUMENT_BEFORE_SAVE] = g_signal_new ( "document-before-save", G_OBJECT_CLASS_TYPE (g_object_class), Modified: branches/sm/src/geanyobject.h =================================================================== --- branches/sm/src/geanyobject.h 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/geanyobject.h 2011-05-21 08:59:27 UTC (rev 5809) @@ -34,6 +34,7 @@ { GCB_DOCUMENT_NEW, GCB_DOCUMENT_OPEN, + GCB_DOCUMENT_RELOAD, GCB_DOCUMENT_BEFORE_SAVE, GCB_DOCUMENT_SAVE, GCB_DOCUMENT_FILETYPE_SET, @@ -82,6 +83,7 @@ void (*document_new)(GeanyDocument *doc); void (*document_open)(GeanyDocument *doc); + void (*document_reload)(GeanyDocument *doc); void (*document_before_save)(GeanyDocument *doc); void (*document_save)(GeanyDocument *doc); void (*document_filetype_set)(GeanyDocument *doc, GeanyFiletype *filetype_old); Modified: branches/sm/src/keyfile.c =================================================================== --- branches/sm/src/keyfile.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/keyfile.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -371,6 +371,14 @@ i++; } } + +#ifdef HAVE_VTE + if (vte_info.have_vte) + { + vte_get_working_directory(); /* refresh vte_info.dir */ + g_key_file_set_string(config, "VTE", "last_dir", vte_info.dir); + } +#endif } @@ -520,8 +528,6 @@ tmp_string = utils_get_hex_from_color(vc->colour_back); g_key_file_set_string(config, "VTE", "colour_back", tmp_string); g_free(tmp_string); - vte_get_working_directory(); /* refresh vte_info.dir */ - g_key_file_set_string(config, "VTE", "last_dir", vte_info.dir); } #endif } @@ -607,6 +613,13 @@ if (cl_options.load_session) configuration_save_session_files(config); +#ifdef HAVE_VTE + else if (vte_info.have_vte) + { + vte_get_working_directory(); /* refresh vte_info.dir */ + g_key_file_set_string(config, "VTE", "last_dir", vte_info.dir); + } +#endif } if (write_recent_files) @@ -666,6 +679,16 @@ g_ptr_array_add(session_files, tmp_array); i++; } + +#ifdef HAVE_VTE + /* BUG: after loading project at startup, closing project doesn't restore old VTE path */ + if (vte_info.have_vte) + { + gchar *tmp_string = utils_get_setting_string(config, "VTE", "last_dir", NULL); + vte_cwd(tmp_string,TRUE); + g_free(tmp_string); + } +#endif } Modified: branches/sm/src/plugindata.h =================================================================== --- branches/sm/src/plugindata.h 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/plugindata.h 2011-05-21 08:59:27 UTC (rev 5809) @@ -54,7 +54,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 205 +#define GEANY_API_VERSION 207 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ -310,6 +310,7 @@ const GdkColor* (*document_get_status_color) (struct GeanyDocument *doc); gchar* (*document_get_basename_for_display) (struct GeanyDocument *doc, gint length); gint (*document_get_notebook_page) (struct GeanyDocument *doc); + gint (*document_sort_by_display_name) (gconstpointer a, gconstpointer b); } DocumentFuncs; @@ -473,6 +474,8 @@ gint (*ui_get_gtk_settings_integer) (const gchar *property_name, gint default_value); void (*ui_combo_box_add_to_history) (GtkComboBoxEntry *combo_entry, const gchar *text, gint history_len); + void (*ui_menu_add_document_items_sorted) (GtkMenu *menu, struct GeanyDocument *active, + GCallback callback, GCompareFunc sort_func); } UIUtilsFuncs; Modified: branches/sm/src/plugins.c =================================================================== --- branches/sm/src/plugins.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/plugins.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -111,7 +111,8 @@ &document_rename_file, &document_get_status_color, &document_get_basename_for_display, - &document_get_notebook_page + &document_get_notebook_page, + &document_sort_by_display_name }; static EditorFuncs editor_funcs = { @@ -243,7 +244,8 @@ &ui_widget_modify_font_from_string, &ui_is_keyval_enter_or_return, &ui_get_gtk_settings_integer, - &ui_combo_box_add_to_history + &ui_combo_box_add_to_history, + &ui_menu_add_document_items_sorted }; static DialogFuncs dialog_funcs = { Modified: branches/sm/src/search.c =================================================================== --- branches/sm/src/search.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/search.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -221,11 +221,10 @@ group = stash_group_new("search"); find_prefs = group; configuration_add_pref_group(group, FALSE); - /* if case is moved after regexp, the first regexp uncheck will clear it */ - stash_group_add_toggle_button(group, &settings.find_case_sensitive, - "find_case_sensitive", FALSE, "check_case"); stash_group_add_toggle_button(group, &settings.find_regexp, "find_regexp", FALSE, "check_regexp"); + stash_group_add_toggle_button(group, &settings.find_case_sensitive, + "find_case_sensitive", FALSE, "check_case"); stash_group_add_toggle_button(group, &settings.find_escape_sequences, "find_escape_sequences", FALSE, "check_escape"); stash_group_add_toggle_button(group, &settings.find_match_whole_word, @@ -238,10 +237,10 @@ group = stash_group_new("search"); replace_prefs = group; configuration_add_pref_group(group, FALSE); - stash_group_add_toggle_button(group, &settings.replace_case_sensitive, - "replace_case_sensitive", FALSE, "check_case"); stash_group_add_toggle_button(group, &settings.replace_regexp, "replace_regexp", FALSE, "check_regexp"); + stash_group_add_toggle_button(group, &settings.replace_case_sensitive, + "replace_case_sensitive", FALSE, "check_case"); stash_group_add_toggle_button(group, &settings.replace_escape_sequences, "replace_escape_sequences", FALSE, "check_escape"); stash_group_add_toggle_button(group, &settings.replace_match_whole_word, Modified: branches/sm/src/symbols.c =================================================================== --- branches/sm/src/symbols.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/symbols.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -946,6 +946,19 @@ &tv_iters.tag_macro, _("Macros"), "classviewer-macro", NULL); break; + case GEANY_FILETYPES_SQL: + { + tag_list_add_groups(tag_store, + &(tv_iters.tag_function), _("Functions"), "classviewer-method", + &(tv_iters.tag_namespace), _("Procedures"), "classviewer-namespace", + &(tv_iters.tag_struct), _("Indexes"), "classviewer-struct", + &(tv_iters.tag_class), _("Tables"), "classviewer-class", + &(tv_iters.tag_macro), _("Triggers"), "classviewer-macro", + &(tv_iters.tag_member), _("Views"), "classviewer-var", + &(tv_iters.tag_other), _("Other"), "classviewer-other", + NULL); + break; + } case GEANY_FILETYPES_D: default: { Modified: branches/sm/src/ui_utils.c =================================================================== --- branches/sm/src/ui_utils.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/ui_utils.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -2446,16 +2446,49 @@ * @since 0.19 */ void ui_menu_add_document_items(GtkMenu *menu, GeanyDocument *active, GCallback callback) { + ui_menu_add_document_items_sorted(menu, active, callback, NULL); +} + + +/** Adds a list of document items to @a menu. + * + * @a sort_func might be NULL to not sort the documents in the menu. In this case, + * the order of the document tabs is used. + * + * See document_sort_by_display_name() for an example sort function. + * + * @param menu Menu. + * @param active Which document to highlight, or @c NULL. + * @param callback is used for each menu item's @c "activate" signal and will be passed + * the corresponding document pointer as @c user_data. + * @param sort_func is used to sort the list. Might be @c NULL to not sort the list. + * @warning You should check @c doc->is_valid in the callback. + * @since 0.21 */ +void ui_menu_add_document_items_sorted(GtkMenu *menu, GeanyDocument *active, + GCallback callback, GCompareFunc sort_func) +{ GtkWidget *menu_item, *menu_item_label, *image; const GdkColor *color; GeanyDocument *doc; guint i, len; gchar *base_name, *label; + GPtrArray *sorted_documents; len = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); - for (i = 0; i < len; i++) + + sorted_documents = g_ptr_array_sized_new(len); + /* copy the documents_array into the new one */ + foreach_document(i) { - doc = document_get_from_page(i); + g_ptr_array_add(sorted_documents, documents[i]); + } + /* and now sort it */ + if (sort_func != NULL) + g_ptr_array_sort(sorted_documents, sort_func); + + for (i = 0; i < GEANY(sorted_documents)->len; i++) + { + doc = g_ptr_array_index(sorted_documents, i); if (! DOC_VALID(doc)) continue; @@ -2482,6 +2515,7 @@ g_free(base_name); } + g_ptr_array_free(sorted_documents, TRUE); } Modified: branches/sm/src/ui_utils.h =================================================================== --- branches/sm/src/ui_utils.h 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/src/ui_utils.h 2011-05-21 08:59:27 UTC (rev 5809) @@ -246,6 +246,8 @@ void ui_menu_add_document_items(GtkMenu *menu, GeanyDocument *active, GCallback callback); +void ui_menu_add_document_items_sorted(GtkMenu *menu, GeanyDocument *active, + GCallback callback, GCompareFunc sort_func); void ui_set_statusbar(gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); Modified: branches/sm/tagmanager/sql.c =================================================================== --- branches/sm/tagmanager/sql.c 2011-05-21 08:58:07 UTC (rev 5808) +++ branches/sm/tagmanager/sql.c 2011-05-21 08:59:27 UTC (rev 5809) @@ -182,18 +182,18 @@ { FALSE, 'l', "local", "local variables" }, { TRUE, 'L', "label", "block label" }, { TRUE, 'P', "package", "packages" }, - { TRUE, 'p', "procedure", "procedures" }, + { TRUE, 'n', "namespace", "procedures" }, { FALSE, 'r', "record", "records" }, { TRUE, 's', "subtype", "subtypes" }, - { TRUE, 't', "table", "tables" }, - { TRUE, 'T', "trigger", "triggers" }, + { TRUE, 't', "class", "tables" }, + { TRUE, 'T', "macro", "triggers" }, { TRUE, 'v', "variable", "variables" }, - { TRUE, 'i', "index", "indexes" }, + { TRUE, 'i', "struct", "indexes" }, { TRUE, 'e', "event", "events" }, { TRUE, 'U', "publication", "publications" }, { TRUE, 'R', "service", "services" }, { TRUE, 'D', "domain", "domains" }, - { TRUE, 'V', "view", "views" }, + { TRUE, 'm', "member", "views" }, { TRUE, 'n', "synonym", "synonyms" }, { TRUE, 'x', "mltable", "MobiLink Table Scripts" }, { TRUE, 'y', "mlconn", "MobiLink Conn Scripts" } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5808] branches/sm
by statc＠users.sourceforge.net 21 May '11

21 May '11

Revision: 5808 http://geany.svn.sourceforge.net/geany/?rev=5808&view=rev Author: statc Date: 2011-05-21 08:58:07 +0000 (Sat, 21 May 2011) Log Message: ----------- Merge trunk (revisions 5681..5700) Modified Paths: -------------- branches/sm/ChangeLog branches/sm/data/filetypes.Genie.conf branches/sm/data/filetypes.Scala.conf branches/sm/data/filetypes.c branches/sm/data/filetypes.vala branches/sm/geany.glade branches/sm/makefile.win32 branches/sm/scintilla/Makefile.am branches/sm/scintilla/gtk/PlatGTK.cxx branches/sm/scintilla/gtk/ScintillaGTK.cxx branches/sm/scintilla/gtk/scintilla-marshal.c branches/sm/scintilla/include/Platform.h branches/sm/scintilla/include/SciLexer.h branches/sm/scintilla/include/Scintilla.h branches/sm/scintilla/include/Scintilla.iface branches/sm/scintilla/lexers/LexAda.cxx branches/sm/scintilla/lexers/LexAsm.cxx branches/sm/scintilla/lexers/LexBash.cxx branches/sm/scintilla/lexers/LexCOBOL.cxx branches/sm/scintilla/lexers/LexCPP.cxx branches/sm/scintilla/lexers/LexCSS.cxx branches/sm/scintilla/lexers/LexCmake.cxx branches/sm/scintilla/lexers/LexD.cxx branches/sm/scintilla/lexers/LexErlang.cxx branches/sm/scintilla/lexers/LexForth.cxx branches/sm/scintilla/lexers/LexFortran.cxx branches/sm/scintilla/lexers/LexHTML.cxx branches/sm/scintilla/lexers/LexLisp.cxx branches/sm/scintilla/lexers/LexLua.cxx branches/sm/scintilla/lexers/LexMarkdown.cxx branches/sm/scintilla/lexers/LexMatlab.cxx branches/sm/scintilla/lexers/LexNsis.cxx branches/sm/scintilla/lexers/LexOthers.cxx branches/sm/scintilla/lexers/LexPascal.cxx branches/sm/scintilla/lexers/LexPerl.cxx branches/sm/scintilla/lexers/LexPython.cxx branches/sm/scintilla/lexers/LexR.cxx branches/sm/scintilla/lexers/LexSQL.cxx branches/sm/scintilla/lexers/LexTCL.cxx branches/sm/scintilla/lexers/LexTxt2tags.cxx branches/sm/scintilla/lexers/LexVHDL.cxx branches/sm/scintilla/lexers/LexVerilog.cxx branches/sm/scintilla/lexers/LexYAML.cxx branches/sm/scintilla/lexlib/CharacterSet.h branches/sm/scintilla/lexlib/LexerBase.h branches/sm/scintilla/lexlib/OptionSet.h branches/sm/scintilla/lexlib/WordList.cxx branches/sm/scintilla/makefile.win32 branches/sm/scintilla/scintilla_changes.patch branches/sm/scintilla/src/AutoComplete.cxx branches/sm/scintilla/src/CallTip.cxx branches/sm/scintilla/src/Document.cxx branches/sm/scintilla/src/Document.h branches/sm/scintilla/src/Editor.cxx branches/sm/scintilla/src/Editor.h branches/sm/scintilla/src/ExternalLexer.cxx branches/sm/scintilla/src/ExternalLexer.h branches/sm/scintilla/src/Partitioning.h branches/sm/scintilla/src/PositionCache.cxx branches/sm/scintilla/src/RunStyles.cxx branches/sm/scintilla/src/Selection.cxx branches/sm/scintilla/src/Selection.h branches/sm/scintilla/src/SplitVector.h branches/sm/scintilla/src/ViewStyle.cxx branches/sm/scintilla/src/ViewStyle.h branches/sm/src/editor.c branches/sm/src/highlighting.c branches/sm/src/interface.c branches/sm/src/prefs.c branches/sm/src/search.c branches/sm/src/templates.c branches/sm/src/tools.c branches/sm/src/win32.c branches/sm/tagmanager/makefile.win32 Added Paths: ----------- branches/sm/scintilla/lexlib/SparseState.h branches/sm/scintilla/version.txt Modified: branches/sm/ChangeLog =================================================================== --- branches/sm/ChangeLog 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/ChangeLog 2011-05-21 08:58:07 UTC (rev 5808) @@ -1,3 +1,64 @@ +2011-04-08 Colomban Wendling <colomban(at)geany(dot)org> + + * scintilla/lexers/LexCPP.cxx: + Make hightlighting of triple-quoted verbatim an option (Backport + from Scintilla HG 3602:5536ed81a85b). + * src/highlighting.c: + Add highlight for triple-quoted verbatims. + * data/filetypes.c, data/filetypes.vala, data/filetypes.Genie.conf, + data/filetypes.Scala.conf: + Highlight triple-quoted verbatims in Vala, Genie and Scala filtypes. + * data/filetypes.Genie.conf: + Copy C styling rather than redefining the styles. + * src/editor.c: + Don't set font twice for line numbers and braces. + + +2011-04-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/templates.c: + Remove TEMPLATES_GET_FILENAME() macro. + * src/search.c: + Don't auto-enable case-sensitive option when enabling regex in + Find/Replace dialogs. + + +2011-04-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/gtk/ScintillaGTK.cxx: + Fix X PRIMARY selection issue when Scintilla widget is + unrealized/re-realized (Backport from Scintilla HG, + original patch by Matthew Brush). + Reset cursors when Scintilla widget is realized (Backport from + Scintilla HG, original patch by Matthew Brush). + + +2011-04-04 Colomban Wendling <colomban(at)geany(dot)org> + + * scintilla/gtk/PlatGTK.cxx: + Fix font rendering in Scintilla when using Cairo. + + +2011-04-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, geany.glade: + Make Project->Properties the last menu item so it's faster to use. + + +2011-04-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/*: + Update Scintilla to version 2.25. + * version.txt, Makefile.am: + Add Scintilla's version.txt file. + * scintilla/makefile.win32, tagmanager/makefile.win32, makefile.win32: + Replace escape character '\' by slash '/' in paths in the + Windows Makefiles (patch by Matthew Brush, thanks). + * src/tools.c: + Reflect the existence of the entered command in `Set Custom Commands` + dialog as well using the yes/no icon. + + 2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> * src/main.c, src/prefs.c, src/tools.c: @@ -2,2 +63,6 @@ Fix loading and updating menu accelerators for custom commands. + * src/prefs.c: + Don't allow editing keybinding column of group rows. + * src/tools.c: + Fix ID of newly added commands in the `Set Custom Commands` dialog. Modified: branches/sm/data/filetypes.Genie.conf =================================================================== --- branches/sm/data/filetypes.Genie.conf 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/data/filetypes.Genie.conf 2011-05-21 08:58:07 UTC (rev 5808) @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line @@ -31,6 +8,9 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +[lexer_properties] +lexer.cpp.triplequoted.strings=1 + [settings] # Vala uses the C lexer lexer_filetype=C Modified: branches/sm/data/filetypes.Scala.conf =================================================================== --- branches/sm/data/filetypes.Scala.conf 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/data/filetypes.Scala.conf 2011-05-21 08:58:07 UTC (rev 5808) @@ -5,11 +5,13 @@ [keywords] # all items must be in one line primary=abstract case catch class def do else extends false final finally for forSome if implicit import lazy match new object override package private protected requires return sealed throw trait true try type val var with while yield @ => - secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List Option Some Stack String Unit Console Nil None Predef # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union +[lexer_properties] +lexer.cpp.triplequoted.strings=1 + [settings] lexer_filetype=C Modified: branches/sm/data/filetypes.c =================================================================== --- branches/sm/data/filetypes.c 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/data/filetypes.c 2011-05-21 08:58:07 UTC (rev 5808) @@ -15,7 +15,7 @@ operator=operator identifier=default stringeol=stringeol -# @"verbatim" +# @"verbatim" and """multi-line verbatim""" verbatim=extra # (/regex/) regex=extra Modified: branches/sm/data/filetypes.vala =================================================================== --- branches/sm/data/filetypes.vala 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/data/filetypes.vala 2011-05-21 08:58:07 UTC (rev 5808) @@ -38,6 +38,7 @@ preprocessor.start.$(file.patterns.cpp)=if preprocessor.middle.$(file.patterns.cpp)=else elif preprocessor.end.$(file.patterns.cpp)=endif +lexer.cpp.triplequoted.strings=1 [settings] lexer_filetype=C Modified: branches/sm/geany.glade =================================================================== --- branches/sm/geany.glade 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/geany.glade 2011-05-21 08:58:07 UTC (rev 5808) @@ -67,7 +67,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4011"> + <widget class="GtkImage" id="image4056"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -144,7 +144,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4012"> + <widget class="GtkImage" id="image4057"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -165,7 +165,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4013"> + <widget class="GtkImage" id="image4058"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -185,7 +185,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4014"> + <widget class="GtkImage" id="image4059"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -272,7 +272,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4015"> + <widget class="GtkImage" id="image4060"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -293,7 +293,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4016"> + <widget class="GtkImage" id="image4061"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -433,7 +433,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4017"> + <widget class="GtkImage" id="image4062"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -454,7 +454,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4018"> + <widget class="GtkImage" id="image4063"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -611,7 +611,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4019"> + <widget class="GtkImage" id="image4064"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -632,7 +632,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4020"> + <widget class="GtkImage" id="image4065"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -697,7 +697,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4021"> + <widget class="GtkImage" id="image4066"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -782,7 +782,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4022"> + <widget class="GtkImage" id="image4067"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -814,7 +814,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4023"> + <widget class="GtkImage" id="image4068"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -862,7 +862,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4024"> + <widget class="GtkImage" id="image4069"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -883,7 +883,7 @@ <signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4025"> + <widget class="GtkImage" id="image4070"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -951,7 +951,7 @@ <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4026"> + <widget class="GtkImage" id="image4071"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -972,7 +972,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4027"> + <widget class="GtkImage" id="image4072"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -999,7 +999,7 @@ <signal name="activate" handler="on_next_message1_activate" last_modification_time="Tue, 05 Dec 2006 11:15:02 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4028"> + <widget class="GtkImage" id="image4073"> <property name="visible">True</property> <property name="stock">gtk-go-down</property> <property name="icon_size">1</property> @@ -1020,7 +1020,7 @@ <signal name="activate" handler="on_previous_message1_activate" last_modification_time="Wed, 25 Jun 2008 12:10:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4029"> + <widget class="GtkImage" id="image4074"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -1071,7 +1071,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4030"> + <widget class="GtkImage" id="image4075"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1199,7 +1199,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4031"> + <widget class="GtkImage" id="image4076"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1771,7 +1771,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4032"> + <widget class="GtkImage" id="image4077"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1792,7 +1792,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4033"> + <widget class="GtkImage" id="image4078"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1821,7 +1821,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4034"> + <widget class="GtkImage" id="image4079"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1841,11 +1841,12 @@ </child> <child> - <widget class="GtkImageMenuItem" id="project_properties1"> + <widget class="GtkMenuItem" id="reset_indentation1"> <property name="visible">True</property> - <property name="label">gtk-properties</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_project_properties1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> + <property name="tooltip" translatable="yes">Apply the default indentation settings to all documents</property> + <property name="label" translatable="yes">_Apply Default Indentation</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_reset_indentation1_activate" last_modification_time="Mon, 08 Nov 2010 15:30:43 GMT"/> </widget> </child> @@ -1856,12 +1857,11 @@ </child> <child> - <widget class="GtkMenuItem" id="reset_indentation1"> + <widget class="GtkImageMenuItem" id="project_properties1"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Apply the default indentation settings to all documents</property> - <property name="label" translatable="yes">_Apply Default Indentation</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_reset_indentation1_activate" last_modification_time="Mon, 08 Nov 2010 15:30:43 GMT"/> + <property name="label">gtk-properties</property> + <property name="use_stock">True</property> + <signal name="activate" handler="on_project_properties1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> </widget> </child> </widget> @@ -1894,7 +1894,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4035"> + <widget class="GtkImage" id="image4080"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1914,7 +1914,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4036"> + <widget class="GtkImage" id="image4081"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1941,7 +1941,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4037"> + <widget class="GtkImage" id="image4082"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1993,7 +1993,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4038"> + <widget class="GtkImage" id="image4083"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> Modified: branches/sm/makefile.win32 =================================================================== --- branches/sm/makefile.win32 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/makefile.win32 2011-05-21 08:58:07 UTC (rev 5808) @@ -22,7 +22,7 @@ # Note: && is needed after cd because each line is executed in a different # shell. (cd .. is just for clarity). all: check-tools config.h - cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\.. + cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../.. cd tagmanager && $(MAKE) -f makefile.win32 && cd .. cd scintilla && $(MAKE) -f makefile.win32 && cd .. cd plugins && $(MAKE) -f makefile.win32 && cd .. @@ -38,14 +38,14 @@ $(CP) $< $@ deps: - -$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak + -$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak # used by src/makefile.win32 to avoid del ../file which is an error clean-local: -$(RM) geany_private.res geany.exe clean: deps - cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\.. + cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../.. cd tagmanager && $(MAKE) -f makefile.win32 clean && cd .. cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. cd plugins && $(MAKE) -f makefile.win32 clean && cd .. Modified: branches/sm/scintilla/Makefile.am =================================================================== --- branches/sm/scintilla/Makefile.am 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/Makefile.am 2011-05-21 08:58:07 UTC (rev 5808) @@ -61,6 +61,7 @@ lexlib/OptionSet.h \ lexlib/PropSetSimple.cxx \ lexlib/PropSetSimple.h \ +lexlib/SparseState.h \ lexlib/StyleContext.cxx \ lexlib/StyleContext.h \ lexlib/WordList.cxx \ @@ -125,4 +126,4 @@ glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --body > gtk/scintilla-marshal.c -EXTRA_DIST=gtk/scintilla-marshal.list License.txt README +EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt Modified: branches/sm/scintilla/gtk/PlatGTK.cxx =================================================================== --- branches/sm/scintilla/gtk/PlatGTK.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/gtk/PlatGTK.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -7,6 +7,7 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> +#include <math.h> #include <glib.h> #include <gmodule.h> @@ -39,6 +40,14 @@ #define IS_WIDGET_FOCUSSED(w) (GTK_WIDGET_HAS_FOCUS(w)) #endif +#if GTK_CHECK_VERSION(2,22,0) +#define USE_CAIRO 1 +#endif + +#ifdef USE_CAIRO +#define DISABLE_GDK_FONT 1 +#endif + #ifdef _MSC_VER // Ignore unreferenced local functions in GTK+ headers #pragma warning(disable: 4505) @@ -688,9 +697,14 @@ #endif class SurfaceImpl : public Surface { encodingType et; +#ifdef USE_CAIRO + cairo_t *context; + cairo_surface_t *psurf; +#else GdkDrawable *drawable; GdkGC *gc; GdkPixmap *ppixmap; +#endif int x; int y; bool inited; @@ -806,7 +820,15 @@ } } -SurfaceImpl::SurfaceImpl() : et(singleByte), drawable(0), gc(0), ppixmap(0), +SurfaceImpl::SurfaceImpl() : et(singleByte), +#ifdef USE_CAIRO +context(0), +psurf(0), +#else +drawable(0), +gc(0), +ppixmap(0), +#endif x(0), y(0), inited(false), createdGC(false) , pcontext(0), layout(0), characterSet(-1) { } @@ -817,15 +839,28 @@ void SurfaceImpl::Release() { et = singleByte; +#ifndef USE_CAIRO drawable = 0; +#endif if (createdGC) { createdGC = false; +#ifdef USE_CAIRO + cairo_destroy(context); +#else g_object_unref(gc); +#endif } +#ifdef USE_CAIRO + context = 0; + if (psurf) + cairo_surface_destroy(psurf); + psurf = 0; +#else gc = 0; if (ppixmap) g_object_unref(ppixmap); ppixmap = 0; +#endif if (layout) g_object_unref(layout); layout = 0; @@ -847,6 +882,19 @@ void SurfaceImpl::Init(WindowID wid) { Release(); PLATFORM_ASSERT(wid); +#ifdef USE_CAIRO + GdkDrawable *drawable_ = GDK_DRAWABLE(PWidget(wid)->window); + if (drawable_) { + context = gdk_cairo_create(drawable_); + PLATFORM_ASSERT(context); + } else { + // Shouldn't happen with valid window but may when calls made before + // window completely allocated and mapped. + psurf = cairo_image_surface_create(CAIRO_FORMAT_RGB24, 1, 1); + context = cairo_create(psurf); + } + createdGC = true; +#endif pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); @@ -859,12 +907,20 @@ GdkDrawable *drawable_ = reinterpret_cast<GdkDrawable *>(sid); Release(); PLATFORM_ASSERT(wid); +#ifdef USE_CAIRO + context = gdk_cairo_create(drawable_); +#else + gc = gdk_gc_new(drawable_); + drawable = drawable_; +#endif pcontext = gtk_widget_create_pango_context(PWidget(wid)); layout = pango_layout_new(pcontext); - drawable = drawable_; - gc = gdk_gc_new(drawable_); +#ifdef USE_CAIRO + cairo_set_line_width(context, 1); +#else // Ask for lines that do not paint the last pixel so is like Win32 gdk_gc_set_line_attributes(gc, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_MITER); +#endif createdGC = true; inited = true; } @@ -873,28 +929,62 @@ PLATFORM_ASSERT(surface_); Release(); SurfaceImpl *surfImpl = static_cast<SurfaceImpl *>(surface_); + PLATFORM_ASSERT(wid); +#ifdef USE_CAIRO + context = cairo_reference(surfImpl->context); +#else PLATFORM_ASSERT(surfImpl->drawable); - PLATFORM_ASSERT(wid); + gc = gdk_gc_new(surfImpl->drawable); +#endif pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); PLATFORM_ASSERT(layout); +#ifdef USE_CAIRO if (height > 0 && width > 0) + psurf = gdk_window_create_similar_surface( + gtk_widget_get_window(PWidget(wid)), + CAIRO_CONTENT_COLOR_ALPHA, width, height); +#else + if (height > 0 && width > 0) ppixmap = gdk_pixmap_new(surfImpl->drawable, width, height, -1); drawable = ppixmap; - gc = gdk_gc_new(surfImpl->drawable); +#endif +#ifdef USE_CAIRO + cairo_destroy(context); + context = cairo_create(psurf); + cairo_rectangle(context, 0, 0, width, height); + cairo_set_source_rgb(context, 1.0, 0, 0); + cairo_fill(context); + // This produces sharp drawing more similar to GDK: + //cairo_set_antialias(context, CAIRO_ANTIALIAS_NONE); +#endif +#ifdef USE_CAIRO + cairo_set_line_width(context, 1); +#else // Ask for lines that do not paint the last pixel so is like Win32 gdk_gc_set_line_attributes(gc, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_MITER); +#endif createdGC = true; inited = true; } void SurfaceImpl::PenColour(ColourAllocated fore) { +#ifdef USE_CAIRO + if (context) { + ColourDesired cdFore(fore.AsLong()); + cairo_set_source_rgb(context, + cdFore.GetBlue() / 255.0, + cdFore.GetGreen() / 255.0, + cdFore.GetRed() / 255.0); + } +#else if (gc) { GdkColor co; co.pixel = fore.AsLong(); gdk_gc_set_foreground(gc, &co); } +#endif } int SurfaceImpl::LogPixelsY() { @@ -911,18 +1001,71 @@ y = y_; } +#ifdef USE_CAIRO +static int Delta(int difference) { + if (difference < 0) + return -1; + else if (difference > 0) + return 1; + else + return 0; +} +#endif + void SurfaceImpl::LineTo(int x_, int y_) { +#ifdef USE_CAIRO + // cairo_line_to draws the end position, unlike Win32 or GDK with GDK_CAP_NOT_LAST. + // For simple cases, move back one pixel from end. + if (context) { + int xDiff = x_ - x; + int xDelta = Delta(xDiff); + int yDiff = y_ - y; + int yDelta = Delta(yDiff); + if ((xDiff == 0) || (yDiff == 0)) { + // Horizontal or vertical lines can be more precisely drawn as a filled rectangle + int xEnd = x_ - xDelta; + int left = Platform::Minimum(x, xEnd); + int width = abs(x - xEnd) + 1; + int yEnd = y_ - yDelta; + int top = Platform::Minimum(y, yEnd); + int height = abs(y - yEnd) + 1; + cairo_rectangle(context, left, top, width, height); + cairo_fill(context); + } else if ((abs(xDiff) == abs(yDiff))) { + // 45 degree slope + cairo_move_to(context, x + 0.5, y + 0.5); + cairo_line_to(context, x_ + 0.5 - xDelta, y_ + 0.5 - yDelta); + } else { + // Line has a different slope so difficult to avoid last pixel + cairo_move_to(context, x + 0.5, y + 0.5); + cairo_line_to(context, x_ + 0.5, y_ + 0.5); + } + cairo_stroke(context); + } +#else if (drawable && gc) { gdk_draw_line(drawable, gc, x, y, x_, y_); } +#endif x = x_; y = y_; } void SurfaceImpl::Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back) { +#ifdef USE_CAIRO + PenColour(back); + cairo_move_to(context, pts[0].x + 0.5, pts[0].y + 0.5); + for (int i = 1;i < npts;i++) { + cairo_line_to(context, pts[i].x + 0.5, pts[i].y + 0.5); + } + cairo_close_path(context); + cairo_fill_preserve(context); + PenColour(fore); + cairo_stroke(context); +#else GdkPoint gpts[20]; if (npts < static_cast<int>((sizeof(gpts) / sizeof(gpts[0])))) { for (int i = 0;i < npts;i++) { @@ -934,35 +1077,62 @@ PenColour(fore); gdk_draw_polygon(drawable, gc, 0, gpts, npts); } +#endif } void SurfaceImpl::RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back) { +#ifdef USE_CAIRO + if (context) { +#else if (gc && drawable) { +#endif +#ifdef USE_CAIRO + cairo_rectangle(context, rc.left + 0.5, rc.top + 0.5, + rc.right - rc.left - 1, rc.bottom - rc.top - 1); PenColour(back); + cairo_fill_preserve(context); + PenColour(fore); + cairo_stroke(context); +#else + PenColour(back); gdk_draw_rectangle(drawable, gc, 1, rc.left + 1, rc.top + 1, rc.right - rc.left - 2, rc.bottom - rc.top - 2); - PenColour(fore); // The subtraction of 1 off the width and height here shouldn't be needed but // otherwise a different rectangle is drawn than would be done if the fill parameter == 1 gdk_draw_rectangle(drawable, gc, 0, rc.left, rc.top, rc.right - rc.left - 1, rc.bottom - rc.top - 1); +#endif } } void SurfaceImpl::FillRectangle(PRectangle rc, ColourAllocated back) { PenColour(back); +#ifdef USE_CAIRO + if (context && (rc.left < maxCoordinate)) { // Protect against out of range + cairo_rectangle(context, rc.left, rc.top, + rc.right - rc.left, rc.bottom - rc.top); + cairo_fill(context); + } +#else if (drawable && (rc.left < maxCoordinate)) { // Protect against out of range gdk_draw_rectangle(drawable, gc, 1, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); } +#endif } void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) { - if (static_cast<SurfaceImpl &>(surfacePattern).drawable) { + SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfacePattern); +#ifdef USE_CAIRO + bool canDraw = surfi.psurf; +#else + bool canDraw = surfi.drawable; +#endif + if (canDraw) { // Tile pattern over rectangle // Currently assumes 8x8 pattern int widthPat = 8; @@ -971,12 +1141,18 @@ int widthx = (xTile + widthPat > rc.right) ? rc.right - xTile : widthPat; for (int yTile = rc.top; yTile < rc.bottom; yTile += heightPat) { int heighty = (yTile + heightPat > rc.bottom) ? rc.bottom - yTile : heightPat; +#ifdef USE_CAIRO + cairo_set_source_surface(context, surfi.psurf, xTile, yTile); + cairo_rectangle(context, xTile, yTile, widthx, heighty); + cairo_fill(context); +#else gdk_draw_drawable(drawable, gc, static_cast<SurfaceImpl &>(surfacePattern).drawable, 0, 0, xTile, yTile, widthx, heighty); +#endif } } } else { @@ -1005,6 +1181,21 @@ } } +#ifdef USE_CAIRO + +static void PathRoundRectangle(cairo_t *context, double left, double top, double width, double height, int radius) { + double degrees = M_PI / 180.0; + + cairo_new_sub_path(context); + cairo_arc(context, left + width - radius, top + radius, radius, -90 * degrees, 0 * degrees); + cairo_arc(context, left + width - radius, top + height - radius, radius, 0 * degrees, 90 * degrees); + cairo_arc(context, left + radius, top + height - radius, radius, 90 * degrees, 180 * degrees); + cairo_arc(context, left + radius, top + radius, radius, 180 * degrees, 270 * degrees); + cairo_close_path(context); +} + +#else + // Plot a point into a guint32 buffer symetrically to all 4 qudrants static void AllFour(guint32 *pixels, int stride, int width, int height, int x, int y, guint32 val) { pixels[y*stride+x] = val; @@ -1013,6 +1204,20 @@ pixels[(height-1-y)*stride+width-1-x] = val; } +static guint32 u32FromRGBA(guint8 r, guint8 g, guint8 b, guint8 a) { + union { + guint8 pixVal[4]; + guint32 val; + } converter; + converter.pixVal[0] = r; + converter.pixVal[1] = g; + converter.pixVal[2] = b; + converter.pixVal[3] = a; + return converter.val; +} + +#endif + static unsigned int GetRValue(unsigned int co) { return (co >> 16) & 0xff; } @@ -1025,20 +1230,27 @@ return co & 0xff; } -static guint32 u32FromRGBA(guint8 r, guint8 g, guint8 b, guint8 a) { - union { - guint8 pixVal[4]; - guint32 val; - } converter; - converter.pixVal[0] = r; - converter.pixVal[1] = g; - converter.pixVal[2] = b; - converter.pixVal[3] = a; - return converter.val; -} - void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill, ColourAllocated outline, int alphaOutline, int flags) { +#ifdef USE_CAIRO + if (context && rc.Width() > 0) { + cairo_set_source_rgba(context, + GetRValue(fill.AsLong()) / 255.0, + GetGValue(fill.AsLong()) / 255.0, + GetBValue(fill.AsLong()) / 255.0, + alphaFill / 255.0); + PathRoundRectangle(context, rc.left + 1.0, rc.top+1.0, rc.right - rc.left - 2.0, rc.bottom - rc.top - 2.0, cornerSize); + cairo_fill(context); + + cairo_set_source_rgba(context, + GetRValue(outline.AsLong()) / 255.0, + GetGValue(outline.AsLong()) / 255.0, + GetBValue(outline.AsLong()) / 255.0, + alphaOutline / 255.0); + PathRoundRectangle(context, rc.left +0.5, rc.top+0.5, rc.right - rc.left - 1, rc.bottom - rc.top - 1, cornerSize); + cairo_stroke(context); + } +#else if (gc && drawable && rc.Width() > 0) { int width = rc.Width(); int height = rc.Height(); @@ -1078,10 +1290,18 @@ g_object_unref(pixalpha); } +#endif } void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) { PenColour(back); +#ifdef USE_CAIRO + cairo_arc(context, (rc.left + rc.right) / 2 + 0.5, (rc.top + rc.bottom) / 2 + 0.5, + Platform::Minimum(rc.Width(), rc.Height()) / 2, 0, 2*M_PI); + cairo_fill_preserve(context); + PenColour(fore); + cairo_stroke(context); +#else gdk_draw_arc(drawable, gc, 1, rc.left + 1, rc.top + 1, rc.right - rc.left - 2, rc.bottom - rc.top - 2, @@ -1093,16 +1313,30 @@ rc.left, rc.top, rc.right - rc.left - 1, rc.bottom - rc.top - 1, 0, 32767); +#endif } void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) { - if (static_cast<SurfaceImpl &>(surfaceSource).drawable) { + SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfaceSource); +#ifdef USE_CAIRO + bool canDraw = surfi.psurf; +#else + bool canDraw = surfi.drawable; +#endif + if (canDraw) { +#ifdef USE_CAIRO + cairo_set_source_surface(context, surfi.psurf, + rc.left - from.x, rc.top - from.y); + cairo_rectangle(context, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top); + cairo_fill(context); +#else gdk_draw_drawable(drawable, gc, static_cast<SurfaceImpl &>(surfaceSource).drawable, from.x, from.y, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); +#endif } } @@ -1232,7 +1466,11 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore) { PenColour(fore); +#ifdef USE_CAIRO + if (context) { +#else if (gc && drawable) { +#endif int xText = rc.left; if (PFont(font_)->pfd) { char *utfForm = 0; @@ -1256,12 +1494,20 @@ pango_layout_set_text(layout, utfForm, len); } pango_layout_set_font_description(layout, PFont(font_)->pfd); +#ifdef USE_CAIRO + pango_cairo_update_layout(context, layout); +#endif #ifdef PANGO_VERSION PangoLayoutLine *pll = pango_layout_get_line_readonly(layout,0); #else PangoLayoutLine *pll = pango_layout_get_line(layout,0); #endif +#ifdef USE_CAIRO + cairo_move_to(context, xText, ybase); + pango_cairo_show_layout_line(context, pll); +#else gdk_draw_layout_line(drawable, gc, xText, ybase, pll); +#endif if (useGFree) { g_free(utfForm); } else { @@ -1717,9 +1963,14 @@ } void SurfaceImpl::SetClip(PRectangle rc) { +#ifdef USE_CAIRO + cairo_rectangle(context, rc.left, rc.top, rc.right, rc.bottom); + cairo_clip(context); +#else GdkRectangle area = {rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top}; gdk_gc_set_clip_rectangle(gc, &area); +#endif } void SurfaceImpl::FlushCachedState() {} @@ -1875,7 +2126,6 @@ gdk window coordinates */ PRectangle Window::GetMonitorRect(Point pt) { gint x_offset, y_offset; - pt = pt; gdk_window_get_origin(PWidget(wid)->window, &x_offset, &y_offset); @@ -1894,6 +2144,7 @@ return PRectangle(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); } #else + pt = pt; return PRectangle(-x_offset, -y_offset, (-x_offset) + gdk_screen_width(), (-y_offset) + gdk_screen_height()); #endif @@ -1936,7 +2187,7 @@ CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } Modified: branches/sm/scintilla/gtk/ScintillaGTK.cxx =================================================================== --- branches/sm/scintilla/gtk/ScintillaGTK.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/gtk/ScintillaGTK.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -75,6 +75,10 @@ #define IS_WIDGET_VISIBLE(w) (GTK_WIDGET_VISIBLE(w)) #endif +#if GTK_CHECK_VERSION(2,22,0) +#define USE_CAIRO 1 +#endif + #ifdef _MSC_VER // Constant conditional expressions are because of GTK+ headers #pragma warning(disable: 4127) @@ -416,6 +420,26 @@ gtk_widget_realize(widtxt); gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); + + cursor = gdk_cursor_new(GDK_XTERM); + gdk_window_set_cursor(PWidget(wText)->window, cursor); + gdk_cursor_unref(cursor); + + cursor = gdk_cursor_new(GDK_LEFT_PTR); + gdk_window_set_cursor(PWidget(scrollbarv)->window, cursor); + gdk_cursor_unref(cursor); + + cursor = gdk_cursor_new(GDK_LEFT_PTR); + gdk_window_set_cursor(PWidget(scrollbarh)->window, cursor); + gdk_cursor_unref(cursor); + + gtk_selection_add_targets(widget, GDK_SELECTION_PRIMARY, + clipboardCopyTargets, nClipboardCopyTargets); + +#ifndef USE_GTK_CLIPBOARD + gtk_selection_add_targets(widget, atomClipboard, + clipboardPasteTargets, nClipboardPasteTargets); +#endif } void ScintillaGTK::Realize(GtkWidget *widget) { @@ -425,6 +449,14 @@ void ScintillaGTK::UnRealizeThis(GtkWidget *widget) { try { + + gtk_selection_clear_targets(widget, GDK_SELECTION_PRIMARY); + +#ifndef USE_GTK_CLIPBOARD + gtk_selection_clear_targets(widget, atomClipboard); +#endif + + if (IS_WIDGET_MAPPED(widget)) { gtk_widget_unmap(widget); } @@ -531,7 +563,6 @@ gint ScintillaGTK::FocusInThis(GtkWidget *widget) { try { - GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS); SetFocusState(true); if (im_context != NULL) { gchar *str = NULL; @@ -562,7 +593,6 @@ gint ScintillaGTK::FocusOutThis(GtkWidget *widget) { try { - GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS); SetFocusState(false); if (PWidget(wPreedit) != NULL) @@ -668,14 +698,6 @@ gtk_widget_grab_focus(PWidget(wMain)); - gtk_selection_add_targets(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, - clipboardCopyTargets, nClipboardCopyTargets); - -#ifndef USE_GTK_CLIPBOARD - gtk_selection_add_targets(GTK_WIDGET(PWidget(wMain)), atomClipboard, - clipboardPasteTargets, nClipboardPasteTargets); -#endif - gtk_drag_dest_set(GTK_WIDGET(PWidget(wMain)), GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE)); @@ -1422,7 +1444,7 @@ UndoGroup ug(pdoc); if (selection_data->selection != GDK_SELECTION_PRIMARY) { - ClearSelection(); + ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); } SelectionPosition selStart = sel.IsRectangular() ? sel.Rectangular().Start() : @@ -1983,6 +2005,7 @@ PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), str); pango_layout_set_attributes(layout, attrs); +#ifndef USE_CAIRO GdkGC *gc = gdk_gc_new(widget->window); GdkColor color[2] = { {0, 0x0000, 0x0000, 0x0000}, {0, 0xffff, 0xffff, 0xffff} @@ -1997,8 +2020,8 @@ gdk_gc_set_foreground(gc, color); gdk_gc_set_background(gc, color + 1); gdk_draw_layout(widget->window, gc, 0, 0, layout); - g_object_unref(gc); +#endif g_free(str); pango_attr_list_unref(attrs); g_object_unref(layout); Modified: branches/sm/scintilla/gtk/scintilla-marshal.c =================================================================== --- branches/sm/scintilla/gtk/scintilla-marshal.c 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/gtk/scintilla-marshal.c 2011-05-21 08:58:07 UTC (rev 5808) @@ -35,8 +35,8 @@ #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_int -#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong #define g_marshal_value_peek_float(v) (v)->data[0].v_float #define g_marshal_value_peek_double(v) (v)->data[0].v_double #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer @@ -50,10 +50,10 @@ /* NONE:INT,POINTER (scintilla-marshal.list:1) */ void scintilla_marshal_VOID__INT_POINTER (GClosure *closure, - GValue *return_value, + GValue *return_value G_GNUC_UNUSED, guint n_param_values, const GValue *param_values, - gpointer invocation_hint, + gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, Modified: branches/sm/scintilla/include/Platform.h =================================================================== --- branches/sm/scintilla/include/Platform.h 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/include/Platform.h 2011-05-21 08:58:07 UTC (rev 5808) @@ -255,8 +255,8 @@ int allocatedLen; #endif // Private so Palette objects can not be copied - Palette(const Palette &) {} - Palette &operator=(const Palette &) { return *this; } + Palette(const Palette &); + Palette &operator=(const Palette &); public: #if PLAT_WIN void *hpal; @@ -288,8 +288,8 @@ int ascent; #endif // Private so Font objects can not be copied - Font(const Font &) {} - Font &operator=(const Font &) { fid=0; return *this; } + Font(const Font &); + Font &operator=(const Font &); public: Font(); virtual ~Font(); Modified: branches/sm/scintilla/include/SciLexer.h =================================================================== --- branches/sm/scintilla/include/SciLexer.h 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/include/SciLexer.h 2011-05-21 08:58:07 UTC (rev 5808) @@ -112,6 +112,8 @@ #define SCLEX_SML 97 #define SCLEX_MARKDOWN 98 #define SCLEX_TXT2TAGS 99 +#define SCLEX_A68K 100 +#define SCLEX_MODULA 101 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -149,6 +151,8 @@ #define SCE_C_COMMENTDOCKEYWORD 17 #define SCE_C_COMMENTDOCKEYWORDERROR 18 #define SCE_C_GLOBALCLASS 19 +#define SCE_C_STRINGRAW 20 +#define SCE_C_TRIPLEVERBATIM 21 #define SCE_D_DEFAULT 0 #define SCE_D_COMMENT 1 #define SCE_D_COMMENTLINE 2 @@ -601,6 +605,7 @@ #define SCE_ASM_CHARACTER 12 #define SCE_ASM_STRINGEOL 13 #define SCE_ASM_EXTINSTRUCTION 14 +#define SCE_ASM_COMMENTDIRECTIVE 15 #define SCE_F_DEFAULT 0 #define SCE_F_COMMENT 1 #define SCE_F_NUMBER 2 @@ -1415,6 +1420,43 @@ #define SCE_TXT2TAGS_OPTION 23 #define SCE_TXT2TAGS_PREPROC 24 #define SCE_TXT2TAGS_POSTPROC 25 +#define SCE_A68K_DEFAULT 0 +#define SCE_A68K_COMMENT 1 +#define SCE_A68K_NUMBER_DEC 2 +#define SCE_A68K_NUMBER_BIN 3 +#define SCE_A68K_NUMBER_HEX 4 +#define SCE_A68K_STRING1 5 +#define SCE_A68K_OPERATOR 6 +#define SCE_A68K_CPUINSTRUCTION 7 +#define SCE_A68K_EXTINSTRUCTION 8 +#define SCE_A68K_REGISTER 9 +#define SCE_A68K_DIRECTIVE 10 +#define SCE_A68K_MACRO_ARG 11 +#define SCE_A68K_LABEL 12 +#define SCE_A68K_STRING2 13 +#define SCE_A68K_IDENTIFIER 14 +#define SCE_A68K_MACRO_DECLARATION 15 +#define SCE_A68K_COMMENT_WORD 16 +#define SCE_A68K_COMMENT_SPECIAL 17 +#define SCE_A68K_COMMENT_DOXYGEN 18 +#define SCE_MODULA_DEFAULT 0 +#define SCE_MODULA_COMMENT 1 +#define SCE_MODULA_DOXYCOMM 2 +#define SCE_MODULA_DOXYKEY 3 +#define SCE_MODULA_KEYWORD 4 +#define SCE_MODULA_RESERVED 5 +#define SCE_MODULA_NUMBER 6 +#define SCE_MODULA_BASENUM 7 +#define SCE_MODULA_FLOAT 8 +#define SCE_MODULA_STRING 9 +#define SCE_MODULA_STRSPEC 10 +#define SCE_MODULA_CHAR 11 +#define SCE_MODULA_CHARSPEC 12 +#define SCE_MODULA_PROC 13 +#define SCE_MODULA_PRAGMA 14 +#define SCE_MODULA_PRGKEY 15 +#define SCE_MODULA_OPERATOR 16 +#define SCE_MODULA_BADSTR 17 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: branches/sm/scintilla/include/Scintilla.h =================================================================== --- branches/sm/scintilla/include/Scintilla.h 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/include/Scintilla.h 2011-05-21 08:58:07 UTC (rev 5808) @@ -159,6 +159,8 @@ #define SCI_GETMARGINMASKN 2245 #define SCI_SETMARGINSENSITIVEN 2246 #define SCI_GETMARGINSENSITIVEN 2247 +#define SCI_SETMARGINCURSORN 2248 +#define SCI_GETMARGINCURSORN 2249 #define STYLE_DEFAULT 32 #define STYLE_LINENUMBER 33 #define STYLE_BRACELIGHT 34 @@ -590,7 +592,9 @@ #define SCI_SETMOUSEDOWNCAPTURES 2384 #define SCI_GETMOUSEDOWNCAPTURES 2385 #define SC_CURSORNORMAL -1 +#define SC_CURSORARROW 2 #define SC_CURSORWAIT 4 +#define SC_CURSORREVERSEARROW 7 #define SCI_SETCURSOR 2386 #define SCI_GETCURSOR 2387 #define SCI_SETCONTROLCHARSYMBOL 2388 @@ -832,6 +836,10 @@ #define SC_MOD_CONTAINER 0x40000 #define SC_MOD_LEXERSTATE 0x80000 #define SC_MODEVENTMASKALL 0xFFFFF +#define SC_UPDATE_CONTENT 0x1 +#define SC_UPDATE_SELECTION 0x2 +#define SC_UPDATE_V_SCROLL 0x4 +#define SC_UPDATE_H_SCROLL 0x8 #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 #define SCEN_KILLFOCUS 256 @@ -971,6 +979,7 @@ int y; /* SCN_DWELLSTART, SCN_DWELLEND */ int token; /* SCN_MODIFIED with SC_MOD_CONTAINER */ int annotationLinesAdded; /* SC_MOD_CHANGEANNOTATION */ + int updated; /* SCN_UPDATEUI */ }; #ifdef SCI_NAMESPACE Modified: branches/sm/scintilla/include/Scintilla.iface =================================================================== --- branches/sm/scintilla/include/Scintilla.iface 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/include/Scintilla.iface 2011-05-21 08:58:07 UTC (rev 5808) @@ -352,6 +352,12 @@ # Retrieve the mouse click sensitivity of a margin. get bool GetMarginSensitiveN=2247(int margin,) +# Set the cursor shown when the mouse is inside a margin. +set void SetMarginCursorN=2248(int margin, int cursor) + +# Retrieve the cursor shown in a margin. +get int GetMarginCursorN=2249(int margin,) + # Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles. # Style 39 is for future use. enu StylesCommon=STYLE_ @@ -1540,7 +1546,9 @@ enu CursorShape=SC_CURSOR val SC_CURSORNORMAL=-1 +val SC_CURSORARROW=2 val SC_CURSORWAIT=4 +val SC_CURSORREVERSEARROW=7 # Sets the cursor to one of the SC_CURSOR* values. set void SetCursor=2386(int cursorType,) # Get cursor type. @@ -2193,6 +2201,12 @@ val SC_MOD_LEXERSTATE=0x80000 val SC_MODEVENTMASKALL=0xFFFFF +enu Update=SC_UPDATE_ +val SC_UPDATE_CONTENT=0x1 +val SC_UPDATE_SELECTION=0x2 +val SC_UPDATE_V_SCROLL=0x4 +val SC_UPDATE_H_SCROLL=0x8 + # For compatibility, these go through the COMMAND notification rather than NOTIFY # and should have had exactly the same values as the EN_* constants. # Unfortunately the SETFOCUS and KILLFOCUS are flipped over from EN_* @@ -2335,6 +2349,8 @@ val SCLEX_SML=97 val SCLEX_MARKDOWN=98 val SCLEX_TXT2TAGS=99 +val SCLEX_A68K=100 +val SCLEX_MODULA=101 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -2381,6 +2397,8 @@ val SCE_C_COMMENTDOCKEYWORD=17 val SCE_C_COMMENTDOCKEYWORDERROR=18 val SCE_C_GLOBALCLASS=19 +val SCE_C_STRINGRAW=20 +val SCE_C_TRIPLEVERBATIM=21 # Lexical states for SCLEX_D lex D=SCLEX_D SCE_D_ val SCE_D_DEFAULT=0 @@ -2900,6 +2918,7 @@ val SCE_ASM_CHARACTER=12 val SCE_ASM_STRINGEOL=13 val SCE_ASM_EXTINSTRUCTION=14 +val SCE_ASM_COMMENTDIRECTIVE=15 # Lexical states for SCLEX_FORTRAN lex Fortran=SCLEX_FORTRAN SCE_F_ lex F77=SCLEX_F77 SCE_F_ @@ -3819,6 +3838,47 @@ val SCE_TXT2TAGS_OPTION=23 val SCE_TXT2TAGS_PREPROC=24 val SCE_TXT2TAGS_POSTPROC=25 +# Lexical states for SCLEX_A68K +lex A68k=SCLEX_A68K SCE_A68K_ +val SCE_A68K_DEFAULT=0 +val SCE_A68K_COMMENT=1 +val SCE_A68K_NUMBER_DEC=2 +val SCE_A68K_NUMBER_BIN=3 +val SCE_A68K_NUMBER_HEX=4 +val SCE_A68K_STRING1=5 +val SCE_A68K_OPERATOR=6 +val SCE_A68K_CPUINSTRUCTION=7 +val SCE_A68K_EXTINSTRUCTION=8 +val SCE_A68K_REGISTER=9 +val SCE_A68K_DIRECTIVE=10 +val SCE_A68K_MACRO_ARG=11 +val SCE_A68K_LABEL=12 +val SCE_A68K_STRING2=13 +val SCE_A68K_IDENTIFIER=14 +val SCE_A68K_MACRO_DECLARATION=15 +val SCE_A68K_COMMENT_WORD=16 +val SCE_A68K_COMMENT_SPECIAL=17 +val SCE_A68K_COMMENT_DOXYGEN=18 +# Lexical states for SCLEX_MODULA +lex Modula=SCLEX_MODULA SCE_MODULA_ +val SCE_MODULA_DEFAULT=0 +val SCE_MODULA_COMMENT=1 +val SCE_MODULA_DOXYCOMM=2 +val SCE_MODULA_DOXYKEY=3 +val SCE_MODULA_KEYWORD=4 +val SCE_MODULA_RESERVED=5 +val SCE_MODULA_NUMBER=6 +val SCE_MODULA_BASENUM=7 +val SCE_MODULA_FLOAT=8 +val SCE_MODULA_STRING=9 +val SCE_MODULA_STRSPEC=10 +val SCE_MODULA_CHAR=11 +val SCE_MODULA_CHARSPEC=12 +val SCE_MODULA_PROC=13 +val SCE_MODULA_PRAGMA=14 +val SCE_MODULA_PRGKEY=15 +val SCE_MODULA_OPERATOR=16 +val SCE_MODULA_BADSTR=17 # Events Modified: branches/sm/scintilla/lexers/LexAda.cxx =================================================================== --- branches/sm/scintilla/lexers/LexAda.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexAda.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexAsm.cxx =================================================================== --- branches/sm/scintilla/lexers/LexAsm.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexAsm.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -4,6 +4,7 @@ ** Written by The Black Horus ** Enhancements and NASM stuff by Kein-Hong Man, 2003-10 ** SCE_ASM_COMMENTBLOCK and SCE_ASM_CHARACTER are for future GNU as colouring + ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net> **/ // Copyright 1998-2003 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -15,17 +16,24 @@ #include <assert.h> #include <ctype.h> +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <map> +#include <set> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" -#include "Accessor.h" #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -54,16 +62,185 @@ return false; } -static void ColouriseAsmDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], - Accessor &styler) { +static bool IsStreamCommentStyle(int style) { + return style == SCE_ASM_COMMENTDIRECTIVE || style == SCE_ASM_COMMENTBLOCK; +} - WordList &cpuInstruction = *keywordlists[0]; - WordList &mathInstruction = *keywordlists[1]; - WordList &registers = *keywordlists[2]; - WordList &directive = *keywordlists[3]; - WordList &directiveOperand = *keywordlists[4]; - WordList &extInstruction = *keywordlists[5]; +static inline int LowerCase(int c) { + if (c >= 'A' && c <= 'Z') + return 'a' + c - 'A'; + return c; +} +// An individual named option for use in an OptionSet + +// Options used for LexerAsm +struct OptionsAsm { + std::string delimiter; + bool fold; + bool foldSyntaxBased; + bool foldCommentMultiline; + bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; + bool foldCompact; + OptionsAsm() { + delimiter = ""; + fold = false; + foldSyntaxBased = true; + foldCommentMultiline = false; + foldCommentExplicit = false; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; + foldCompact = true; + } +}; + +static const char * const asmWordListDesc[] = { + "CPU instructions", + "FPU instructions", + "Registers", + "Directives", + "Directive operands", + "Extended instructions", + "Directives4Foldstart", + "Directives4Foldend", + 0 +}; + +struct OptionSetAsm : public OptionSet<OptionsAsm> { + OptionSetAsm() { + DefineProperty("lexer.asm.comment.delimiter", &OptionsAsm::delimiter, + "Character used for COMMENT directive's delimiter, replacing the standard \"~\"."); + + DefineProperty("fold", &OptionsAsm::fold); + + DefineProperty("fold.asm.syntax.based", &OptionsAsm::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + + DefineProperty("fold.asm.comment.multiline", &OptionsAsm::foldCommentMultiline, + "Set this property to 1 to enable folding multi-line comments."); + + DefineProperty("fold.asm.comment.explicit", &OptionsAsm::foldCommentExplicit, + "This option enables folding explicit fold points when using the Asm lexer. " + "Explicit fold points allows adding extra folding by placing a ;{ comment at the start and a ;} " + "at the end of a section that should fold."); + + DefineProperty("fold.asm.explicit.start", &OptionsAsm::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard ;{."); + + DefineProperty("fold.asm.explicit.end", &OptionsAsm::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard ;}."); + + DefineProperty("fold.asm.explicit.anywhere", &OptionsAsm::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + + DefineProperty("fold.compact", &OptionsAsm::foldCompact); + + DefineWordListSets(asmWordListDesc); + } +}; + +class LexerAsm : public ILexer { + WordList cpuInstruction; + WordList mathInstruction; + WordList registers; + WordList directive; + WordList directiveOperand; + WordList extInstruction; + WordList directives4foldstart; + WordList directives4foldend; + OptionsAsm options; + OptionSetAsm osAsm; +public: + LexerAsm() { + } + ~LexerAsm() { + } + void SCI_METHOD Release() { + delete this; + } + int SCI_METHOD Version() const { + return lvOriginal; + } + const char * SCI_METHOD PropertyNames() { + return osAsm.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) { + return osAsm.PropertyType(name); + } + const char * SCI_METHOD DescribeProperty(const char *name) { + return osAsm.DescribeProperty(name); + } + int SCI_METHOD PropertySet(const char *key, const char *val); + const char * SCI_METHOD DescribeWordListSets() { + return osAsm.DescribeWordListSets(); + } + int SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + + void * SCI_METHOD PrivateCall(int, void *) { + return 0; + } + + static ILexer *LexerFactoryAsm() { + return new LexerAsm(); + } +}; + +int SCI_METHOD LexerAsm::PropertySet(const char *key, const char *val) { + if (osAsm.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +int SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + switch (n) { + case 0: + wordListN = &cpuInstruction; + break; + case 1: + wordListN = &mathInstruction; + break; + case 2: + wordListN = &registers; + break; + case 3: + wordListN = &directive; + break; + case 4: + wordListN = &directiveOperand; + break; + case 5: + wordListN = &extInstruction; + break; + case 6: + wordListN = &directives4foldstart; + break; + case 7: + wordListN = &directives4foldend; + break; + } + int firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +void SCI_METHOD LexerAsm::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + LexAccessor styler(pAccess); + // Do not leak onto next line if (initStyle == SCE_ASM_STRINGEOL) initStyle = SCE_ASM_DEFAULT; @@ -96,7 +273,7 @@ if (!IsAsmOperator(sc.ch)) { sc.SetState(SCE_ASM_DEFAULT); } - }else if (sc.state == SCE_ASM_NUMBER) { + } else if (sc.state == SCE_ASM_NUMBER) { if (!IsAWordChar(sc.ch)) { sc.SetState(SCE_ASM_DEFAULT); } @@ -104,6 +281,7 @@ if (!IsAWordChar(sc.ch) ) { char s[100]; sc.GetCurrentLowered(s, sizeof(s)); + bool IsDirective = false; if (cpuInstruction.InList(s)) { sc.ChangeState(SCE_ASM_CPUINSTRUCTION); @@ -113,15 +291,32 @@ sc.ChangeState(SCE_ASM_REGISTER); } else if (directive.InList(s)) { sc.ChangeState(SCE_ASM_DIRECTIVE); + IsDirective = true; } else if (directiveOperand.InList(s)) { sc.ChangeState(SCE_ASM_DIRECTIVEOPERAND); } else if (extInstruction.InList(s)) { sc.ChangeState(SCE_ASM_EXTINSTRUCTION); } sc.SetState(SCE_ASM_DEFAULT); + if (IsDirective && !strcmp(s, "comment")) { + char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0]; + while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd) { + sc.ForwardSetState(SCE_ASM_DEFAULT); + } + if (sc.ch == delimiter) { + sc.SetState(SCE_ASM_COMMENTDIRECTIVE); + } + } } - } - else if (sc.state == SCE_ASM_COMMENT ) { + } else if (sc.state == SCE_ASM_COMMENTDIRECTIVE) { + char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0]; + if (sc.ch == delimiter) { + while (!sc.atLineEnd) { + sc.Forward(); + } + sc.SetState(SCE_ASM_DEFAULT); + } + } else if (sc.state == SCE_ASM_COMMENT ) { if (sc.atLineEnd) { sc.SetState(SCE_ASM_DEFAULT); } @@ -170,15 +365,100 @@ sc.Complete(); } -static const char * const asmWordListDesc[] = { - "CPU instructions", - "FPU instructions", - "Registers", - "Directives", - "Directive operands", - "Extended instructions", - 0 -}; +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "else". -LexerModule lmAsm(SCLEX_ASM, ColouriseAsmDoc, "asm", 0, asmWordListDesc); +void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + + LexAccessor styler(pAccess); + + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + char word[100]; + int wordlen = 0; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int stylePrev = style; + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (options.foldCommentMultiline && IsStreamCommentStyle(style)) { + if (!IsStreamCommentStyle(stylePrev)) { + levelNext++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + // Comments don't end at end of line and the next character may be unstyled. + levelNext--; + } + } + if (options.foldCommentExplicit && ((style == SCE_ASM_COMMENT) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { + levelNext++; + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { + levelNext--; + } + } else { + if (ch == ';') { + if (chNext == '{') { + levelNext++; + } else if (chNext == '}') { + levelNext--; + } + } + } + } + if (options.foldSyntaxBased && (style == SCE_ASM_DIRECTIVE)) { + word[wordlen++] = static_cast<char>(LowerCase(ch)); + if (wordlen == 100) { // prevent overflow + word[0] = '\0'; + wordlen = 1; + } + if (styleNext != SCE_ASM_DIRECTIVE) { // reading directive ready + word[wordlen] = '\0'; + wordlen = 0; + if (directives4foldstart.InList(word)) { + levelNext++; + } else if (directives4foldend.InList(word)){ + levelNext--; + } + } + } + if (!IsASpace(ch)) + visibleChars++; + if (atEOL || (i == endPos-1)) { + int levelUse = levelCurrent; + int lev = levelUse | levelNext << 16; + if (visibleChars == 0 && options.foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelCurrent = levelNext; + if (atEOL && (i == static_cast<unsigned int>(styler.Length()-1))) { + // There is an empty line at end of file so give it same level and empty + styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG); + } + visibleChars = 0; + } + } +} + +LexerModule lmAsm(SCLEX_ASM, LexerAsm::LexerFactoryAsm, "asm", asmWordListDesc); + Modified: branches/sm/scintilla/lexers/LexBash.cxx =================================================================== --- branches/sm/scintilla/lexers/LexBash.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexBash.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -640,6 +639,14 @@ levelCurrent--; } } + // Here Document folding + if (style == SCE_SH_HERE_DELIM) { + if (ch == '<' && chNext == '<') { + levelCurrent++; + } + } else if (style == SCE_SH_HERE_Q && styler.StyleAt(i+1) == SCE_PL_DEFAULT) { + levelCurrent--; + } if (atEOL) { int lev = levelPrev; if (visibleChars == 0 && foldCompact) Modified: branches/sm/scintilla/lexers/LexCOBOL.cxx =================================================================== --- branches/sm/scintilla/lexers/LexCOBOL.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexCOBOL.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -19,7 +19,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexCPP.cxx =================================================================== --- branches/sm/scintilla/lexers/LexCPP.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexCPP.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -1,6 +1,7 @@ // Scintilla source code edit control /** @file LexCPP.cxx ** Lexer for C++, C, Java, and JavaScript. + ** Further folding features and configuration properties added by "Udo Lechner" <dlchnr(at)gmx(dot)net> **/ // Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -15,10 +16,6 @@ #ifdef _MSC_VER #pragma warning(disable: 4786) #endif -#ifdef __BORLANDC__ -// Borland C++ displays warnings in vector header without this -#pragma option -w-ccc -w-rch -#endif #include <string> #include <vector> @@ -29,7 +26,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -37,6 +33,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "SparseState.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -211,9 +208,15 @@ bool identifiersAllowDollars; bool trackPreprocessor; bool updatePreprocessor; + bool triplequotedStrings; bool fold; + bool foldSyntaxBased; bool foldComment; + bool foldCommentMultiline; bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; bool foldPreprocessor; bool foldCompact; bool foldAtElse; @@ -222,9 +225,15 @@ identifiersAllowDollars = true; trackPreprocessor = true; updatePreprocessor = true; + triplequotedStrings = false; fold = false; + foldSyntaxBased = true; foldComment = false; + foldCommentMultiline = true; foldCommentExplicit = true; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; foldPreprocessor = false; foldCompact = false; foldAtElse = false; @@ -256,16 +265,34 @@ DefineProperty("lexer.cpp.update.preprocessor", &OptionsCPP::updatePreprocessor, "Set to 1 to update preprocessor definitions when #define found."); + DefineProperty("lexer.cpp.triplequoted.strings", &OptionsCPP::triplequotedStrings, + "Set to 1 to enable highlighting of triple-quoted strings."); + DefineProperty("fold", &OptionsCPP::fold); + DefineProperty("fold.cpp.syntax.based", &OptionsCPP::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + DefineProperty("fold.comment", &OptionsCPP::foldComment, "This option enables folding multi-line comments and explicit fold points when using the C++ lexer. " "Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} " "at the end of a section that should fold."); + DefineProperty("fold.cpp.comment.multiline", &OptionsCPP::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + DefineProperty("fold.cpp.comment.explicit", &OptionsCPP::foldCommentExplicit, "Set this property to 0 to disable folding explicit fold points when fold.comment=1."); + DefineProperty("fold.cpp.explicit.start", &OptionsCPP::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard //{."); + + DefineProperty("fold.cpp.explicit.end", &OptionsCPP::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard //}."); + + DefineProperty("fold.cpp.explicit.anywhere", &OptionsCPP::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + DefineProperty("fold.preprocessor", &OptionsCPP::foldPreprocessor, "This option enables folding preprocessor directives when using the C++ lexer. " "Includes C#'s explicit #region and #endregion folding directives."); @@ -288,7 +315,6 @@ CharacterSet setLogicalOp; PPStates vlls; std::vector<PPDefinition> ppDefineHistory; - PropSetSimple props; WordList keywords; WordList keywords2; WordList keywords3; @@ -297,6 +323,7 @@ std::map<std::string, std::string> preprocessorDefinitionsStart; OptionsCPP options; OptionSetCPP osCPP; + SparseState<std::string> rawStringTerminators; public: LexerCPP(bool caseSensitive_) : caseSensitive(caseSensitive_), @@ -419,7 +446,6 @@ CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]"); CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); - CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); if (options.identifiersAllowDollars) { setWordStart.Add('$'); @@ -483,16 +509,18 @@ } const int maskActivity = 0x3F; + std::string rawStringTerminator = rawStringTerminators.ValueAt(lineCurrent-1); + SparseState<std::string> rawSTNew(lineCurrent); int activitySet = preproc.IsInactive() ? 0x40 : 0; for (; sc.More(); sc.Forward()) { if (sc.atLineStart) { - if (sc.state == SCE_C_STRING) { + if ((sc.state == SCE_C_STRING) || (sc.state == SCE_C_CHARACTER)) { // Prevent SCE_C_STRINGEOL from leaking back to previous line which // ends with a line continuation by locking in the state upto this position. - sc.SetState(SCE_C_STRING); + sc.SetState(sc.state); } // Reset states to begining of colourise so no surprises // if different sets of lines lexed. @@ -515,6 +543,9 @@ if (sc.atLineEnd) { lineCurrent++; vlls.Add(lineCurrent, preproc); + if (rawStringTerminator != "") { + rawSTNew.Set(lineCurrent-1, rawStringTerminator); + } } // Handle line continuation generically. @@ -558,6 +589,23 @@ } else if (keywords4.InList(s)) { sc.ChangeState(SCE_C_GLOBALCLASS|activitySet); } + const bool literalString = sc.ch == '\"'; + if (literalString || sc.ch == '\'') { + size_t lenS = strlen(s); + const bool raw = literalString && sc.chPrev == 'R'; + if (raw) + s[lenS--] = '\0'; + bool valid = + (lenS == 0) || + ((lenS == 1) && ((s[0] == 'L') || (s[0] == 'u') || (s[0] == 'U'))) || + ((lenS == 2) && literalString && (s[0] == 'u') && (s[1] == '8')); + if (valid) { + if (literalString) + sc.ChangeState((raw ? SCE_C_STRINGRAW : SCE_C_STRING)|activitySet); + else + sc.ChangeState(SCE_C_CHARACTER|activitySet); + } + } sc.SetState(SCE_C_DEFAULT|activitySet); } break; @@ -642,6 +690,14 @@ sc.ForwardSetState(SCE_C_DEFAULT|activitySet); } break; + case SCE_C_STRINGRAW: + if (sc.Match(rawStringTerminator.c_str())) { + for (size_t termPos=rawStringTerminator.size(); termPos; termPos--) + sc.Forward(); + sc.SetState(SCE_C_DEFAULT|activitySet); + rawStringTerminator = ""; + } + break; case SCE_C_CHARACTER: if (sc.atLineEnd) { sc.ChangeState(SCE_C_STRINGEOL|activitySet); @@ -682,6 +738,14 @@ } } break; + case SCE_C_TRIPLEVERBATIM: + if (sc.Match ("\"\"\"")) { + while (sc.Match('"')) { + sc.Forward(); + } + sc.SetState(SCE_C_DEFAULT|activitySet); + } + break; case SCE_C_UUID: if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') { sc.SetState(SCE_C_DEFAULT|activitySet); @@ -699,6 +763,9 @@ if (sc.Match('@', '\"')) { sc.SetState(SCE_C_VERBATIM|activitySet); sc.Forward(); + } else if (options.triplequotedStrings && sc.Match("\"\"\"")) { + sc.SetState(SCE_C_TRIPLEVERBATIM|activitySet); + sc.Forward(2); } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { if (lastWordWasUUID) { sc.SetState(SCE_C_UUID|activitySet); @@ -733,7 +800,19 @@ || !FollowsPostfixOperator(sc, styler))) { sc.SetState(SCE_C_REGEX|activitySet); // JavaScript's RegEx } else if (sc.ch == '\"') { - sc.SetState(SCE_C_STRING|activitySet); + if (sc.chPrev == 'R') { + sc.SetState(SCE_C_STRINGRAW|activitySet); + rawStringTerminator = ")"; + for (int termPos = sc.currentPos + 1;;termPos++) { + char chTerminator = styler.SafeGetCharAt(termPos, '('); + if (chTerminator == '(') + break; + rawStringTerminator += chTerminator; + } + rawStringTerminator += '\"'; + } else { + sc.SetState(SCE_C_STRING|activitySet); + } isIncludePreprocessor = false; // ensure that '>' won't end the string } else if (isIncludePreprocessor && sc.ch == '<') { sc.SetState(SCE_C_STRING|activitySet); @@ -828,10 +907,10 @@ } continuationLine = false; } - if (definitionsChanged) + const bool rawStringsChanged = rawStringTerminators.Merge(rawSTNew, lineCurrent); + if (definitionsChanged || rawStringsChanged) styler.ChangeLexerState(startPos, startPos + length); sc.Complete(); - styler.Flush(); } // Store both the current line's fold level and the next lines in the @@ -856,6 +935,7 @@ char chNext = styler[startPos]; int styleNext = styler.StyleAt(startPos); int style = initStyle; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); for (unsigned int i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); @@ -863,7 +943,7 @@ style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (options.foldComment && IsStreamCommentStyle(style)) { + if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) { if (!IsStreamCommentStyle(stylePrev) && (stylePrev != SCE_C_COMMENTLINEDOC)) { levelNext++; } else if (!IsStreamCommentStyle(styleNext) && (styleNext != SCE_C_COMMENTLINEDOC) && !atEOL) { @@ -871,14 +951,22 @@ levelNext--; } } - if (options.foldComment && options.foldCommentExplicit && (style == SCE_C_COMMENTLINE)) { - if ((ch == '/') && (chNext == '/')) { - char chNext2 = styler.SafeGetCharAt(i + 2); - if (chNext2 == '{') { + if (options.foldComment && options.foldCommentExplicit && ((style == SCE_C_COMMENTLINE) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { levelNext++; - } else if (chNext2 == '}') { + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { levelNext--; } + } else { + if ((ch == '/') && (chNext == '/')) { + char chNext2 = styler.SafeGetCharAt(i + 2); + if (chNext2 == '{') { + levelNext++; + } else if (chNext2 == '}') { + levelNext--; + } + } } } if (options.foldPreprocessor && (style == SCE_C_PREPROCESSOR)) { @@ -894,7 +982,7 @@ } } } - if (style == SCE_C_OPERATOR) { + if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) { if (ch == '{') { // Measure the minimum before a '{' to allow // folding on "} else {" @@ -910,7 +998,7 @@ visibleChars++; if (atEOL || (i == endPos-1)) { int levelUse = levelCurrent; - if (options.foldAtElse) { + if (options.foldSyntaxBased && options.foldAtElse) { levelUse = levelMinCurrent; } int lev = levelUse | levelNext << 16; Modified: branches/sm/scintilla/lexers/LexCSS.cxx =================================================================== --- branches/sm/scintilla/lexers/LexCSS.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexCSS.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -18,7 +18,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexCmake.cxx =================================================================== --- branches/sm/scintilla/lexers/LexCmake.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexCmake.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexD.cxx =================================================================== --- branches/sm/scintilla/lexers/LexD.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexD.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -2,6 +2,7 @@ ** Lexer for D. ** ** Copyright (c) 2006 by Waldemar Augustyn <waldemar(a)wdmsys.com> + ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net> **/ // Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -13,17 +14,23 @@ #include <assert.h> #include <ctype.h> +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <map> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" -#include "Accessor.h" #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -59,18 +66,188 @@ return ch == 'c' || ch == 'w' || ch == 'd'; } +static bool IsStreamCommentStyle(int style) { + return style == SCE_D_COMMENT || + style == SCE_D_COMMENTDOC || + style == SCE_D_COMMENTDOCKEYWORD || + style == SCE_D_COMMENTDOCKEYWORDERROR; +} -static void ColouriseDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler, bool caseSensitive) { +// An individual named option for use in an OptionSet - WordList &keywords = *keywordlists[0]; - WordList &keywords2 = *keywordlists[1]; - WordList &keywords3 = *keywordlists[2]; //doxygen - WordList &keywords4 = *keywordlists[3]; - WordList &keywords5 = *keywordlists[4]; - WordList &keywords6 = *keywordlists[5]; - WordList &keywords7 = *keywordlists[6]; +// Options used for LexerD +struct OptionsD { + bool fold; + bool foldSyntaxBased; + bool foldComment; + bool foldCommentMultiline; + bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; + bool foldCompact; + int foldAtElseInt; + bool foldAtElse; + OptionsD() { + fold = false; + foldSyntaxBased = true; + foldComment = false; + foldCommentMultiline = true; + foldCommentExplicit = true; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; + foldCompact = true; + foldAtElseInt = -1; + foldAtElse = false; + } +}; +static const char * const dWordLists[] = { + "Primary keywords and identifiers", + "Secondary keywords and identifiers", + "Documentation comment keywords", + "Type definitions and aliases", + "Keywords 5", + "Keywords 6", + "Keywords 7", + 0, + }; + +struct OptionSetD : public OptionSet<OptionsD> { + OptionSetD() { + DefineProperty("fold", &OptionsD::fold); + + DefineProperty("fold.d.syntax.based", &OptionsD::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + + DefineProperty("fold.comment", &OptionsD::foldComment); + + DefineProperty("fold.d.comment.multiline", &OptionsD::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + + DefineProperty("fold.d.comment.explicit", &OptionsD::foldCommentExplicit, + "Set this property to 0 to disable folding explicit fold points when fold.comment=1."); + + DefineProperty("fold.d.explicit.start", &OptionsD::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard //{."); + + DefineProperty("fold.d.explicit.end", &OptionsD::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard //}."); + + DefineProperty("fold.d.explicit.anywhere", &OptionsD::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + + DefineProperty("fold.compact", &OptionsD::foldCompact); + + DefineProperty("lexer.d.fold.at.else", &OptionsD::foldAtElseInt, + "This option enables D folding on a \"} else {\" line of an if statement."); + + DefineProperty("fold.at.else", &OptionsD::foldAtElse); + + DefineWordListSets(dWordLists); + } +}; + +class LexerD : public ILexer { + bool caseSensitive; + WordList keywords; + WordList keywords2; + WordList keywords3; + WordList keywords4; + WordList keywords5; + WordList keywords6; + WordList keywords7; + OptionsD options; + OptionSetD osD; +public: + LexerD(bool caseSensitive_) : + caseSensitive(caseSensitive_) { + } + ~LexerD() { + } + void SCI_METHOD Release() { + delete this; + } + int SCI_METHOD Version() const { + return lvOriginal; + } + const char * SCI_METHOD PropertyNames() { + return osD.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) { + return osD.PropertyType(name); + } + const char * SCI_METHOD DescribeProperty(const char *name) { + return osD.DescribeProperty(name); + } + int SCI_METHOD PropertySet(const char *key, const char *val); + const char * SCI_METHOD DescribeWordListSets() { + return osD.DescribeWordListSets(); + } + int SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + + void * SCI_METHOD PrivateCall(int, void *) { + return 0; + } + + static ILexer *LexerFactoryD() { + return new LexerD(true); + } + static ILexer *LexerFactoryDInsensitive() { + return new LexerD(false); + } +}; + +int SCI_METHOD LexerD::PropertySet(const char *key, const char *val) { + if (osD.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +int SCI_METHOD LexerD::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + switch (n) { + case 0: + wordListN = &keywords; + break; + case 1: + wordListN = &keywords2; + break; + case 2: + wordListN = &keywords3; + break; + case 3: + wordListN = &keywords4; + break; + case 4: + wordListN = &keywords5; + break; + case 5: + wordListN = &keywords6; + break; + case 6: + wordListN = &keywords7; + break; + } + int firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +void SCI_METHOD LexerD::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + LexAccessor styler(pAccess); + int styleBeforeDCKeyword = SCE_D_DEFAULT; StyleContext sc(startPos, length, initStyle, styler); @@ -294,24 +471,17 @@ sc.Complete(); } -static bool IsStreamCommentStyle(int style) { - return style == SCE_D_COMMENT || - style == SCE_D_COMMENTDOC || - style == SCE_D_COMMENTDOCKEYWORD || - style == SCE_D_COMMENTDOCKEYWORDERROR; -} - // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldDoc(unsigned int startPos, int length, int initStyle, Accessor &styler) { - bool foldComment = styler.GetPropertyInt("fold.comment") != 0; - bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - // property lexer.d.fold.at.else - // This option enables D folding on a "} else {" line of an if statement. - bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else", - styler.GetPropertyInt("fold.at.else", 0)) != 0; +void SCI_METHOD LexerD::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + + if (!options.fold) + return; + + LexAccessor styler(pAccess); + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -323,6 +493,8 @@ char chNext = styler[startPos]; int styleNext = styler.StyleAt(startPos); int style = initStyle; + bool foldAtElse = options.foldAtElseInt >= 0 ? options.foldAtElseInt != 0 : options.foldAtElse; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); for (unsigned int i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); @@ -330,7 +502,7 @@ style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (foldComment && IsStreamCommentStyle(style)) { + if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) { if (!IsStreamCommentStyle(stylePrev)) { levelNext++; } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { @@ -338,7 +510,25 @@ levelNext--; } } - if (style == SCE_D_OPERATOR) { + if (options.foldComment && options.foldCommentExplicit && ((style == SCE_D_COMMENTLINE) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { + levelNext++; + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { + levelNext--; + } + } else { + if ((ch == '/') && (chNext == '/')) { + char chNext2 = styler.SafeGetCharAt(i + 2); + if (chNext2 == '{') { + levelNext++; + } else if (chNext2 == '}') { + levelNext--; + } + } + } + } + if (options.foldSyntaxBased && (style == SCE_D_OPERATOR)) { if (ch == '{') { // Measure the minimum before a '{' to allow // folding on "} else {" @@ -350,19 +540,19 @@ levelNext--; } } - if (atEOL) { - if (foldComment) { // Handle nested comments + if (atEOL || (i == endPos-1)) { + if (options.foldComment && options.foldCommentMultiline) { // Handle nested comments int nc; nc = styler.GetLineState(lineCurrent); nc -= lineCurrent>0? styler.GetLineState(lineCurrent-1): 0; levelNext += nc; } int levelUse = levelCurrent; - if (foldAtElse) { + if (options.foldSyntaxBased && foldAtElse) { levelUse = levelMinCurrent; } int lev = levelUse | levelNext << 16; - if (visibleChars == 0 && foldCompact) + if (visibleChars == 0 && options.foldCompact) lev |= SC_FOLDLEVELWHITEFLAG; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; @@ -379,25 +569,4 @@ } } -static void FoldDDoc(unsigned int startPos, int length, int initStyle, - WordList *[], Accessor &styler) { - FoldDoc(startPos, length, initStyle, styler); -} - -static const char * const dWordLists[] = { - "Primary keywords and identifiers", - "Secondary keywords and identifiers", - "Documentation comment keywords", - "Type definitions and aliases", - "Keywords 5", - "Keywords 6", - "Keywords 7", - 0, - }; - -static void ColouriseDDoc(unsigned int startPos, int length, - int initStyle, WordList *keywordlists[], Accessor &styler) { - ColouriseDoc(startPos, length, initStyle, keywordlists, styler, true); -} - -LexerModule lmD(SCLEX_D, ColouriseDDoc, "d", FoldDDoc, dWordLists); +LexerModule lmD(SCLEX_D, LexerD::LexerFactoryD, "d", dWordLists); Modified: branches/sm/scintilla/lexers/LexErlang.cxx =================================================================== --- branches/sm/scintilla/lexers/LexErlang.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexErlang.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -19,7 +19,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexForth.cxx =================================================================== --- branches/sm/scintilla/lexers/LexForth.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexForth.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexFortran.cxx =================================================================== --- branches/sm/scintilla/lexers/LexFortran.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexFortran.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -267,7 +266,7 @@ || strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0 || strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0 || strcmp(s, "endwhere") == 0 - || strcmp(s, "procedure") == 0 ) { // Take care of the module procedure statement + || (strcmp(s, "procedure") == 0 && strcmp(prevWord,"module")==0) ) { // Take care of the module procedure statement lev = -1; } else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if lev = 0; Modified: branches/sm/scintilla/lexers/LexHTML.cxx =================================================================== --- branches/sm/scintilla/lexers/LexHTML.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexHTML.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -745,8 +744,18 @@ if ((state != SCE_HPHP_COMMENT) && (state != SCE_HPHP_COMMENTLINE) && (state != SCE_HJ_COMMENT) && (state != SCE_HJ_COMMENTLINE) && (state != SCE_HJ_COMMENTDOC) && (!isStringState(state))) { //Platform::DebugPrintf("state=%d, StateToPrint=%d, initStyle=%d\n", state, StateToPrint, initStyle); //if ((state == SCE_HPHP_OPERATOR) || (state == SCE_HPHP_DEFAULT) || (state == SCE_HJ_SYMBOLS) || (state == SCE_HJ_START) || (state == SCE_HJ_DEFAULT)) { - if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*'))) { - levelCurrent += ((ch == '{') || (ch == '/')) ? 1 : -1; + if (ch == '#') { + int j = i + 1; + while ((j < lengthDoc) && IsASpaceOrTab(styler.SafeGetCharAt(j))) { + j++; + } + if (styler.Match(j, "region") || styler.Match(j, "if")) { + levelCurrent++; + } else if (styler.Match(j, "end")) { + levelCurrent--; + } + } else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*')) ) { + levelCurrent += ((ch == '{') || (ch == '/') ) ? 1 : -1; } } else if (((state == SCE_HPHP_COMMENT) || (state == SCE_HJ_COMMENT)) && foldComment && (ch == '*') && (chNext == '/')) { levelCurrent--; Modified: branches/sm/scintilla/lexers/LexLisp.cxx =================================================================== --- branches/sm/scintilla/lexers/LexLisp.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexLisp.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexLua.cxx =================================================================== --- branches/sm/scintilla/lexers/LexLua.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexLua.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -18,7 +18,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexMarkdown.cxx =================================================================== --- branches/sm/scintilla/lexers/LexMarkdown.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexMarkdown.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -44,7 +44,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexMatlab.cxx =================================================================== --- branches/sm/scintilla/lexers/LexMatlab.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexMatlab.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -21,7 +21,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexNsis.cxx =================================================================== --- branches/sm/scintilla/lexers/LexNsis.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexNsis.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexOthers.cxx =================================================================== --- branches/sm/scintilla/lexers/LexOthers.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexOthers.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -510,7 +509,7 @@ styler.ColourTo(endLine, SCE_DIFF_COMMAND); } else if (0 == strncmp(lineBuffer, "Index: ", 7)) { // For subversion's diff styler.ColourTo(endLine, SCE_DIFF_COMMAND); - } else if (0 == strncmp(lineBuffer, "---", 3)) { + } else if (0 == strncmp(lineBuffer, "---", 3) && lineBuffer[3] != '-') { // In a context diff, --- appears in both the header and the position markers if (lineBuffer[3] == ' ' && atoi(lineBuffer + 4) && !strchr(lineBuffer, '/')) styler.ColourTo(endLine, SCE_DIFF_POSITION); @@ -930,8 +929,8 @@ // Command or return status return SCE_ERR_CMD; } else if (lineBuffer[0] == '<') { - // Diff removal, but not interested. Trapped to avoid hitting CTAG cases. - return SCE_ERR_DEFAULT; + // Diff removal. + return SCE_ERR_DIFF_DELETION; } else if (lineBuffer[0] == '!') { return SCE_ERR_DIFF_CHANGED; } else if (lineBuffer[0] == '+') { Modified: branches/sm/scintilla/lexers/LexPascal.cxx =================================================================== --- branches/sm/scintilla/lexers/LexPascal.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexPascal.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -118,7 +118,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexPerl.cxx =================================================================== --- branches/sm/scintilla/lexers/LexPerl.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexPerl.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexPython.cxx =================================================================== --- branches/sm/scintilla/lexers/LexPython.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexPython.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexR.cxx =================================================================== --- branches/sm/scintilla/lexers/LexR.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexR.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: branches/sm/scintilla/lexers/LexSQL.cxx =================================================================== --- branches/sm/scintilla/lexers/LexSQL.cxx 2011-05-21 08:54:44 UTC (rev 5807) +++ branches/sm/scintilla/lexers/LexSQL.cxx 2011-05-21 08:58:07 UTC (rev 5808) @@ -2,7 +2,7 @@ /** @file LexSQL.cxx ** Lexer for SQL, including PL/SQL and SQL*Plus. **/ -// Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> +// Copyright 1998-2011 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. #include <stdlib.h> @@ -12,24 +12,36 @@ #include <assert.h> #include <ctype.h> +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <vector> +#include <map> +#include <algorithm> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; #endif -static inline bool IsAWordChar(int ch) { - return (ch < 0x80) && (isalnum(ch) || ch == '_'); +static inline bool IsAWordChar(int ch, bool sqlAllowDottedWord) { + if (!sqlAllowDottedWord) + return (ch < 0x80) && (isalnum(ch) || ch == '_'); + else + return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'); } static inline bool IsAWordStart(int ch) { @@ -47,31 +59,289 @@ // Not exactly following number definition (several dots are seen as OK, etc.) // but probably enough in most cases. return (ch < 0x80) && - (isdigit(ch) || toupper(ch) == 'E' || - ch == '.' || ch == '-' || ch == '+'); + (isdigit(ch) || toupper(ch) == 'E' || + ch == '.' || ch == '-' || ch == '+'); } -static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], - Accessor &styler) { - WordList &keywords1 = *keywordlists[0]; - WordList &keywords2 = *keywordlists[1]; - WordList &kw_pldoc = *keywordlists[2]; - WordList &kw_sqlplus = *keywordlists[3]; - WordList &kw_user1 = *keywordlists[4]; - WordList &kw_user2 = *keywordlists[5]; - WordList &kw_user3 = *keywordlists[6]; - WordList &kw_user4 = *keywordlists[7]; +class SQLStates { +public : + void Set(int lineNumber, unsigned short int sqlStatesLine) { + if (!sqlStatement.size() == 0 || !sqlStatesLine == 0) { + sqlStatement.resize(lineNumber + 1, 0); + sqlStatement[lineNumber] = sqlStatesLine; + } + } - StyleContext sc(startPos, length, initStyle, styler); + unsigned short int IgnoreWhen (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_IGNORE_WHEN; + else + sqlStatesLine &= ~MASK_IGNORE_WHEN; - // property sql.backslash.escapes - // Enables backslash as an escape character in SQL. - bool sqlBackslashEscapes = styler.GetPropertyInt("sql.backslash.escapes", 0) != 0; + return sqlStatesLine; + } - bool sqlBackticksIdentifier = styler.GetPropertyInt("lexer.sql.backticks.identifier", 0) != 0; + unsigned short int IntoCondition (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_INTO_CONDITION; + else + sqlStatesLine &= ~MASK_INTO_CONDITION; + + return sqlStatesLine; + } + + unsigned short int IntoExceptionBlock (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_INTO_EXCEPTION; + else + sqlStatesLine &= ~MASK_INTO_EXCEPTION; + + return sqlStatesLine; + } + + unsigned short int IntoDeclareBlock (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_INTO_DECLARE; + else + sqlStatesLine &= ~MASK_INTO_DECLARE; + + return sqlStatesLine; + } + + unsigned short int BeginCaseBlock (unsigned short int sqlStatesLine) { + if ((sqlStatesLine & MASK_NESTED_CASES) < MASK_NESTED_CASES) { + sqlStatesLine++; + } + return sqlStatesLine; + } + + unsigned short int EndCaseBlock (unsigned short int sqlStatesLine) { + if ((sqlStatesLine & MASK_NESTED_CASES) > 0) { + sqlStatesLine--; + } + return sqlStatesLine; + } + + bool IsIgnoreWhen (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_IGNORE_WHEN) != 0; + } + + bool IsIntoCondition (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_INTO_CONDITION) != 0; + } + + bool IsIntoCaseBlock (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_NESTED_CASES) != 0; + } + + bool IsIntoExceptionBlock (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_INTO_EXCEPTION) != 0; + } + + bool IsIntoDeclareBlock (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_INTO_DECLARE) != 0; + } + + unsigned short int ForLine(int lineNumber) { + if ((lineNumber > 0) && (sqlStatement.size() > static_cast<size_t>(lineNumber))) { + return sqlStatement[lineNumber]; + } else { + return 0; + } + } + + SQLStates() {} + +private : + std::vector <unsigned short int> sqlStatement; + enum { + MASK_INTO_DECLARE = 0x1000, + MASK_INTO_EXCEPTION = 0x2000, + MASK_INTO_CONDITION = 0x4000, + MASK_IGNORE_WHEN = 0x8000, + MASK_NESTED_CASES = 0x0FFF + }; +}; + +// Options used for LexerSQL +struct OptionsSQL { + bool fold; + bool foldAtElse; + bool foldComment; + bool foldCompact; + bool foldOnlyBegin; + bool sqlBackticksIdentifier; + bool sqlNumbersignComment; + bool sqlBackslashEscapes; + bool sqlAllowDottedWord; + OptionsSQL() { + fold = false; + foldAtElse = false; + foldComment = false; + foldCompact = false; + foldOnlyBegin = false; + sqlBackticksIdentifier = false; + sqlNumbersignComment = false; @@ 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011