Commits

commits@lists.geany.org

11838 discussions

[geany/geany] bb6bfd: Document the filtering feature
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 26 Jan 2025 20:57:25 UTC Commit: bb6bfdffaf9550a3e5da9d6a74146987c586c7f9 https://github.com/geany/geany/commit/bb6bfdffaf9550a3e5da9d6a74146987c586c… Log Message: ----------- Document the filtering feature The documentation just refers to the Symbols tab documentation which is more or less identical so there's no need of duplicated text. Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -282,6 +282,7 @@ described by that plugin documentation): * save to or reload from files * search tree based at selected file * show or hide the document paths + * filter documents based on their name similarly to the Symbols tab Command line options -------------------- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 74d3b2: Add code for filtering document tree
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 26 Jan 2025 20:57:14 UTC Commit: 74d3b271fbb2e1ba63239f84e166557720f43794 https://github.com/geany/geany/commit/74d3b271fbb2e1ba63239f84e166557720f43… Log Message: ----------- Add code for filtering document tree Modified Paths: -------------- data/geany.glade src/callbacks.c src/callbacks.h src/sidebar.c src/sidebar.h Modified: data/geany.glade 40 lines changed, 35 insertions(+), 5 deletions(-) =================================================================== @@ -8399,17 +8399,47 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow7"> + <object class="GtkVBox" id="vbox47"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkEntry" id="entry_docfilter"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Filter the document 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> + <signal name="activate" handler="on_entry_docfilter_activate" swapped="no"/> + <signal name="changed" handler="on_entry_docfilter_changed" swapped="no"/> + <signal name="icon-press" handler="on_entry_docfilter_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="treeview6"> + <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can-focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> + <child> + <object class="GtkTreeView" id="treeview6"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> Modified: src/callbacks.c 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -475,6 +475,37 @@ void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data) } +void on_entry_docfilter_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_docfilter")); + sidebar_openfiles_set_filter(gtk_entry_get_text(filter_entry)); +} + + +void on_entry_docfilter_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_docfilter_activate(GtkEntry *entry, gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + if (!doc) + return; + + sidebar_focus_openfiles_tab(); +} + + /* hides toolbar from toolbar popup menu */ static void on_hide_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data) { Modified: src/callbacks.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -78,6 +78,12 @@ void on_entry_tagfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_po void on_entry_tagfilter_activate(GtkEntry *entry, gpointer user_data); +void on_entry_docfilter_changed(GtkAction *action, gpointer user_data); + +void on_entry_docfilter_icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, gpointer user_data); + +void on_entry_docfilter_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/sidebar.c 68 lines changed, 67 insertions(+), 1 deletions(-) =================================================================== @@ -78,6 +78,7 @@ enum static GtkTreeStore *store_openfiles; static GtkWidget *openfiles_popup_menu; +static gchar *openfiles_filter; static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ /* callback prototypes */ @@ -598,7 +599,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte GdkColor *color; GeanyDocument *doc; GtkTreeModel *model = GTK_TREE_MODEL(tree); - gboolean fold; + gboolean fold, visible; gtk_tree_store_append(tree, new_node, parent_new); gtk_tree_model_get(model, node, @@ -608,6 +609,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte DOCUMENTS_COLOR, &color, DOCUMENTS_FILENAME, &filename, DOCUMENTS_FOLD, &fold, + DOCUMENTS_VISIBLE, &visible, -1); if (doc) @@ -622,6 +624,7 @@ static void tree_copy_node(GtkTreeStore *tree, GtkTreeIter *new_node, GtkTreeIte DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, filename, DOCUMENTS_FOLD, fold, + DOCUMENTS_VISIBLE, visible, -1); g_free(filename); g_free(shortname); @@ -671,16 +674,21 @@ static void tree_add_new_dir(GtkTreeStore *tree, GtkTreeIter *child, GtkTreeIter { static GIcon *dir_icon = NULL; gchar *dirname = parent_dir_name(tree, parent, file); + gboolean visible = TRUE; if (!dir_icon) dir_icon = ui_get_mime_icon("inode/directory"); + if (!EMPTY(openfiles_filter)) + visible = utils_utf8_substring_match(openfiles_filter, dirname); + gtk_tree_store_append(tree, child, parent); gtk_tree_store_set(tree, child, DOCUMENTS_ICON, dir_icon, DOCUMENTS_FILENAME, file, DOCUMENTS_SHORTNAME, dirname, DOCUMENTS_FOLD, TRUE, /* GTK inserts folded by default, caller may expand */ + DOCUMENTS_VISIBLE, visible, -1); g_free(dirname); @@ -927,6 +935,7 @@ void sidebar_openfiles_add(GeanyDocument *doc) const GdkColor *color = document_get_status_color(doc); static GIcon *file_icon = NULL; gboolean expand = FALSE; + gboolean visible = TRUE; if (interface_prefs.openfiles_path_mode != OPENFILES_PATHS_NONE) expand = sidebar_openfiles_add_iter(store_openfiles, filename, iter, &parent); @@ -937,11 +946,16 @@ void sidebar_openfiles_add(GeanyDocument *doc) file_icon = ui_get_mime_icon("text/plain"); basename = g_path_get_basename(filename); + + if (!EMPTY(openfiles_filter)) + visible = utils_utf8_substring_match(openfiles_filter, basename); + gtk_tree_store_set(store_openfiles, iter, DOCUMENTS_ICON, (doc->file_type && doc->file_type->icon) ? doc->file_type->icon : file_icon, DOCUMENTS_SHORTNAME, basename, DOCUMENTS_DOCUMENT, doc, DOCUMENTS_COLOR, color, DOCUMENTS_FILENAME, DOC_FILENAME(doc), DOCUMENTS_FOLD, FALSE, + DOCUMENTS_VISIBLE, visible, -1); g_free(basename); @@ -1080,6 +1094,54 @@ void sidebar_openfiles_update_all(void) } +static gboolean update_visibility(GtkTreeStore *store, GtkTreeIter *root, gboolean visible_root) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + gboolean is_visible = FALSE; + GtkTreeIter parent; + + if (!gtk_tree_model_iter_children(model, &parent, root)) + return FALSE; + + while (TRUE) + { + gboolean visible_parent = TRUE; + gboolean visible_children; + gchar *parent_name; + + /* check if parent matches and then display *all* its children, otherwise + * check each child if the action name matches */ + gtk_tree_model_get(model, &parent, DOCUMENTS_SHORTNAME, &parent_name, -1); + if (! EMPTY(openfiles_filter)) + visible_parent = utils_utf8_substring_match(openfiles_filter, parent_name); + g_free(parent_name); + + visible_children = update_visibility(store, &parent, visible_root || visible_parent); + + if (visible_parent || visible_children) + is_visible = TRUE; + + gtk_tree_store_set(store, &parent, DOCUMENTS_VISIBLE, + visible_root || visible_parent || visible_children, -1); + + if (! gtk_tree_model_iter_next(model, &parent)) + return is_visible; + } +} + + +void sidebar_openfiles_set_filter(const gchar *filter) +{ + GeanyDocument *doc = document_get_current(); + + SETPTR(openfiles_filter, g_strdup(filter)); + update_visibility(store_openfiles, NULL, FALSE); + gtk_tree_view_expand_all(GTK_TREE_VIEW(tv.tree_openfiles)); + if (doc) + sidebar_openfiles_select(doc); +} + + void sidebar_remove_document(GeanyDocument *doc) { openfiles_remove(doc); @@ -1668,6 +1730,8 @@ void sidebar_init(void) { StashGroup *group; + openfiles_filter = g_strdup(""); + group = stash_group_new(PACKAGE); stash_group_add_widget_property(group, &ui_prefs.sidebar_page, "sidebar_page", GINT_TO_POINTER(0), main_widgets.sidebar_notebook, "page", 0); @@ -1702,6 +1766,8 @@ void sidebar_finalize(void) gtk_widget_destroy(tv.popup_taglist); if (WIDGET(openfiles_popup_menu)) gtk_widget_destroy(openfiles_popup_menu); + + g_free(openfiles_filter); } Modified: src/sidebar.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -85,6 +85,8 @@ void sidebar_openfiles_select(GeanyDocument *doc); void sidebar_openfiles_update_all(void); +void sidebar_openfiles_set_filter(const gchar *filter); + void sidebar_select_openfiles_item(GeanyDocument *doc); void sidebar_remove_document(GeanyDocument *doc); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8280bc: Bump required glib version to 2.56
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 09 Jan 2025 10:22:39 UTC Commit: 8280bc2c32485083e79aa88b3369790c38d372fd https://github.com/geany/geany/commit/8280bc2c32485083e79aa88b3369790c38d37… Log Message: ----------- Bump required glib version to 2.56 Also remove now unneeded GLIB_CHECK_VERSION() checks. Modified Paths: -------------- m4/geany-gtk.m4 meson.build src/libmain.c src/spawn.c src/tagmanager/tm_workspace.c Modified: m4/geany-gtk.m4 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -2,12 +2,12 @@ dnl GEANY_CHECK_GTK dnl Checks whether the GTK stack is available and new enough. Sets GTK_CFLAGS and GTK_LIBS. AC_DEFUN([GEANY_CHECK_GTK], [ - gtk_modules="gtk+-3.0 >= 3.24 glib-2.0 >= 2.32" - gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0 gthread-2.0" + gtk_modules="gtk+-3.0 >= 3.24 glib-2.0 >= 2.56" + gtk_modules_private="gio-2.0 >= 2.56 gmodule-no-export-2.0 gthread-2.0" PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) AC_SUBST([DEPENDENCIES], [$gtk_modules]) - AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"]) + AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56"]) dnl Disable all GTK deprecations AS_VAR_APPEND([GTK_CFLAGS], [" -DGDK_DISABLE_DEPRECATION_WARNINGS"]) AC_SUBST([GTK_CFLAGS]) Modified: meson.build 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -11,8 +11,8 @@ cxx = meson.get_compiler('cpp') prefix = get_option('prefix') deps_in = [ - ['glib-2.0', '2.32'], - ['gmodule-2.0', '2.32'], + ['glib-2.0', '2.56'], + ['gmodule-2.0', '2.56'], ['gtk+-3.0', '3.24'] ] @@ -201,7 +201,7 @@ def_cflags = basic_cflags + [ # we're using lots of deprecated stuff with gtk3 (often because there is no proper alternative!) '-Wno-deprecated-declarations', '-DGDK_DISABLE_DEPRECATION_WARNINGS', - '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32', + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56', '-DGEANY_PREFIX="@0@"'.format(get_option('prefix')), '-DGEANY_DOCDIR="@0@"'.format(join_paths(prefix, get_option('datadir'), 'doc')) ] Modified: src/libmain.c 11 lines changed, 0 insertions(+), 11 deletions(-) =================================================================== @@ -1030,10 +1030,6 @@ static const gchar *get_locale(void) GEANY_EXPORT_SYMBOL void main_init_headless(void) { -#if ! GLIB_CHECK_VERSION(2, 36, 0) - g_type_init(); -#endif - app = g_new0(GeanyApp, 1); memset(&main_status, 0, sizeof(GeanyStatus)); memset(&prefs, 0, sizeof(GeanyPrefs)); @@ -1084,13 +1080,6 @@ gint main_lib(gint argc, gchar **argv) app->tm_workspace = tm_get_workspace(); parse_command_line_options(&argc, &argv); -#if ! GLIB_CHECK_VERSION(2, 32, 0) - /* Initialize GLib's thread system in case any plugins want to use it or their - * dependencies (e.g. WebKit, Soup, ...). Deprecated since GLIB 2.32. */ - if (!g_thread_supported()) - g_thread_init(NULL); -#endif - #ifdef G_OS_UNIX g_unix_signal_add(SIGTERM, signal_cb, GINT_TO_POINTER(SIGTERM)); Modified: src/spawn.c 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -70,10 +70,6 @@ # include "geany.h" #endif -#if ! GLIB_CHECK_VERSION(2, 31, 20) && ! defined(G_SPAWN_ERROR_TOO_BIG) -# define G_SPAWN_ERROR_TOO_BIG G_SPAWN_ERROR_2BIG -#endif - #ifdef G_OS_WIN32 /* Each 4KB under Windows seem to come in 2 portions, so 2K + 2K is more balanced than 4095 + 1. May be different on the latest Windows/glib? */ Modified: src/tagmanager/tm_workspace.c 25 lines changed, 0 insertions(+), 25 deletions(-) =================================================================== @@ -681,31 +681,6 @@ gboolean tm_workspace_is_autocomplete_tag(TMTag *tag, } -#if ! GLIB_CHECK_VERSION(2, 54, 0) -static gboolean -g_ptr_array_find (GPtrArray *haystack, - gconstpointer needle, - guint *index_) -{ - guint i; - - g_return_val_if_fail (haystack != NULL, FALSE); - - for (i = 0; i < haystack->len; i++) - { - if (g_direct_equal (g_ptr_array_index (haystack, i), needle)) - { - if (index_ != NULL) - *index_ = i; - return TRUE; - } - } - - return FALSE; -} -#endif - - typedef struct { TMSourceFile *file; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 433ef5: Replace deprecated GTrashStack with GSList
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 09 Jan 2025 10:22:46 UTC Commit: 433ef5515eb7f420b24a4ca69b9ea4f7d977b504 https://github.com/geany/geany/commit/433ef5515eb7f420b24a4ca69b9ea4f7d977b… Log Message: ----------- Replace deprecated GTrashStack with GSList Using GTrashStack after the glib version bump produces warnings now. Replace it with GSList (as GTrashStack is a list internally anyway and in fact, GTrashStack wasn't used in Geany for its intended purpose; for undo/redo Geany just needs a stack-like behavior). Modified Paths: -------------- src/document.c src/documentprivate.h Modified: src/document.c 54 lines changed, 35 insertions(+), 19 deletions(-) =================================================================== @@ -91,7 +91,6 @@ GPtrArray *documents_array = NULL; /* an undo action, also used for redo actions */ typedef struct { - GTrashStack *next; /* pointer to the next stack element(required for the GTrashStack) */ guint type; /* to identify the action */ gpointer *data; /* the old value (before the change), in case of a redo action * it contains the new value */ @@ -108,7 +107,7 @@ enum static guint doc_id_counter = 0; -static void document_undo_clear_stack(GTrashStack **stack); +static void document_undo_clear_stack(GSList **stack); static void document_undo_clear(GeanyDocument *doc); static void document_undo_add_internal(GeanyDocument *doc, guint type, gpointer data); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); @@ -1371,10 +1370,10 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename * reloading, and at the end add an UNDO_RELOAD action that performs * all these actions in bulk. To keep track of how many undo actions * were added during this time, we compare the current undo-stack height - * with its height at the end of the process. Note that g_trash_stack_height() + * with its height at the end of the process. Note that g_slist_length() * is O(N), which is a little ugly, but this seems like the most maintainable * option. */ - undo_reload_data->actions_count = g_trash_stack_height(&doc->priv->undo_actions); + undo_reload_data->actions_count = g_slist_length(doc->priv->undo_actions); /* We use add_undo_reload_action to track any changes to the document that * require adding an undo action to revert the reload, but that do not @@ -1441,7 +1440,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename /* Calculate the number of undo actions that are part of the reloading * process, and add the UNDO_RELOAD action. */ undo_reload_data->actions_count = - g_trash_stack_height(&doc->priv->undo_actions) - undo_reload_data->actions_count; + g_slist_length(doc->priv->undo_actions) - undo_reload_data->actions_count; /* We only add an undo-reload action if the document has actually changed. * At the time of writing, this condition is moot because sci_set_text @@ -2902,11 +2901,12 @@ void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding) * All Scintilla events are stored in the undo / redo buffer and are passed through. */ /* Clears an Undo or Redo buffer. */ -void document_undo_clear_stack(GTrashStack **stack) +void document_undo_clear_stack(GSList **stack) { - while (g_trash_stack_height(stack) > 0) + while (*stack) { - undo_action *a = g_trash_stack_pop(stack); + GSList *top = *stack; + undo_action *a = top->data; if (G_LIKELY(a != NULL)) { @@ -2919,8 +2919,10 @@ void document_undo_clear_stack(GTrashStack **stack) } g_free(a); } + + *stack = top->next; + g_slist_free1(top); } - *stack = NULL; } /* Clears the Undo and Redo buffer (to be called when reloading or closing the document) */ @@ -2948,7 +2950,7 @@ void document_undo_add_internal(GeanyDocument *doc, guint type, gpointer data) action->type = type; action->data = data; - g_trash_stack_push(&doc->priv->undo_actions, action); + doc->priv->undo_actions = g_slist_prepend(doc->priv->undo_actions, action); /* avoid unnecessary redraws */ if (type != UNDO_SCINTILLA || !doc->changed) @@ -2971,7 +2973,7 @@ gboolean document_can_undo(GeanyDocument *doc) { g_return_val_if_fail(doc != NULL, FALSE); - if (g_trash_stack_height(&doc->priv->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) + if (doc->priv->undo_actions || sci_can_undo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2990,11 +2992,18 @@ static void update_changed_state(GeanyDocument *doc) void document_undo(GeanyDocument *doc) { - undo_action *action; + GSList *top; + undo_action *action = NULL; g_return_if_fail(doc != NULL); - action = g_trash_stack_pop(&doc->priv->undo_actions); + top = doc->priv->undo_actions; + if (top) + { + action = top->data; + doc->priv->undo_actions = top->next; + g_slist_free1(top); + } if (G_UNLIKELY(action == NULL)) { @@ -3048,7 +3057,7 @@ void document_undo(GeanyDocument *doc) /* When undoing, UNDO_EOL is always followed by UNDO_SCINTILLA * which undos the line endings in the editor and should be * performed together with UNDO_EOL. */ - next_action = g_trash_stack_peek(&doc->priv->undo_actions); + next_action = doc->priv->undo_actions ? doc->priv->undo_actions->data : NULL; if (next_action && next_action->type == UNDO_SCINTILLA) document_undo(doc); break; @@ -3090,7 +3099,7 @@ gboolean document_can_redo(GeanyDocument *doc) { g_return_val_if_fail(doc != NULL, FALSE); - if (g_trash_stack_height(&doc->priv->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) + if (doc->priv->redo_actions || sci_can_redo(doc->editor->sci)) return TRUE; else return FALSE; @@ -3099,11 +3108,18 @@ gboolean document_can_redo(GeanyDocument *doc) void document_redo(GeanyDocument *doc) { - undo_action *action; + GSList *top; + undo_action *action = NULL; g_return_if_fail(doc != NULL); - action = g_trash_stack_pop(&doc->priv->redo_actions); + top = doc->priv->redo_actions; + if (top) + { + action = top->data; + doc->priv->redo_actions = top->next; + g_slist_free1(top); + } if (G_UNLIKELY(action == NULL)) { @@ -3126,7 +3142,7 @@ void document_redo(GeanyDocument *doc) /* When redoing an EOL change, the UNDO_SCINTILLA which changes * the line ends in the editor is followed by UNDO_EOL * which should be performed together with UNDO_SCINTILLA. */ - next_action = g_trash_stack_peek(&doc->priv->redo_actions); + next_action = doc->priv->redo_actions ? doc->priv->redo_actions->data : NULL; if (next_action != NULL && next_action->type == UNDO_EOL) document_redo(doc); break; @@ -3204,7 +3220,7 @@ static void document_redo_add(GeanyDocument *doc, guint type, gpointer data) action->type = type; action->data = data; - g_trash_stack_push(&doc->priv->redo_actions, action); + doc->priv->redo_actions = g_slist_prepend(doc->priv->redo_actions, action); if (type != UNDO_SCINTILLA || !doc->changed) document_set_text_changed(doc, TRUE); Modified: src/documentprivate.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -84,9 +84,9 @@ typedef struct GeanyDocumentPrivate /* Iter for this document within the Open Files treeview of the sidebar. */ GtkTreeIter iter; /* Used by the Undo/Redo management code. */ - GTrashStack *undo_actions; + GSList *undo_actions; /* Used by the Undo/Redo management code. */ - GTrashStack *redo_actions; + GSList *redo_actions; /* Used so Undo/Redo works for encoding changes. */ FileEncoding saved_encoding; gboolean colourise_needed; /* use document.c:queue_colourise() instead */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3bd3ac: Merge pull request #4199 from techee/glib_version
by Jiří Techet 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 26 Jan 2025 20:15:00 UTC Commit: 3bd3acf35b463e9219017dc4a4c2ee5d563f7260 https://github.com/geany/geany/commit/3bd3acf35b463e9219017dc4a4c2ee5d563f7… Log Message: ----------- Merge pull request #4199 from techee/glib_version Bump required glib version to 2.56 Modified Paths: -------------- m4/geany-gtk.m4 meson.build src/document.c src/documentprivate.h src/libmain.c src/spawn.c src/tagmanager/tm_workspace.c Modified: m4/geany-gtk.m4 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -2,12 +2,12 @@ dnl GEANY_CHECK_GTK dnl Checks whether the GTK stack is available and new enough. Sets GTK_CFLAGS and GTK_LIBS. AC_DEFUN([GEANY_CHECK_GTK], [ - gtk_modules="gtk+-3.0 >= 3.24 glib-2.0 >= 2.32" - gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0 gthread-2.0" + gtk_modules="gtk+-3.0 >= 3.24 glib-2.0 >= 2.56" + gtk_modules_private="gio-2.0 >= 2.56 gmodule-no-export-2.0 gthread-2.0" PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) AC_SUBST([DEPENDENCIES], [$gtk_modules]) - AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"]) + AS_VAR_APPEND([GTK_CFLAGS], [" -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56"]) dnl Disable all GTK deprecations AS_VAR_APPEND([GTK_CFLAGS], [" -DGDK_DISABLE_DEPRECATION_WARNINGS"]) AC_SUBST([GTK_CFLAGS]) Modified: meson.build 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -11,8 +11,8 @@ cxx = meson.get_compiler('cpp') prefix = get_option('prefix') deps_in = [ - ['glib-2.0', '2.32'], - ['gmodule-2.0', '2.32'], + ['glib-2.0', '2.56'], + ['gmodule-2.0', '2.56'], ['gtk+-3.0', '3.24'] ] @@ -201,7 +201,7 @@ def_cflags = basic_cflags + [ # we're using lots of deprecated stuff with gtk3 (often because there is no proper alternative!) '-Wno-deprecated-declarations', '-DGDK_DISABLE_DEPRECATION_WARNINGS', - '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32', + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56', '-DGEANY_PREFIX="@0@"'.format(get_option('prefix')), '-DGEANY_DOCDIR="@0@"'.format(join_paths(prefix, get_option('datadir'), 'doc')) ] Modified: src/document.c 54 lines changed, 35 insertions(+), 19 deletions(-) =================================================================== @@ -91,7 +91,6 @@ GPtrArray *documents_array = NULL; /* an undo action, also used for redo actions */ typedef struct { - GTrashStack *next; /* pointer to the next stack element(required for the GTrashStack) */ guint type; /* to identify the action */ gpointer *data; /* the old value (before the change), in case of a redo action * it contains the new value */ @@ -108,7 +107,7 @@ enum static guint doc_id_counter = 0; -static void document_undo_clear_stack(GTrashStack **stack); +static void document_undo_clear_stack(GSList **stack); static void document_undo_clear(GeanyDocument *doc); static void document_undo_add_internal(GeanyDocument *doc, guint type, gpointer data); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); @@ -1371,10 +1370,10 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename * reloading, and at the end add an UNDO_RELOAD action that performs * all these actions in bulk. To keep track of how many undo actions * were added during this time, we compare the current undo-stack height - * with its height at the end of the process. Note that g_trash_stack_height() + * with its height at the end of the process. Note that g_slist_length() * is O(N), which is a little ugly, but this seems like the most maintainable * option. */ - undo_reload_data->actions_count = g_trash_stack_height(&doc->priv->undo_actions); + undo_reload_data->actions_count = g_slist_length(doc->priv->undo_actions); /* We use add_undo_reload_action to track any changes to the document that * require adding an undo action to revert the reload, but that do not @@ -1441,7 +1440,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename /* Calculate the number of undo actions that are part of the reloading * process, and add the UNDO_RELOAD action. */ undo_reload_data->actions_count = - g_trash_stack_height(&doc->priv->undo_actions) - undo_reload_data->actions_count; + g_slist_length(doc->priv->undo_actions) - undo_reload_data->actions_count; /* We only add an undo-reload action if the document has actually changed. * At the time of writing, this condition is moot because sci_set_text @@ -2902,11 +2901,12 @@ void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding) * All Scintilla events are stored in the undo / redo buffer and are passed through. */ /* Clears an Undo or Redo buffer. */ -void document_undo_clear_stack(GTrashStack **stack) +void document_undo_clear_stack(GSList **stack) { - while (g_trash_stack_height(stack) > 0) + while (*stack) { - undo_action *a = g_trash_stack_pop(stack); + GSList *top = *stack; + undo_action *a = top->data; if (G_LIKELY(a != NULL)) { @@ -2919,8 +2919,10 @@ void document_undo_clear_stack(GTrashStack **stack) } g_free(a); } + + *stack = top->next; + g_slist_free1(top); } - *stack = NULL; } /* Clears the Undo and Redo buffer (to be called when reloading or closing the document) */ @@ -2948,7 +2950,7 @@ void document_undo_add_internal(GeanyDocument *doc, guint type, gpointer data) action->type = type; action->data = data; - g_trash_stack_push(&doc->priv->undo_actions, action); + doc->priv->undo_actions = g_slist_prepend(doc->priv->undo_actions, action); /* avoid unnecessary redraws */ if (type != UNDO_SCINTILLA || !doc->changed) @@ -2971,7 +2973,7 @@ gboolean document_can_undo(GeanyDocument *doc) { g_return_val_if_fail(doc != NULL, FALSE); - if (g_trash_stack_height(&doc->priv->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) + if (doc->priv->undo_actions || sci_can_undo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2990,11 +2992,18 @@ static void update_changed_state(GeanyDocument *doc) void document_undo(GeanyDocument *doc) { - undo_action *action; + GSList *top; + undo_action *action = NULL; g_return_if_fail(doc != NULL); - action = g_trash_stack_pop(&doc->priv->undo_actions); + top = doc->priv->undo_actions; + if (top) + { + action = top->data; + doc->priv->undo_actions = top->next; + g_slist_free1(top); + } if (G_UNLIKELY(action == NULL)) { @@ -3048,7 +3057,7 @@ void document_undo(GeanyDocument *doc) /* When undoing, UNDO_EOL is always followed by UNDO_SCINTILLA * which undos the line endings in the editor and should be * performed together with UNDO_EOL. */ - next_action = g_trash_stack_peek(&doc->priv->undo_actions); + next_action = doc->priv->undo_actions ? doc->priv->undo_actions->data : NULL; if (next_action && next_action->type == UNDO_SCINTILLA) document_undo(doc); break; @@ -3090,7 +3099,7 @@ gboolean document_can_redo(GeanyDocument *doc) { g_return_val_if_fail(doc != NULL, FALSE); - if (g_trash_stack_height(&doc->priv->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) + if (doc->priv->redo_actions || sci_can_redo(doc->editor->sci)) return TRUE; else return FALSE; @@ -3099,11 +3108,18 @@ gboolean document_can_redo(GeanyDocument *doc) void document_redo(GeanyDocument *doc) { - undo_action *action; + GSList *top; + undo_action *action = NULL; g_return_if_fail(doc != NULL); - action = g_trash_stack_pop(&doc->priv->redo_actions); + top = doc->priv->redo_actions; + if (top) + { + action = top->data; + doc->priv->redo_actions = top->next; + g_slist_free1(top); + } if (G_UNLIKELY(action == NULL)) { @@ -3126,7 +3142,7 @@ void document_redo(GeanyDocument *doc) /* When redoing an EOL change, the UNDO_SCINTILLA which changes * the line ends in the editor is followed by UNDO_EOL * which should be performed together with UNDO_SCINTILLA. */ - next_action = g_trash_stack_peek(&doc->priv->redo_actions); + next_action = doc->priv->redo_actions ? doc->priv->redo_actions->data : NULL; if (next_action != NULL && next_action->type == UNDO_EOL) document_redo(doc); break; @@ -3204,7 +3220,7 @@ static void document_redo_add(GeanyDocument *doc, guint type, gpointer data) action->type = type; action->data = data; - g_trash_stack_push(&doc->priv->redo_actions, action); + doc->priv->redo_actions = g_slist_prepend(doc->priv->redo_actions, action); if (type != UNDO_SCINTILLA || !doc->changed) document_set_text_changed(doc, TRUE); Modified: src/documentprivate.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -84,9 +84,9 @@ typedef struct GeanyDocumentPrivate /* Iter for this document within the Open Files treeview of the sidebar. */ GtkTreeIter iter; /* Used by the Undo/Redo management code. */ - GTrashStack *undo_actions; + GSList *undo_actions; /* Used by the Undo/Redo management code. */ - GTrashStack *redo_actions; + GSList *redo_actions; /* Used so Undo/Redo works for encoding changes. */ FileEncoding saved_encoding; gboolean colourise_needed; /* use document.c:queue_colourise() instead */ Modified: src/libmain.c 11 lines changed, 0 insertions(+), 11 deletions(-) =================================================================== @@ -1030,10 +1030,6 @@ static const gchar *get_locale(void) GEANY_EXPORT_SYMBOL void main_init_headless(void) { -#if ! GLIB_CHECK_VERSION(2, 36, 0) - g_type_init(); -#endif - app = g_new0(GeanyApp, 1); memset(&main_status, 0, sizeof(GeanyStatus)); memset(&prefs, 0, sizeof(GeanyPrefs)); @@ -1084,13 +1080,6 @@ gint main_lib(gint argc, gchar **argv) app->tm_workspace = tm_get_workspace(); parse_command_line_options(&argc, &argv); -#if ! GLIB_CHECK_VERSION(2, 32, 0) - /* Initialize GLib's thread system in case any plugins want to use it or their - * dependencies (e.g. WebKit, Soup, ...). Deprecated since GLIB 2.32. */ - if (!g_thread_supported()) - g_thread_init(NULL); -#endif - #ifdef G_OS_UNIX g_unix_signal_add(SIGTERM, signal_cb, GINT_TO_POINTER(SIGTERM)); Modified: src/spawn.c 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -70,10 +70,6 @@ # include "geany.h" #endif -#if ! GLIB_CHECK_VERSION(2, 31, 20) && ! defined(G_SPAWN_ERROR_TOO_BIG) -# define G_SPAWN_ERROR_TOO_BIG G_SPAWN_ERROR_2BIG -#endif - #ifdef G_OS_WIN32 /* Each 4KB under Windows seem to come in 2 portions, so 2K + 2K is more balanced than 4095 + 1. May be different on the latest Windows/glib? */ Modified: src/tagmanager/tm_workspace.c 25 lines changed, 0 insertions(+), 25 deletions(-) =================================================================== @@ -681,31 +681,6 @@ gboolean tm_workspace_is_autocomplete_tag(TMTag *tag, } -#if ! GLIB_CHECK_VERSION(2, 54, 0) -static gboolean -g_ptr_array_find (GPtrArray *haystack, - gconstpointer needle, - guint *index_) -{ - guint i; - - g_return_val_if_fail (haystack != NULL, FALSE); - - for (i = 0; i < haystack->len; i++) - { - if (g_direct_equal (g_ptr_array_index (haystack, i), needle)) - { - if (index_ != NULL) - *index_ = i; - return TRUE; - } - } - - return FALSE; -} -#endif - - typedef struct { TMSourceFile *file; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 93c9ea: SaveActions: Ignore files open from CLI for InstantSave and PUD
by Enrico Tröger 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 19 Jan 2025 11:52:39 UTC Commit: 93c9ea64fd78bd138444dc13924d2438a3012d10 https://github.com/geany/geany/commit/93c9ea64fd78bd138444dc13924d2438a3012… Log Message: ----------- SaveActions: Ignore files open from CLI for InstantSave and PUD When opening new files via command line, those files should be ignored by Instant Save and Persistent Untitled Documents to not override the provided filename and should not be treated as new files. Modified Paths: -------------- plugins/saveactions.c Modified: plugins/saveactions.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -311,7 +311,7 @@ static GeanyFiletype *get_doc_filetype(GeanyDocument *doc) static void instantsave_document_new(GeanyDocument *doc) { - if (doc->real_path == NULL) + if (doc->real_path == NULL && doc->file_name == NULL) { const gchar *directory; gchar *new_filename; @@ -428,7 +428,7 @@ static gchar* create_new_persistent_doc_file_name(GeanyDocument *doc, GeanyFilet static void persistent_doc_new(GeanyDocument *doc) { - if (doc->real_path == NULL) + if (doc->real_path == NULL && doc->file_name == NULL) { gchar *files_dir_utf8, *new_file_name_utf8, *new_file_path_utf8; GeanyFiletype *ft; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c1e25d: Merge pull request #4209 from eht16/saveactions_fix_new_files_from_cli
by Enrico Tröger 26 Jan '25

26 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 26 Jan 2025 16:29:50 UTC Commit: c1e25dafd6f2ae270f082caccb1a1188cc57b883 https://github.com/geany/geany/commit/c1e25dafd6f2ae270f082caccb1a1188cc57b… Log Message: ----------- Merge pull request #4209 from eht16/saveactions_fix_new_files_from_cli SaveActions: Ignore files open from CLI for InstantSave and PUD Modified Paths: -------------- plugins/saveactions.c Modified: plugins/saveactions.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -311,7 +311,7 @@ static GeanyFiletype *get_doc_filetype(GeanyDocument *doc) static void instantsave_document_new(GeanyDocument *doc) { - if (doc->real_path == NULL) + if (doc->real_path == NULL && doc->file_name == NULL) { const gchar *directory; gchar *new_filename; @@ -428,7 +428,7 @@ static gchar* create_new_persistent_doc_file_name(GeanyDocument *doc, GeanyFilet static void persistent_doc_new(GeanyDocument *doc) { - if (doc->real_path == NULL) + if (doc->real_path == NULL && doc->file_name == NULL) { gchar *files_dir_utf8, *new_file_name_utf8, *new_file_path_utf8; GeanyFiletype *ft; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 54551a: Move UTF-8 capable sub string matching from plugin manager to utils
by Enrico Tröger 19 Jan '25

19 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 05 Jan 2025 10:43:42 UTC Commit: 54551a2879e61fc43b59029406a8684f85df69db https://github.com/geany/geany/commit/54551a2879e61fc43b59029406a8684f85df6… Log Message: ----------- Move UTF-8 capable sub string matching from plugin manager to utils Modified Paths: -------------- src/plugins.c src/utils.c src/utils.h Modified: src/plugins.c 44 lines changed, 1 insertions(+), 43 deletions(-) =================================================================== @@ -1663,48 +1663,6 @@ static gint pm_tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter * } -static gboolean pm_tree_search(const gchar *key, const gchar *haystack) -{ - gchar *normalized_string = NULL; - gchar *normalized_key = NULL; - gchar *case_normalized_string = NULL; - gchar *case_normalized_key = NULL; - gboolean matched = TRUE; - - normalized_string = g_utf8_normalize(haystack, -1, G_NORMALIZE_ALL); - normalized_key = g_utf8_normalize(key, -1, G_NORMALIZE_ALL); - - if (normalized_string != NULL && normalized_key != NULL) - { - GString *stripped_key; - gchar **subkey, **subkeys; - - case_normalized_string = g_utf8_casefold(normalized_string, -1); - case_normalized_key = g_utf8_casefold(normalized_key, -1); - stripped_key = g_string_new(case_normalized_key); - do {} while (utils_string_replace_all(stripped_key, " ", " ")); - subkeys = g_strsplit(stripped_key->str, " ", -1); - g_string_free(stripped_key, TRUE); - foreach_strv(subkey, subkeys) - { - if (strstr(case_normalized_string, *subkey) == NULL) - { - matched = FALSE; - break; - } - } - g_strfreev(subkeys); - } - - g_free(normalized_key); - g_free(normalized_string); - g_free(case_normalized_key); - g_free(case_normalized_string); - - return matched; -} - - static gboolean pm_tree_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { Plugin *plugin; @@ -1721,7 +1679,7 @@ static gboolean pm_tree_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpoi filename = g_path_get_basename(plugin->filename); haystack = g_strjoin(" ", plugin->info.name, plugin->info.description, plugin->info.author, filename, NULL); - matched = pm_tree_search(key, haystack); + matched = utils_utf8_substring_match(key, haystack); g_free(haystack); g_free(filename); Modified: src/utils.c 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -475,6 +475,54 @@ gchar *utils_utf8_strdown(const gchar *str) } +/* Returns @c TRUE if @a key is a substring of @a haystack, case-insensitive. + * Applies @c g_utf8_normalize and @c g_utf8_casefold on both input strings before comparison. + */ +gboolean utils_utf8_substring_match(const gchar *key, const gchar *haystack) +{ + gchar *normalized_string = NULL; + gchar *normalized_key = NULL; + gchar *case_normalized_string = NULL; + gchar *case_normalized_key = NULL; + gboolean matched = TRUE; + + g_return_val_if_fail(key != NULL, FALSE); + g_return_val_if_fail(haystack != NULL, FALSE); + + normalized_string = g_utf8_normalize(haystack, -1, G_NORMALIZE_ALL); + normalized_key = g_utf8_normalize(key, -1, G_NORMALIZE_ALL); + + if (normalized_string != NULL && normalized_key != NULL) + { + GString *stripped_key; + gchar **subkey, **subkeys; + + case_normalized_string = g_utf8_casefold(normalized_string, -1); + case_normalized_key = g_utf8_casefold(normalized_key, -1); + stripped_key = g_string_new(case_normalized_key); + do {} while (utils_string_replace_all(stripped_key, " ", " ")); + subkeys = g_strsplit(stripped_key->str, " ", -1); + g_string_free(stripped_key, TRUE); + foreach_strv(subkey, subkeys) + { + if (strstr(case_normalized_string, *subkey) == NULL) + { + matched = FALSE; + break; + } + } + g_strfreev(subkeys); + } + + g_free(normalized_key); + g_free(normalized_string); + g_free(case_normalized_key); + g_free(case_normalized_string); + + return matched; +} + + /** * A replacement function for g_strncasecmp() to compare strings case-insensitive. * It converts both strings into lowercase using g_utf8_strdown() and then compare Modified: src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -338,6 +338,8 @@ gchar *utils_get_os_info_string(void); gchar *utils_utf8_strdown(const gchar *str); +gboolean utils_utf8_substring_match(const gchar *key, const gchar *haystack); + #endif /* GEANY_PRIVATE */ G_END_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] eb5c3f: Merge pull request #4192 from eht16/issue2848_add_filter_for_keybindings
by Enrico Tröger 19 Jan '25

19 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Jan 2025 14:25:22 UTC Commit: eb5c3fb35110c21d7e28a88c24a8606013b24d3d https://github.com/geany/geany/commit/eb5c3fb35110c21d7e28a88c24a8606013b24… Log Message: ----------- Merge pull request #4192 from eht16/issue2848_add_filter_for_keybindings Add filter for keybindings in preferences dialog Modified Paths: -------------- data/geany.glade src/plugins.c src/prefs.c src/utils.c src/utils.h Modified: data/geany.glade 18 lines changed, 16 insertions(+), 2 deletions(-) =================================================================== @@ -5532,6 +5532,20 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkEntry" id="entry_keybinding_filter"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="primary-icon-stock">gtk-find</property> + <property name="secondary-icon-activatable">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkScrolledWindow" id="scrolledwindow8"> <property name="visible">True</property> @@ -5551,7 +5565,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -5573,7 +5587,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> Modified: src/plugins.c 56 lines changed, 13 insertions(+), 43 deletions(-) =================================================================== @@ -1648,6 +1648,17 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e } +static gboolean pm_treeview_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + if (event->keyval == GDK_KEY_f && (event->state & GEANY_PRIMARY_MOD_MASK)) + { + gtk_widget_grab_focus(pm_widgets.filter_entry); + return TRUE; + } + return FALSE; +} + + static gint pm_tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { @@ -1663,48 +1674,6 @@ static gint pm_tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter * } -static gboolean pm_tree_search(const gchar *key, const gchar *haystack) -{ - gchar *normalized_string = NULL; - gchar *normalized_key = NULL; - gchar *case_normalized_string = NULL; - gchar *case_normalized_key = NULL; - gboolean matched = TRUE; - - normalized_string = g_utf8_normalize(haystack, -1, G_NORMALIZE_ALL); - normalized_key = g_utf8_normalize(key, -1, G_NORMALIZE_ALL); - - if (normalized_string != NULL && normalized_key != NULL) - { - GString *stripped_key; - gchar **subkey, **subkeys; - - case_normalized_string = g_utf8_casefold(normalized_string, -1); - case_normalized_key = g_utf8_casefold(normalized_key, -1); - stripped_key = g_string_new(case_normalized_key); - do {} while (utils_string_replace_all(stripped_key, " ", " ")); - subkeys = g_strsplit(stripped_key->str, " ", -1); - g_string_free(stripped_key, TRUE); - foreach_strv(subkey, subkeys) - { - if (strstr(case_normalized_string, *subkey) == NULL) - { - matched = FALSE; - break; - } - } - g_strfreev(subkeys); - } - - g_free(normalized_key); - g_free(normalized_string); - g_free(case_normalized_key); - g_free(case_normalized_string); - - return matched; -} - - static gboolean pm_tree_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { Plugin *plugin; @@ -1721,7 +1690,7 @@ static gboolean pm_tree_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpoi filename = g_path_get_basename(plugin->filename); haystack = g_strjoin(" ", plugin->info.name, plugin->info.description, plugin->info.author, filename, NULL); - matched = pm_tree_search(key, haystack); + matched = utils_utf8_substring_match(key, haystack); g_free(haystack); g_free(filename); @@ -1782,6 +1751,7 @@ static void pm_prepare_treeview(GtkWidget *tree, GtkTreeStore *store) g_signal_connect(sel, "changed", G_CALLBACK(pm_selection_changed), NULL); g_signal_connect(tree, "button-press-event", G_CALLBACK(pm_treeview_button_press_cb), NULL); + g_signal_connect(tree, "key-press-event", G_CALLBACK(pm_treeview_key_press_cb), NULL); /* filter */ filter_model = gtk_tree_model_filter_new(GTK_TREE_MODEL(store), NULL); Modified: src/prefs.c 124 lines changed, 115 insertions(+), 9 deletions(-) =================================================================== @@ -84,6 +84,10 @@ static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey * static void kb_change_iter_shortcut(KbData *kbdata, GtkTreeIter *iter, const gchar *new_text); static gboolean kb_find_duplicate(GtkTreeStore *store, GtkWidget *parent, GtkTreeIter *old_iter, guint key, GdkModifierType mods, const gchar *shortcut); +static void kb_filter_entry_changed_cb(GtkEntry *entry, gpointer user_data); +static void kb_filter_entry_icon_release_cb(GtkEntry *entry, GtkEntryIconPosition icon_pos, + GdkEvent *event, gpointer user_data); +static gboolean kb_tree_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data); static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_enable_plugins_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -141,6 +145,7 @@ enum KB_TREE_INDEX, KB_TREE_EDITABLE, KB_TREE_WEIGHT, + KB_TREE_VISIBLE, KB_TREE_COLUMNS }; @@ -176,7 +181,8 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd GtkWidget *accel_label; gchar *str; - dialog = gtk_dialog_new_with_buttons(_("Grab Key"), GTK_WINDOW(ui_widgets.prefs_dialog), + dialog = gtk_dialog_new_with_buttons(_("Assign Keybinding"), + GTK_WINDOW(ui_widgets.prefs_dialog), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); @@ -261,16 +267,21 @@ static gboolean kb_tree_view_button_press_event_cb(GtkWidget *widget, GdkEventBu } -static void kb_init_tree(KbData *kbdata) +static void kb_init_tree(KbData *kbdata, GtkWidget *kb_filter_entry) { GtkCellRenderer *renderer; + GtkTreeModel *filter_model; GtkTreeViewColumn *column; kbdata->tree = GTK_TREE_VIEW(ui_lookup_widget(ui_widgets.prefs_dialog, "treeview7")); kbdata->store = gtk_tree_store_new(KB_TREE_COLUMNS, - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_INT); - gtk_tree_view_set_model(GTK_TREE_VIEW(kbdata->tree), GTK_TREE_MODEL(kbdata->store)); + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_BOOLEAN); + filter_model = gtk_tree_model_filter_new(GTK_TREE_MODEL(kbdata->store), NULL); + gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(filter_model), KB_TREE_VISIBLE); + /* set model to tree view */ + gtk_tree_view_set_model(GTK_TREE_VIEW(kbdata->tree), filter_model); + g_object_unref(filter_model); g_object_unref(kbdata->store); renderer = gtk_cell_renderer_text_new(); @@ -292,9 +303,13 @@ static void kb_init_tree(KbData *kbdata) g_signal_connect(renderer, "edited", G_CALLBACK(kb_cell_edited_cb), kbdata); g_signal_connect(kbdata->tree, "button-press-event", G_CALLBACK(kb_tree_view_button_press_event_cb), kbdata); + g_signal_connect(kbdata->tree, "key-press-event", G_CALLBACK(kb_tree_key_press_cb), kb_filter_entry); g_signal_connect(kbdata->tree, "popup-menu", G_CALLBACK(kb_popup_menu_cb), kbdata); g_signal_connect(ui_lookup_widget(ui_widgets.prefs_dialog, "button2"), "clicked", G_CALLBACK(kb_tree_view_change_button_clicked_cb), kbdata); + g_signal_connect(kb_filter_entry, "changed", G_CALLBACK(kb_filter_entry_changed_cb), NULL); + g_signal_connect(kb_filter_entry, "icon-release", G_CALLBACK(kb_filter_entry_icon_release_cb), NULL); + } @@ -348,7 +363,7 @@ void prefs_kb_search_name(const gchar *search) } -static void kb_init(KbData *kbdata) +static void kb_init(KbData *kbdata, GtkWidget *kb_filter_entry) { GtkTreeIter parent, iter; gsize g, i; @@ -357,20 +372,21 @@ static void kb_init(KbData *kbdata) GeanyKeyBinding *kb; if (kbdata->store == NULL) - kb_init_tree(kbdata); + kb_init_tree(kbdata, kb_filter_entry); + gtk_entry_set_text(GTK_ENTRY(kb_filter_entry), ""); foreach_ptr_array(group, g, keybinding_groups) { gtk_tree_store_append(kbdata->store, &parent, NULL); gtk_tree_store_set(kbdata->store, &parent, KB_TREE_ACTION, group->label, - KB_TREE_INDEX, g, -1); + KB_TREE_INDEX, g, KB_TREE_VISIBLE, TRUE, -1); foreach_ptr_array(kb, i, group->key_items) { label = keybindings_get_label(kb); gtk_tree_store_append(kbdata->store, &iter, &parent); gtk_tree_store_set(kbdata->store, &iter, KB_TREE_ACTION, label, - KB_TREE_EDITABLE, TRUE, KB_TREE_INDEX, kb->id, -1); + KB_TREE_EDITABLE, TRUE, KB_TREE_INDEX, kb->id, KB_TREE_VISIBLE, TRUE, -1); kb_set_shortcut(kbdata->store, &iter, kb->key, kb->mods); g_free(label); } @@ -691,7 +707,8 @@ static void prefs_init_dialog(void) /* Keybindings */ - kb_init(&global_kb_data); + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_keybinding_filter"); + kb_init(&global_kb_data, widget); /* Printing */ { @@ -1397,6 +1414,94 @@ static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, } +static void kb_tree_update_visibility(GtkTreeStore *store, const gchar *entry_text) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + GtkTreeIter child, parent; + + /* get first parent */ + if (! gtk_tree_model_iter_children(model, &parent, NULL)) + return; + + /* foreach parent */ + while (TRUE) + { + gboolean visible_parent = FALSE; + gboolean visible_children = FALSE; + gchar *group_name; + + /* check if group name matches and then display *all* its children, otherwise + * check each child if the action name matches */ + gtk_tree_model_get(model, &parent, KB_TREE_ACTION, &group_name, -1); + if (group_name && ! EMPTY(entry_text)) + visible_parent = utils_utf8_substring_match(entry_text, group_name); + else + visible_parent = FALSE; + g_free(group_name); + + /* get first child */ + if (! gtk_tree_model_iter_children(model, &child, &parent)) + return; + + /* foreach child */ + while (TRUE) + { + gboolean visible; + gchar *action_name; + + gtk_tree_model_get(model, &child, KB_TREE_ACTION, &action_name, -1); + if (!action_name || EMPTY(entry_text)) + visible = TRUE; + else + visible = utils_utf8_substring_match(entry_text, action_name); + g_free(action_name); + + if (visible) + visible_children = TRUE; + + gtk_tree_store_set(store, &child, KB_TREE_VISIBLE, visible || visible_parent, -1); + + if (! gtk_tree_model_iter_next(model, &child)) + break; + } + + gtk_tree_store_set(store, &parent, KB_TREE_VISIBLE, visible_children || visible_parent, -1); + + if (! gtk_tree_model_iter_next(model, &parent)) + return; + } +} + + +static void kb_filter_entry_changed_cb(GtkEntry *entry, gpointer user_data) +{ + const gchar *entry_text = gtk_entry_get_text(entry); + + kb_tree_update_visibility(global_kb_data.store, entry_text); + gtk_tree_view_expand_all(global_kb_data.tree); +} + + +static void kb_filter_entry_icon_release_cb(GtkEntry *entry, GtkEntryIconPosition icon_pos, + GdkEvent *event, gpointer user_data) +{ + if (event->button.button == 1 && icon_pos == GTK_ENTRY_ICON_PRIMARY) + kb_filter_entry_changed_cb(entry, user_data); +} + + +static gboolean kb_tree_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + if (event->keyval == GDK_KEY_f && (event->state & GEANY_PRIMARY_MOD_MASK)) + { + GtkWidget *kb_filter_entry = user_data; + gtk_widget_grab_focus(kb_filter_entry); + return TRUE; + } + return FALSE; +} + + static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey *event, GtkLabel *label) { gchar *str; @@ -1720,6 +1825,7 @@ void prefs_show_dialog(void) "entry_com_term", "entry_browser", "entry_grep", + "entry_keybinding_filter", "entry_contextaction", "entry_template_developer", "entry_template_initial", Modified: src/utils.c 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -475,6 +475,54 @@ gchar *utils_utf8_strdown(const gchar *str) } +/* Returns @c TRUE if @a key is a substring of @a haystack, case-insensitive. + * Applies @c g_utf8_normalize and @c g_utf8_casefold on both input strings before comparison. + */ +gboolean utils_utf8_substring_match(const gchar *key, const gchar *haystack) +{ + gchar *normalized_string = NULL; + gchar *normalized_key = NULL; + gchar *case_normalized_string = NULL; + gchar *case_normalized_key = NULL; + gboolean matched = TRUE; + + g_return_val_if_fail(key != NULL, FALSE); + g_return_val_if_fail(haystack != NULL, FALSE); + + normalized_string = g_utf8_normalize(haystack, -1, G_NORMALIZE_ALL); + normalized_key = g_utf8_normalize(key, -1, G_NORMALIZE_ALL); + + if (normalized_string != NULL && normalized_key != NULL) + { + GString *stripped_key; + gchar **subkey, **subkeys; + + case_normalized_string = g_utf8_casefold(normalized_string, -1); + case_normalized_key = g_utf8_casefold(normalized_key, -1); + stripped_key = g_string_new(case_normalized_key); + do {} while (utils_string_replace_all(stripped_key, " ", " ")); + subkeys = g_strsplit(stripped_key->str, " ", -1); + g_string_free(stripped_key, TRUE); + foreach_strv(subkey, subkeys) + { + if (strstr(case_normalized_string, *subkey) == NULL) + { + matched = FALSE; + break; + } + } + g_strfreev(subkeys); + } + + g_free(normalized_key); + g_free(normalized_string); + g_free(case_normalized_key); + g_free(case_normalized_string); + + return matched; +} + + /** * A replacement function for g_strncasecmp() to compare strings case-insensitive. * It converts both strings into lowercase using g_utf8_strdown() and then compare Modified: src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -338,6 +338,8 @@ gchar *utils_get_os_info_string(void); gchar *utils_utf8_strdown(const gchar *str); +gboolean utils_utf8_substring_match(const gchar *key, const gchar *haystack); + #endif /* GEANY_PRIVATE */ G_END_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 54d67e: Plugin Manager: Bind Ctrl-F shortcut to focus the filter entry
by Enrico Tröger 19 Jan '25

19 Jan '25

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 19 Jan 2025 14:12:15 UTC Commit: 54d67e308394a5d88ed52515d101f786ed5f22a7 https://github.com/geany/geany/commit/54d67e308394a5d88ed52515d101f786ed5f2… Log Message: ----------- Plugin Manager: Bind Ctrl-F shortcut to focus the filter entry Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -1648,6 +1648,17 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e } +static gboolean pm_treeview_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + if (event->keyval == GDK_KEY_f && (event->state & GEANY_PRIMARY_MOD_MASK)) + { + gtk_widget_grab_focus(pm_widgets.filter_entry); + return TRUE; + } + return FALSE; +} + + static gint pm_tree_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { @@ -1740,6 +1751,7 @@ static void pm_prepare_treeview(GtkWidget *tree, GtkTreeStore *store) g_signal_connect(sel, "changed", G_CALLBACK(pm_selection_changed), NULL); g_signal_connect(tree, "button-press-event", G_CALLBACK(pm_treeview_button_press_cb), NULL); + g_signal_connect(tree, "key-press-event", G_CALLBACK(pm_treeview_key_press_cb), NULL); /* filter */ filter_model = gtk_tree_model_filter_new(GTK_TREE_MODEL(store), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
1184
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits