Commits

commits@lists.geany.org

1 participants
11771 discussions

[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

1 0

[geany/geany] 71f586: Preferences: add filter entry 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: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 19 Jan 2025 14:12:15 UTC Commit: 71f5865f080dd370d87dbab5987ea3749f352212 https://github.com/geany/geany/commit/71f5865f080dd370d87dbab5987ea3749f352… Log Message: ----------- Preferences: add filter entry for keybindings Closes #2848. Modified Paths: -------------- data/geany.glade src/prefs.c 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/prefs.c 121 lines changed, 113 insertions(+), 8 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 }; @@ -261,16 +266,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 +302,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 +362,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 +371,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 +706,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 +1413,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; @@ -1719,6 +1823,7 @@ void prefs_show_dialog(void) "entry_com_term", "entry_browser", "entry_grep", + "entry_keybinding_filter", "entry_contextaction", "entry_template_developer", "entry_template_initial", -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6dbcd5: Preferences: Retitle assign keybinding dialog title
by Enrico Tröger 19 Jan '25

19 Jan '25

1 0

[geany/geany] 53a09b: Set some reasonable minimum width for the preferences dialog
by Jiří Techet 15 Jan '25

15 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 05 Jan 2025 18:54:23 UTC Commit: 53a09b5b8f99ffe76b4312c324556e9552eecc2a https://github.com/geany/geany/commit/53a09b5b8f99ffe76b4312c324556e9552eec… Log Message: ----------- Set some reasonable minimum width for the preferences dialog Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1646,6 +1646,7 @@ void prefs_show_dialog(void) ui_widgets.prefs_dialog = create_prefs_dialog(); gtk_widget_set_name(ui_widgets.prefs_dialog, "GeanyPrefsDialog"); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.prefs_dialog), GTK_WINDOW(main_widgets.window)); + gtk_widget_set_size_request(ui_widgets.prefs_dialog, 600, -1); /* init the file encoding combo boxes */ { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1206c1: Merge pull request #4195 from techee/pref_size
by Jiří Techet 15 Jan '25

15 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 15 Jan 2025 15:08:55 UTC Commit: 1206c1bb035157963e46469bf3d0ab34494b8cf1 https://github.com/geany/geany/commit/1206c1bb035157963e46469bf3d0ab34494b8… Log Message: ----------- Merge pull request #4195 from techee/pref_size Set some reasonable minimum width for the preferences dialog Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1646,6 +1646,7 @@ void prefs_show_dialog(void) ui_widgets.prefs_dialog = create_prefs_dialog(); gtk_widget_set_name(ui_widgets.prefs_dialog, "GeanyPrefsDialog"); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.prefs_dialog), GTK_WINDOW(main_widgets.window)); + gtk_widget_set_size_request(ui_widgets.prefs_dialog, 600, -1); /* init the file encoding combo boxes */ { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 535013: Don't use CSS parser for LESS
by Jiří Techet 15 Jan '25

15 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 04 Dec 2024 14:59:13 UTC Commit: 5350136b43f0fe0896c1a71f57176798f5060de4 https://github.com/geany/geany/commit/5350136b43f0fe0896c1a71f57176798f5060… Log Message: ----------- Don't use CSS parser for LESS It doesn't seem to produce very good results. In any case, add commented-out options to use either CSS or SCSS parsers so users can experiment with them. Modified Paths: -------------- data/filedefs/filetypes.LESS.conf Modified: data/filedefs/filetypes.LESS.conf 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,8 @@ lexer.css.less.language=1 [settings=CSS] lexer_filetype=CSS -tag_parser=CSS +#tag_parser=CSS +#tag_parser=SCSS # default extension used when saving files extension=less -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fe9cf5: Use SCSS ctags optlib parser
by Jiří Techet 15 Jan '25

15 Jan '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 04 Dec 2024 14:57:58 UTC Commit: fe9cf586ca4f09a5814886208b92e15285cd2d2b https://github.com/geany/geany/commit/fe9cf586ca4f09a5814886208b92e15285cd2… Log Message: ----------- Use SCSS ctags optlib parser Modified Paths: -------------- ctags/Makefile.am ctags/optlib/scss.c data/filedefs/filetypes.SCSS.conf meson.build src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_parsers.h tests/ctags/Makefile.am tests/ctags/simple.scss tests/ctags/simple.scss.tags tests/meson.build Modified: ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -13,6 +13,7 @@ noinst_LTLIBRARIES = libctags.la parsers = \ optlib/forth.c \ optlib/meson.c \ + optlib/scss.c \ parsers/cxx/cxx.c \ parsers/cxx/cxx_debug.c \ parsers/cxx/cxx_debug.h \ Modified: ctags/optlib/scss.c 212 lines changed, 212 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,212 @@ +/* + * Generated by ./misc/optlib2c from optlib/scss.ctags, Don't edit this manually. + */ +#include "general.h" +#include "parse.h" +#include "routines.h" +#include "field.h" +#include "xtag.h" + + +static void initializeSCSSParser (const langType language) +{ + + addLanguageRegexTable (language, "toplevel"); + addLanguageRegexTable (language, "comment"); + addLanguageRegexTable (language, "interp"); + addLanguageRegexTable (language, "args"); + addLanguageRegexTable (language, "map"); + addLanguageRegexTable (language, "strs"); + addLanguageRegexTable (language, "strd"); + + addLanguageTagMultiTableRegex (language, "toplevel", + "^//[^\n]*\n?", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^/\\*", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^#\\{", + "", "", "{tenter=interp}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^'", + "", "", "{tenter=strs}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^\"", + "", "", "{tenter=strd}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^[ \t]([A-Za-z0-9_-]+)[ \t]*:[^\n]*\n?", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^@mixin[ \t]+([A-Za-z0-9_-]+)", + "\\1", "m", "{tenter=args}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^@function[ \t]+([A-Za-z0-9_-]+)", + "\\1", "f", "{tenter=args}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^@each[ \t]+\\$([A-Za-z0-9_-]+)[ \t]in[ \t]+", + "\\1", "v", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^@for[ \t]+\\$([A-Za-z0-9_-]+)[ \t]from[ \t]+.*[ \t]+(to|through)[ \t]+[^{]+", + "\\1", "v", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^@[^\n]+\n?", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^:[^{;]+;\n?", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^:[^\n;{]+\n", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^::?([A-Za-z0-9_-]+)[ \t]*[,({]", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^:[^\n{]+[;{]\n?", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^\\$([A-Za-z0-9_-]+)[ \t]*:[ \t]*\\(", + "\\1", "v", "{tenter=map}", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^\\$([A-Za-z0-9_-]+)[ \t]*:[^\n]*\n?", + "\\1", "v", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^[.]([A-Za-z0-9_-]+)", + "\\1", "c", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^%([A-Za-z0-9_-]+)", + "\\1", "P", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^#([A-Za-z0-9_-]+)", + "\\1", "i", "", NULL); + addLanguageTagMultiTableRegex (language, "toplevel", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "comment", + "^\\*/", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "comment", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "interp", + "^\\}", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "interp", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "args", + "^\\{", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "args", + "^#\\{", + "", "", "{tenter=interp}", NULL); + addLanguageTagMultiTableRegex (language, "args", + "^\\$([A-Za-z0-9_-]+)[ \t]*(:([ \t]*\\$)?|[,)])", + "\\1", "z", "", NULL); + addLanguageTagMultiTableRegex (language, "args", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^//[^\n]*\n?", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^/\\*", + "", "", "{tenter=comment}", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^#\\{", + "", "", "{tenter=interp}", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^\\)", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^([A-Za-z0-9_-]+)[ \t]*:", + "\\1", "v", "", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^'", + "", "", "{tenter=strs}", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^\"", + "", "", "{tenter=strd}", NULL); + addLanguageTagMultiTableRegex (language, "map", + "^.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "strs", + "^'", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "strs", + "^#\\{", + "", "", "{tenter=interp}", NULL); + addLanguageTagMultiTableRegex (language, "strs", + "^[^'#\\\\]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "strs", + "^\\\\?.", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "strd", + "^\"", + "", "", "{tleave}", NULL); + addLanguageTagMultiTableRegex (language, "strd", + "^#\\{", + "", "", "{tenter=interp}", NULL); + addLanguageTagMultiTableRegex (language, "strd", + "^[^\"#\\\\]+", + "", "", "", NULL); + addLanguageTagMultiTableRegex (language, "strd", + "^\\\\?.", + "", "", "", NULL); +} + +extern parserDefinition* SCSSParser (void) +{ + static const char *const extensions [] = { + "scss", + NULL + }; + + static const char *const aliases [] = { + NULL + }; + + static const char *const patterns [] = { + NULL + }; + + static kindDefinition SCSSKindTable [] = { + { + true, 'm', "mixin", "mixins", + }, + { + true, 'f', "function", "functions", + }, + { + true, 'v', "variable", "variables", + }, + { + true, 'c', "class", "classes", + }, + { + true, 'P', "placeholder", "placeholder classes", + }, + { + true, 'i', "id", "identities", + }, + { + true, 'z', "parameter", "function parameters", + }, + }; + + parserDefinition* const def = parserNew ("SCSS"); + + def->versionCurrent= 0; + def->versionAge = 0; + def->enabled = true; + def->extensions = extensions; + def->patterns = patterns; + def->aliases = aliases; + def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; + def->kindTable = SCSSKindTable; + def->kindCount = ARRAY_SIZE(SCSSKindTable); + def->initialize = initializeSCSSParser; + + return def; +} Modified: data/filedefs/filetypes.SCSS.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ lexer.css.scss.language=1 [settings=CSS] lexer_filetype=CSS -tag_parser=CSS +tag_parser=SCSS # default extension used when saving files extension=scss Modified: meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -601,6 +601,7 @@ ctags = static_library('ctags', 'ctags/main/xtag_p.h', 'ctags/optlib/forth.c', 'ctags/optlib/meson.c', + 'ctags/optlib/scss.c', 'ctags/parsers/abaqus.c', 'ctags/parsers/abc.c', 'ctags/parsers/ada.c', Modified: src/tagmanager/tm_parser.c 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -1242,6 +1242,24 @@ static TMParserMapGroup group_MESON[] = { {N_("Tests"), TM_ICON_NONE, tm_tag_field_t}, }; +static TMParserMapEntry map_SCSS[] = { + {'m', tm_tag_macro_t}, // mixin + {'f', tm_tag_function_t}, // function + {'v', tm_tag_member_t}, // variable + {'c', tm_tag_class_t}, // class + {'P', tm_tag_enum_t}, // placeholder + {'i', tm_tag_variable_t}, // id + {'z', tm_tag_local_var_t}, // parameter +}; +static TMParserMapGroup group_SCSS[] = { + {N_("Mixins"), TM_ICON_MACRO, tm_tag_macro_t}, + {N_("Functions"), TM_ICON_METHOD, tm_tag_function_t}, + {N_("Variables"), TM_ICON_MEMBER, tm_tag_member_t}, + {N_("Classes"), TM_ICON_CLASS, tm_tag_class_t}, + {N_("Placeholders"), TM_ICON_OTHER, tm_tag_enum_t}, + {N_("ID Selectors"), TM_ICON_VAR, tm_tag_variable_t | tm_tag_local_var_t}, +}; + typedef struct { TMParserMapEntry *entries; @@ -1320,6 +1338,7 @@ static TMParserMap parser_map[] = { MAP_ENTRY(FORTH), MAP_ENTRY(MESON), MAP_ENTRY(SYSVERILOG), + MAP_ENTRY(SCSS), }; /* make sure the parser map is consistent and complete */ G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT); Modified: src/tagmanager/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -145,6 +145,7 @@ enum TM_PARSER_FORTH, TM_PARSER_MESON, TM_PARSER_SYSVERILOG, + TM_PARSER_SCSS, TM_PARSER_COUNT }; Modified: src/tagmanager/tm_parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -79,6 +79,7 @@ LdScriptParser, \ ForthParser, \ MesonParser, \ - SystemVerilogParser + SystemVerilogParser, \ + SCSSParser #endif Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -327,6 +327,7 @@ test_sources = \ simple.raku \ simple.rb \ simple.rst \ + simple.scss \ simple.sh \ simple.tcl \ simple.ts \ Modified: tests/ctags/simple.scss 89 lines changed, 89 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,89 @@ +// _library.scss +$black: #000 !default; +$border-radius: 0.25rem !default; +$box-shadow: 0 0.5rem 1rem rgba($black, 0.15) !default; + +code { + border-radius: $border-radius; + box-shadow: $box-shadow; +} + +.button { + padding: 3px 10px; + font-size: 12px; + border-radius: 3px; + border: 1px solid #e1e4e8; +} + +@mixin prefix($property, $value, $prefixes) { + @each $prefix in $prefixes { + -#{$prefix}-#{$property}: $value; + } + #{$property}: $value; +} + +.gray { + @include prefix(filter, grayscale(50%), moz webkit); +} + +.enlarge { + font-size: 14px; + transition: { + property: font-size; + duration: 4s; + delay: 2s; + } + + &:hover { font-size: 36px; } +} + +%toolbelt { + box-sizing: border-box; + border-top: 1px rgba(#000, .12) solid; + padding: 16px 0; + width: 100%; + + &:hover { border: 2px rgba(#000, .5) solid; } +} + +.action-buttons { + @extend %toolbelt; + color: #4285f4; +} + +.reset-buttons { + @extend %toolbelt; + color: #cddc39; +} + +@use "sass:list"; +@use "sass:meta"; +@use "sass:string"; + +/// Return a copy of $list with all elements for which $condition returns `true` +/// removed. +@function remove-where($list, $condition) { + $new-list: (); + $separator: list.separator($list); + @each $element in $list { + @if not meta.call($condition, $element) { + $new-list: list.append($new-list, $element, $separator: $separator); + } + } + @return $new-list; +} + +$fonts: Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; + +.content { + @function contains-helvetica($string) { + @return string.index($string, "Helvetica"); + } + font-family: remove-where($fonts, meta.get-function("contains-helvetica")); +} + +#para1 { + text-align: center; + color: red; +} + Modified: tests/ctags/simple.scss.tags 38 lines changed, 38 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,38 @@ +action-buttons�1�0 +class: action-buttons +black�64�0 +member: black +border-radius�64�0 +member: border-radius +box-shadow�64�0 +member: box-shadow +button�1�0 +class: button +contains-helvetica�16�0 +function: contains-helvetica +content�1�0 +class: content +element�64�0 +member: element +enlarge�1�0 +class: enlarge +fonts�64�0 +member: fonts +gray�1�0 +class: gray +new-list�64�0 +member: new-list +para1�16384�0 +variable: para1 +prefix�64�0 +member: prefix +prefix�65536�0 +macro: prefix +remove-where�16�0 +function: remove-where +reset-buttons�1�0 +class: reset-buttons +separator�64�0 +member: separator +toolbelt�2�0 +enum: toolbelt Modified: tests/meson.build 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -324,6 +324,7 @@ ctags_tests = [ 'ctags/simple.raku.tags', 'ctags/simple.rb.tags', 'ctags/simple.rst.tags', + 'ctags/simple.scss.tags', 'ctags/simple.sh.tags', 'ctags/simple.tcl.tags', 'ctags/simple.ts.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8f9e31: add less and scss file types
by Kirill Zhumarin 15 Jan '25

15 Jan '25

Branch: refs/heads/master Author: Kirill Zhumarin <kirill.zhumarin(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 04 Dec 2024 13:46:16 UTC Commit: 8f9e31a12c9c7fe1d7a69570bee0b120cae09796 https://github.com/geany/geany/commit/8f9e31a12c9c7fe1d7a69570bee0b120cae09… Log Message: ----------- add less and scss file types Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.less.conf data/filedefs/filetypes.scss.conf data/filetype_extensions.conf Modified: data/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -51,6 +51,7 @@ filetypes_dist = \ filedefs/filetypes.julia \ filedefs/filetypes.JSON.conf \ filedefs/filetypes.latex \ + filedefs/filetypes.less.conf \ filedefs/filetypes.lisp \ filedefs/filetypes.lua \ filedefs/filetypes.Kotlin.conf \ @@ -74,6 +75,7 @@ filetypes_dist = \ filedefs/filetypes.ruby \ filedefs/filetypes.rust \ filedefs/filetypes.Scala.conf \ + filedefs/filetypes.scss.conf \ filedefs/filetypes.sh \ filedefs/filetypes.smalltalk \ filedefs/filetypes.sql \ Modified: data/filedefs/filetypes.less.conf 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=CSS] +[keywords=CSS] +[indentation=CSS] + +[lexer_properties=CSS] +lexer.css.less.language=1 + +[settings=CSS] +lexer_filetype=CSS +tag_parser=CSS +# default extension used when saving files +extension=less + +# LESS has single-line comments in addition to CSS multi-line ones +comment_single=// + +# MIME type +mime_type=plain/text Modified: data/filedefs/filetypes.scss.conf 26 lines changed, 26 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,26 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=CSS] +[keywords=CSS] +[indentation=CSS] + +[lexer_properties=CSS] +lexer.css.scss.language=1 + +[settings=CSS] +lexer_filetype=CSS +tag_parser=CSS +# default extension used when saving files +extension=scss + +# SCSS has single-line comments in addition to CSS multi-line ones +comment_single=// + +# MIME type +mime_type=plain/text + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=sass -c "%f" +linker=sass --style expanded "%f" "%e.dev.css" Modified: data/filetype_extensions.conf 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -24,6 +24,8 @@ COBOL=*.cob;*.cpy;*.cbl;*.cobol; CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb; Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; +SCSS=*.scss; +LESS=*.less; Cython=*.pyx;*.pxd;*.pxi; D=*.d;*.di; Dart=*.dart; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits