Commits

commits@lists.geany.org

1 participants
11464 discussions

[geany/geany] de4f02: Merge pull request #3785 from techee/anon_fix
by Jiří Techet 24 Apr '24

24 Apr '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 23 Apr 2024 22:09:36 UTC Commit: de4f029fb23c4058a71db6f05a4c892643a0ec62 https://github.com/geany/geany/commit/de4f029fb23c4058a71db6f05a4c892643a0e… Log Message: ----------- Merge pull request #3785 from techee/anon_fix Rename both scope and var_type of anonymous types Modified Paths: -------------- src/tagmanager/tm_ctags.c tests/ctags/Makefile.am tests/ctags/nested_anon.c tests/ctags/nested_anon.c.tags tests/meson.build Modified: src/tagmanager/tm_ctags.c 59 lines changed, 34 insertions(+), 25 deletions(-) =================================================================== @@ -241,6 +241,33 @@ void tm_ctags_clear_ignore_symbols(void) } +static gboolean replace_str(gchar **where, const gchar *what, guint what_len, + const gchar *replacement, guint replacement_len) +{ + if (where && *where) + { + gchar *pos = strstr(*where, what); + + if (pos) + { + gsize where_len = strlen(*where); + gchar *str = g_malloc(where_len + replacement_len - what_len + 1); + gsize prefix_len = (gsize) (pos - *where); + + strncpy(str, *where, prefix_len); + strcpy(str + prefix_len, replacement); + strcpy(str + prefix_len + replacement_len, pos + what_len); + g_free(*where); + *where = str; + + return TRUE; + } + } + + return FALSE; +} + + /* call after all tags have been collected so we don't have to handle reparses * with the counter (which gets complicated when also subparsers are involved) */ static void rename_anon_tags(TMSourceFile *source_file) @@ -336,7 +363,6 @@ static void rename_anon_tags(TMSourceFile *source_file) { TMTag *nested_tag = TM_TAG(source_file->tags_array->pdata[j]); guint nested_scope_len = nested_tag->scope ? strlen(nested_tag->scope) : 0; - gchar *pos; /* Tags can be interleaved with scopeless macros - skip those */ if (is_c && nested_tag->type & (tm_tag_macro_t | tm_tag_macro_with_arg_t)) @@ -361,22 +387,14 @@ static void rename_anon_tags(TMSourceFile *source_file) if (nested_scope_len <= scope_len) break; - pos = strstr(nested_tag->scope, orig_name); /* We found the parent name in the nested tag scope - replace it * with the new name. Note: anonymous tag names generated by * ctags are unique enough that we don't have to check for * scope separators here. */ - if (pos) - { - gchar *str = g_malloc(nested_scope_len + 50); - guint prefix_len = pos - nested_tag->scope; - - strncpy(str, nested_tag->scope, prefix_len); - strcpy(str + prefix_len, new_name); - strcpy(str + prefix_len + new_name_len, pos + orig_name_len); - g_free(nested_tag->scope); - nested_tag->scope = str; - } + replace_str(&nested_tag->scope, orig_name, orig_name_len, new_name, new_name_len); + + /* Do the same for var_type as well */ + replace_str(&nested_tag->var_type, orig_name, orig_name_len, new_name, new_name_len); } /* We are out of the nesting - the next tags could be variables @@ -385,22 +403,13 @@ static void rename_anon_tags(TMSourceFile *source_file) { TMTag *var_tag = TM_TAG(source_file->tags_array->pdata[j]); guint var_scope_len = var_tag->scope ? strlen(var_tag->scope) : 0; - gchar *pos; /* Should be at the same scope level as the anon tag */ - if (var_scope_len == scope_len && - var_tag->var_type && (pos = strstr(var_tag->var_type, orig_name))) + if (var_scope_len != scope_len || ! var_tag->var_type || + ! replace_str(&var_tag->var_type, orig_name, orig_name_len, new_name, new_name_len)) { - GString *str = g_string_new(var_tag->var_type); - gssize p = pos - var_tag->var_type; - g_string_erase(str, p, strlen(orig_name)); - g_string_insert(str, p, new_name); - g_free(var_tag->var_type); - var_tag->var_type = str->str; - g_string_free(str, FALSE); - } - else break; + } j++; } Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -252,6 +252,7 @@ test_sources = \ namespace.cpp \ namespaces2.php \ namespaces.php \ + nested_anon.c \ no_terminator.js \ non-ascii-ident1.php \ numlib.f90 \ Modified: tests/ctags/nested_anon.c 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +typedef struct { + struct + { + } __value32; +} __atomic_wide_counter; Modified: tests/ctags/nested_anon.c.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +__atomic_wide_counter�2048�0 +struct: __atomic_wide_counter +__value32�64�__atomic_wide_counter�0�__atomic_wide_counter::anon_struct_1 +member: __atomic_wide_counter::anon_struct_1 __atomic_wide_counter :: __value32 +anon_struct_1�2048�__atomic_wide_counter�1 +struct: __atomic_wide_counter :: anon_struct_1 flags: 1 Modified: tests/meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -249,6 +249,7 @@ ctags_tests = files([ 'ctags/namespace.cpp.tags', 'ctags/namespaces2.php.tags', 'ctags/namespaces.php.tags', + 'ctags/nested_anon.c.tags', 'ctags/no_terminator.js.tags', 'ctags/non-ascii-ident1.php.tags', 'ctags/numlib.f90.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aa4e90: Rename both scope and var_type of anonymous types
by Jiří Techet 24 Apr '24

24 Apr '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 23 Apr 2024 21:54:18 UTC Commit: aa4e901807e8f0294f25d9f4ef3516b775ce0b8d https://github.com/geany/geany/commit/aa4e901807e8f0294f25d9f4ef3516b775ce0… Log Message: ----------- Rename both scope and var_type of anonymous types In addition to scope, anonymous type can appear also inside var_type which should be renamed as well. Thanks to Colomban Wendling for improving the original version of this patch. Fixes #3717. Modified Paths: -------------- src/tagmanager/tm_ctags.c tests/ctags/Makefile.am tests/ctags/nested_anon.c tests/ctags/nested_anon.c.tags tests/meson.build Modified: src/tagmanager/tm_ctags.c 59 lines changed, 34 insertions(+), 25 deletions(-) =================================================================== @@ -241,6 +241,33 @@ void tm_ctags_clear_ignore_symbols(void) } +static gboolean replace_str(gchar **where, const gchar *what, guint what_len, + const gchar *replacement, guint replacement_len) +{ + if (where && *where) + { + gchar *pos = strstr(*where, what); + + if (pos) + { + gsize where_len = strlen(*where); + gchar *str = g_malloc(where_len + replacement_len - what_len + 1); + gsize prefix_len = (gsize) (pos - *where); + + strncpy(str, *where, prefix_len); + strcpy(str + prefix_len, replacement); + strcpy(str + prefix_len + replacement_len, pos + what_len); + g_free(*where); + *where = str; + + return TRUE; + } + } + + return FALSE; +} + + /* call after all tags have been collected so we don't have to handle reparses * with the counter (which gets complicated when also subparsers are involved) */ static void rename_anon_tags(TMSourceFile *source_file) @@ -336,7 +363,6 @@ static void rename_anon_tags(TMSourceFile *source_file) { TMTag *nested_tag = TM_TAG(source_file->tags_array->pdata[j]); guint nested_scope_len = nested_tag->scope ? strlen(nested_tag->scope) : 0; - gchar *pos; /* Tags can be interleaved with scopeless macros - skip those */ if (is_c && nested_tag->type & (tm_tag_macro_t | tm_tag_macro_with_arg_t)) @@ -361,22 +387,14 @@ static void rename_anon_tags(TMSourceFile *source_file) if (nested_scope_len <= scope_len) break; - pos = strstr(nested_tag->scope, orig_name); /* We found the parent name in the nested tag scope - replace it * with the new name. Note: anonymous tag names generated by * ctags are unique enough that we don't have to check for * scope separators here. */ - if (pos) - { - gchar *str = g_malloc(nested_scope_len + 50); - guint prefix_len = pos - nested_tag->scope; - - strncpy(str, nested_tag->scope, prefix_len); - strcpy(str + prefix_len, new_name); - strcpy(str + prefix_len + new_name_len, pos + orig_name_len); - g_free(nested_tag->scope); - nested_tag->scope = str; - } + replace_str(&nested_tag->scope, orig_name, orig_name_len, new_name, new_name_len); + + /* Do the same for var_type as well */ + replace_str(&nested_tag->var_type, orig_name, orig_name_len, new_name, new_name_len); } /* We are out of the nesting - the next tags could be variables @@ -385,22 +403,13 @@ static void rename_anon_tags(TMSourceFile *source_file) { TMTag *var_tag = TM_TAG(source_file->tags_array->pdata[j]); guint var_scope_len = var_tag->scope ? strlen(var_tag->scope) : 0; - gchar *pos; /* Should be at the same scope level as the anon tag */ - if (var_scope_len == scope_len && - var_tag->var_type && (pos = strstr(var_tag->var_type, orig_name))) + if (var_scope_len != scope_len || ! var_tag->var_type || + ! replace_str(&var_tag->var_type, orig_name, orig_name_len, new_name, new_name_len)) { - GString *str = g_string_new(var_tag->var_type); - gssize p = pos - var_tag->var_type; - g_string_erase(str, p, strlen(orig_name)); - g_string_insert(str, p, new_name); - g_free(var_tag->var_type); - var_tag->var_type = str->str; - g_string_free(str, FALSE); - } - else break; + } j++; } Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -252,6 +252,7 @@ test_sources = \ namespace.cpp \ namespaces2.php \ namespaces.php \ + nested_anon.c \ no_terminator.js \ non-ascii-ident1.php \ numlib.f90 \ Modified: tests/ctags/nested_anon.c 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +typedef struct { + struct + { + } __value32; +} __atomic_wide_counter; Modified: tests/ctags/nested_anon.c.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +__atomic_wide_counter�2048�0 +struct: __atomic_wide_counter +__value32�64�__atomic_wide_counter�0�__atomic_wide_counter::anon_struct_1 +member: __atomic_wide_counter::anon_struct_1 __atomic_wide_counter :: __value32 +anon_struct_1�2048�__atomic_wide_counter�1 +struct: __atomic_wide_counter :: anon_struct_1 flags: 1 Modified: tests/meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -249,6 +249,7 @@ ctags_tests = files([ 'ctags/namespace.cpp.tags', 'ctags/namespaces2.php.tags', 'ctags/namespaces.php.tags', + 'ctags/nested_anon.c.tags', 'ctags/no_terminator.js.tags', 'ctags/non-ascii-ident1.php.tags', 'ctags/numlib.f90.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9a507b: meson: Use host instead of target
by Colomban Wendling 24 Apr '24

24 Apr '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 22 Apr 2024 20:26:55 UTC Commit: 9a507b47bc514514d15838d0dbf442317ed987fd https://github.com/geany/geany/commit/9a507b47bc514514d15838d0dbf442317ed98… Log Message: ----------- meson: Use host instead of target They are gonna be the same in practice, but it's not how "target" is supposed to be used, see [1] and [2]. Streamline this to use "host", which also makes things match our Autotools closer. [1] https://mesonbuild.com/Cross-compilation.html [2] https://www.gnu.org/software/autoconf/manual/html_node/Specifying-Target-Tr… Modified Paths: -------------- meson.build Modified: meson.build 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -168,7 +168,7 @@ cdata.set_quoted('REVISION', revision) python_command = get_option('python-command') if python_command == '' or python_command == 'auto' - if target_machine.system() == 'windows' + if host_machine.system() == 'windows' python_command = 'py' else python_command = 'python' @@ -213,7 +213,7 @@ endforeach geany_cflags = def_cflags have_gcc4_visibility = cc.has_argument('-fvisibility=hidden') geany_cflags += '-DGEANY_PRIVATE' -if target_machine.system() == 'windows' +if host_machine.system() == 'windows' geany_cflags += '-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)' elif have_gcc4_visibility geany_cflags += '-fvisibility=hidden' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3b1079: prefs: Remove separate checkbox for default open encoding
by Colomban Wendling 22 Apr '24

22 Apr '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 12 Dec 2023 23:36:00 UTC Commit: 3b10790a41d570bb52cd1a40952914dd3641a743 https://github.com/geany/geany/commit/3b10790a41d570bb52cd1a40952914dd3641a… Log Message: ----------- prefs: Remove separate checkbox for default open encoding Show and use the "Detect from file" combo member instead of having a dedicated checkbox for this. I don't see the value of having a separate checkbox for this: * We don't save two values anyway, so the value when detection is enabled is artificial; * It makes the UI more complex by having more controls; * It takes screen estate; * We already have the code for adding a "Detect from file" in the combo box. Modified Paths: -------------- data/geany.glade doc/geany.txt src/prefs.c Modified: data/geany.glade 16 lines changed, 0 insertions(+), 16 deletions(-) =================================================================== @@ -4566,22 +4566,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="check_open_encoding"> - <property name="label" translatable="yes">Use fixed encoding when opening non-Unicode files</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkVBox" id="vbox45"> <property name="visible">True</property> Modified: doc/geany.txt 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -2470,12 +2470,12 @@ Open new documents from the command-line Default encoding (new files) The type of file encoding you wish to use when creating files. -Used fixed encoding when opening files - Assume all files you are opening are using the type of encoding specified below. - Default encoding (existing files) - Opens all files with the specified encoding instead of auto-detecting it. - Use this option when it's not possible for Geany to detect the exact encoding. + Selects the encoding used when opening existing files. If set to something + other than *Detect from file*, all files will be opened with the specified + encoding instead of auto-detecting it. + Use a specific encoding when it's not possible for Geany to detect the + correct one. Default end of line characters The end of line characters to which should be used for new files. Modified: src/prefs.c 40 lines changed, 9 insertions(+), 31 deletions(-) =================================================================== @@ -89,7 +89,6 @@ static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointe static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_check_line_end_toggled(GtkToggleButton *togglebutton, gpointer user_data); -static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_radio_button_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_page_header_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -533,18 +532,11 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), - (file_prefs.default_open_encoding >= 0) ? TRUE : FALSE); - on_open_encoding_toggled(GTK_TOGGLE_BUTTON(widget), NULL); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); if (file_prefs.default_open_encoding >= 0) - { ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_open_encoding); - } else - ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), GEANY_ENCODING_UTF_8); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), GEANY_ENCODINGS_MAX); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_eol"); if (file_prefs.default_eol_character >= 0 && file_prefs.default_eol_character < 3) @@ -1006,13 +998,9 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); file_prefs.default_new_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - { - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); - file_prefs.default_open_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); - } - else + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); + file_prefs.default_open_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); + if (file_prefs.default_open_encoding >= GEANY_ENCODINGS_MAX) file_prefs.default_open_encoding = -1; widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_eol"); @@ -1547,15 +1535,6 @@ static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer us } -static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data) -{ - gboolean sens = gtk_toggle_button_get_active(togglebutton); - - gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "eventbox3"), sens); - gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "label_open_encoding"), sens); -} - - static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data) { gboolean sens = gtk_toggle_button_get_active(togglebutton); @@ -1664,23 +1643,24 @@ void prefs_show_dialog(void) { struct { const gchar *combo, *renderer; + gboolean has_detect; } names[] = { - { "combo_new_encoding", "combo_new_encoding_renderer" }, - { "combo_open_encoding", "combo_open_encoding_renderer" } + { "combo_new_encoding", "combo_new_encoding_renderer", FALSE }, + { "combo_open_encoding", "combo_open_encoding_renderer", TRUE } }; guint i; - GtkTreeStore *encoding_list = encodings_encoding_store_new(FALSE); for (i = 0; i < G_N_ELEMENTS(names); i++) { + GtkTreeStore *encoding_list = encodings_encoding_store_new(names[i].has_detect); GtkWidget *combo = ui_lookup_widget(ui_widgets.prefs_dialog, names[i].combo); gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), ui_builder_get_object(names[i].renderer), encodings_encoding_store_cell_data_func, NULL, NULL); gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(encoding_list)); + g_object_unref(encoding_list); } - g_object_unref(encoding_list); } /* init the eol character combo box */ @@ -1813,8 +1793,6 @@ void prefs_show_dialog(void) "toggled", G_CALLBACK(on_use_folding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"), "toggled", G_CALLBACK(on_check_line_end_toggled), NULL); - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"), - "toggled", G_CALLBACK(on_open_encoding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"), "toggled", G_CALLBACK(on_sidebar_visible_toggled), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3a019a: encodings: Add a flag for whether the encoding is supported
by Colomban Wendling 22 Apr '24

22 Apr '24

1 0

[geany/geany] 9e4c6e: Don't display unsupported encodings
by Colomban Wendling 22 Apr '24

22 Apr '24

1 0

[geany/geany] c8365f: Don't try knowingly unsupported encodings
by Colomban Wendling 22 Apr '24

22 Apr '24

1 0

[geany/geany] 15831f: Merge pull request #3720 from b4n/encodings-ui-improvements
by Colomban Wendling 22 Apr '24

22 Apr '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: GitHub <noreply(a)github.com> Date: Sun, 21 Apr 2024 19:34:31 UTC Commit: 15831f4dfb7c8cd7de5080e8dfddf7d84ca60c4f https://github.com/geany/geany/commit/15831f4dfb7c8cd7de5080e8dfddf7d84ca60… Log Message: ----------- Merge pull request #3720 from b4n/encodings-ui-improvements Encodings UI improvements Modified Paths: -------------- data/geany.glade doc/geany.txt src/encodings.c src/encodingsprivate.h src/prefs.c Modified: data/geany.glade 16 lines changed, 0 insertions(+), 16 deletions(-) =================================================================== @@ -4550,22 +4550,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="check_open_encoding"> - <property name="label" translatable="yes">Use fixed encoding when opening non-Unicode files</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkVBox" id="vbox45"> <property name="visible">True</property> Modified: doc/geany.txt 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -2473,12 +2473,12 @@ Open new documents from the command-line Default encoding (new files) The type of file encoding you wish to use when creating files. -Used fixed encoding when opening files - Assume all files you are opening are using the type of encoding specified below. - Default encoding (existing files) - Opens all files with the specified encoding instead of auto-detecting it. - Use this option when it's not possible for Geany to detect the exact encoding. + Selects the encoding used when opening existing files. If set to something + other than *Detect from file*, all files will be opened with the specified + encoding instead of auto-detecting it. + Use a specific encoding when it's not possible for Geany to detect the + correct one. Default end of line characters The end of line characters to which should be used for new files. Modified: src/encodings.c 35 lines changed, 32 insertions(+), 3 deletions(-) =================================================================== @@ -59,12 +59,24 @@ static gboolean pregs_loaded = FALSE; GeanyEncoding encodings[GEANY_ENCODINGS_MAX]; +static gboolean conversion_supported(const gchar *to, const gchar *from) +{ + GIConv conv = g_iconv_open(to, from); + if (conv == (GIConv) -1) + return FALSE; + + g_iconv_close(conv); + return TRUE; +} + + #define fill(Order, Group, Idx, Charset, Name) \ encodings[Idx].idx = Idx; \ encodings[Idx].order = Order; \ encodings[Idx].group = Group; \ encodings[Idx].charset = Charset; \ - encodings[Idx].name = Name; + encodings[Idx].name = Name; \ + encodings[Idx].supported = FALSE; static void init_encodings(void) { @@ -140,6 +152,19 @@ static void init_encodings(void) fill(14, EASTASIAN, GEANY_ENCODING_UHC, "UHC", _("Korean")); fill(0, NONE, GEANY_ENCODING_NONE, "None", _("Without encoding")); + + /* fill the flags member */ + for (guint i = 0; i < G_N_ELEMENTS(encodings); i++) + { + if (i == GEANY_ENCODING_NONE || conversion_supported("UTF-8", encodings[i].charset)) + encodings[i].supported = TRUE; + else + { + /* geany_debug() doesn't really work at this point, unless G_MESSAGES_DEBUG + * is set explicitly by the caller, but that's better than nothing */ + geany_debug("Encoding %s is not supported by the system", encodings[i].charset); + } + } } @@ -476,7 +501,8 @@ void encodings_init(void) } else item = gtk_menu_item_new_with_label(label); - gtk_widget_show(item); + if (encodings[i].supported) + gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(submenus[encodings[i].group]), item); g_signal_connect(item, "activate", cb_func[k], (gpointer) encodings[i].charset); @@ -548,6 +574,9 @@ GtkTreeStore *encodings_encoding_store_new(gboolean has_detect) { gchar *encoding_string; + if (! encodings[i].supported) + continue; + switch (encodings[i].group) { case WESTEUROPEAN: iter_parent = &iter_westeuro; break; @@ -756,7 +785,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gss else continue; } - else if (i >= 0) + else if (i >= 0 && encodings[i].supported) charset = encodings[i].charset; else /* in this case we have i == -2, continue to increase i and go ahead */ continue; Modified: src/encodingsprivate.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -46,6 +46,7 @@ typedef struct GeanyEncoding GeanyEncodingGroup group; /* Internally used member for grouping */ const gchar *charset; /* String representation of the encoding, e.g. "ISO-8859-3" */ const gchar *name; /* Translatable and descriptive name of the encoding, e.g. "South European" */ + gboolean supported; /* Whether this encoding is supported on the system */ } GeanyEncoding; Modified: src/prefs.c 40 lines changed, 9 insertions(+), 31 deletions(-) =================================================================== @@ -89,7 +89,6 @@ static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointe static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_check_line_end_toggled(GtkToggleButton *togglebutton, gpointer user_data); -static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_radio_button_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_prefs_print_page_header_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -533,18 +532,11 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), - (file_prefs.default_open_encoding >= 0) ? TRUE : FALSE); - on_open_encoding_toggled(GTK_TOGGLE_BUTTON(widget), NULL); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); if (file_prefs.default_open_encoding >= 0) - { ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_open_encoding); - } else - ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), GEANY_ENCODING_UTF_8); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), GEANY_ENCODINGS_MAX); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_eol"); if (file_prefs.default_eol_character >= 0 && file_prefs.default_eol_character < 3) @@ -1006,13 +998,9 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); file_prefs.default_new_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) - { - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); - file_prefs.default_open_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); - } - else + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); + file_prefs.default_open_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); + if (file_prefs.default_open_encoding >= GEANY_ENCODINGS_MAX) file_prefs.default_open_encoding = -1; widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_eol"); @@ -1547,15 +1535,6 @@ static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer us } -static void on_open_encoding_toggled(GtkToggleButton *togglebutton, gpointer user_data) -{ - gboolean sens = gtk_toggle_button_get_active(togglebutton); - - gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "eventbox3"), sens); - gtk_widget_set_sensitive(ui_lookup_widget(ui_widgets.prefs_dialog, "label_open_encoding"), sens); -} - - static void on_sidebar_visible_toggled(GtkToggleButton *togglebutton, gpointer user_data) { gboolean sens = gtk_toggle_button_get_active(togglebutton); @@ -1664,23 +1643,24 @@ void prefs_show_dialog(void) { struct { const gchar *combo, *renderer; + gboolean has_detect; } names[] = { - { "combo_new_encoding", "combo_new_encoding_renderer" }, - { "combo_open_encoding", "combo_open_encoding_renderer" } + { "combo_new_encoding", "combo_new_encoding_renderer", FALSE }, + { "combo_open_encoding", "combo_open_encoding_renderer", TRUE } }; guint i; - GtkTreeStore *encoding_list = encodings_encoding_store_new(FALSE); for (i = 0; i < G_N_ELEMENTS(names); i++) { + GtkTreeStore *encoding_list = encodings_encoding_store_new(names[i].has_detect); GtkWidget *combo = ui_lookup_widget(ui_widgets.prefs_dialog, names[i].combo); gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), ui_builder_get_object(names[i].renderer), encodings_encoding_store_cell_data_func, NULL, NULL); gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(encoding_list)); + g_object_unref(encoding_list); } - g_object_unref(encoding_list); } /* init the eol character combo box */ @@ -1810,8 +1790,6 @@ void prefs_show_dialog(void) "toggled", G_CALLBACK(on_use_folding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"), "toggled", G_CALLBACK(on_check_line_end_toggled), NULL); - g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"), - "toggled", G_CALLBACK(on_open_encoding_toggled), NULL); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "check_sidebar_visible"), "toggled", G_CALLBACK(on_sidebar_visible_toggled), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] effe63: Small code cleanup
by Colomban Wendling 22 Apr '24

22 Apr '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 10 Dec 2023 21:50:59 UTC Commit: effe633ef710c690eeff4bb37ce5ce1d13d1c8fc https://github.com/geany/geany/commit/effe633ef710c690eeff4bb37ce5ce1d13d1c… Log Message: ----------- Small code cleanup Use more idiomatic loops. Modified Paths: -------------- src/encodings.c Modified: src/encodings.c 18 lines changed, 3 insertions(+), 15 deletions(-) =================================================================== @@ -195,37 +195,27 @@ static gboolean encodings_charset_equals(const gchar *a, const gchar *b) GeanyEncodingIndex encodings_get_idx_from_charset(const gchar *charset) { - gint i; - if (charset == NULL) return GEANY_ENCODING_UTF_8; - i = 0; - while (i < GEANY_ENCODINGS_MAX) + for (gint i = 0; i < GEANY_ENCODINGS_MAX; i++) { if (encodings_charset_equals(charset, encodings[i].charset)) return i; - - ++i; } return GEANY_ENCODING_UTF_8; } const GeanyEncoding *encodings_get_from_charset(const gchar *charset) { - gint i; - if (charset == NULL) return &encodings[GEANY_ENCODING_UTF_8]; - i = 0; - while (i < GEANY_ENCODINGS_MAX) + for (gint i = 0; i < GEANY_ENCODINGS_MAX; i++) { if (encodings_charset_equals(charset, encodings[i].charset)) return &encodings[i]; - - ++i; } return NULL; @@ -300,12 +290,10 @@ void encodings_select_radio_item(const gchar *charset) g_return_if_fail(charset != NULL); - i = 0; - while (i < GEANY_ENCODINGS_MAX) + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { if (utils_str_equal(charset, encodings[i].charset)) break; - i++; } if (i == GEANY_ENCODINGS_MAX) i = GEANY_ENCODING_UTF_8; /* fallback to UTF-8 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 053667: Report actual error to the caller in encodings_convert_to_utf8_auto()
by Colomban Wendling 22 Apr '24

22 Apr '24

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 12 Dec 2023 21:40:38 UTC Commit: 053667e3a95650691f1a48673c94794d98b1da37 https://github.com/geany/geany/commit/053667e3a95650691f1a48673c94794d98b1d… Log Message: ----------- Report actual error to the caller in encodings_convert_to_utf8_auto() This allows the caller to produce a more precise error message, and in some cases handle specific failures specifically if it wants to. Modified Paths: -------------- src/document.c src/encodings.c src/encodingsprivate.h src/templates.c tests/test_encodings.c Modified: src/document.c 16 lines changed, 6 insertions(+), 10 deletions(-) =================================================================== @@ -998,19 +998,15 @@ static gboolean load_text_file(const gchar *locale_filename, const gchar *displa } if (! encodings_convert_to_utf8_auto(&filedata->data, &filedata->len, forced_enc, - &filedata->enc, &filedata->bom, &filedata->readonly)) + &filedata->enc, &filedata->bom, &filedata->readonly, &err)) { if (forced_enc) - { - ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."), - display_filename, forced_enc); - } + ui_set_statusbar(TRUE, _("Failed to load file \"%s\" as %s: %s."), + display_filename, forced_enc, err->message); else - { - ui_set_statusbar(TRUE, - _("The file \"%s\" does not look like a text file or the file encoding is not supported."), - display_filename); - } + ui_set_statusbar(TRUE, _("Failed to load file \"%s\": %s."), + display_filename, err->message); + g_error_free(err); g_free(filedata->data); return FALSE; } Modified: src/encodings.c 43 lines changed, 26 insertions(+), 17 deletions(-) =================================================================== @@ -609,7 +609,7 @@ void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, static gchar *convert_to_utf8_from_charset(const gchar *buffer, gssize size, const gchar *charset, gboolean fast, - gsize *utf8_size) + gsize *utf8_size, GError **error) { gchar *utf8_content = NULL; GError *conv_error = NULL; @@ -625,18 +625,22 @@ static gchar *convert_to_utf8_from_charset(const gchar *buffer, gssize size, if (fast) { utf8_content = converted_contents; - if (conv_error != NULL) g_error_free(conv_error); + if (conv_error != NULL) g_propagate_error(error, conv_error); } else if (conv_error != NULL || ! g_utf8_validate(converted_contents, bytes_written, NULL)) { if (conv_error != NULL) { geany_debug("Couldn't convert from %s to UTF-8 (%s).", charset, conv_error->message); - g_error_free(conv_error); + g_propagate_error(error, conv_error); conv_error = NULL; } else + { geany_debug("Couldn't convert from %s to UTF-8.", charset); + g_set_error(error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, + _("Data contains NULs")); + } utf8_content = NULL; g_free(converted_contents); @@ -672,7 +676,7 @@ gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gssize size, { /* If fast=FALSE, we can safely ignore the size as the output cannot contain NULs. * Otherwise, the caller already agrees on partial data anyway. */ - return convert_to_utf8_from_charset(buffer, size, charset, fast, NULL); + return convert_to_utf8_from_charset(buffer, size, charset, fast, NULL, NULL); } @@ -692,7 +696,7 @@ static gchar *encodings_check_regexes(const gchar *buffer, gsize size) static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gssize size, - const gchar *suggested_charset, gchar **used_encoding, gsize *utf8_size) + const gchar *suggested_charset, gchar **used_encoding, gsize *utf8_size, GError **error) { const gchar *locale_charset = NULL; const gchar *charset; @@ -759,7 +763,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gss geany_debug("Trying to convert %" G_GSIZE_FORMAT " bytes of data from %s into UTF-8.", size, charset); - utf8_content = convert_to_utf8_from_charset(buffer, size, charset, FALSE, utf8_size); + utf8_content = convert_to_utf8_from_charset(buffer, size, charset, FALSE, utf8_size, NULL); if (G_LIKELY(utf8_content != NULL)) { @@ -776,6 +780,9 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gss } } + g_set_error(error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, + _("Data contains NULs or the encoding is not supported")); + return NULL; } @@ -800,7 +807,7 @@ gchar *encodings_convert_to_utf8(const gchar *buffer, gssize size, gchar **used_ /* first try to read the encoding from the file content */ regex_charset = encodings_check_regexes(buffer, size); /* we know this cannot succeed if there are NULs in the output, so ignoring the size is OK */ - utf8 = encodings_convert_to_utf8_with_suggestion(buffer, size, regex_charset, used_encoding, NULL); + utf8 = encodings_convert_to_utf8_with_suggestion(buffer, size, regex_charset, used_encoding, NULL, NULL); g_free(regex_charset); return utf8; @@ -886,21 +893,23 @@ typedef struct /* convert data with the specified encoding */ static gboolean -handle_forced_encoding(BufferData *buffer, const gchar *forced_enc) +handle_forced_encoding(BufferData *buffer, const gchar *forced_enc, GError **error) { GeanyEncodingIndex enc_idx; if (utils_str_equal(forced_enc, "UTF-8")) { if (! g_utf8_validate(buffer->data, buffer->size, NULL)) { + g_set_error(error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, + _("Data contains NULs or is not valid UTF-8")); return FALSE; } } else { gchar *converted_text = convert_to_utf8_from_charset( - buffer->data, buffer->size, forced_enc, FALSE, &buffer->size); + buffer->data, buffer->size, forced_enc, FALSE, &buffer->size, error); if (converted_text == NULL) { return FALSE; @@ -919,7 +928,7 @@ handle_forced_encoding(BufferData *buffer, const gchar *forced_enc) /* detect encoding and convert to UTF-8 if necessary */ static gboolean -handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx) +handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx, GError **error) { g_return_val_if_fail(buffer->enc == NULL, FALSE); g_return_val_if_fail(buffer->bom == FALSE, FALSE); @@ -949,7 +958,7 @@ handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx) else /* the BOM indicated something else than UTF-8 */ { gchar *converted_text = convert_to_utf8_from_charset( - buffer->data, buffer->size, buffer->enc, FALSE, &buffer->size); + buffer->data, buffer->size, buffer->enc, FALSE, &buffer->size, NULL); if (converted_text != NULL) { SETPTR(buffer->data, converted_text); @@ -978,7 +987,7 @@ handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx) { /* detect the encoding */ gchar *converted_text = encodings_convert_to_utf8_with_suggestion(buffer->data, - buffer->size, regex_charset, &buffer->enc, &buffer->size); + buffer->size, regex_charset, &buffer->enc, &buffer->size, error); if (converted_text == NULL) { @@ -1011,7 +1020,7 @@ handle_bom(BufferData *buffer) /* loads textfile data, verifies and converts to forced_enc or UTF-8. Also handles BOM. */ -static gboolean handle_buffer(BufferData *buffer, const gchar *forced_enc) +static gboolean handle_buffer(BufferData *buffer, const gchar *forced_enc, GError **error) { GeanyEncodingIndex tmp_enc_idx; @@ -1028,12 +1037,12 @@ static gboolean handle_buffer(BufferData *buffer, const gchar *forced_enc) buffer->bom = FALSE; buffer->enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset); } - else if (! handle_forced_encoding(buffer, forced_enc)) + else if (! handle_forced_encoding(buffer, forced_enc, error)) { return FALSE; } } - else if (! handle_encoding(buffer, tmp_enc_idx)) + else if (! handle_encoding(buffer, tmp_enc_idx, error)) { return FALSE; } @@ -1061,7 +1070,7 @@ static gboolean handle_buffer(BufferData *buffer, const gchar *forced_enc) */ GEANY_EXPORT_SYMBOL gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *forced_enc, - gchar **used_encoding, gboolean *has_bom, gboolean *has_nuls) + gchar **used_encoding, gboolean *has_bom, gboolean *has_nuls, GError **error) { BufferData buffer; @@ -1070,7 +1079,7 @@ gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *f buffer.enc = NULL; buffer.bom = FALSE; - if (! handle_buffer(&buffer, forced_enc)) + if (! handle_buffer(&buffer, forced_enc, error)) return FALSE; *size = buffer.size; Modified: src/encodingsprivate.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -73,7 +73,8 @@ void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, GtkCell gboolean encodings_is_unicode_charset(const gchar *string); gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *forced_enc, - gchar **used_encoding, gboolean *has_bom, gboolean *has_nuls); + gchar **used_encoding, gboolean *has_bom, gboolean *has_nuls, + GError **error); GeanyEncodingIndex encodings_scan_unicode_bom(const gchar *string, gsize len, guint *bom_len); Modified: src/templates.c 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -70,15 +70,18 @@ static gchar *read_file(const gchar *locale_fname) gchar *contents; gsize length; GString *str; + GError *err = NULL; if (! g_file_get_contents(locale_fname, &contents, &length, NULL)) return NULL; - if (! encodings_convert_to_utf8_auto(&contents, &length, NULL, NULL, NULL, NULL)) + if (! encodings_convert_to_utf8_auto(&contents, &length, NULL, NULL, NULL, NULL, &err)) { gchar *utf8_fname = utils_get_utf8_from_locale(locale_fname); - ui_set_statusbar(TRUE, _("Failed to convert template file \"%s\" to UTF-8"), utf8_fname); + ui_set_statusbar(TRUE, _("Failed to convert template file \"%s\" to UTF-8: %s"), + utf8_fname, err->message); + g_error_free(err); g_free(utf8_fname); g_free(contents); return NULL; Modified: tests/test_encodings.c 10 lines changed, 8 insertions(+), 2 deletions(-) =================================================================== @@ -74,11 +74,17 @@ static gboolean assert_convert_to_utf8_auto_impl( gboolean has_bom = FALSE; gboolean partial = FALSE; gboolean ret; + GError *err = NULL; g_log(domain, G_LOG_LEVEL_INFO, "%s:%d:%s: converting %lu bytes", file, line, func, input_size); - ret = encodings_convert_to_utf8_auto(&buf, &size, forced_enc, &used_encoding, &has_bom, &partial); + ret = encodings_convert_to_utf8_auto(&buf, &size, forced_enc, &used_encoding, &has_bom, &partial, &err); fflush(stdout); - if (ret) + if (! ret) + { + g_log(domain, G_LOG_LEVEL_INFO, "%s:%d:%s: conversion failed: %s", file, line, func, err->message); + g_error_free(err); + } + else { assert_cmpmem_eq_with_caller(buf, expected_output, MIN(size, expected_size), domain, file, line, func); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits