Commits January 2022

commits@lists.geany.org

1 participants
68 discussions

[geany/geany] 55deaa: Use GDateTime for date and time formatting

by Enrico Tröger

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 01 Dec 2021 13:29:43 UTC Commit: 55deaab40499c2fed5c0b77903f2a6ea2924dfef https://github.com/geany/geany/commit/55deaab40499c2fed5c0b77903f2a6ea2924d… Log Message: ----------- Use GDateTime for date and time formatting This replaces the use of the native strftime() function to use GLib's GDateTime functions which should work more platform agnostic. Fixes #2968. Modified Paths: -------------- data/geany.glade doc/geany.txt plugins/saveactions.c src/printing.c src/ui_utils.c src/utils.c Modified: data/geany.glade 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -5342,7 +5342,7 @@ <object class="GtkEntry" id="entry_template_datetime"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {datetime} wildcard. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5360,7 +5360,7 @@ <object class="GtkEntry" id="entry_template_year"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {year} wildcard. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5378,7 +5378,7 @@ <object class="GtkEntry" id="entry_template_date"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {date} wildcard. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5755,7 +5755,7 @@ <object class="GtkEntry" id="entry_print_dateformat"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the date and time stamp which is added to the page header on each page. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> Modified: doc/geany.txt 29 lines changed, 12 insertions(+), 17 deletions(-) =================================================================== @@ -2434,19 +2434,16 @@ Initial version The initial version of files you will be creating. Year - Specify a format for the {year} wildcard. You can use any conversion specifiers - which can be used with the ANSI C strftime function. For details please see - http://man.cx/strftime. + Specify a format for the {year} wildcard. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Date - Specify a format for the {date} wildcard. You can use any conversion specifiers - which can be used with the ANSI C strftime function. For details please see - http://man.cx/strftime. + Specify a format for the {date} wildcard. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Date & Time - Specify a format for the {datetime} wildcard. You can use any conversion specifiers - which can be used with the ANSI C strftime function. For details please see - http://man.cx/strftime. + Specify a format for the {datetime} wildcard. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Keybinding preferences @@ -2485,9 +2482,8 @@ Use base name of the printed file Don't use the entire path for the header, only the filename. Date format - How the date should be printed. You can use the same format - specifiers as in the ANSI C function strftime(). For details please - see http://man.cx/strftime. + How the date should be printed. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Various preferences @@ -3213,8 +3209,8 @@ the date and time of printing. By default, the file name of the document with full path information is added to the header. If you prefer to add only the basename of the file(without any path information) you can set it in the preferences dialog. You can also adjust the format of the date and -time added to the page header. The available conversion specifiers are the -same as the ones which can be used with the ANSI C strftime function. +time added to the page header. For a list of available conversion +specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. All of these settings can also be changed in the print dialog just before actual printing is done. @@ -4931,9 +4927,8 @@ version The initial version of a new file. file templates, fil **Date & time wildcards** The format for these wildcards can be changed in the preferences -dialog, see `Template preferences`_. You can use any conversion -specifiers which can be used with the ANSI C strftime function. -For details please see http://man.cx/strftime. +dialog, see `Template preferences`_. For a list of available conversion +specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. ============== ============================================= ======================================= Wildcard Description Available in Modified: plugins/saveactions.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -814,7 +814,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic( - _("Date/_Time format for backup files (\"man strftime\" for details):")); + _("Date/_Time format for backup files (for a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html):")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 7); Modified: src/printing.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -276,7 +276,7 @@ static GtkWidget *create_custom_widget(GtkPrintOperation *operation, gpointer us w->entry_print_dateformat = gtk_entry_new(); ui_entry_add_clear_icon(GTK_ENTRY(w->entry_print_dateformat)); gtk_box_pack_start(GTK_BOX(hbox10), w->entry_print_dateformat, TRUE, TRUE, 0); - gtk_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.")); + gtk_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.")); gtk_entry_set_text(GTK_ENTRY(w->entry_print_dateformat), printing_prefs.page_header_datefmt); on_page_header_toggled(GTK_TOGGLE_BUTTON(w->check_print_pageheader), w); Modified: src/ui_utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -728,7 +728,7 @@ static void insert_date(GeanyDocument *doc, gint pos, const gchar *date_style) { gchar *str = dialogs_show_input(_("Custom Date Format"), GTK_WINDOW(main_widgets.window), _("Enter here a custom date and time format. " - "You can use any conversion specifiers which can be used with the ANSI C strftime function."), + "For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html."), ui_prefs.custom_date_format); if (str) SETPTR(ui_prefs.custom_date_format, str); Modified: src/utils.c 44 lines changed, 13 insertions(+), 31 deletions(-) =================================================================== @@ -720,12 +720,11 @@ gint utils_strpos(const gchar *haystack, const gchar *needle) /** - * Retrieves a formatted date/time string from strftime(). - * This function should be preferred to directly calling strftime() since this function - * works on UTF-8 encoded strings. + * Retrieves a formatted date/time string from GDateTime. + * This function works on UTF-8 encoded strings. * - * @param format The format string to pass to strftime(3). See the strftime(3) - * documentation for details, in UTF-8 encoding. + * @param format The format string to pass to g_date_time_format, in UTF-8 encoding. + See https://docs.gtk.org/glib/method.DateTime.format.html for details. * @param time_to_use @nullable The date/time to use, in time_t format or @c NULL to use the current time. * * @return A newly-allocated string, should be freed when no longer needed. @@ -735,39 +734,22 @@ gint utils_strpos(const gchar *haystack, const gchar *needle) GEANY_API_SYMBOL gchar *utils_get_date_time(const gchar *format, time_t *time_to_use) { - const struct tm *tm; - static gchar date[1024]; - gchar *locale_format; - gsize len; + time_t unixtime; + gchar *datetime_formatted; + GDateTime *datetime; g_return_val_if_fail(format != NULL, NULL); - if (! g_utf8_validate(format, -1, NULL)) - { - locale_format = g_locale_from_utf8(format, -1, NULL, NULL, NULL); - if (locale_format == NULL) - return NULL; - } - else - locale_format = g_strdup(format); - if (time_to_use != NULL) - tm = localtime(time_to_use); + unixtime = *time_to_use; else - { - time_t tp = time(NULL); - tm = localtime(&tp); - } + unixtime = time(NULL); - len = strftime(date, 1024, locale_format, tm); - g_free(locale_format); - if (len == 0) - return NULL; + datetime = g_date_time_new_from_unix_local(unixtime); + datetime_formatted = g_date_time_format(datetime, format); - if (! g_utf8_validate(date, len, NULL)) - return g_locale_to_utf8(date, len, NULL, NULL, NULL); - else - return g_strdup(date); + g_date_time_unref(datetime); + return datetime_formatted; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] 977928: Merge pull request #3037 from eht16/issue2968_windows_strftime

by Enrico Tröger

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 30 Jan 2022 21:40:24 UTC Commit: 977928a1bcc683c2896281421c9228140f6efe07 https://github.com/geany/geany/commit/977928a1bcc683c2896281421c9228140f6ef… Log Message: ----------- Merge pull request #3037 from eht16/issue2968_windows_strftime Use GDateTime for date and time formatting Modified Paths: -------------- data/geany.glade doc/geany.txt plugins/saveactions.c src/printing.c src/ui_utils.c src/utils.c Modified: data/geany.glade 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -5342,7 +5342,7 @@ <object class="GtkEntry" id="entry_template_datetime"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {datetime} wildcard. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5360,7 +5360,7 @@ <object class="GtkEntry" id="entry_template_year"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {year} wildcard. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5378,7 +5378,7 @@ <object class="GtkEntry" id="entry_template_date"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the {date} wildcard. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> <property name="primary_icon_sensitive">True</property> @@ -5755,7 +5755,7 @@ <object class="GtkEntry" id="entry_print_dateformat"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.</property> + <property name="tooltip_text" translatable="yes">Specify a format for the date and time stamp which is added to the page header on each page. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.</property> <property name="invisible_char">●</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</property> Modified: doc/geany.txt 29 lines changed, 12 insertions(+), 17 deletions(-) =================================================================== @@ -2451,19 +2451,16 @@ Initial version The initial version of files you will be creating. Year - Specify a format for the {year} wildcard. You can use any conversion specifiers - which can be used with the ANSI C strftime function. For details please see - http://man.cx/strftime. + Specify a format for the {year} wildcard. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Date - Specify a format for the {date} wildcard. You can use any conversion specifiers - which can be used with the ANSI C strftime function. For details please see - http://man.cx/strftime. + Specify a format for the {date} wildcard. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Date & Time - Specify a format for the {datetime} wildcard. You can use any conversion specifiers - which can be used with the ANSI C strftime function. For details please see - http://man.cx/strftime. + Specify a format for the {datetime} wildcard. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Keybinding preferences @@ -2502,9 +2499,8 @@ Use base name of the printed file Don't use the entire path for the header, only the filename. Date format - How the date should be printed. You can use the same format - specifiers as in the ANSI C function strftime(). For details please - see http://man.cx/strftime. + How the date should be printed. For a list of available conversion + specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. Various preferences @@ -3230,8 +3226,8 @@ the date and time of printing. By default, the file name of the document with full path information is added to the header. If you prefer to add only the basename of the file(without any path information) you can set it in the preferences dialog. You can also adjust the format of the date and -time added to the page header. The available conversion specifiers are the -same as the ones which can be used with the ANSI C strftime function. +time added to the page header. For a list of available conversion +specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. All of these settings can also be changed in the print dialog just before actual printing is done. @@ -4948,9 +4944,8 @@ version The initial version of a new file. file templates, fil **Date & time wildcards** The format for these wildcards can be changed in the preferences -dialog, see `Template preferences`_. You can use any conversion -specifiers which can be used with the ANSI C strftime function. -For details please see http://man.cx/strftime. +dialog, see `Template preferences`_. For a list of available conversion +specifiers see https://docs.gtk.org/glib/method.DateTime.format.html. ============== ============================================= ======================================= Wildcard Description Available in Modified: plugins/saveactions.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -814,7 +814,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic( - _("Date/_Time format for backup files (\"man strftime\" for details):")); + _("Date/_Time format for backup files (for a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html):")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 7); Modified: src/printing.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -276,7 +276,7 @@ static GtkWidget *create_custom_widget(GtkPrintOperation *operation, gpointer us w->entry_print_dateformat = gtk_entry_new(); ui_entry_add_clear_icon(GTK_ENTRY(w->entry_print_dateformat)); gtk_box_pack_start(GTK_BOX(hbox10), w->entry_print_dateformat, TRUE, TRUE, 0); - gtk_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function.")); + gtk_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html.")); gtk_entry_set_text(GTK_ENTRY(w->entry_print_dateformat), printing_prefs.page_header_datefmt); on_page_header_toggled(GTK_TOGGLE_BUTTON(w->check_print_pageheader), w); Modified: src/ui_utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -728,7 +728,7 @@ static void insert_date(GeanyDocument *doc, gint pos, const gchar *date_style) { gchar *str = dialogs_show_input(_("Custom Date Format"), GTK_WINDOW(main_widgets.window), _("Enter here a custom date and time format. " - "You can use any conversion specifiers which can be used with the ANSI C strftime function."), + "For a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html."), ui_prefs.custom_date_format); if (str) SETPTR(ui_prefs.custom_date_format, str); Modified: src/utils.c 44 lines changed, 13 insertions(+), 31 deletions(-) =================================================================== @@ -720,12 +720,11 @@ gint utils_strpos(const gchar *haystack, const gchar *needle) /** - * Retrieves a formatted date/time string from strftime(). - * This function should be preferred to directly calling strftime() since this function - * works on UTF-8 encoded strings. + * Retrieves a formatted date/time string from GDateTime. + * This function works on UTF-8 encoded strings. * - * @param format The format string to pass to strftime(3). See the strftime(3) - * documentation for details, in UTF-8 encoding. + * @param format The format string to pass to g_date_time_format, in UTF-8 encoding. + See https://docs.gtk.org/glib/method.DateTime.format.html for details. * @param time_to_use @nullable The date/time to use, in time_t format or @c NULL to use the current time. * * @return A newly-allocated string, should be freed when no longer needed. @@ -735,39 +734,22 @@ gint utils_strpos(const gchar *haystack, const gchar *needle) GEANY_API_SYMBOL gchar *utils_get_date_time(const gchar *format, time_t *time_to_use) { - const struct tm *tm; - static gchar date[1024]; - gchar *locale_format; - gsize len; + time_t unixtime; + gchar *datetime_formatted; + GDateTime *datetime; g_return_val_if_fail(format != NULL, NULL); - if (! g_utf8_validate(format, -1, NULL)) - { - locale_format = g_locale_from_utf8(format, -1, NULL, NULL, NULL); - if (locale_format == NULL) - return NULL; - } - else - locale_format = g_strdup(format); - if (time_to_use != NULL) - tm = localtime(time_to_use); + unixtime = *time_to_use; else - { - time_t tp = time(NULL); - tm = localtime(&tp); - } + unixtime = time(NULL); - len = strftime(date, 1024, locale_format, tm); - g_free(locale_format); - if (len == 0) - return NULL; + datetime = g_date_time_new_from_unix_local(unixtime); + datetime_formatted = g_date_time_format(datetime, format); - if (! g_utf8_validate(date, len, NULL)) - return g_locale_to_utf8(date, len, NULL, NULL, NULL); - else - return g_strdup(date); + g_date_time_unref(datetime); + return datetime_formatted; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] 5a369a: Merge pull request #3055 from techee/tagfilter-new

by Enrico Tröger

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 23 Jan 2022 23:06:51 UTC Commit: 5a369a41e3cb6fd1bc57e602fa567e8c0d153bfc https://github.com/geany/geany/commit/5a369a41e3cb6fd1bc57e602fa567e8c0d153… Log Message: ----------- Merge pull request #3055 from techee/tagfilter-new Filter for symbol tree - improved version Modified Paths: -------------- HACKING data/geany.glade doc/geany.txt src/callbacks.c src/callbacks.h src/document.c src/documentprivate.h src/editor.c src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_tag.c src/tagmanager/tm_workspace.c Modified: HACKING 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -676,7 +676,7 @@ MAP_ENTRY(FOO) to parser_map. (You may want to make the symbols.c change before doing this). In src/tagmanager/tm_parser.c: -Update tm_parser_context_separator() and tm_parser_has_full_context() to +Update tm_parser_scope_separator() and tm_parser_has_full_scope() to handle the new parser if applicable, by adding a TM_PARSER_FOO case entry. In filetypes.c, init_builtin_filetypes(): Modified: data/geany.glade 45 lines changed, 39 insertions(+), 6 deletions(-) =================================================================== @@ -8245,17 +8245,50 @@ <signal name="switch-page" handler="on_tv_notebook_switch_page" swapped="no"/> <signal name="switch-page" handler="on_tv_notebook_switch_page_after" after="yes" swapped="no"/> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkVBox" id="vbox46"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="can_focus">False</property> + <child> + <object class="GtkEntry" id="entry_tagfilter"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Filter the symbol list using the entered text. Separate multiple filters with a space.</property> + <property name="invisible_char">•</property> + <property name="primary_icon_stock">gtk-find</property> + <property name="secondary_icon_stock">gtk-clear</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">True</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <signal name="changed" handler="on_entry_tagfilter_changed" swapped="no"/> + <signal name="activate" handler="on_entry_tagfilter_activate" swapped="no"/> + <signal name="icon-press" handler="on_entry_tagfilter_icon_press" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkTreeView" id="treeview2"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="enable_search">False</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="enable_search">False</property> + </object> + </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> Modified: doc/geany.txt 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -253,6 +253,31 @@ The position of the tabs can be selected in the interface preferences. The sizes of the sidebar and message window can be adjusted by dragging the dividers. +Sidebar Usage +^^^^^^^^^^^^^ + +The sidebar has a right click menu that can control what is visible and +has actions specific to the tab (other tabs added by plugins are +described by that plugin documentation): + +* Symbols + + * expand/collapse the tree + * control sorting order + * locate the symbol in documents + + The symbols tab can also be filtered by typing a string into + the entry at the top of the tab. All symbols that contain the entered + string as a substring will be shown in the tree. Multiple filters can + be separated by a space. + +* Documents + + * expand/collapse the tree + * save to or reload from files + * search tree based at selected file + * show or hide the document paths + Command line options -------------------- Modified: src/callbacks.c 49 lines changed, 48 insertions(+), 1 deletions(-) =================================================================== @@ -437,6 +437,44 @@ void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data) } +void on_entry_tagfilter_changed(GtkAction *action, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + GtkEntry *filter_entry; + + if (!doc) + return; + + filter_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_tagfilter")); + g_free(doc->priv->tag_filter); + doc->priv->tag_filter = g_strdup(gtk_entry_get_text(filter_entry)); + + /* make sure the tree is fully re-created so it appears correctly + * after applying filter */ + if (doc->priv->tag_store) + gtk_tree_store_clear(doc->priv->tag_store); + sidebar_update_tag_list(doc, TRUE); +} + + +void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data) +{ + if (event->button.button == 1) + gtk_entry_set_text(entry, ""); +} + + +void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + + gtk_widget_grab_focus(doc->priv->tag_tree); +} + + /* hides toolbar from toolbar popup menu */ static void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data) { @@ -491,14 +529,23 @@ static void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page, if (doc != NULL) { + GtkEntry *filter_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_tagfilter")); + const gchar *entry_text = gtk_entry_get_text(filter_entry); + sidebar_select_openfiles_item(doc); ui_save_buttons_toggle(doc->changed); ui_set_window_title(doc); ui_update_statusbar(doc, -1); ui_update_popup_reundo_items(doc); ui_document_show_hide(doc); /* update the document menu */ build_menu_update(doc); - sidebar_update_tag_list(doc, FALSE); + if (g_strcmp0(entry_text, doc->priv->tag_filter) != 0) + { + /* calls sidebar_update_tag_list() in on_entry_tagfilter_changed() */ + gtk_entry_set_text(filter_entry, doc->priv->tag_filter); + } + else + sidebar_update_tag_list(doc, TRUE); document_highlight_tags(doc); document_check_disk_status(doc, TRUE); Modified: src/callbacks.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -72,6 +72,12 @@ void on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpoin void on_toolbar_search_entry_activate(GtkAction *action, const gchar *text, gpointer user_data); +void on_entry_tagfilter_changed(GtkAction *action, gpointer user_data); + +void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data); + +void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data); + void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data); void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); Modified: src/document.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -647,6 +647,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) /* initialize default document settings */ doc->priv = g_new0(GeanyDocumentPrivate, 1); + doc->priv->tag_filter = g_strdup(""); doc->id = ++doc_id_counter; doc->index = new_idx; doc->file_name = g_strdup(utf8_filename); @@ -734,6 +735,7 @@ static gboolean remove_page(guint page_num) } g_free(doc->encoding); g_free(doc->priv->saved_encoding.encoding); + g_free(doc->priv->tag_filter); g_free(doc->file_name); g_free(doc->real_path); if (doc->tm_file) Modified: src/documentprivate.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,8 @@ typedef struct GeanyDocumentPrivate GtkWidget *info_bars[NUM_MSG_TYPES]; /* Keyed Data List to attach arbitrary data to the document */ GData *data; + /* Text used for filtering symbol tree. */ + gchar *tag_filter; } GeanyDocumentPrivate; Modified: src/editor.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -645,7 +645,7 @@ static void show_tags_list(GeanyEditor *editor, const GPtrArray *tags, gsize roo static gint scope_autocomplete_suffix(ScintillaObject *sci, TMParserType lang, gint pos, gboolean *scope_sep) { - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); const gsize max_len = 3; gboolean is_scope_sep; gchar *buf; @@ -708,7 +708,7 @@ static gboolean autocomplete_scope(GeanyEditor *editor, const gchar *root, gsize gboolean scope_sep_typed = FALSE; gboolean ret = FALSE; const gchar *current_scope; - const gchar *context_sep = tm_parser_context_separator(ft->lang); + const gchar *context_sep = tm_parser_scope_separator(ft->lang); gint autocomplete_suffix_len; if (autocomplete_scope_shown) @@ -1866,7 +1866,7 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) { const TMTagType arg_types = tm_tag_function_t | tm_tag_prototype_t | tm_tag_method_t | tm_tag_macro_with_arg_t; - const gchar *scope_sep = tm_parser_context_separator(ft->lang); + const gchar *scope_sep = tm_parser_scope_separator(ft->lang); gchar *scope = EMPTY(tag->scope) ? g_strdup(tag->name) : g_strjoin(scope_sep, tag->scope, tag->name, NULL); Modified: src/symbols.c 54 lines changed, 43 insertions(+), 11 deletions(-) =================================================================== @@ -265,7 +265,7 @@ GString *symbols_find_typenames_as_string(TMParserType lang, gboolean global) GEANY_API_SYMBOL const gchar *symbols_get_context_separator(gint ft_id) { - return tm_parser_context_separator(filetypes[ft_id]->lang); + return tm_parser_scope_separator(filetypes[ft_id]->lang); } @@ -319,26 +319,58 @@ static gint compare_symbol_lines(gconstpointer a, gconstpointer b) static GList *get_tag_list(GeanyDocument *doc, TMTagType tag_types) { GList *tag_names = NULL; - guint i; + guint i, j; + gchar **tf_strv; g_return_val_if_fail(doc, NULL); if (! doc->tm_file || ! doc->tm_file->tags_array) return NULL; + tf_strv = g_strsplit_set(doc->priv->tag_filter, " ", -1); + for (i = 0; i < doc->tm_file->tags_array->len; ++i) { TMTag *tag = TM_TAG(doc->tm_file->tags_array->pdata[i]); - if (G_UNLIKELY(tag == NULL)) - return NULL; - if (tag->type & tag_types) { - tag_names = g_list_prepend(tag_names, tag); + gboolean filtered = FALSE; + gchar **val; + gchar *full_tagname = g_strconcat(tag->scope ? tag->scope : "", + tag->scope ? tm_parser_scope_separator_printable(tag->lang) : "", + tag->name, NULL); + gchar *normalized_tagname = g_utf8_normalize(full_tagname, -1, G_NORMALIZE_ALL); + + foreach_strv(val, tf_strv) + { + gchar *normalized_val = g_utf8_normalize(*val, -1, G_NORMALIZE_ALL); + + if (normalized_tagname != NULL && normalized_val != NULL) + { + gchar *case_normalized_tagname = g_utf8_casefold(normalized_tagname, -1); + gchar *case_normalized_val = g_utf8_casefold(normalized_val, -1); + + filtered = strstr(case_normalized_tagname, case_normalized_val) == NULL; + g_free(case_normalized_tagname); + g_free(case_normalized_val); + } + g_free(normalized_val); + + if (filtered) + break; + } + if (!filtered) + tag_names = g_list_prepend(tag_names, tag); + + g_free(normalized_tagname); + g_free(full_tagname); } } tag_names = g_list_sort(tag_names, compare_symbol_lines); + + g_strfreev(tf_strv); + return tag_names; } @@ -940,7 +972,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole if (!found_parent && scope && strpbrk(scope, GEANY_WORDCHARS) == scope) { - const gchar *sep = symbols_get_context_separator(doc->file_type->id); + const gchar *sep = tm_parser_scope_separator_printable(tag->lang); g_string_append(buffer, scope); g_string_append(buffer, sep); @@ -1196,7 +1228,7 @@ static void update_parents_table(GHashTable *table, const TMTag *tag, const GtkT /* simple case, just use the tag name */ name = tag->name; } - else if (! tm_parser_has_full_context(tag->lang)) + else if (! tm_parser_has_full_scope(tag->lang)) { /* if the parser doesn't use fully qualified scope, use the name alone but * prevent Foo::Foo from making parent = child */ @@ -1208,7 +1240,7 @@ static void update_parents_table(GHashTable *table, const TMTag *tag, const GtkT else { /* build the fully qualified scope as get_parent_name() would return it for a child tag */ - name_free = g_strconcat(tag->scope, tm_parser_context_separator(tag->lang), tag->name, NULL); + name_free = g_strconcat(tag->scope, tm_parser_scope_separator(tag->lang), tag->name, NULL); name = name_free; } @@ -1378,7 +1410,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) /* Build hash tables holding tags and parents */ /* parent table is GHashTable<tag_name, GTree<line_num, GtkTreeIter>> * where tag_name might be a fully qualified name (with scope) if the language - * parser reports scope properly (see tm_parser_has_full_context()). */ + * parser reports scope properly (see tm_parser_has_full_scope()). */ parents_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, parents_table_value_free); /* tags table is another representation of the @tags list, * GHashTable<TMTag, GTree<line_num, GList<GList<TMTag>>>> */ @@ -2431,7 +2463,7 @@ static gint get_current_tag_name(GeanyDocument *doc, gchar **tagname, TMTagType { if (tag->scope) *tagname = g_strconcat(tag->scope, - symbols_get_context_separator(doc->file_type->id), tag->name, NULL); + tm_parser_scope_separator(tag->lang), tag->name, NULL); else *tagname = g_strdup(tag->name); Modified: src/tagmanager/tm_parser.c 26 lines changed, 21 insertions(+), 5 deletions(-) =================================================================== @@ -835,7 +835,7 @@ void tm_parser_verify_type_mappings(void) * zero otherwise. */ gint tm_parser_scope_autocomplete_suffix(TMParserType lang, const gchar *str) { - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); if (g_str_has_suffix(str, sep)) return strlen(sep); @@ -971,7 +971,7 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc if (scope) { g_string_append(str, scope); - g_string_append(str, tm_parser_context_separator(lang)); + g_string_append(str, tm_parser_scope_separator_printable(lang)); } g_string_append(str, fname); g_string_append_c(str, ' '); @@ -1017,7 +1017,7 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc } -const gchar *tm_parser_context_separator(TMParserType lang) +const gchar *tm_parser_scope_separator(TMParserType lang) { switch (lang) { @@ -1046,11 +1046,27 @@ const gchar *tm_parser_context_separator(TMParserType lang) } -gboolean tm_parser_has_full_context(TMParserType lang) +const gchar *tm_parser_scope_separator_printable(TMParserType lang) { switch (lang) { - /* These parsers include full hierarchy in the tag scope, separated by tm_parser_context_separator() */ + case TM_PARSER_TXT2TAGS: + case TM_PARSER_ASCIIDOC: + case TM_PARSER_CONF: + case TM_PARSER_REST: + return " > "; + + default: + return tm_parser_scope_separator(lang); + } +} + + +gboolean tm_parser_has_full_scope(TMParserType lang) +{ + switch (lang) + { + /* These parsers include full hierarchy in the tag scope, separated by tm_parser_scope_separator() */ case TM_PARSER_ACTIONSCRIPT: case TM_PARSER_C: case TM_PARSER_CPP: Modified: src/tagmanager/tm_parser.h 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -140,9 +140,11 @@ gchar *tm_parser_format_variable(TMParserType lang, const gchar *name, const gch gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gchar *args, const gchar *retval, const gchar *scope); -const gchar *tm_parser_context_separator(TMParserType lang); +const gchar *tm_parser_scope_separator(TMParserType lang); -gboolean tm_parser_has_full_context(TMParserType lang); +const gchar *tm_parser_scope_separator_printable(TMParserType lang); + +gboolean tm_parser_has_full_scope(TMParserType lang); gboolean tm_parser_langs_compatible(TMParserType lang, TMParserType other); Modified: src/tagmanager/tm_tag.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -781,7 +781,7 @@ void tm_tags_array_print(GPtrArray *tags, FILE *fp) */ gint tm_tag_scope_depth(const TMTag *t) { - const gchar *context_sep = tm_parser_context_separator(t->lang); + const gchar *context_sep = tm_parser_scope_separator(t->lang); gint depth; char *s; if(!(t && t->scope)) Modified: src/tagmanager/tm_workspace.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -750,7 +750,7 @@ find_scope_members_tags (const GPtrArray *all, TMTag *type_tag, gboolean namespa member_types = tm_tag_max_t; if (type_tag->scope && *(type_tag->scope)) - scope = g_strconcat(type_tag->scope, tm_parser_context_separator(type_tag->lang), type_tag->name, NULL); + scope = g_strconcat(type_tag->scope, tm_parser_scope_separator(type_tag->lang), type_tag->name, NULL); else scope = g_strdup(type_tag->name); @@ -785,7 +785,7 @@ static gchar *strip_type(const gchar *scoped_name, TMParserType lang) if (scoped_name != NULL) { /* remove scope prefix */ - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); const gchar *base = g_strrstr(scoped_name, sep); gchar *name = base ? g_strdup(base + strlen(sep)) : g_strdup(scoped_name); @@ -881,7 +881,7 @@ find_scope_members (const GPtrArray *tags_array, const gchar *name, TMSourceFile static gboolean member_at_method_scope(const GPtrArray *tags, const gchar *method_scope, TMTag *member_tag, TMParserType lang) { - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); gboolean ret = FALSE; gchar **comps; guint len; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] 0c311c: Use per-document filter for symbol tree

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: 0c311c02fd3f1b527d777ca21a5f83f198d57537 https://github.com/geany/geany/commit/0c311c02fd3f1b527d777ca21a5f83f198d57… Log Message: ----------- Use per-document filter for symbol tree Modified Paths: -------------- src/callbacks.c src/document.c src/documentprivate.h src/symbols.c Modified: src/callbacks.c 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -440,10 +440,15 @@ void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data) void on_entry_tagfilter_changed(GtkAction *action, gpointer user_data) { GeanyDocument *doc = document_get_current(); + GtkEntry *filter_entry; if (!doc) return; + filter_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_tagfilter")); + g_free(doc->priv->tag_filter); + doc->priv->tag_filter = g_strdup(gtk_entry_get_text(filter_entry)); + /* make sure the tree is fully re-created so it appears correctly * after applying filter */ if (doc->priv->tag_store) @@ -524,14 +529,23 @@ static void on_notebook1_switch_page_after(GtkNotebook *notebook, gpointer page, if (doc != NULL) { + GtkEntry *filter_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_tagfilter")); + const gchar *entry_text = gtk_entry_get_text(filter_entry); + sidebar_select_openfiles_item(doc); ui_save_buttons_toggle(doc->changed); ui_set_window_title(doc); ui_update_statusbar(doc, -1); ui_update_popup_reundo_items(doc); ui_document_show_hide(doc); /* update the document menu */ build_menu_update(doc); - sidebar_update_tag_list(doc, TRUE); + if (g_strcmp0(entry_text, doc->priv->tag_filter) != 0) + { + /* calls sidebar_update_tag_list() in on_entry_tagfilter_changed() */ + gtk_entry_set_text(filter_entry, doc->priv->tag_filter); + } + else + sidebar_update_tag_list(doc, TRUE); document_highlight_tags(doc); document_check_disk_status(doc, TRUE); Modified: src/document.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -647,6 +647,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) /* initialize default document settings */ doc->priv = g_new0(GeanyDocumentPrivate, 1); + doc->priv->tag_filter = g_strdup(""); doc->id = ++doc_id_counter; doc->index = new_idx; doc->file_name = g_strdup(utf8_filename); @@ -734,6 +735,7 @@ static gboolean remove_page(guint page_num) } g_free(doc->encoding); g_free(doc->priv->saved_encoding.encoding); + g_free(doc->priv->tag_filter); g_free(doc->file_name); g_free(doc->real_path); if (doc->tm_file) Modified: src/documentprivate.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,8 @@ typedef struct GeanyDocumentPrivate GtkWidget *info_bars[NUM_MSG_TYPES]; /* Keyed Data List to attach arbitrary data to the document */ GData *data; + /* Text used for filtering symbol tree. */ + gchar *tag_filter; } GeanyDocumentPrivate; Modified: src/symbols.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -320,16 +320,14 @@ static GList *get_tag_list(GeanyDocument *doc, TMTagType tag_types) { GList *tag_names = NULL; guint i, j; - GtkEntry *tf_entry; gchar **tf_strv; g_return_val_if_fail(doc, NULL); if (! doc->tm_file || ! doc->tm_file->tags_array) return NULL; - tf_entry = GTK_ENTRY(ui_lookup_widget(main_widgets.window, "entry_tagfilter")); - tf_strv = g_strsplit_set(gtk_entry_get_text(tf_entry), " ", -1); + tf_strv = g_strsplit_set(doc->priv->tag_filter, " ", -1); for (i = 0; i < doc->tm_file->tags_array->len; ++i) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] c18004: Add documentation about the filtering feature

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: c180040dd3870afe5bc583d6502309e4d73df912 https://github.com/geany/geany/commit/c180040dd3870afe5bc583d6502309e4d73df… Log Message: ----------- Add documentation about the filtering feature Thanks to @elextr for most of the text. Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -253,6 +253,31 @@ The position of the tabs can be selected in the interface preferences. The sizes of the sidebar and message window can be adjusted by dragging the dividers. +Sidebar Usage +^^^^^^^^^^^^^ + +The sidebar has a right click menu that can control what is visible and +has actions specific to the tab (other tabs added by plugins are +described by that plugin documentation): + +* Symbols + + * expand/collapse the tree + * control sorting order + * locate the symbol in documents + + The symbols tab can also be filtered by typing a string into + the entry at the top of the tab. All symbols that contain the entered + string as a substring will be shown in the tree. Multiple filters can + be separated by a space. + +* Documents + + * expand/collapse the tree + * save to or reload from files + * search tree based at selected file + * show or hide the document paths + Command line options -------------------- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] c1e0ae: Rename tm_parser_context_separator() to tm_parser_scope_separator()

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: c1e0ae3851c8abf01642693c19fd7f8671060924 https://github.com/geany/geany/commit/c1e0ae3851c8abf01642693c19fd7f8671060… Log Message: ----------- Rename tm_parser_context_separator() to tm_parser_scope_separator() This thing is called "scope separator" officially in ctags and when someone adds a new parser to Geany, it's unnecessary to cause a confusion to that person by strange naming. Modified Paths: -------------- HACKING src/editor.c src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_tag.c src/tagmanager/tm_workspace.c Modified: HACKING 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -676,7 +676,7 @@ MAP_ENTRY(FOO) to parser_map. (You may want to make the symbols.c change before doing this). In src/tagmanager/tm_parser.c: -Update tm_parser_context_separator() and tm_parser_has_full_context() to +Update tm_parser_scope_separator() and tm_parser_has_full_context() to handle the new parser if applicable, by adding a TM_PARSER_FOO case entry. In filetypes.c, init_builtin_filetypes(): Modified: src/editor.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -645,7 +645,7 @@ static void show_tags_list(GeanyEditor *editor, const GPtrArray *tags, gsize roo static gint scope_autocomplete_suffix(ScintillaObject *sci, TMParserType lang, gint pos, gboolean *scope_sep) { - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); const gsize max_len = 3; gboolean is_scope_sep; gchar *buf; @@ -708,7 +708,7 @@ static gboolean autocomplete_scope(GeanyEditor *editor, const gchar *root, gsize gboolean scope_sep_typed = FALSE; gboolean ret = FALSE; const gchar *current_scope; - const gchar *context_sep = tm_parser_context_separator(ft->lang); + const gchar *context_sep = tm_parser_scope_separator(ft->lang); gint autocomplete_suffix_len; if (autocomplete_scope_shown) @@ -1866,7 +1866,7 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) { const TMTagType arg_types = tm_tag_function_t | tm_tag_prototype_t | tm_tag_method_t | tm_tag_macro_with_arg_t; - const gchar *scope_sep = tm_parser_context_separator(ft->lang); + const gchar *scope_sep = tm_parser_scope_separator(ft->lang); gchar *scope = EMPTY(tag->scope) ? g_strdup(tag->name) : g_strjoin(scope_sep, tag->scope, tag->name, NULL); Modified: src/symbols.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -265,7 +265,7 @@ GString *symbols_find_typenames_as_string(TMParserType lang, gboolean global) GEANY_API_SYMBOL const gchar *symbols_get_context_separator(gint ft_id) { - return tm_parser_context_separator(filetypes[ft_id]->lang); + return tm_parser_scope_separator(filetypes[ft_id]->lang); } @@ -338,7 +338,7 @@ static GList *get_tag_list(GeanyDocument *doc, TMTagType tag_types) gboolean filtered = FALSE; gchar **val; gchar *full_tagname = g_strconcat(tag->scope ? tag->scope : "", - tag->scope ? tm_parser_context_separator(tag->lang) : "", + tag->scope ? tm_parser_scope_separator(tag->lang) : "", tag->name, NULL); gchar *normalized_tagname = g_utf8_normalize(full_tagname, -1, G_NORMALIZE_ALL); @@ -1228,7 +1228,7 @@ static void update_parents_table(GHashTable *table, const TMTag *tag, const GtkT else { /* build the fully qualified scope as get_parent_name() would return it for a child tag */ - name_free = g_strconcat(tag->scope, tm_parser_context_separator(tag->lang), tag->name, NULL); + name_free = g_strconcat(tag->scope, tm_parser_scope_separator(tag->lang), tag->name, NULL); name = name_free; } Modified: src/tagmanager/tm_parser.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -823,7 +823,7 @@ void tm_parser_verify_type_mappings(void) * zero otherwise. */ gint tm_parser_scope_autocomplete_suffix(TMParserType lang, const gchar *str) { - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); if (g_str_has_suffix(str, sep)) return strlen(sep); @@ -957,7 +957,7 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc if (scope) { g_string_append(str, scope); - g_string_append(str, tm_parser_context_separator(lang)); + g_string_append(str, tm_parser_scope_separator(lang)); } g_string_append(str, fname); g_string_append_c(str, ' '); @@ -1001,7 +1001,7 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc } -const gchar *tm_parser_context_separator(TMParserType lang) +const gchar *tm_parser_scope_separator(TMParserType lang) { switch (lang) { @@ -1034,7 +1034,7 @@ gboolean tm_parser_has_full_context(TMParserType lang) { switch (lang) { - /* These parsers include full hierarchy in the tag scope, separated by tm_parser_context_separator() */ + /* These parsers include full hierarchy in the tag scope, separated by tm_parser_scope_separator() */ case TM_PARSER_ACTIONSCRIPT: case TM_PARSER_C: case TM_PARSER_CPP: Modified: src/tagmanager/tm_parser.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -139,7 +139,7 @@ gchar *tm_parser_format_variable(TMParserType lang, const gchar *name, const gch gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gchar *args, const gchar *retval, const gchar *scope); -const gchar *tm_parser_context_separator(TMParserType lang); +const gchar *tm_parser_scope_separator(TMParserType lang); gboolean tm_parser_has_full_context(TMParserType lang); Modified: src/tagmanager/tm_tag.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -781,7 +781,7 @@ void tm_tags_array_print(GPtrArray *tags, FILE *fp) */ gint tm_tag_scope_depth(const TMTag *t) { - const gchar *context_sep = tm_parser_context_separator(t->lang); + const gchar *context_sep = tm_parser_scope_separator(t->lang); gint depth; char *s; if(!(t && t->scope)) Modified: src/tagmanager/tm_workspace.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -750,7 +750,7 @@ find_scope_members_tags (const GPtrArray *all, TMTag *type_tag, gboolean namespa member_types = tm_tag_max_t; if (type_tag->scope && *(type_tag->scope)) - scope = g_strconcat(type_tag->scope, tm_parser_context_separator(type_tag->lang), type_tag->name, NULL); + scope = g_strconcat(type_tag->scope, tm_parser_scope_separator(type_tag->lang), type_tag->name, NULL); else scope = g_strdup(type_tag->name); @@ -785,7 +785,7 @@ static gchar *strip_type(const gchar *scoped_name, TMParserType lang) if (scoped_name != NULL) { /* remove scope prefix */ - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); const gchar *base = g_strrstr(scoped_name, sep); gchar *name = base ? g_strdup(base + strlen(sep)) : g_strdup(scoped_name); @@ -881,7 +881,7 @@ find_scope_members (const GPtrArray *tags_array, const gchar *name, TMSourceFile static gboolean member_at_method_scope(const GPtrArray *tags, const gchar *method_scope, TMTag *member_tag, TMParserType lang) { - const gchar *sep = tm_parser_context_separator(lang); + const gchar *sep = tm_parser_scope_separator(lang); gboolean ret = FALSE; gchar **comps; guint len; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] 7ccf2b: Rename tm_parser_has_full_context() to tm_parser_has_full_scope()

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: 7ccf2bba6ceb8de2aefaa1c44c8eeebe996702f8 https://github.com/geany/geany/commit/7ccf2bba6ceb8de2aefaa1c44c8eeebe99670… Log Message: ----------- Rename tm_parser_has_full_context() to tm_parser_has_full_scope() Modified Paths: -------------- HACKING src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h Modified: HACKING 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -676,7 +676,7 @@ MAP_ENTRY(FOO) to parser_map. (You may want to make the symbols.c change before doing this). In src/tagmanager/tm_parser.c: -Update tm_parser_scope_separator() and tm_parser_has_full_context() to +Update tm_parser_scope_separator() and tm_parser_has_full_scope() to handle the new parser if applicable, by adding a TM_PARSER_FOO case entry. In filetypes.c, init_builtin_filetypes(): Modified: src/symbols.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1216,7 +1216,7 @@ static void update_parents_table(GHashTable *table, const TMTag *tag, const GtkT /* simple case, just use the tag name */ name = tag->name; } - else if (! tm_parser_has_full_context(tag->lang)) + else if (! tm_parser_has_full_scope(tag->lang)) { /* if the parser doesn't use fully qualified scope, use the name alone but * prevent Foo::Foo from making parent = child */ @@ -1398,7 +1398,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) /* Build hash tables holding tags and parents */ /* parent table is GHashTable<tag_name, GTree<line_num, GtkTreeIter>> * where tag_name might be a fully qualified name (with scope) if the language - * parser reports scope properly (see tm_parser_has_full_context()). */ + * parser reports scope properly (see tm_parser_has_full_scope()). */ parents_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, parents_table_value_free); /* tags table is another representation of the @tags list, * GHashTable<TMTag, GTree<line_num, GList<GList<TMTag>>>> */ Modified: src/tagmanager/tm_parser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1030,7 +1030,7 @@ const gchar *tm_parser_scope_separator(TMParserType lang) } -gboolean tm_parser_has_full_context(TMParserType lang) +gboolean tm_parser_has_full_scope(TMParserType lang) { switch (lang) { Modified: src/tagmanager/tm_parser.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -141,7 +141,7 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc const gchar *tm_parser_scope_separator(TMParserType lang); -gboolean tm_parser_has_full_context(TMParserType lang); +gboolean tm_parser_has_full_scope(TMParserType lang); gboolean tm_parser_langs_compatible(TMParserType lang, TMParserType other); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] 79295c: Use tm_parser_scope_separator() instead of symbols_get_context_separator()

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: 79295ce727e9b7c667b616516655a8c61566e181 https://github.com/geany/geany/commit/79295ce727e9b7c667b616516655a8c61566e… Log Message: ----------- Use tm_parser_scope_separator() instead of symbols_get_context_separator() symbols_get_context_separator() uses filetype ID as its argument and tm_parser_scope_separator() uses parser ID as its argument and those are easy to confuse. Use just one of them in Geany code to avoid errors. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -960,7 +960,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole if (!found_parent && scope && strpbrk(scope, GEANY_WORDCHARS) == scope) { - const gchar *sep = symbols_get_context_separator(doc->file_type->id); + const gchar *sep = tm_parser_scope_separator(tag->lang); g_string_append(buffer, scope); g_string_append(buffer, sep); @@ -2451,7 +2451,7 @@ static gint get_current_tag_name(GeanyDocument *doc, gchar **tagname, TMTagType { if (tag->scope) *tagname = g_strconcat(tag->scope, - symbols_get_context_separator(doc->file_type->id), tag->name, NULL); + tm_parser_scope_separator(tag->lang), tag->name, NULL); else *tagname = g_strdup(tag->name); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] bd93be: Add tm_parser_scope_separator_printable()

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:44:14 UTC Commit: bd93be412a5eb286cad978928d01f7e9c26da59e https://github.com/geany/geany/commit/bd93be412a5eb286cad978928d01f7e9c26da… Log Message: ----------- Add tm_parser_scope_separator_printable() The added tm_parser_scope_separator_printable() function is a human readable representation of scope separator. For most languages, this is equal to the scope separator but for some (mostly markup languages), some "strange" scope separators are used like \0x3 or \"\" and we need something more readable when displayed to users. " > " seems to look good. This new function can be used to: 1. Format calltips (though real languages use human-readable scope sep) 2. Symbol tree filter and display. Modified Paths: -------------- src/symbols.c src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h Modified: src/symbols.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -338,7 +338,7 @@ static GList *get_tag_list(GeanyDocument *doc, TMTagType tag_types) gboolean filtered = FALSE; gchar **val; gchar *full_tagname = g_strconcat(tag->scope ? tag->scope : "", - tag->scope ? tm_parser_scope_separator(tag->lang) : "", + tag->scope ? tm_parser_scope_separator_printable(tag->lang) : "", tag->name, NULL); gchar *normalized_tagname = g_utf8_normalize(full_tagname, -1, G_NORMALIZE_ALL); @@ -960,7 +960,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole if (!found_parent && scope && strpbrk(scope, GEANY_WORDCHARS) == scope) { - const gchar *sep = tm_parser_scope_separator(tag->lang); + const gchar *sep = tm_parser_scope_separator_printable(tag->lang); g_string_append(buffer, scope); g_string_append(buffer, sep); Modified: src/tagmanager/tm_parser.c 18 lines changed, 17 insertions(+), 1 deletions(-) =================================================================== @@ -957,7 +957,7 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc if (scope) { g_string_append(str, scope); - g_string_append(str, tm_parser_scope_separator(lang)); + g_string_append(str, tm_parser_scope_separator_printable(lang)); } g_string_append(str, fname); g_string_append_c(str, ' '); @@ -1030,6 +1030,22 @@ const gchar *tm_parser_scope_separator(TMParserType lang) } +const gchar *tm_parser_scope_separator_printable(TMParserType lang) +{ + switch (lang) + { + case TM_PARSER_TXT2TAGS: + case TM_PARSER_ASCIIDOC: + case TM_PARSER_CONF: + case TM_PARSER_REST: + return " > "; + + default: + return tm_parser_scope_separator(lang); + } +} + + gboolean tm_parser_has_full_scope(TMParserType lang) { switch (lang) Modified: src/tagmanager/tm_parser.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -141,6 +141,8 @@ gchar *tm_parser_format_function(TMParserType lang, const gchar *fname, const gc const gchar *tm_parser_scope_separator(TMParserType lang); +const gchar *tm_parser_scope_separator_printable(TMParserType lang); + gboolean tm_parser_has_full_scope(TMParserType lang); gboolean tm_parser_langs_compatible(TMParserType lang, TMParserType other); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

[geany/geany] f15f5a: Minor improvements related to the search entry

by Jiří Techet

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 23 Jan 2022 16:43:57 UTC Commit: f15f5a5dd87e4128bb14e3aa97ad5aacb7c28c69 https://github.com/geany/geany/commit/f15f5a5dd87e4128bb14e3aa97ad5aacb7c28… Log Message: ----------- Minor improvements related to the search entry * Add search icon to the entry * Mention the possibility to use more filters separated by space in tooltip * Focus the tree when pressing enter in the search entry Modified Paths: -------------- data/geany.glade src/callbacks.c src/callbacks.h Modified: data/geany.glade 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -8252,14 +8252,16 @@ <object class="GtkEntry" id="entry_tagfilter"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Filter the Symbol List</property> + <property name="tooltip_text" translatable="yes">Filter the symbol list using the entered text. Separate multiple filters with a space.</property> <property name="invisible_char">•</property> + <property name="primary_icon_stock">gtk-find</property> <property name="secondary_icon_stock">gtk-clear</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">True</property> <property name="primary_icon_sensitive">True</property> <property name="secondary_icon_sensitive">True</property> <signal name="changed" handler="on_entry_tagfilter_changed" swapped="no"/> + <signal name="activate" handler="on_entry_tagfilter_activate" swapped="no"/> <signal name="icon-press" handler="on_entry_tagfilter_icon_press" swapped="no"/> </object> <packing> Modified: src/callbacks.c 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -440,6 +440,10 @@ void on_toolbutton_search_clicked(GtkAction *action, gpointer user_data) void on_entry_tagfilter_changed(GtkAction *action, gpointer user_data) { GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + /* make sure the tree is fully re-created so it appears correctly * after applying filter */ if (doc->priv->tag_store) @@ -455,6 +459,17 @@ void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_po } +void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + + gtk_widget_grab_focus(doc->priv->tag_tree); +} + + /* hides toolbar from toolbar popup menu */ static void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data) { Modified: src/callbacks.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -76,6 +76,8 @@ void on_entry_tagfilter_changed(GtkAction *action, gpointer user_data); void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data); +void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data); + void on_toggle_case1_activate(GtkMenuItem *menuitem, gpointer user_data); void on_find_usage1_activate(GtkMenuItem *menuitem, gpointer user_data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 year, 10 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2022