Plugins-Commits May 2019

plugins-commits@lists.geany.org

1 participants
44 discussions

[geany/geany-plugins] 05218d: tableconvert: fixed deprecated gtk call for gtk3
by LarsGit223 13 May '19

13 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Mon, 13 May 2019 19:00:18 UTC Commit: 05218d959bc77103a9010fdf981a3b17abdee5b2 https://github.com/geany/geany-plugins/commit/05218d959bc77103a9010fdf981a3… Log Message: ----------- tableconvert: fixed deprecated gtk call for gtk3 Modified Paths: -------------- tableconvert/src/tableconvert_ui.c Modified: tableconvert/src/tableconvert_ui.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -49,7 +49,11 @@ void init_menuentries(void) * This is needed for e.g. different wiki-Syntax or differenz stiles * within a special file type */ +#if GTK_CHECK_VERSION(3, 10, 0) + menu_tableconvert = gtk_menu_item_new_with_mnemonic(_("_More TableConvert")); +#else menu_tableconvert = gtk_image_menu_item_new_with_mnemonic(_("_More TableConvert")); +#endif gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_tableconvert); menu_tableconvert_menu = gtk_menu_new (); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8320b7: extrasel: fixed deprecated gtk call
by LarsGit223 13 May '19

13 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Mon, 13 May 2019 18:28:59 UTC Commit: 8320b73349ac59853e2155fec68a753aedcd2960 https://github.com/geany/geany-plugins/commit/8320b73349ac59853e2155fec68a7… Log Message: ----------- extrasel: fixed deprecated gtk call Modified Paths: -------------- geanyextrasel/src/extrasel.c Modified: geanyextrasel/src/extrasel.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -334,7 +334,11 @@ static void doit_and_select(guint group_id, guint key_id) else { if (geany_data->prefs->beep_on_errors) +#if GTK_CHECK_VERSION(2, 2, 0) + gdk_display_beep(gdk_display_get_default()); +#else gdk_beep(); +#endif return; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fa5347: lipsum: fixed deprecated gtk call for gtk3
by LarsGit223 13 May '19

13 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Mon, 13 May 2019 17:13:31 UTC Commit: fa53474dbc1cadbfa2832ef67519f84f2cfd3d93 https://github.com/geany/geany-plugins/commit/fa53474dbc1cadbfa2832ef67519f… Log Message: ----------- lipsum: fixed deprecated gtk call for gtk3 Modified Paths: -------------- lipsum/src/lipsum.c Modified: lipsum/src/lipsum.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -219,7 +219,11 @@ plugin_init(G_GNUC_UNUSED GeanyData *data) g_free(config_file); /* Building menu entry */ +#if GTK_CHECK_VERSION(3, 10, 0) + menu_lipsum = gtk_menu_item_new_with_mnemonic(_("_Lipsum...")); +#else menu_lipsum = gtk_image_menu_item_new_with_mnemonic(_("_Lipsum...")); +#endif gtk_widget_set_tooltip_text(menu_lipsum, _("Include Pseudotext to your code")); gtk_widget_show(menu_lipsum); g_signal_connect((gpointer) menu_lipsum, "activate", -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8e6b2c: autoclose: fixed deprecated gtk call for gtk3
by LarsGit223 12 May '19

12 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Sun, 12 May 2019 17:11:32 UTC Commit: 8e6b2c78e72b2d3f74562599f3fbd30f31e20e2f https://github.com/geany/geany-plugins/commit/8e6b2c78e72b2d3f74562599f3fbd… Log Message: ----------- autoclose: fixed deprecated gtk call for gtk3 Modified Paths: -------------- autoclose/src/autoclose.c Modified: autoclose/src/autoclose.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1005,7 +1005,11 @@ plugin_autoclose_configure(G_GNUC_UNUSED GeanyPlugin *plugin, GtkDialog *dialog, vbox = gtk_vbox_new(FALSE, 0); scrollbox = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(GTK_WIDGET(scrollbox), -1, 400); +#if GTK_CHECK_VERSION(3, 8, 0) + gtk_container_add(GTK_CONTAINER(scrollbox), vbox); +#else gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollbox), vbox); +#endif gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbox), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 55f55e: Merge pull request #855 from LarsGit223/projectorganizer-readme
by Frank Lanitz 12 May '19

12 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 12 May 2019 12:40:09 UTC Commit: 55f55e4d01751529d5341e1b99ea146a2d933c51 https://github.com/geany/geany-plugins/commit/55f55e4d01751529d5341e1b99ea1… Log Message: ----------- Merge pull request #855 from LarsGit223/projectorganizer-readme projectorganizer: fixed too short title underline in README Modified Paths: -------------- projectorganizer/README Modified: projectorganizer/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -173,7 +173,7 @@ The following search properties are configurable: name only (excluding path); when checked, the search is performed in the full path Find symbol dialog ----------------- +------------------ The Find symbol dialog can be invoked either from the Project menu or from the sidebar's context menu. Searches are performed within the "Search inside" directory. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 47acc7: projectorganizer: fixed too short title underline in README
by LarsGit223 12 May '19

12 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Sun, 12 May 2019 10:07:28 UTC Commit: 47acc7f1a79bc490068fd2ca90eb97776c2bf45a https://github.com/geany/geany-plugins/commit/47acc7f1a79bc490068fd2ca90eb9… Log Message: ----------- projectorganizer: fixed too short title underline in README Modified Paths: -------------- projectorganizer/README Modified: projectorganizer/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -173,7 +173,7 @@ The following search properties are configurable: name only (excluding path); when checked, the search is performed in the full path Find symbol dialog ----------------- +------------------ The Find symbol dialog can be invoked either from the Project menu or from the sidebar's context menu. Searches are performed within the "Search inside" directory. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6d4b0b: Merge pull request #854 from LarsGit223/scope-readme
by elextr 12 May '19

12 May '19

Branch: refs/heads/master Author: elextr <elextr(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 12 May 2019 09:53:39 UTC Commit: 6d4b0b50f345083204f7022600680668b279cd9a https://github.com/geany/geany-plugins/commit/6d4b0b50f345083204f7022600680… Log Message: ----------- Merge pull request #854 from LarsGit223/scope-readme scope: fixed missing escape character in README Modified Paths: -------------- scope/README Modified: scope/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -18,7 +18,7 @@ expect (stepping, breakpoints...), and a few notable features: Requirements ------------ -Geany 1.25 or later and the respective libraries, including VTE under *nix. +Geany 1.25 or later and the respective libraries, including VTE under \*nix. GLib-2.18 or later. For Windows, 2.24 is recommended. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 499fae: scope: fixed missing escape character in README
by LarsGit223 12 May '19

12 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Sun, 12 May 2019 09:28:38 UTC Commit: 499faec8814170b2b0a86385a58da66f8a5e33e3 https://github.com/geany/geany-plugins/commit/499faec8814170b2b0a86385a58da… Log Message: ----------- scope: fixed missing escape character in README Modified Paths: -------------- scope/README Modified: scope/README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -18,7 +18,7 @@ expect (stepping, breakpoints...), and a few notable features: Requirements ------------ -Geany 1.25 or later and the respective libraries, including VTE under *nix. +Geany 1.25 or later and the respective libraries, including VTE under \*nix. GLib-2.18 or later. For Windows, 2.24 is recommended. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ea0124: workbench: fixed deprecated gtk calls for gtk3
by LarsGit223 11 May '19

11 May '19

Branch: refs/heads/master Author: LarsGit223 <lars_paulsen(a)web.de> Committer: LarsGit223 <lars_paulsen(a)web.de> Date: Sat, 11 May 2019 13:12:52 UTC Commit: ea0124d174fca6a69404930910ec9c4a2f3f92ba https://github.com/geany/geany-plugins/commit/ea0124d174fca6a69404930910ec9… Log Message: ----------- workbench: fixed deprecated gtk calls for gtk3 Modified Paths: -------------- utils/src/gp_gtkcompat.h workbench/src/dialogs.c workbench/src/popup_menu.c workbench/src/sidebar.c Modified: utils/src/gp_gtkcompat.h 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,14 @@ G_BEGIN_DECLS #define GTK_STOCK_OPEN _("_Open") #define GTK_STOCK_CANCEL _("_Cancel") #endif + +/* Replace calls to gtk_icon_info_free() with call to + g_object_unref(). Starting from version 3.8.*/ +#if GTK_CHECK_VERSION(3, 8, 0) +#define gtk_icon_info_free(icon_info) \ + g_object_unref(icon_info) +#endif + G_END_DECLS #endif /* GP_GTKCOMPAT_H */ - Modified: workbench/src/dialogs.c 100 lines changed, 98 insertions(+), 2 deletions(-) =================================================================== @@ -279,7 +279,12 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) { GtkWidget *w_file_patterns, *w_ignored_dirs_patterns, *w_ignored_file_patterns; GtkWidget *dialog, *label, *content_area; - GtkWidget *vbox, *hbox, *hbox1, *table; + GtkWidget *vbox, *hbox, *hbox1; +#if GTK_CHECK_VERSION(3, 4, 0) + GtkWidget *grid; +#else + GtkWidget *table; +#endif GtkDialogFlags flags; gchar *file_patterns_old, *ignored_file_patterns_old, *ignored_dirs_patterns_old; gboolean changed; @@ -296,14 +301,34 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) vbox = gtk_vbox_new(FALSE, 0); +#if GTK_CHECK_VERSION(3, 4, 0) + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID(grid), 5); + gtk_grid_set_column_spacing (GTK_GRID(grid), 10); +#else table = gtk_table_new(5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 10); +#endif label = gtk_label_new(_("File patterns:")); +#if GTK_CHECK_VERSION(3, 16, 0) + gtk_label_set_xalign (GTK_LABEL(label), 0); + gtk_label_set_yalign (GTK_LABEL(label), 0); +#else gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +#endif w_file_patterns = gtk_entry_new(); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), label, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID(grid), w_file_patterns, 1, 0, 1, 1); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (label, FALSE); + gtk_widget_set_valign (w_file_patterns, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (w_file_patterns, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 0, label, w_file_patterns, NULL); +#endif ui_entry_add_clear_icon(GTK_ENTRY(w_file_patterns)); gtk_widget_set_tooltip_text(w_file_patterns, _("Space separated list of patterns that are used to identify files " @@ -312,28 +337,60 @@ gboolean dialogs_directory_settings(WB_PROJECT_DIR *directory) gtk_entry_set_text(GTK_ENTRY(w_file_patterns), file_patterns_old); label = gtk_label_new(_("Ignored file patterns:")); +#if GTK_CHECK_VERSION(3, 16, 0) + gtk_label_set_xalign (GTK_LABEL(label), 0); + gtk_label_set_yalign (GTK_LABEL(label), 0); +#else gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +#endif w_ignored_file_patterns = gtk_entry_new(); ui_entry_add_clear_icon(GTK_ENTRY(w_ignored_file_patterns)); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID(grid), w_ignored_file_patterns, 1, 1, 1, 1); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (label, FALSE); + gtk_widget_set_valign (w_ignored_file_patterns, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (w_ignored_file_patterns, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 2, label, w_ignored_file_patterns, NULL); +#endif gtk_widget_set_tooltip_text(w_ignored_file_patterns, _("Space separated list of patterns that are used to identify files " "that shall not be displayed in the directory tree.")); ignored_file_patterns_old = g_strjoinv(" ", wb_project_dir_get_ignored_file_patterns(directory)); gtk_entry_set_text(GTK_ENTRY(w_ignored_file_patterns), ignored_file_patterns_old); label = gtk_label_new(_("Ignored directory patterns:")); +#if GTK_CHECK_VERSION(3, 16, 0) + gtk_label_set_xalign (GTK_LABEL(label), 0); + gtk_label_set_yalign (GTK_LABEL(label), 0); +#else gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +#endif w_ignored_dirs_patterns = gtk_entry_new(); ui_entry_add_clear_icon(GTK_ENTRY(w_ignored_dirs_patterns)); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), label, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID(grid), w_ignored_dirs_patterns, 1, 2, 1, 1); + gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (label, FALSE); + gtk_widget_set_valign (w_ignored_dirs_patterns, GTK_ALIGN_BASELINE); + gtk_widget_set_hexpand (w_ignored_dirs_patterns, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 3, label, w_ignored_dirs_patterns, NULL); +#endif gtk_widget_set_tooltip_text(w_ignored_dirs_patterns, _("Space separated list of patterns that are used to identify directories " "that shall not be scanned for source files.")); ignored_dirs_patterns_old = g_strjoinv(" ", wb_project_dir_get_ignored_dirs_patterns(directory)); gtk_entry_set_text(GTK_ENTRY(w_ignored_dirs_patterns), ignored_dirs_patterns_old); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 6); +#else gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 6); +#endif hbox1 = gtk_hbox_new(FALSE, 0); label = gtk_label_new(_("Note: the patterns above affect only the workbench directory and are not used in the Find in Files\n" @@ -409,7 +466,12 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) gint result; GtkWidget *w_rescan_projects_on_open, *w_enable_live_update, *w_expand_on_hover; GtkWidget *dialog, *content_area; - GtkWidget *vbox, *hbox, *table; + GtkWidget *vbox, *hbox; +#if GTK_CHECK_VERSION(3, 4, 0) + GtkWidget *grid; +#else + GtkWidget *table; +#endif GtkDialogFlags flags; gboolean changed, rescan_projects_on_open, rescan_projects_on_open_old; gboolean enable_live_update, enable_live_update_old; @@ -427,20 +489,42 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) vbox = gtk_vbox_new(FALSE, 0); +#if GTK_CHECK_VERSION(3, 4, 0) + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID(grid), 5); + gtk_grid_set_column_spacing (GTK_GRID(grid), 10); +#else table = gtk_table_new(5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 10); +#endif w_rescan_projects_on_open = gtk_check_button_new_with_mnemonic(_("_Rescan all projects on open")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_rescan_projects_on_open, 0, 0, 1, 1); + gtk_widget_set_halign (w_rescan_projects_on_open, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_rescan_projects_on_open, TRUE); + gtk_widget_set_valign (w_rescan_projects_on_open, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_rescan_projects_on_open, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 0, w_rescan_projects_on_open, NULL); +#endif gtk_widget_set_tooltip_text(w_rescan_projects_on_open, _("If the option is activated (default), then all projects will be re-scanned " "on opening of the workbench.")); rescan_projects_on_open_old = workbench_get_rescan_projects_on_open(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_rescan_projects_on_open), rescan_projects_on_open_old); w_enable_live_update = gtk_check_button_new_with_mnemonic(_("_Enable live update")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_enable_live_update, 0, 1, 1, 1); + gtk_widget_set_halign (w_enable_live_update, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_enable_live_update, TRUE); + gtk_widget_set_valign (w_enable_live_update, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_enable_live_update, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); +#endif gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar " "will be updated automatically if a file or directory is created, removed or renamed. " @@ -449,14 +533,26 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); w_expand_on_hover = gtk_check_button_new_with_mnemonic(_("_Expand on hover")); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_grid_attach (GTK_GRID(grid), w_expand_on_hover, 0, 2, 1, 1); + gtk_widget_set_halign (w_expand_on_hover, GTK_ALIGN_CENTER); + gtk_widget_set_hexpand (w_expand_on_hover, TRUE); + gtk_widget_set_valign (w_expand_on_hover, GTK_ALIGN_CENTER); + gtk_widget_set_vexpand (w_expand_on_hover, TRUE); +#else ui_table_add_row(GTK_TABLE(table), 2, w_expand_on_hover, NULL); +#endif gtk_widget_set_tooltip_text(w_expand_on_hover, _("If the option is activated, then a tree node in the sidebar " "will be expanded or collapsed by hovering over it with the mouse cursor.")); expand_on_hover_old = workbench_get_expand_on_hover(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_expand_on_hover), expand_on_hover_old); +#if GTK_CHECK_VERSION(3, 4, 0) + gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 6); +#else gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 6); +#endif hbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 6); Modified: workbench/src/popup_menu.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -234,8 +234,12 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, FALSE); break; } +#if GTK_CHECK_VERSION(3, 22, 0) + gtk_menu_popup_at_pointer(GTK_MENU(s_popup_menu.widget), (GdkEvent *)event); +#else gtk_menu_popup(GTK_MENU(s_popup_menu.widget), NULL, NULL, NULL, NULL, event->button, event->time); +#endif } Modified: workbench/src/sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ #endif #include "wb_globals.h" #include <gtkcompat.h> +#include <gp_gtkcompat.h> #include "sidebar.h" #include "popup_menu.h" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3ecb15: Merge pull request #848 from techee/vimode_history2
by Frank Lanitz 10 May '19

10 May '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 10 May 2019 08:34:32 UTC Commit: 3ecb15ad2a82afc91cb2ee35ae74f6005a824d1c https://github.com/geany/geany-plugins/commit/3ecb15ad2a82afc91cb2ee35ae74f… Log Message: ----------- Merge pull request #848 from techee/vimode_history2 vimode: Separate command and search history Modified Paths: -------------- vimode/src/excmd-prompt.c Modified: vimode/src/excmd-prompt.c 187 lines changed, 133 insertions(+), 54 deletions(-) =================================================================== @@ -34,86 +34,155 @@ static GtkWidget *prompt; static GtkWidget *entry; static CmdContext *ctx; -static GList *history; + +static gchar cmd_first_char; +static GPtrArray *history; +static GPtrArray *cmd_history; +static GPtrArray *search_history; static gint history_pos; +/* text entered by user used to filter history */ +static gchar *entered_text; +/* ignore change of text inside entry when set from history */ +static gboolean ignore_change; static void close_prompt() { gtk_widget_hide(prompt); + if (entered_text) + { + g_free(entered_text); + entered_text = NULL; + } +} + + +static void set_prompt_text(const gchar *val) +{ + gchar *text = g_strconcat(" ", val, NULL); + text[0] = cmd_first_char; + ignore_change = TRUE; + gtk_entry_set_text(GTK_ENTRY(entry), text); + gtk_editable_set_position(GTK_EDITABLE(entry), strlen(text)); + g_free(text); } static gboolean on_prompt_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer dummy) { - switch (event->keyval) - { - case GDK_KEY_Escape: - close_prompt(); - return TRUE; + const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry)); + guint modif_mask = GDK_MODIFIER_MASK & ~GDK_LOCK_MASK; - case GDK_KEY_Tab: - /* avoid leaving the entry */ - return TRUE; + ignore_change = FALSE; - case GDK_KEY_Return: - case GDK_KEY_KP_Enter: - case GDK_KEY_ISO_Enter: + if ((event->state & modif_mask) == 0) + { + switch (event->keyval) { - const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry)); - GList *link = g_list_find_custom(history, text, (GCompareFunc)g_strcmp0); + case GDK_KEY_Escape: + close_prompt(); + return TRUE; - if (link) - { - g_free(link->data); - history = g_list_remove_link(history, link); - } - if (g_strcmp0(text, ":") != 0) - history = g_list_prepend(history, g_strdup(text)); + case GDK_KEY_Tab: + /* avoid leaving the entry */ + return TRUE; - excmd_perform(ctx, text); - close_prompt(); + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: + case GDK_KEY_ISO_Enter: + { + guint i; - return TRUE; - } + for (i = 0; i < history->len; i++) + if (g_str_equal(text + 1, history->pdata[i])) + g_ptr_array_remove_index(history, i); + if (strlen(text) > 1) + g_ptr_array_add(history, g_strdup(text + 1)); + if (history->len > 20) // default vim history size + g_ptr_array_remove_index(history, 0); - case GDK_KEY_Up: - case GDK_KEY_KP_Up: - case GDK_KEY_uparrow: - { - gint history_len = g_list_length(history); + excmd_perform(ctx, text); + close_prompt(); - if (history_pos == -1 && history_len > 0) - history_pos = 0; - else if (history_pos + 1 < history_len) - history_pos++; + return TRUE; + } - if (history_pos != -1 && history_pos < history_len) + case GDK_KEY_Up: + case GDK_KEY_KP_Up: + case GDK_KEY_uparrow: { - gchar *val = g_list_nth_data(history, history_pos); - gtk_entry_set_text(GTK_ENTRY(entry), val); - gtk_editable_set_position(GTK_EDITABLE(entry), strlen(val)); + gint pos = -1; + + if (history_pos == -1 && history->len > 0) + pos = history->len - 1; + else if (history_pos > 0) + pos = history_pos - 1; + + while (pos >= 0) + { + if (g_str_has_prefix(history->pdata[pos], entered_text)) + break; + pos--; + } + + if (pos != -1) + { + set_prompt_text(history->pdata[pos]); + history_pos = pos; + } + + return TRUE; } - return TRUE; - } + case GDK_KEY_Down: + case GDK_KEY_KP_Down: + case GDK_KEY_downarrow: + { + gint pos; - case GDK_KEY_Down: - case GDK_KEY_KP_Down: - case GDK_KEY_downarrow: - { - const gchar *val; + if (history_pos == -1) + return TRUE; - if (history_pos == -1) - return TRUE; + pos = history_pos + 1; + + while (pos < history->len) + { + if (g_str_has_prefix(history->pdata[pos], entered_text)) + break; + pos++; + } - history_pos--; + if (pos >= history->len) + pos = -1; - val = history_pos == -1 ? ":" : g_list_nth_data(history, history_pos); - gtk_entry_set_text(GTK_ENTRY(entry), val); - gtk_editable_set_position(GTK_EDITABLE(entry), strlen(val)); + set_prompt_text(pos == -1 ? "" : history->pdata[pos]); + history_pos = pos; + + return TRUE; + } + + case GDK_KEY_Home: + gtk_editable_set_position(GTK_EDITABLE(entry), 1); + return TRUE; + case GDK_KEY_End: + gtk_editable_set_position(GTK_EDITABLE(entry), strlen(text)); + return TRUE; + } + } + else if ((event->state & modif_mask) == GDK_CONTROL_MASK) + { + switch (event->keyval) + { + case GDK_KEY_c: + close_prompt(); + return TRUE; - return TRUE; + case GDK_KEY_b: + gtk_editable_set_position(GTK_EDITABLE(entry), 1); + return TRUE; + case GDK_KEY_e: + gtk_editable_set_position(GTK_EDITABLE(entry), strlen(text)); + return TRUE; } } @@ -129,6 +198,11 @@ static void on_entry_text_notify(GObject *object, GParamSpec *pspec, gpointer du if (cmd == NULL || strlen(cmd) == 0) close_prompt(); + else if (!ignore_change) + { + g_free(entered_text); + entered_text = g_strdup(cmd + 1); + } } @@ -144,7 +218,8 @@ void ex_prompt_init(GtkWidget *parent_window, CmdContext *c) ctx = c; - history = NULL; + cmd_history = g_ptr_array_new_with_free_func(g_free); + search_history = g_ptr_array_new_with_free_func(g_free); /* prompt */ prompt = g_object_new(GTK_TYPE_WINDOW, @@ -188,6 +263,9 @@ static void position_prompt(void) void ex_prompt_show(const gchar *val) { history_pos = -1; + entered_text = g_strdup(val + 1); + cmd_first_char = val[0]; + history = cmd_first_char == ':' ? cmd_history : search_history; gtk_widget_show(prompt); position_prompt(); gtk_entry_set_text(GTK_ENTRY(entry), val); @@ -198,5 +276,6 @@ void ex_prompt_show(const gchar *val) void ex_prompt_cleanup(void) { gtk_widget_destroy(prompt); - g_list_free_full(history, g_free); + g_ptr_array_free(cmd_history, TRUE); + g_ptr_array_free(search_history, TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits May 2019