Plugins-Commits May 2023

plugins-commits@lists.geany.org

1 participants
22 discussions

[geany/geany-plugins] a17d51: projectorganizer: Remember selected row in sidebar when reloading
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 May 2023 21:22:31 UTC Commit: a17d5128f777a679b97234d706886cda59ef977e https://github.com/geany/geany-plugins/commit/a17d5128f777a679b97234d706886… Log Message: ----------- projectorganizer: Remember selected row in sidebar when reloading In addition to remembering which paths are expanded, this patch also remembers which item in the tree is selected so when the project gets reloaded, the selection gets restored. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 28 insertions(+), 1 deletions(-) =================================================================== @@ -52,6 +52,7 @@ typedef struct { GeanyProject *project; GPtrArray *expanded_paths; + gchar *selected_path; } ExpandData; @@ -1487,6 +1488,7 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) static gboolean expand_on_idle(ExpandData *expand_data) { GeanyDocument *doc = document_get_current(); + gboolean selected = FALSE; if (!prj_org) return FALSE; @@ -1502,9 +1504,16 @@ static gboolean expand_on_idle(ExpandData *expand_data) g_ptr_array_free(expand_data->expanded_paths, TRUE); } + if (expand_data->selected_path) + { + expand_path(expand_data->selected_path, TRUE); + g_free(expand_data->selected_path); + selected = TRUE; + } + g_free(expand_data); - if (!s_follow_editor || !doc || !doc->file_name) + if (selected || !s_follow_editor || !doc || !doc->file_name) return FALSE; expand_path(doc->file_name, TRUE); @@ -1558,6 +1567,19 @@ static GPtrArray *get_expanded_paths(void) } +static gchar *get_selected_path(void) +{ + GtkTreeSelection *treesel; + GtkTreeIter iter; + GtkTreeModel *model; + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); + if (gtk_tree_selection_get_selected(treesel, &model, &iter)) + return build_path(&iter); + return NULL; +} + + void prjorg_sidebar_update(gboolean reload) { ExpandData *expand_data = g_new0(ExpandData, 1); @@ -1566,7 +1588,12 @@ void prjorg_sidebar_update(gboolean reload) if (reload) { + GtkTreeSelection *treesel; + GtkTreeIter iter; + GtkTreeModel *model; + expand_data->expanded_paths = get_expanded_paths(); + expand_data->selected_path = get_selected_path(); load_project(); /* we get color information only after the sidebar is realized - -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7e8682: Project Organizer: Add ability to open file manager and terminal
by xiota 07 May '23

07 May '23

Branch: refs/heads/master Author: xiota <github(a)mentalfossa.com> Committer: xiota <github(a)mentalfossa.com> Date: Tue, 07 Mar 2023 05:03:25 UTC Commit: 7e86828684c07622f2c2387db1785c73a2b04c50 https://github.com/geany/geany-plugins/commit/7e86828684c07622f2c2387db1785… Log Message: ----------- Project Organizer: Add ability to open file manager and terminal File manager/terminal are opened at the location of the selected file in the tree view. If nothing is selected, the location of the current document is used. If the current document does not have a path, the project directory is used. If the project directory cannot be located, the current directory is used. The file manager is opened with the path as the first argument. The terminal path is set using the PWD. Modified Paths: -------------- projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-sidebar.h Modified: projectorganizer/src/prjorg-menu.c 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,8 @@ enum KB_FIND_FILE, KB_FIND_TAG, KB_FOCUS_SIDEBAR, + KB_OPEN_FILE_MANAGER, + KB_OPEN_TERMINAL, KB_COUNT }; @@ -408,6 +410,12 @@ void prjorg_menu_init(void) keybindings_set_item(key_group, KB_FOCUS_SIDEBAR, (GeanyKeyCallback)prjorg_sidebar_focus_project_tab, 0, 0, "focus_project_sidebar", _("Focus Project Sidebar"), NULL); + keybindings_set_item(key_group, KB_OPEN_FILE_MANAGER, (GeanyKeyCallback)on_open_file_manager, + 0, 0, "open_file_manager", _("Open File Manager at file location"), NULL); + + keybindings_set_item(key_group, KB_OPEN_TERMINAL, (GeanyKeyCallback)on_open_terminal, + 0, 0, "open_terminal", _("Open Terminal at file location"), NULL); + s_context_sep_item = gtk_separator_menu_item_new(); gtk_widget_show(s_context_sep_item); gtk_menu_shell_prepend(GTK_MENU_SHELL(geany->main_widgets->editor_menu), s_context_sep_item); Modified: projectorganizer/src/prjorg-project.h 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -64,6 +64,22 @@ void prjorg_project_remove_single_tm_file(gchar *utf8_filename); gboolean prjorg_project_is_in_project(const gchar *utf8_filename); + +/* set open command based on OS */ +#if defined(_WIN32) || defined(G_OS_WIN32) +#define PRJORG_COMMAND_OPEN "start" +#define PRJORG_COMMAND_TERMINAL "PowerShell" +#define PRJORG_COMMAND_TERMINAL_ALT "" +#elif defined(__APPLE__) +#define PRJORG_COMMAND_OPEN "open" +#define PRJORG_COMMAND_TERMINAL "open -b com.apple.terminal" +#define PRJORG_COMMAND_TERMINAL_ALT "" +#else +#define PRJORG_COMMAND_OPEN "xdg-open" +#define PRJORG_COMMAND_TERMINAL "xterm" +#define PRJORG_COMMAND_TERMINAL_ALT "/usr/bin/x-terminal-emulator" +#endif + /* In the code we create a list of all files but we want to keep empty directories * in the list for which we create a fake file name with the PROJORG_DIR_ENTRY * value. */ Modified: projectorganizer/src/prjorg-sidebar.c 172 lines changed, 143 insertions(+), 29 deletions(-) =================================================================== @@ -300,6 +300,129 @@ static void on_follow_active(GtkToggleToolButton *button, G_GNUC_UNUSED gpointer } +// returns path to selection if dir +// otherwise returns parent +// returned string must be freed +static gchar* get_dir_of_selection() +{ + GtkTreeSelection *treesel; + GtkTreeModel *model; + GtkTreeIter iter, parent; + gchar *path = NULL; + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); + if (gtk_tree_selection_get_selected(treesel, &model, &iter)) + { + path = build_path(&iter); + if (!g_file_test(path, G_FILE_TEST_IS_DIR)) + { + g_free(path); + path = NULL; + if (gtk_tree_model_iter_parent(model, &parent, &iter)) + path = build_path(&parent); + } + } + return path; +} + + +/* if get_dir_of_selection() fails, + * returns parent of current document, project folder, or home folder */ +static gchar *get_fallback_dir_of_selection(void) +{ + gchar *locale_path; + + /* get path from treeview selection */ + locale_path = get_dir_of_selection(); + + /* get path from current document */ + if (!locale_path) + { + GeanyDocument *doc; + + doc = document_get_current(); + if (DOC_VALID(doc) && doc->real_path) + { + locale_path = g_path_get_dirname(doc->real_path); + + if (locale_path && locale_path == '.') + { + g_free(locale_path); + locale_path = NULL; + } + } + } + + /* get path from project */ + if (!locale_path && geany_data->app->project) + { + gchar *utf8_path = NULL; + utf8_path = get_project_base_path(); + locale_path = utils_get_locale_from_utf8(utf8_path); + g_free(utf8_path); + } + + /* get current directory */ + if (!locale_path || !g_file_test(locale_path, G_FILE_TEST_IS_DIR)) + locale_path = g_strdup(g_get_current_dir()); + + /* get user home directory */ + if (!locale_path || !g_file_test(locale_path, G_FILE_TEST_IS_DIR)) + locale_path = g_strdup(g_get_home_dir()); + + return locale_path; +} + + +void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) +{ + gchar *locale_path; + locale_path = get_fallback_dir_of_selection(); + + if (locale_path) + { + gchar *command, *open_command; + + open_command = PRJORG_COMMAND_OPEN; + command = g_strconcat (open_command, " \"", locale_path, "\"", NULL); + if (!spawn_async(locale_path, command, NULL, NULL, NULL, NULL)) + msgwin_status_add(_("Unable to open folder. Command unavailable: %s"), open_command); + + g_free(command); + g_free(locale_path); + } + else + { + msgwin_status_add(_("Unable to find folder.")); + } +} + + +void on_open_terminal(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) +{ + gchar *locale_path, *open_command; + + if (g_file_test(PRJORG_COMMAND_TERMINAL_ALT, G_FILE_TEST_EXISTS)) + { + gchar *alt_command; + alt_command = utils_get_real_path(PRJORG_COMMAND_TERMINAL_ALT); + open_command = g_path_get_basename(alt_command); + g_free(alt_command); + } + else + { + open_command = g_strdup(PRJORG_COMMAND_TERMINAL); + } + + locale_path = get_fallback_dir_of_selection(); + if (!spawn_async(locale_path, open_command, NULL, NULL, NULL, NULL)) + msgwin_status_add(_("Unable to open terminal: %s"), open_command); + + g_free(locale_path); + g_free(open_command); +} + + static void on_add_external(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { gchar *utf8_base_path = get_project_base_path(); @@ -355,35 +478,11 @@ static void on_remove_external_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_U } -// returned string must be freed -static gchar* parent_dir_for_create() -{ - GtkTreeSelection *treesel; - GtkTreeModel *model; - GtkTreeIter iter, parent; - gchar *path = NULL; - - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); - if (gtk_tree_selection_get_selected(treesel, &model, &iter)) - { - path = build_path(&iter); - if (!g_file_test(path, G_FILE_TEST_IS_DIR)) - { - g_free(path); - path = NULL; - if (gtk_tree_model_iter_parent(model, &parent, &iter)) - path = build_path(&parent); - } - } - return path; -} - - static void on_create_file(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { gchar *dir, *name; - dir = parent_dir_for_create(); + dir = get_dir_of_selection(); if (dir == NULL) return; @@ -414,7 +513,7 @@ static void on_create_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpo { gchar *dir, *name; - dir = parent_dir_for_create(); + dir = get_dir_of_selection(); if (dir == NULL) return; @@ -1543,9 +1642,6 @@ void prjorg_sidebar_init(void) g_signal_connect(item, "clicked", G_CALLBACK(on_reload_project), NULL); gtk_container_add(GTK_CONTAINER(s_toolbar), item); - item = GTK_WIDGET(gtk_separator_tool_item_new()); - gtk_container_add(GTK_CONTAINER(s_toolbar), item); - image = gtk_image_new_from_icon_name("folder-new", GTK_ICON_SIZE_SMALL_TOOLBAR); item = GTK_WIDGET(gtk_tool_button_new(image, NULL)); gtk_widget_set_tooltip_text(item, _("Add external directory")); @@ -1634,6 +1730,10 @@ void prjorg_sidebar_init(void) g_signal_connect((gpointer) item, "activate", G_CALLBACK(expand_all), NULL); s_popup_menu.expand = item; + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + item = menu_item_new("edit-find", _("Find in Files...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_in_files), NULL); @@ -1653,6 +1753,20 @@ void prjorg_sidebar_init(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + item = menu_item_new("folder-open", _("Open File Manager")); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_open_file_manager), NULL); + s_popup_menu.find_in_directory = item; + + item = menu_item_new("terminal", _("Open Terminal")); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_open_terminal), NULL); + s_popup_menu.find_in_directory = item; + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + item = menu_item_new("list-remove", _("Remove External Directory")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_remove_external_dir), NULL); Modified: projectorganizer/src/prjorg-sidebar.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -31,5 +31,7 @@ void prjorg_sidebar_update(gboolean reload); void prjorg_sidebar_focus_project_tab(void); +void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data); +void on_open_terminal(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 24bbc8: Merge pull request #1126 from xiota/pr-prjorg-open-folder
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 07 May 2023 20:47:58 UTC Commit: 24bbc88821fd58654202b8154bebb77a56643c20 https://github.com/geany/geany-plugins/commit/24bbc88821fd58654202b8154bebb… Log Message: ----------- Merge pull request #1126 from xiota/pr-prjorg-open-folder Project Organizer: Add option to open current folder in file manager and terminal Modified Paths: -------------- projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-sidebar.h Modified: projectorganizer/src/prjorg-menu.c 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,8 @@ enum KB_FIND_FILE, KB_FIND_TAG, KB_FOCUS_SIDEBAR, + KB_OPEN_FILE_MANAGER, + KB_OPEN_TERMINAL, KB_COUNT }; @@ -283,6 +285,12 @@ void prjorg_menu_init(void) keybindings_set_item(key_group, KB_FOCUS_SIDEBAR, (GeanyKeyCallback)prjorg_sidebar_focus_project_tab, 0, 0, "focus_project_sidebar", _("Focus Project Sidebar"), NULL); + keybindings_set_item(key_group, KB_OPEN_FILE_MANAGER, (GeanyKeyCallback)on_open_file_manager, + 0, 0, "open_file_manager", _("Open File Manager at file location"), NULL); + + keybindings_set_item(key_group, KB_OPEN_TERMINAL, (GeanyKeyCallback)on_open_terminal, + 0, 0, "open_terminal", _("Open Terminal at file location"), NULL); + s_context_sep_item = gtk_separator_menu_item_new(); gtk_widget_show(s_context_sep_item); gtk_menu_shell_prepend(GTK_MENU_SHELL(geany->main_widgets->editor_menu), s_context_sep_item); Modified: projectorganizer/src/prjorg-project.h 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,22 @@ void prjorg_project_remove_single_tm_file(gchar *utf8_filename); gboolean prjorg_project_is_in_project(const gchar *utf8_filename); + +/* set open command based on OS */ +#if defined(_WIN32) || defined(G_OS_WIN32) +#define PRJORG_COMMAND_OPEN "start" +#define PRJORG_COMMAND_TERMINAL "PowerShell" +#define PRJORG_COMMAND_TERMINAL_ALT "" +#elif defined(__APPLE__) +#define PRJORG_COMMAND_OPEN "open" +#define PRJORG_COMMAND_TERMINAL "open -b com.apple.terminal" +#define PRJORG_COMMAND_TERMINAL_ALT "" +#else +#define PRJORG_COMMAND_OPEN "xdg-open" +#define PRJORG_COMMAND_TERMINAL "xterm" +#define PRJORG_COMMAND_TERMINAL_ALT "/usr/bin/x-terminal-emulator" +#endif + /* In the code we create a list of all files but we want to keep empty directories * in the list for which we create a fake file name with the PROJORG_DIR_ENTRY * value. */ Modified: projectorganizer/src/prjorg-sidebar.c 172 lines changed, 143 insertions(+), 29 deletions(-) =================================================================== @@ -300,6 +300,129 @@ static void on_follow_active(GtkToggleToolButton *button, G_GNUC_UNUSED gpointer } +// returns path to selection if dir +// otherwise returns parent +// returned string must be freed +static gchar* get_dir_of_selection() +{ + GtkTreeSelection *treesel; + GtkTreeModel *model; + GtkTreeIter iter, parent; + gchar *path = NULL; + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); + if (gtk_tree_selection_get_selected(treesel, &model, &iter)) + { + path = build_path(&iter); + if (!g_file_test(path, G_FILE_TEST_IS_DIR)) + { + g_free(path); + path = NULL; + if (gtk_tree_model_iter_parent(model, &parent, &iter)) + path = build_path(&parent); + } + } + return path; +} + + +/* if get_dir_of_selection() fails, + * returns parent of current document, project folder, or home folder */ +static gchar *get_fallback_dir_of_selection(void) +{ + gchar *locale_path; + + /* get path from treeview selection */ + locale_path = get_dir_of_selection(); + + /* get path from current document */ + if (!locale_path) + { + GeanyDocument *doc; + + doc = document_get_current(); + if (DOC_VALID(doc) && doc->real_path) + { + locale_path = g_path_get_dirname(doc->real_path); + + if (locale_path && locale_path == '.') + { + g_free(locale_path); + locale_path = NULL; + } + } + } + + /* get path from project */ + if (!locale_path && geany_data->app->project) + { + gchar *utf8_path = NULL; + utf8_path = get_project_base_path(); + locale_path = utils_get_locale_from_utf8(utf8_path); + g_free(utf8_path); + } + + /* get current directory */ + if (!locale_path || !g_file_test(locale_path, G_FILE_TEST_IS_DIR)) + locale_path = g_strdup(g_get_current_dir()); + + /* get user home directory */ + if (!locale_path || !g_file_test(locale_path, G_FILE_TEST_IS_DIR)) + locale_path = g_strdup(g_get_home_dir()); + + return locale_path; +} + + +void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) +{ + gchar *locale_path; + locale_path = get_fallback_dir_of_selection(); + + if (locale_path) + { + gchar *command, *open_command; + + open_command = PRJORG_COMMAND_OPEN; + command = g_strconcat (open_command, " \"", locale_path, "\"", NULL); + if (!spawn_async(locale_path, command, NULL, NULL, NULL, NULL)) + msgwin_status_add(_("Unable to open folder. Command unavailable: %s"), open_command); + + g_free(command); + g_free(locale_path); + } + else + { + msgwin_status_add(_("Unable to find folder.")); + } +} + + +void on_open_terminal(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) +{ + gchar *locale_path, *open_command; + + if (g_file_test(PRJORG_COMMAND_TERMINAL_ALT, G_FILE_TEST_EXISTS)) + { + gchar *alt_command; + alt_command = utils_get_real_path(PRJORG_COMMAND_TERMINAL_ALT); + open_command = g_path_get_basename(alt_command); + g_free(alt_command); + } + else + { + open_command = g_strdup(PRJORG_COMMAND_TERMINAL); + } + + locale_path = get_fallback_dir_of_selection(); + if (!spawn_async(locale_path, open_command, NULL, NULL, NULL, NULL)) + msgwin_status_add(_("Unable to open terminal: %s"), open_command); + + g_free(locale_path); + g_free(open_command); +} + + static void on_add_external(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { gchar *utf8_base_path = get_project_base_path(); @@ -355,35 +478,11 @@ static void on_remove_external_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_U } -// returned string must be freed -static gchar* parent_dir_for_create() -{ - GtkTreeSelection *treesel; - GtkTreeModel *model; - GtkTreeIter iter, parent; - gchar *path = NULL; - - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); - if (gtk_tree_selection_get_selected(treesel, &model, &iter)) - { - path = build_path(&iter); - if (!g_file_test(path, G_FILE_TEST_IS_DIR)) - { - g_free(path); - path = NULL; - if (gtk_tree_model_iter_parent(model, &parent, &iter)) - path = build_path(&parent); - } - } - return path; -} - - static void on_create_file(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { gchar *dir, *name; - dir = parent_dir_for_create(); + dir = get_dir_of_selection(); if (dir == NULL) return; @@ -414,7 +513,7 @@ static void on_create_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpo { gchar *dir, *name; - dir = parent_dir_for_create(); + dir = get_dir_of_selection(); if (dir == NULL) return; @@ -1543,9 +1642,6 @@ void prjorg_sidebar_init(void) g_signal_connect(item, "clicked", G_CALLBACK(on_reload_project), NULL); gtk_container_add(GTK_CONTAINER(s_toolbar), item); - item = GTK_WIDGET(gtk_separator_tool_item_new()); - gtk_container_add(GTK_CONTAINER(s_toolbar), item); - image = gtk_image_new_from_icon_name("folder-new", GTK_ICON_SIZE_SMALL_TOOLBAR); item = GTK_WIDGET(gtk_tool_button_new(image, NULL)); gtk_widget_set_tooltip_text(item, _("Add external directory")); @@ -1634,6 +1730,10 @@ void prjorg_sidebar_init(void) g_signal_connect((gpointer) item, "activate", G_CALLBACK(expand_all), NULL); s_popup_menu.expand = item; + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + item = menu_item_new("edit-find", _("Find in Files...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_in_files), NULL); @@ -1653,6 +1753,20 @@ void prjorg_sidebar_init(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + item = menu_item_new("folder-open", _("Open File Manager")); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_open_file_manager), NULL); + s_popup_menu.find_in_directory = item; + + item = menu_item_new("terminal", _("Open Terminal")); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_open_terminal), NULL); + s_popup_menu.find_in_directory = item; + + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); + item = menu_item_new("list-remove", _("Remove External Directory")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_remove_external_dir), NULL); Modified: projectorganizer/src/prjorg-sidebar.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -31,5 +31,7 @@ void prjorg_sidebar_update(gboolean reload); void prjorg_sidebar_focus_project_tab(void); +void on_open_file_manager(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data); +void on_open_terminal(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 18f9e1: Project Organizer: Set header filetype to match source filetype
by xiota 07 May '23

07 May '23

Branch: refs/heads/master Author: xiota <github(a)mentalfossa.com> Committer: xiota <github(a)mentalfossa.com> Date: Wed, 10 Nov 2021 18:09:47 UTC Commit: 18f9e1d1be413227c4989da1b5fc5d2e5db3ee79 https://github.com/geany/geany-plugins/commit/18f9e1d1be413227c4989da1b5fc5… Log Message: ----------- Project Organizer: Set header filetype to match source filetype When opened, the filetype of header files is changed to match the source filetype. This is particularly useful for *.h files, which may be C or C++. Out of project files are matched with files in the same directory. Common code between swap header/source and change header filetypes are combined. When a project is not loaded, default file extensions are used. Modified Paths: -------------- projectorganizer/src/prjorg-main.c projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-utils.c projectorganizer/src/prjorg-utils.h Modified: projectorganizer/src/prjorg-main.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ #include "prjorg-project.h" #include "prjorg-sidebar.h" #include "prjorg-menu.h" +#include "prjorg-utils.h" GeanyPlugin *geany_plugin; @@ -54,6 +55,7 @@ static void on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument prjorg_project_remove_single_tm_file(doc->file_name); prjorg_sidebar_update(FALSE); + set_header_filetype(doc); } Modified: projectorganizer/src/prjorg-menu.c 134 lines changed, 4 insertions(+), 130 deletions(-) =================================================================== @@ -50,137 +50,12 @@ enum static GtkWidget *s_fif_item, *s_ff_item, *s_ft_item, *s_shs_item, *s_sep_item, *s_context_osf_item, *s_context_sep_item; -static gboolean try_swap_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns) -{ - gchar *name_pattern; - GSList *elem = NULL; - GPatternSpec *pattern; - gboolean found = FALSE; - - name_pattern = g_path_get_basename(utf8_file_name); - SETPTR(name_pattern, utils_remove_ext_from_filename(name_pattern)); - SETPTR(name_pattern, g_strconcat(name_pattern, ".*", NULL)); - pattern = g_pattern_spec_new(name_pattern); - g_free(name_pattern); - - foreach_slist (elem, file_list) - { - gchar *full_name = elem->data; - gchar *base_name = g_path_get_basename(full_name); - - if (g_pattern_match_string(pattern, base_name) && - prjorg_project_is_in_project(full_name)) - { - if ((is_header && patterns_match(source_patterns, base_name)) || - (!is_header && patterns_match(header_patterns, base_name))) - { - open_file(full_name); - found = TRUE; - g_free(base_name); - break; - } - } - g_free(base_name); - } - - g_pattern_spec_free(pattern); - return found; -} - - static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { - GSList *header_patterns, *source_patterns; - GeanyDocument *doc; - gboolean known_type = TRUE; - gboolean is_header; - gchar *doc_basename; - doc = document_get_current(); - - if (!prj_org || !geany_data->app->project || !doc || !doc->file_name) - return; - - header_patterns = get_precompiled_patterns(prj_org->header_patterns); - source_patterns = get_precompiled_patterns(prj_org->source_patterns); - - doc_basename = g_path_get_basename(doc->file_name); - - if (patterns_match(header_patterns, doc_basename)) - is_header = TRUE; - else if (patterns_match(source_patterns, doc_basename)) - is_header = FALSE; - else - known_type = FALSE; - - if (known_type) - { - gboolean swapped; - GSList *elem = NULL, *list = NULL; - guint i = 0; - - foreach_document(i) - { - gchar *filename; - - filename = document_index(i)->file_name; - if (prjorg_project_is_in_project(filename)) - list = g_slist_prepend(list, filename); - } - swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); - g_slist_free(list); - list = NULL; - - if (!swapped) - { - gchar *utf8_doc_dir; - gchar *locale_doc_dir; - - utf8_doc_dir = g_path_get_dirname(doc->file_name); - locale_doc_dir = utils_get_locale_from_utf8(utf8_doc_dir); - - list = utils_get_file_list(locale_doc_dir, NULL, NULL); - foreach_list (elem, list) - { - gchar *full_name; - - full_name = g_build_filename(locale_doc_dir, elem->data, NULL); - SETPTR(full_name, utils_get_utf8_from_locale(full_name)); - SETPTR(elem->data, full_name); - } - swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); - g_slist_foreach(list, (GFunc) g_free, NULL); - g_slist_free(list); - g_free(utf8_doc_dir); - g_free(locale_doc_dir); - list = NULL; - } - - if (!swapped) - { - foreach_slist(elem, prj_org->roots) - { - GHashTableIter iter; - gpointer key, value; - PrjOrgRoot *root = elem->data; - - list = NULL; - g_hash_table_iter_init(&iter, root->file_table); - while (g_hash_table_iter_next(&iter, &key, &value)) - list = g_slist_prepend(list, key); - swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); - g_slist_free(list); - if (swapped) - break; - } - } - } - - g_free(doc_basename); - - g_slist_foreach(header_patterns, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(header_patterns); - g_slist_foreach(source_patterns, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(source_patterns); + GeanyDocument *doc = document_get_current(); + gchar *full_name = find_header_source(doc); + open_file(full_name); + g_free(full_name); } @@ -424,7 +299,6 @@ void prjorg_menu_init(void) void prjorg_menu_activate_menu_items(gboolean activate) { gtk_widget_set_sensitive(s_context_osf_item, activate); - gtk_widget_set_sensitive(s_shs_item, activate); gtk_widget_set_sensitive(s_ff_item, activate); gtk_widget_set_sensitive(s_ft_item, activate); gtk_widget_set_sensitive(s_fif_item, activate); Modified: projectorganizer/src/prjorg-project.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -500,16 +500,16 @@ void prjorg_project_open(GKeyFile * key_file) source_patterns = g_key_file_get_string_list(key_file, "prjorg", "source_patterns", NULL, NULL); if (!source_patterns) - source_patterns = g_strsplit("*.c *.C *.cpp *.cxx *.c++ *.cc *.m", " ", -1); + source_patterns = g_strsplit(PRJORG_PATTERNS_SOURCE, " ", -1); header_patterns = g_key_file_get_string_list(key_file, "prjorg", "header_patterns", NULL, NULL); if (!header_patterns) - header_patterns = g_strsplit("*.h *.H *.hpp *.hxx *.h++ *.hh", " ", -1); + header_patterns = g_strsplit(PRJORG_PATTERNS_HEADER, " ", -1); ignored_dirs_patterns = g_key_file_get_string_list(key_file, "prjorg", "ignored_dirs_patterns", NULL, NULL); if (!ignored_dirs_patterns) - ignored_dirs_patterns = g_strsplit(".* CVS", " ", -1); + ignored_dirs_patterns = g_strsplit(PRJORG_PATTERNS_IGNORED_DIRS, " ", -1); ignored_file_patterns = g_key_file_get_string_list(key_file, "prjorg", "ignored_file_patterns", NULL, NULL); if (!ignored_file_patterns) - ignored_file_patterns = g_strsplit("*.o *.obj *.a *.lib *.so *.dll *.lo *.la *.class *.jar *.pyc *.mo *.gmo", " ", -1); + ignored_file_patterns = g_strsplit(PRJORG_PATTERNS_IGNORED_FILE, " ", -1); generate_tag_prefs = utils_get_setting_integer(key_file, "prjorg", "generate_tag_prefs", PrjOrgTagAuto); show_empty_dirs = utils_get_setting_boolean(key_file, "prjorg", "show_empty_dirs", TRUE); Modified: projectorganizer/src/prjorg-project.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,11 @@ #ifndef __PRJORG_PROJECT_H__ #define __PRJORG_PROJECT_H__ +#define PRJORG_PATTERNS_SOURCE "*.c *.C *.cpp *.cxx *.c++ *.cc *.m" +#define PRJORG_PATTERNS_HEADER "*.h *.H *.hpp *.hxx *.h++ *.hh" +#define PRJORG_PATTERNS_IGNORED_DIRS ".* CVS" +#define PRJORG_PATTERNS_IGNORED_FILE "*.o *.obj *.a *.lib *.so *.dll *.lo *.la *.class *.jar *.pyc *.mo *.gmo" + typedef struct { gchar *base_dir; Modified: projectorganizer/src/prjorg-utils.c 194 lines changed, 194 insertions(+), 0 deletions(-) =================================================================== @@ -26,6 +26,7 @@ #include <geanyplugin.h> +#include "prjorg-project.h" #include "prjorg-utils.h" extern GeanyData *geany_data; @@ -241,3 +242,196 @@ GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label) gtk_widget_show(item); return item; } + +gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns) +{ + gchar *full_name; + gchar *name_pattern; + GSList *elem = NULL; + GPatternSpec *pattern; + gboolean found = FALSE; + + name_pattern = g_path_get_basename(utf8_file_name); + SETPTR(name_pattern, utils_remove_ext_from_filename(name_pattern)); + SETPTR(name_pattern, g_strconcat(name_pattern, ".*", NULL)); + pattern = g_pattern_spec_new(name_pattern); + g_free(name_pattern); + + foreach_slist (elem, file_list) + { + full_name = elem->data; + gchar *base_name = g_path_get_basename(full_name); + + if (g_pattern_match_string(pattern, base_name)) + { + if ((is_header && patterns_match(source_patterns, base_name)) || + (!is_header && patterns_match(header_patterns, base_name))) + { + g_free(base_name); + found = TRUE; + break; + } + } + g_free(base_name); + } + + g_pattern_spec_free(pattern); + + if(found) + return g_strdup(full_name); + + return NULL; +} + +gchar *find_header_source(GeanyDocument *doc) +{ + GSList *header_patterns, *source_patterns; + gboolean known_type = TRUE; + gboolean is_header; + gchar *found_name = NULL; + + if (!doc || !doc->file_name) + return NULL; + + if (prj_org) + { + header_patterns = get_precompiled_patterns(prj_org->header_patterns); + source_patterns = get_precompiled_patterns(prj_org->source_patterns); + } + else + { + // use default header/source patterns if project isn't open + gchar **headers, **source; + headers = g_strsplit(PRJORG_PATTERNS_HEADER, " ", -1); + source = g_strsplit(PRJORG_PATTERNS_SOURCE, " ", -1); + + header_patterns = get_precompiled_patterns(headers); + source_patterns = get_precompiled_patterns(source); + + g_strfreev(headers); + g_strfreev(source); + } + + // check if file matches patterns + { + gchar *doc_basename; + doc_basename = g_path_get_basename(doc->file_name); + + if (patterns_match(header_patterns, doc_basename)) + is_header = TRUE; + else if (patterns_match(source_patterns, doc_basename)) + is_header = FALSE; + else + known_type = FALSE; + + g_free(doc_basename); + } + + if (known_type) + { + GSList *elem = NULL, *list = NULL; + guint i = 0; + + /* check open documents */ + foreach_document(i) + { + gchar *filename; + filename = document_index(i)->file_name; + list = g_slist_prepend(list, filename); + } + found_name = try_find_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); + g_slist_free(list); + list = NULL; + + /* check document directory */ + if (!found_name) + { + gchar *utf8_doc_dir; + gchar *locale_doc_dir; + + utf8_doc_dir = g_path_get_dirname(doc->file_name); + locale_doc_dir = utils_get_locale_from_utf8(utf8_doc_dir); + + list = utils_get_file_list(locale_doc_dir, NULL, NULL); + foreach_list (elem, list) + { + gchar *full_name; + full_name = g_build_filename(locale_doc_dir, elem->data, NULL); + SETPTR(full_name, utils_get_utf8_from_locale(full_name)); + SETPTR(elem->data, full_name); + } + found_name = try_find_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); + g_slist_foreach(list, (GFunc) g_free, NULL); + g_slist_free(list); + g_free(utf8_doc_dir); + g_free(locale_doc_dir); + list = NULL; + } + + /* check project files */ + if (!found_name && prj_org) + { + foreach_slist(elem, prj_org->roots) + { + GHashTableIter iter; + gpointer key, value; + PrjOrgRoot *root = elem->data; + + list = NULL; + g_hash_table_iter_init(&iter, root->file_table); + while (g_hash_table_iter_next(&iter, &key, &value)) + list = g_slist_prepend(list, key); + found_name = try_find_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); + g_slist_free(list); + if (found_name) + break; + } + } + } + + g_slist_foreach(header_patterns, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(header_patterns); + g_slist_foreach(source_patterns, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(source_patterns); + + return found_name; +} + + +/* sets filetype of header to match source + * changes filetype only if document is a header */ +void set_header_filetype(GeanyDocument * doc) +{ + gchar *doc_basename, *full_name; + gboolean is_header; + GSList * header_patterns; + + if (!doc || !doc->file_name) + return; + + if (prj_org) + { + header_patterns = get_precompiled_patterns(prj_org->header_patterns); + } + else + { + /* use default patterns when project isn't open */ + gchar ** patterns = g_strsplit(PRJORG_PATTERNS_HEADER, " ", -1); + header_patterns = get_precompiled_patterns(patterns); + g_strfreev(patterns); + } + + doc_basename = g_path_get_basename(doc->file_name); + is_header = patterns_match(header_patterns, doc_basename); + full_name = is_header ? find_header_source(doc) : NULL; + + if (full_name) + { + GeanyFiletype * source_filetype = filetypes_detect_from_file(full_name); + document_set_filetype(doc, source_filetype); + g_free(full_name); + } + + g_free(doc_basename); + g_slist_free(header_patterns); +} Modified: projectorganizer/src/prjorg-utils.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -37,4 +37,8 @@ gchar *get_project_base_path(void); GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label); +gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns); +gchar *find_header_source(GeanyDocument *doc); +void set_header_filetype(GeanyDocument * doc); + #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f2f21c: Merge pull request #1122 from xiota/pr-prjorg-header-filetype
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 07 May 2023 20:43:15 UTC Commit: f2f21cde201d9e5305a31b64e8b7f2dd92f28bc0 https://github.com/geany/geany-plugins/commit/f2f21cde201d9e5305a31b64e8b7f… Log Message: ----------- Merge pull request #1122 from xiota/pr-prjorg-header-filetype Project Organizer: Set header filetype to match source filetype Modified Paths: -------------- projectorganizer/src/prjorg-main.c projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-utils.c projectorganizer/src/prjorg-utils.h Modified: projectorganizer/src/prjorg-main.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ #include "prjorg-project.h" #include "prjorg-sidebar.h" #include "prjorg-menu.h" +#include "prjorg-utils.h" GeanyPlugin *geany_plugin; @@ -54,6 +55,7 @@ static void on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument prjorg_project_remove_single_tm_file(doc->file_name); prjorg_sidebar_update(FALSE); + set_header_filetype(doc); } Modified: projectorganizer/src/prjorg-menu.c 134 lines changed, 4 insertions(+), 130 deletions(-) =================================================================== @@ -50,137 +50,12 @@ enum static GtkWidget *s_fif_item, *s_ff_item, *s_ft_item, *s_shs_item, *s_sep_item, *s_context_osf_item, *s_context_sep_item; -static gboolean try_swap_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns) -{ - gchar *name_pattern; - GSList *elem = NULL; - GPatternSpec *pattern; - gboolean found = FALSE; - - name_pattern = g_path_get_basename(utf8_file_name); - SETPTR(name_pattern, utils_remove_ext_from_filename(name_pattern)); - SETPTR(name_pattern, g_strconcat(name_pattern, ".*", NULL)); - pattern = g_pattern_spec_new(name_pattern); - g_free(name_pattern); - - foreach_slist (elem, file_list) - { - gchar *full_name = elem->data; - gchar *base_name = g_path_get_basename(full_name); - - if (g_pattern_match_string(pattern, base_name) && - prjorg_project_is_in_project(full_name)) - { - if ((is_header && patterns_match(source_patterns, base_name)) || - (!is_header && patterns_match(header_patterns, base_name))) - { - open_file(full_name); - found = TRUE; - g_free(base_name); - break; - } - } - g_free(base_name); - } - - g_pattern_spec_free(pattern); - return found; -} - - static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { - GSList *header_patterns, *source_patterns; - GeanyDocument *doc; - gboolean known_type = TRUE; - gboolean is_header; - gchar *doc_basename; - doc = document_get_current(); - - if (!prj_org || !geany_data->app->project || !doc || !doc->file_name) - return; - - header_patterns = get_precompiled_patterns(prj_org->header_patterns); - source_patterns = get_precompiled_patterns(prj_org->source_patterns); - - doc_basename = g_path_get_basename(doc->file_name); - - if (patterns_match(header_patterns, doc_basename)) - is_header = TRUE; - else if (patterns_match(source_patterns, doc_basename)) - is_header = FALSE; - else - known_type = FALSE; - - if (known_type) - { - gboolean swapped; - GSList *elem = NULL, *list = NULL; - guint i = 0; - - foreach_document(i) - { - gchar *filename; - - filename = document_index(i)->file_name; - if (prjorg_project_is_in_project(filename)) - list = g_slist_prepend(list, filename); - } - swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); - g_slist_free(list); - list = NULL; - - if (!swapped) - { - gchar *utf8_doc_dir; - gchar *locale_doc_dir; - - utf8_doc_dir = g_path_get_dirname(doc->file_name); - locale_doc_dir = utils_get_locale_from_utf8(utf8_doc_dir); - - list = utils_get_file_list(locale_doc_dir, NULL, NULL); - foreach_list (elem, list) - { - gchar *full_name; - - full_name = g_build_filename(locale_doc_dir, elem->data, NULL); - SETPTR(full_name, utils_get_utf8_from_locale(full_name)); - SETPTR(elem->data, full_name); - } - swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); - g_slist_foreach(list, (GFunc) g_free, NULL); - g_slist_free(list); - g_free(utf8_doc_dir); - g_free(locale_doc_dir); - list = NULL; - } - - if (!swapped) - { - foreach_slist(elem, prj_org->roots) - { - GHashTableIter iter; - gpointer key, value; - PrjOrgRoot *root = elem->data; - - list = NULL; - g_hash_table_iter_init(&iter, root->file_table); - while (g_hash_table_iter_next(&iter, &key, &value)) - list = g_slist_prepend(list, key); - swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); - g_slist_free(list); - if (swapped) - break; - } - } - } - - g_free(doc_basename); - - g_slist_foreach(header_patterns, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(header_patterns); - g_slist_foreach(source_patterns, (GFunc) g_pattern_spec_free, NULL); - g_slist_free(source_patterns); + GeanyDocument *doc = document_get_current(); + gchar *full_name = find_header_source(doc); + open_file(full_name); + g_free(full_name); } @@ -424,7 +299,6 @@ void prjorg_menu_init(void) void prjorg_menu_activate_menu_items(gboolean activate) { gtk_widget_set_sensitive(s_context_osf_item, activate); - gtk_widget_set_sensitive(s_shs_item, activate); gtk_widget_set_sensitive(s_ff_item, activate); gtk_widget_set_sensitive(s_ft_item, activate); gtk_widget_set_sensitive(s_fif_item, activate); Modified: projectorganizer/src/prjorg-project.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -500,16 +500,16 @@ void prjorg_project_open(GKeyFile * key_file) source_patterns = g_key_file_get_string_list(key_file, "prjorg", "source_patterns", NULL, NULL); if (!source_patterns) - source_patterns = g_strsplit("*.c *.C *.cpp *.cxx *.c++ *.cc *.m", " ", -1); + source_patterns = g_strsplit(PRJORG_PATTERNS_SOURCE, " ", -1); header_patterns = g_key_file_get_string_list(key_file, "prjorg", "header_patterns", NULL, NULL); if (!header_patterns) - header_patterns = g_strsplit("*.h *.H *.hpp *.hxx *.h++ *.hh", " ", -1); + header_patterns = g_strsplit(PRJORG_PATTERNS_HEADER, " ", -1); ignored_dirs_patterns = g_key_file_get_string_list(key_file, "prjorg", "ignored_dirs_patterns", NULL, NULL); if (!ignored_dirs_patterns) - ignored_dirs_patterns = g_strsplit(".* CVS", " ", -1); + ignored_dirs_patterns = g_strsplit(PRJORG_PATTERNS_IGNORED_DIRS, " ", -1); ignored_file_patterns = g_key_file_get_string_list(key_file, "prjorg", "ignored_file_patterns", NULL, NULL); if (!ignored_file_patterns) - ignored_file_patterns = g_strsplit("*.o *.obj *.a *.lib *.so *.dll *.lo *.la *.class *.jar *.pyc *.mo *.gmo", " ", -1); + ignored_file_patterns = g_strsplit(PRJORG_PATTERNS_IGNORED_FILE, " ", -1); generate_tag_prefs = utils_get_setting_integer(key_file, "prjorg", "generate_tag_prefs", PrjOrgTagAuto); show_empty_dirs = utils_get_setting_boolean(key_file, "prjorg", "show_empty_dirs", TRUE); Modified: projectorganizer/src/prjorg-project.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,11 @@ #ifndef __PRJORG_PROJECT_H__ #define __PRJORG_PROJECT_H__ +#define PRJORG_PATTERNS_SOURCE "*.c *.C *.cpp *.cxx *.c++ *.cc *.m" +#define PRJORG_PATTERNS_HEADER "*.h *.H *.hpp *.hxx *.h++ *.hh" +#define PRJORG_PATTERNS_IGNORED_DIRS ".* CVS" +#define PRJORG_PATTERNS_IGNORED_FILE "*.o *.obj *.a *.lib *.so *.dll *.lo *.la *.class *.jar *.pyc *.mo *.gmo" + typedef struct { gchar *base_dir; Modified: projectorganizer/src/prjorg-utils.c 194 lines changed, 194 insertions(+), 0 deletions(-) =================================================================== @@ -26,6 +26,7 @@ #include <geanyplugin.h> +#include "prjorg-project.h" #include "prjorg-utils.h" extern GeanyData *geany_data; @@ -248,3 +249,196 @@ GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label) gtk_widget_show(item); return item; } + +gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns) +{ + gchar *full_name; + gchar *name_pattern; + GSList *elem = NULL; + GPatternSpec *pattern; + gboolean found = FALSE; + + name_pattern = g_path_get_basename(utf8_file_name); + SETPTR(name_pattern, utils_remove_ext_from_filename(name_pattern)); + SETPTR(name_pattern, g_strconcat(name_pattern, ".*", NULL)); + pattern = g_pattern_spec_new(name_pattern); + g_free(name_pattern); + + foreach_slist (elem, file_list) + { + full_name = elem->data; + gchar *base_name = g_path_get_basename(full_name); + + if (g_pattern_match_string(pattern, base_name)) + { + if ((is_header && patterns_match(source_patterns, base_name)) || + (!is_header && patterns_match(header_patterns, base_name))) + { + g_free(base_name); + found = TRUE; + break; + } + } + g_free(base_name); + } + + g_pattern_spec_free(pattern); + + if(found) + return g_strdup(full_name); + + return NULL; +} + +gchar *find_header_source(GeanyDocument *doc) +{ + GSList *header_patterns, *source_patterns; + gboolean known_type = TRUE; + gboolean is_header; + gchar *found_name = NULL; + + if (!doc || !doc->file_name) + return NULL; + + if (prj_org) + { + header_patterns = get_precompiled_patterns(prj_org->header_patterns); + source_patterns = get_precompiled_patterns(prj_org->source_patterns); + } + else + { + // use default header/source patterns if project isn't open + gchar **headers, **source; + headers = g_strsplit(PRJORG_PATTERNS_HEADER, " ", -1); + source = g_strsplit(PRJORG_PATTERNS_SOURCE, " ", -1); + + header_patterns = get_precompiled_patterns(headers); + source_patterns = get_precompiled_patterns(source); + + g_strfreev(headers); + g_strfreev(source); + } + + // check if file matches patterns + { + gchar *doc_basename; + doc_basename = g_path_get_basename(doc->file_name); + + if (patterns_match(header_patterns, doc_basename)) + is_header = TRUE; + else if (patterns_match(source_patterns, doc_basename)) + is_header = FALSE; + else + known_type = FALSE; + + g_free(doc_basename); + } + + if (known_type) + { + GSList *elem = NULL, *list = NULL; + guint i = 0; + + /* check open documents */ + foreach_document(i) + { + gchar *filename; + filename = document_index(i)->file_name; + list = g_slist_prepend(list, filename); + } + found_name = try_find_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); + g_slist_free(list); + list = NULL; + + /* check document directory */ + if (!found_name) + { + gchar *utf8_doc_dir; + gchar *locale_doc_dir; + + utf8_doc_dir = g_path_get_dirname(doc->file_name); + locale_doc_dir = utils_get_locale_from_utf8(utf8_doc_dir); + + list = utils_get_file_list(locale_doc_dir, NULL, NULL); + foreach_list (elem, list) + { + gchar *full_name; + full_name = g_build_filename(locale_doc_dir, elem->data, NULL); + SETPTR(full_name, utils_get_utf8_from_locale(full_name)); + SETPTR(elem->data, full_name); + } + found_name = try_find_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); + g_slist_foreach(list, (GFunc) g_free, NULL); + g_slist_free(list); + g_free(utf8_doc_dir); + g_free(locale_doc_dir); + list = NULL; + } + + /* check project files */ + if (!found_name && prj_org) + { + foreach_slist(elem, prj_org->roots) + { + GHashTableIter iter; + gpointer key, value; + PrjOrgRoot *root = elem->data; + + list = NULL; + g_hash_table_iter_init(&iter, root->file_table); + while (g_hash_table_iter_next(&iter, &key, &value)) + list = g_slist_prepend(list, key); + found_name = try_find_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); + g_slist_free(list); + if (found_name) + break; + } + } + } + + g_slist_foreach(header_patterns, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(header_patterns); + g_slist_foreach(source_patterns, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(source_patterns); + + return found_name; +} + + +/* sets filetype of header to match source + * changes filetype only if document is a header */ +void set_header_filetype(GeanyDocument * doc) +{ + gchar *doc_basename, *full_name; + gboolean is_header; + GSList * header_patterns; + + if (!doc || !doc->file_name) + return; + + if (prj_org) + { + header_patterns = get_precompiled_patterns(prj_org->header_patterns); + } + else + { + /* use default patterns when project isn't open */ + gchar ** patterns = g_strsplit(PRJORG_PATTERNS_HEADER, " ", -1); + header_patterns = get_precompiled_patterns(patterns); + g_strfreev(patterns); + } + + doc_basename = g_path_get_basename(doc->file_name); + is_header = patterns_match(header_patterns, doc_basename); + full_name = is_header ? find_header_source(doc) : NULL; + + if (full_name) + { + GeanyFiletype * source_filetype = filetypes_detect_from_file(full_name); + document_set_filetype(doc, source_filetype); + g_free(full_name); + } + + g_free(doc_basename); + g_slist_free(header_patterns); +} Modified: projectorganizer/src/prjorg-utils.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -37,4 +37,8 @@ gchar *get_project_base_path(void); GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label); +gchar *try_find_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns); +gchar *find_header_source(GeanyDocument *doc); +void set_header_filetype(GeanyDocument * doc); + #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c6af6c: Merge pull request #1139 from techee/eof_eol_fix
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 07 May 2023 20:38:25 UTC Commit: c6af6c361cb0e3c5610fa052e234b6e5a3ceb8a3 https://github.com/geany/geany-plugins/commit/c6af6c361cb0e3c5610fa052e234b… Log Message: ----------- Merge pull request #1139 from techee/eof_eol_fix vimode: Fix caret position change when performing line operations Modified Paths: -------------- vimode/src/cmds/edit.c Modified: vimode/src/cmds/edit.c 33 lines changed, 18 insertions(+), 15 deletions(-) =================================================================== @@ -83,15 +83,21 @@ void cmd_clear_right(CmdContext *c, CmdParams *p) static gboolean insert_eof_nl_if_missing(CmdParams *p) { - gint pos = SSM(p->sci, SCI_GETCURRENTPOS, 0, 0); - gint last_line = SSM(p->sci, SCI_GETLINECOUNT, 0, 0); - gint line_start_pos = SSM(p->sci, SCI_POSITIONFROMLINE, last_line, 0); - gint line_end_pos = SSM(p->sci, SCI_GETLINEENDPOSITION, last_line, 0); - - if (line_start_pos == line_end_pos) { - SET_POS(p->sci, line_end_pos, FALSE); - SSM(p->sci, SCI_NEWLINE, 0, 0); - SET_POS(p->sci, pos, FALSE); + gint eof_pos = SSM(p->sci, SCI_GETLENGTH, 0, 0); + gint eof_line_num = SSM(p->sci, SCI_LINEFROMPOSITION, eof_pos, 0); + gint before_eof = PREV(p->sci, eof_pos); + gint before_eof_line_num = SSM(p->sci, SCI_LINEFROMPOSITION, before_eof, 0); + + if (eof_line_num == before_eof_line_num) { + const gchar *nl = "\n"; + gint eol_mode = SSM(p->sci, SCI_GETEOLMODE, 0, 0); + if (eol_mode == SC_EOL_CRLF) { + nl = "\r\n"; + } + else if (eol_mode == SC_EOL_CR) { + nl = "\r"; + } + SSM(p->sci, SCI_INSERTTEXT, eof_pos, (sptr_t)nl); return TRUE; } return FALSE; @@ -100,13 +106,10 @@ static gboolean insert_eof_nl_if_missing(CmdParams *p) static void remove_char_from_eof(CmdParams *p) { - gint pos = SSM(p->sci, SCI_GETCURRENTPOS, 0, 0); - gint last_line = SSM(p->sci, SCI_GETLINECOUNT, 0, 0); - gint line_end_pos = SSM(p->sci, SCI_GETLINEENDPOSITION, last_line, 0); + gint eof_pos = SSM(p->sci, SCI_GETLENGTH, 0, 0); + gint before_eof_pos = PREV(p->sci, eof_pos); - SET_POS(p->sci, line_end_pos, FALSE); - SSM(p->sci, SCI_DELETEBACK, 0, 0); - SET_POS(p->sci, pos, FALSE); + SSM(p->sci, SCI_DELETERANGE, before_eof_pos, eof_pos - before_eof_pos); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ca117f: Merge pull request #1141 from techee/numlock_fix
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 07 May 2023 20:37:14 UTC Commit: ca117fcff88d7332ae1b16585f446a16d999bc52 https://github.com/geany/geany-plugins/commit/ca117fcff88d7332ae1b16585f446… Log Message: ----------- Merge pull request #1141 from techee/numlock_fix vimode: fix escape not working when numlock is on Modified Paths: -------------- vimode/src/keypress.c Modified: vimode/src/keypress.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ KeyPress *kp_from_event_key(GdkEventKey *ev) KeyPress *kp; /* ignore keypresses containing Alt and Command on macOS - no Vim command uses them */ - if (ev->state & (GDK_MOD1_MASK | GDK_MOD2_MASK)) + if (ev->state & (GDK_MOD1_MASK | GDK_META_MASK)) return NULL; switch (ev->keyval) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a54b9f: Merge pull request #1137 from techee/vimode_excmd_height
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 07 May 2023 20:36:38 UTC Commit: a54b9f53d8482e97f1aecf71a74024e15540fbf6 https://github.com/geany/geany-plugins/commit/a54b9f53d8482e97f1aecf71a7402… Log Message: ----------- Merge pull request #1137 from techee/vimode_excmd_height vimode: Set default height of excmd popup to a small number Modified Paths: -------------- vimode/src/excmd-prompt.c Modified: vimode/src/excmd-prompt.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -225,6 +225,7 @@ void ex_prompt_init(GtkWidget *parent_window, CmdContext *c) prompt = g_object_new(GTK_TYPE_WINDOW, "decorated", FALSE, "default-width", PROMPT_WIDTH, + "default-height", 1, "transient-for", parent_window, "window-position", GTK_WIN_POS_CENTER_ON_PARENT, "type-hint", GDK_WINDOW_TYPE_HINT_DIALOG, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 20a034: vimode: fix escape not working when numlock is on
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 May 2023 19:05:17 UTC Commit: 20a0343120e7cee1366d1cd74c14d53eb9d62f7c https://github.com/geany/geany-plugins/commit/20a0343120e7cee1366d1cd74c14d… Log Message: ----------- vimode: fix escape not working when numlock is on It seems that GDK_MOD2_MASK isn't the right modifier to check for command pressed - its mapping is platform-specific and while this works on macOS, it has undesirable side-effects on linux. Use GDK_META_MASK instead which based on my testing seems to do the right thing both on macOS and linux. Modified Paths: -------------- vimode/src/keypress.c Modified: vimode/src/keypress.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ KeyPress *kp_from_event_key(GdkEventKey *ev) KeyPress *kp; /* ignore keypresses containing Alt and Command on macOS - no Vim command uses them */ - if (ev->state & (GDK_MOD1_MASK | GDK_MOD2_MASK)) + if (ev->state & (GDK_MOD1_MASK | GDK_META_MASK)) return NULL; switch (ev->keyval) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c4ea31: vimode: Set default height of excmd popup to a small number
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 May 2023 19:02:47 UTC Commit: c4ea3105cd8b7aa2a37e095e5ddb3e9a62bcaf17 https://github.com/geany/geany-plugins/commit/c4ea3105cd8b7aa2a37e095e5ddb3… Log Message: ----------- vimode: Set default height of excmd popup to a small number On macOS there seems to be some bigger default height so the excmd popup is too tall. When default-height is set to 1, it is automatically resized to the height of the text entry it contains and has correct size on both linux and macOS. Modified Paths: -------------- vimode/src/excmd-prompt.c Modified: vimode/src/excmd-prompt.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -225,6 +225,7 @@ void ex_prompt_init(GtkWidget *parent_window, CmdContext *c) prompt = g_object_new(GTK_TYPE_WINDOW, "decorated", FALSE, "default-width", PROMPT_WIDTH, + "default-height", 1, "transient-for", parent_window, "window-position", GTK_WIN_POS_CENTER_ON_PARENT, "type-hint", GDK_WINDOW_TYPE_HINT_DIALOG, -------------- 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 2023