Commits October 2019

commits@lists.geany.org

1 participants
94 discussions

[geany/geany] e5e2a2: Replace unhygienic macro calls with array of struct
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: e5e2a28dac912a1483194b445620efbae0dbb7b0 https://github.com/geany/geany/commit/e5e2a28dac912a1483194b445620efbae0dbb… Log Message: ----------- Replace unhygienic macro calls with array of struct Modified Paths: -------------- src/build.c Modified: src/build.c 79 lines changed, 49 insertions(+), 30 deletions(-) =================================================================== @@ -349,14 +349,13 @@ static void printfcmds(void) } -// Note: reads below and cmdindex parameters -#define BREAK_IF_CMD(src, cmds, outsrc, outcmds) \ - if ((src) < (below) && (cmds) != NULL && (cmds)[cmdindex].exists) \ - { outsrc = src; \ - outcmds = cmds; \ - break; \ - } +typedef struct CommandSet +{ + GeanyBuildSource src; + GeanyBuildCommand *cmds; +} CommandSet; +// Note: Could return CommandSet instead of using psrc /* get the next lowest command taking priority into account * below = only consider GeanyBuildSource values less than this parameter * psrc = Address to write GeanyBuildSource */ @@ -374,41 +373,61 @@ static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, GeanyFiletypePrivate empty_ftp = {}, *ftp = doc ? doc->file_type->priv : &empty_ftp; // avoid checking for null - GeanyBuildSource src; - GeanyBuildCommand *cmds = NULL; + CommandSet overloads[6] = {}; switch (cmdgrp) { - case GEANY_GBG_FT: /* order proj ft, home ft, ft, defft */ - BREAK_IF_CMD(GEANY_BCS_PROJ, ftp->projfilecmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_PREF, ftp->homefilecmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_FT, ftp->filecmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_DEF, ft_def, src, cmds); + case GEANY_GBG_FT: /* order proj ft, home ft, ft, def ft */ + { + CommandSet cs[] = { + {GEANY_BCS_PROJ, ftp->projfilecmds}, + {GEANY_BCS_PREF, ftp->homefilecmds}, + {GEANY_BCS_FT, ftp->filecmds}, + {GEANY_BCS_DEF, ft_def}, + }; + memcpy(overloads, cs, sizeof(cs)); break; + } case GEANY_GBG_NON_FT: /* order proj, pref, def */ - BREAK_IF_CMD(GEANY_BCS_PROJ, non_ft_proj, src, cmds); - BREAK_IF_CMD(GEANY_BCS_PREF, non_ft_pref, src, cmds); - BREAK_IF_CMD(GEANY_BCS_FT, ftp->ftdefcmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_DEF, non_ft_def, src, cmds); + { + CommandSet cs[] = { + {GEANY_BCS_PROJ, non_ft_proj}, + {GEANY_BCS_PREF, non_ft_pref}, + {GEANY_BCS_FT, ftp->ftdefcmds}, + {GEANY_BCS_DEF, non_ft_def}, + }; + memcpy(overloads, cs, sizeof(cs)); break; + } case GEANY_GBG_EXEC: /* order proj, proj ft, pref, home ft, ft, def */ - BREAK_IF_CMD(GEANY_BCS_PROJ, exec_proj, src, cmds); - BREAK_IF_CMD(GEANY_BCS_PROJ_FT, ftp->projexeccmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_PREF, exec_pref, src, cmds); - BREAK_IF_CMD(GEANY_BCS_FT, ftp->homeexeccmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_FT, ftp->execcmds, src, cmds); - BREAK_IF_CMD(GEANY_BCS_DEF, exec_def, src, cmds); + { + CommandSet cs[] = { + {GEANY_BCS_PROJ, exec_proj}, + {GEANY_BCS_PROJ_FT, ftp->projexeccmds}, + {GEANY_BCS_PREF, exec_pref}, + {GEANY_BCS_FT, ftp->homeexeccmds}, + {GEANY_BCS_FT, ftp->execcmds}, + {GEANY_BCS_DEF, exec_def}, + }; + memcpy(overloads, cs, sizeof(cs)); break; + } default: return NULL; } - if (cmds != NULL) + for (guint i = 0; i < G_N_ELEMENTS(overloads); i++) { - if (psrc) - *psrc = src; - if (printbuildcmds) - printf("cmd[%u,%u]=%u\n", cmdgrp, cmdindex, src); - return &(cmds[cmdindex]); + GeanyBuildCommand *cmds = overloads[i].cmds; + guint src = overloads[i].src; + + if (cmds != NULL && cmds[cmdindex].exists && src < below) + { + if (psrc) + *psrc = src; + if (printbuildcmds) + printf("cmd[%u,%u]=%u\n", cmdgrp, cmdindex, src); + return &(cmds[cmdindex]); + } } return NULL; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1f7d84: Begin separating filetype-independent execute commands from FT execute
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: 1f7d846cc95bf704b7d272149e7335a0ff979d8f https://github.com/geany/geany/commit/1f7d846cc95bf704b7d272149e7335a0ff979… Log Message: ----------- Begin separating filetype-independent execute commands from FT execute Add GEANY_GBG_EXEC_IND. Modified Paths: -------------- TODO src/build.c src/build.h Modified: TODO 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -15,7 +15,6 @@ Note: features included in brackets have lower priority. programming languages (done for C-like filetypes using filetypes.common named styles) o asynchronous build commands on Windows - o (filetype-independent run command in build dialog & keybinding) o (better custom filetype support) o (custom template insertion - so user can add licenses, etc) o (selectable menu of arguments to use for Make, from Make Custom) Modified: src/build.c 25 lines changed, 20 insertions(+), 5 deletions(-) =================================================================== @@ -155,7 +155,7 @@ static struct } widgets; -static guint build_groups_count[GEANY_GBG_COUNT] = { 3, 4, 2 }; +static guint build_groups_count[GEANY_GBG_COUNT] = { 3, 4, 2, 2 }; static guint build_items_count = 9; static void build_exit_cb(GPid pid, gint status, gpointer user_data); @@ -399,19 +399,26 @@ static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, memcpy(overloads, cs, sizeof(cs)); break; } - case GEANY_GBG_EXEC: /* order proj, proj ft, pref, home ft, ft, def */ + case GEANY_GBG_EXEC: /* order proj ft, home ft, ft, def */ { CommandSet cs[] = { - {GEANY_BCS_PROJ, exec_proj}, {GEANY_BCS_PROJ_FT, ftp->projexeccmds}, - {GEANY_BCS_PREF, exec_pref}, {GEANY_BCS_FT, ftp->homeexeccmds}, {GEANY_BCS_FT, ftp->execcmds}, {GEANY_BCS_DEF, exec_def}, }; memcpy(overloads, cs, sizeof(cs)); break; } + case GEANY_GBG_EXEC_IND: /* order proj, pref */ + { + CommandSet cs[] = { + {GEANY_BCS_PROJ, exec_proj}, + {GEANY_BCS_PREF, exec_pref}, + }; + memcpy(overloads, cs, sizeof(cs)); + break; + } default: return NULL; } @@ -516,14 +523,21 @@ static GeanyBuildCommand **get_build_group_pointer(const GeanyBuildSource src, c case GEANY_BCS_FT: return ft ? &(ft->priv->execcmds): NULL; case GEANY_BCS_HOME_FT: return ft ? &(ft->priv->homeexeccmds): NULL; case GEANY_BCS_PROJ_FT: return ft ? &(ft->priv->projexeccmds): NULL; + default: return NULL; + } + break; + case GEANY_GBG_EXEC_IND: + switch (src) + { case GEANY_BCS_PREF: return &(exec_pref); case GEANY_BCS_PROJ: return &(exec_proj); default: return NULL; } break; default: - return NULL; + break; } + return NULL; } @@ -1406,6 +1420,7 @@ static void create_build_menu(BuildMenuItems *build_menu_items) build_menu_items->menu_item[GEANY_GBG_FT] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_FT]); build_menu_items->menu_item[GEANY_GBG_NON_FT] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_NON_FT]); build_menu_items->menu_item[GEANY_GBG_EXEC] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_EXEC]); + build_menu_items->menu_item[GEANY_GBG_EXEC_IND] = g_new0(GtkWidget*, build_groups_count[GEANY_GBG_EXEC_IND]); build_menu_items->menu_item[GBG_FIXED] = g_new0(GtkWidget*, GBF_COUNT); for (i = 0; build_menu_specs[i].build_grp != MENU_DONE; ++i) Modified: src/build.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -36,6 +36,7 @@ typedef enum GEANY_GBG_FT, /**< filetype items */ GEANY_GBG_NON_FT, /**< non filetype items.*/ GEANY_GBG_EXEC, /**< execute items */ + GEANY_GBG_EXEC_IND, /**< independent execute items */ GEANY_GBG_COUNT /**< count of groups. */ } GeanyBuildGroup; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9219e9: Make build_run_cmd support independent execute & add keybinding
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: 9219e983c181a78c7e3448a92702fcec9d5d5ad5 https://github.com/geany/geany/commit/9219e983c181a78c7e3448a92702fcec9d5d5… Log Message: ----------- Make build_run_cmd support independent execute & add keybinding Modified Paths: -------------- src/build.c src/keybindings.c src/keybindings.h Modified: src/build.c 21 lines changed, 13 insertions(+), 8 deletions(-) =================================================================== @@ -858,16 +858,13 @@ static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d * the command; otherwise the command itself is returned. working_dir is a pointer * to the working directory from which the command is executed. Both strings are * in the locale encoding. */ -static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmdindex) +static gchar *prepare_run_cmd(GeanyDocument *doc, GeanyBuildCommand *cmd, gchar **working_dir) { - GeanyBuildCommand *cmd = NULL; const gchar *cmd_working_dir; gboolean autoclose = FALSE; gchar *cmd_string_utf8, *working_dir_utf8, *run_cmd, *cmd_string; GError *error = NULL; - cmd = get_build_cmd(doc, GEANY_GBG_EXEC, cmdindex, NULL); - cmd_string_utf8 = build_replace_placeholder(doc, cmd->command); cmd_working_dir = cmd->working_dir; if (EMPTY(cmd_working_dir)) @@ -925,15 +922,18 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmd } -static void build_run_cmd(GeanyDocument *doc, guint cmdindex) +static void build_run_cmd(GeanyDocument *doc, guint group, guint cmdindex) { gchar *working_dir; gchar *run_cmd = NULL; if (! DOC_VALID(doc) || doc->file_name == NULL) return; - - run_cmd = prepare_run_cmd(doc, &working_dir, cmdindex); + GeanyBuildCommand *cmd = get_build_cmd(doc, group, cmdindex, NULL); + if (!cmd) + return; + + run_cmd = prepare_run_cmd(doc, cmd, &working_dir); if (run_cmd == NULL) return; @@ -1319,7 +1319,7 @@ static void on_build_menu_item(GtkWidget *w, gpointer user_data) g_free(uri); } else - build_run_cmd(doc, cmd); + build_run_cmd(doc, grp, cmd); } else build_command(doc, grp, cmd, NULL); @@ -2841,6 +2841,11 @@ gboolean build_keybinding(guint key_id) case GEANY_KEYS_BUILD_RUN: item = menu_items->menu_item[GEANY_GBG_EXEC][GBO_TO_CMD(GEANY_GBO_EXEC)]; break; + case GEANY_KEYS_BUILD_RUNINDEPENDENT: + { + build_run_cmd(doc, GEANY_GBG_EXEC_IND, 0); + return TRUE; + } case GEANY_KEYS_BUILD_OPTIONS: item = menu_items->menu_item[GBG_FIXED][GBF_COMMANDS]; break; Modified: src/keybindings.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -704,6 +704,8 @@ static void init_default_kb(void) 0, 0, "build_previouserror", _("Previous error"), NULL); add_kb(group, GEANY_KEYS_BUILD_RUN, NULL, GDK_F5, 0, "build_run", _("Run"), NULL); + add_kb(group, GEANY_KEYS_BUILD_RUNINDEPENDENT, NULL, + GDK_F5, GDK_SHIFT_MASK, "build_run_ind", _("_Independent Run"), NULL); add_kb(group, GEANY_KEYS_BUILD_OPTIONS, NULL, 0, 0, "build_options", _("Build options"), NULL); Modified: src/keybindings.h 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -273,8 +273,9 @@ enum GeanyKeyBindingID GEANY_KEYS_FORMAT_SENDTOCMD8, /**< Keybinding. */ GEANY_KEYS_FORMAT_SENDTOCMD9, /**< Keybinding. */ GEANY_KEYS_EDITOR_DELETELINETOBEGINNING, /**< Keybinding. */ - GEANY_KEYS_DOCUMENT_STRIPTRAILINGSPACES, /**< Keybinding. - * @since 1.34 (API 238) */ + GEANY_KEYS_DOCUMENT_STRIPTRAILINGSPACES, /**< Keybinding. */ + GEANY_KEYS_BUILD_RUNINDEPENDENT, /**< Keybinding. + * @since 1.34 (API 239) */ GEANY_KEYS_COUNT /* must not be used by plugins */ }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d138d5: Replace run_info with run_pids
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: d138d56cd63a170e8187726906c36b24aa963244 https://github.com/geany/geany/commit/d138d56cd63a170e8187726906c36b24aa963… Log Message: ----------- Replace run_info with run_pids Note: RunInfo.file_type_id is not needed. Modified Paths: -------------- src/build.c Modified: src/build.c 45 lines changed, 23 insertions(+), 22 deletions(-) =================================================================== @@ -69,14 +69,6 @@ GeanyBuildInfo build_info = {GEANY_GBG_FT, 0, 0, NULL, GEANY_FILETYPES_NONE, NUL static gchar *current_dir_entered = NULL; -typedef struct RunInfo -{ - GPid pid; - gint file_type_id; -} RunInfo; - -static RunInfo *run_info; - #ifndef G_OS_WIN32 static const gchar RUN_SCRIPT_CMD[] = "geany_run_script_XXXXXX.sh"; #endif @@ -922,6 +914,16 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, GeanyBuildCommand *cmd, gchar } +// array of filetype run IDs followed by independent run IDs +static GPid *run_pids = NULL; + +static GPid *get_run_pid(GeanyBuildGroup grp, guint cmd) +{ + if (grp == GEANY_GBG_EXEC_IND) + cmd += build_groups_count[GEANY_GBG_EXEC]; + return &run_pids[cmd]; +} + static void build_run_cmd(GeanyDocument *doc, guint group, guint cmdindex) { gchar *working_dir; @@ -937,8 +939,6 @@ static void build_run_cmd(GeanyDocument *doc, guint group, guint cmdindex) if (run_cmd == NULL) return; - run_info[cmdindex].file_type_id = doc->file_type->id; - #ifdef HAVE_VTE if (vte_info.have_vte && vc->run_in_vte) { @@ -968,7 +968,7 @@ static void build_run_cmd(GeanyDocument *doc, guint group, guint cmdindex) gtk_widget_grab_focus(vc->vte); msgwin_show_hide(TRUE); - run_info[cmdindex].pid = 1; + *get_run_pid(group, cmdindex) = 1; g_free(vte_cmd); } else @@ -994,11 +994,11 @@ static void build_run_cmd(GeanyDocument *doc, guint group, guint cmdindex) utils_str_replace_all(&locale_term_cmd, "%c", run_cmd); - if (spawn_async(working_dir, locale_term_cmd, NULL, NULL, &(run_info[cmdindex].pid), + GPid *pid = get_run_pid(group, cmdindex); + if (spawn_async(working_dir, locale_term_cmd, NULL, NULL, pid, &error)) { - g_child_watch_add(run_info[cmdindex].pid, (GChildWatchFunc) run_exit_cb, - (gpointer) &(run_info[cmdindex])); + g_child_watch_add(*pid, run_exit_cb, pid); build_menu_update(doc); } else @@ -1011,10 +1011,9 @@ static void build_run_cmd(GeanyDocument *doc, guint group, guint cmdindex) #ifndef G_OS_WIN32 g_unlink(run_cmd); #endif - run_info[cmdindex].pid = (GPid) 0; + *get_run_pid(group, cmdindex) = (GPid) 0; } } - g_free(working_dir); g_free(run_cmd); } @@ -1152,11 +1151,11 @@ static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) { - RunInfo *run_info_data = user_data; + GPid *pid = user_data; g_spawn_close_pid(child_pid); - run_info_data->pid = 0; + *pid = 0; /* reset the stop button and menu item to the original meaning */ build_menu_update(NULL); } @@ -1301,9 +1300,10 @@ static void on_build_menu_item(GtkWidget *w, gpointer user_data) } else if (grp == GEANY_GBG_EXEC) { - if (run_info[cmd].pid > (GPid) 1) + GPid *pid = get_run_pid(grp, cmd); + if (*pid > (GPid) 1) { - kill_process(&run_info[cmd].pid); + kill_process(pid); return; } bc = get_build_cmd(doc, grp, cmd, NULL); @@ -1553,7 +1553,7 @@ void build_menu_update(GeanyDocument *doc) else { GtkWidget *image; - exec_running = run_info[cmd].pid > (GPid) 1; + exec_running = *get_run_pid(grp, cmd) > (GPid) 1; cmd_sensitivity = (bc != NULL) || exec_running; gtk_widget_set_sensitive(menu_item, cmd_sensitivity); if (cmd == GBO_TO_CMD(GEANY_GBO_EXEC)) @@ -2729,7 +2729,8 @@ void build_init(void) ft_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_FT]); non_ft_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); exec_def = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); - run_info = g_new0(RunInfo, build_groups_count[GEANY_GBG_EXEC]); + run_pids = g_new0(GPid, build_groups_count[GEANY_GBG_EXEC] + + build_groups_count[GEANY_GBG_EXEC_IND]); for (cmdindex = 0; default_cmds[cmdindex].command != NULL; ++cmdindex) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e4cd4a: load & save independent exec group instead of ft exec
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: e4cd4a09e74814351788646febb34946bfb093c1 https://github.com/geany/geany/commit/e4cd4a09e74814351788646febb34946bfb09… Log Message: ----------- load & save independent exec group instead of ft exec Modified Paths: -------------- src/build.c Modified: src/build.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -2239,7 +2239,7 @@ void build_read_project(GeanyFiletype *ft, BuildTableData build_properties) menu_dst.fileregexstr = NULL; } menu_dst.dst[GEANY_GBG_NON_FT] = &non_ft_proj; - menu_dst.dst[GEANY_GBG_EXEC] = &exec_proj; + menu_dst.dst[GEANY_GBG_EXEC_IND] = &exec_proj; menu_dst.nonfileregexstr = &regex_proj; build_read_commands(&menu_dst, build_properties, GTK_RESPONSE_ACCEPT); @@ -2315,7 +2315,7 @@ static const gchar *build_grp_name = "build-menu"; * where gg = FT, NF, EX for the command group * nn = 2 digit command number * xx = LB for label, CM for command and WD for working dir */ -static const gchar *groups[GEANY_GBG_COUNT] = { "FT", "NF", "EX" }; +static const gchar *groups[GEANY_GBG_COUNT] = { "FT", "NF", "EX", "EX" }; static const gchar *fixedkey="xx_xx_xx"; #define set_key_grp(key, grp) (key[prefixlen + 0] = grp[0], key[prefixlen + 1] = grp[1]) @@ -2417,12 +2417,12 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) break; case GEANY_BCS_PREF: build_load_menu_grp(config, &non_ft_pref, GEANY_GBG_NON_FT, NULL, FALSE); - build_load_menu_grp(config, &exec_pref, GEANY_GBG_EXEC, NULL, FALSE); + build_load_menu_grp(config, &exec_pref, GEANY_GBG_EXEC_IND, NULL, FALSE); SETPTR(regex_pref, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); break; case GEANY_BCS_PROJ: build_load_menu_grp(config, &non_ft_proj, GEANY_GBG_NON_FT, NULL, FALSE); - build_load_menu_grp(config, &exec_proj, GEANY_GBG_EXEC, NULL, FALSE); + build_load_menu_grp(config, &exec_proj, GEANY_GBG_EXEC_IND, NULL, FALSE); SETPTR(regex_proj, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); pj = (GeanyProject*)p; if (p == NULL) @@ -2507,7 +2507,7 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) if (!EMPTY(value)) { if (exec_proj == NULL) - exec_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC]); + exec_proj = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_EXEC_IND]); if (! exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists) { exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists = TRUE; @@ -2624,7 +2624,7 @@ void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) break; case GEANY_BCS_PREF: build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL); - build_save_menu_grp(config, exec_pref, GEANY_GBG_EXEC, NULL); + build_save_menu_grp(config, exec_pref, GEANY_GBG_EXEC_IND, NULL); if (!EMPTY(regex_pref)) g_key_file_set_string(config, build_grp_name, "error_regex", regex_pref); else @@ -2633,7 +2633,7 @@ void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) case GEANY_BCS_PROJ: pj = (GeanyProject*)ptr; build_save_menu_grp(config, non_ft_proj, GEANY_GBG_NON_FT, NULL); - build_save_menu_grp(config, exec_proj, GEANY_GBG_EXEC, NULL); + build_save_menu_grp(config, exec_proj, GEANY_GBG_EXEC_IND, NULL); if (!EMPTY(regex_proj)) g_key_file_set_string(config, build_grp_name, "error_regex", regex_proj); else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 84e07f: Show independent run menu items
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: 84e07f25da673d0f60d3d4963553c8dcf050cd85 https://github.com/geany/geany/commit/84e07f25da673d0f60d3d4963553c8dcf050c… Log Message: ----------- Show independent run menu items Modified Paths: -------------- src/build.c src/build.h Modified: src/build.c 24 lines changed, 19 insertions(+), 5 deletions(-) =================================================================== @@ -1298,7 +1298,7 @@ static void on_build_menu_item(GtkWidget *w, gpointer user_data) } return; } - else if (grp == GEANY_GBG_EXEC) + else if (grp == GEANY_GBG_EXEC || grp == GEANY_GBG_EXEC_IND) { GPid *pid = get_run_pid(grp, cmd); if (*pid > (GPid) 1) @@ -1333,6 +1333,7 @@ static void on_build_menu_item(GtkWidget *w, gpointer user_data) #define MENU_FT_REST (GEANY_GBG_COUNT + GEANY_GBG_FT) #define MENU_NON_FT_REST (GEANY_GBG_COUNT + GEANY_GBG_NON_FT) #define MENU_EXEC_REST (GEANY_GBG_COUNT + GEANY_GBG_EXEC) +#define MENU_EXEC_IND_REST (GEANY_GBG_COUNT + GEANY_GBG_EXEC_IND) /* the separator */ #define MENU_SEPARATOR (2*GEANY_GBG_COUNT) /* the fixed items */ @@ -1378,6 +1379,12 @@ static struct BuildMenuItemSpec { GBO_TO_CMD(GEANY_GBO_EXEC), NULL, on_build_menu_item}, {NULL, -1, MENU_EXEC_REST, GBO_TO_CMD(GEANY_GBO_EXEC) + 1, NULL, on_build_menu_item}, + {NULL, -1, MENU_SEPARATOR, + GBF_SEP_5, NULL, NULL}, + {GTK_STOCK_EXECUTE, GEANY_KEYS_BUILD_RUNINDEPENDENT, GEANY_GBG_EXEC_IND, + 0, NULL, on_build_menu_item}, + {NULL, -1, MENU_EXEC_IND_REST, + 1, NULL, on_build_menu_item}, {NULL, -1, MENU_SEPARATOR, GBF_SEP_4, NULL, NULL}, {GTK_STOCK_PREFERENCES, GEANY_KEYS_BUILD_OPTIONS, MENU_COMMANDS, @@ -2699,6 +2706,15 @@ static void on_project_close(void) { /* remove project regexen */ SETPTR(regex_proj, NULL); + + guint n = build_groups_count[GEANY_GBG_EXEC_IND]; + for (guint i = 0; i < n; i++) + { + g_free(exec_proj[i].label); + g_free(exec_proj[i].command); + g_free(exec_proj[i].working_dir); + } + memset(exec_proj, 0, sizeof(GeanyBuildCommand) * n); } @@ -2843,10 +2859,8 @@ gboolean build_keybinding(guint key_id) item = menu_items->menu_item[GEANY_GBG_EXEC][GBO_TO_CMD(GEANY_GBO_EXEC)]; break; case GEANY_KEYS_BUILD_RUNINDEPENDENT: - { - build_run_cmd(doc, GEANY_GBG_EXEC_IND, 0); - return TRUE; - } + item = menu_items->menu_item[GEANY_GBG_EXEC_IND][0]; + break; case GEANY_KEYS_BUILD_OPTIONS: item = menu_items->menu_item[GBG_FIXED][GBF_COMMANDS]; break; Modified: src/build.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -88,6 +88,7 @@ enum GeanyBuildFixedMenuItems GBF_SEP_2, GBF_SEP_3, GBF_SEP_4, + GBF_SEP_5, GBF_COUNT }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8de857: Allow overriding number of independent execute commands
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: 8de8571c4c6375fcd6c1d4b5f90a4ff2facaef2e https://github.com/geany/geany/commit/8de8571c4c6375fcd6c1d4b5f90a4ff2facae… Log Message: ----------- Allow overriding number of independent execute commands Modified Paths: -------------- doc/geany.txt src/keyfile.c Modified: doc/geany.txt 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -2652,6 +2652,8 @@ number_non_ft_menu_items The maximum number of menu items in the 3 independent build section. number_exec_menu_items The maximum number of menu items in the 2 on restart execute section of the Build menu. +number_exec_ind_menu_items The maximum number of menu items in the 2 on restart + independent execute section. ================================ =========================================== ========== =========== Statusbar Templates Modified: src/keyfile.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -117,6 +117,7 @@ static struct gint number_ft_menu_items; gint number_non_ft_menu_items; gint number_exec_menu_items; + gint number_exec_ind_menu_items; } build_menu_prefs; @@ -284,6 +285,8 @@ static void init_pref_groups(void) "number_non_ft_menu_items", 0); stash_group_add_integer(group, &build_menu_prefs.number_exec_menu_items, "number_exec_menu_items", 0); + stash_group_add_integer(group, &build_menu_prefs.number_exec_ind_menu_items, + "number_exec_ind_menu_items", 0); } @@ -1000,6 +1003,7 @@ static void load_dialog_prefs(GKeyFile *config) build_set_group_count(GEANY_GBG_FT, build_menu_prefs.number_ft_menu_items); build_set_group_count(GEANY_GBG_NON_FT, build_menu_prefs.number_non_ft_menu_items); build_set_group_count(GEANY_GBG_EXEC, build_menu_prefs.number_exec_menu_items); + build_set_group_count(GEANY_GBG_EXEC_IND, build_menu_prefs.number_exec_ind_menu_items); build_load_menu(config, GEANY_BCS_PREF, NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ce0f57: Fix segfault after editing project filetype execute command
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: ce0f57d1767e52137d3cf96824a7755c5b173f2d https://github.com/geany/geany/commit/ce0f57d1767e52137d3cf96824a7755c5b173… Log Message: ----------- Fix segfault after editing project filetype execute command Modified Paths: -------------- src/build.c Modified: src/build.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -2238,11 +2238,13 @@ void build_read_project(GeanyFiletype *ft, BuildTableData build_properties) if (ft != NULL) { menu_dst.dst[GEANY_GBG_FT] = &(ft->priv->projfilecmds); + menu_dst.dst[GEANY_GBG_EXEC] = &ft->priv->projexeccmds; menu_dst.fileregexstr = &(ft->priv->projerror_regex_string); } else { menu_dst.dst[GEANY_GBG_FT] = NULL; + menu_dst.dst[GEANY_GBG_EXEC] = NULL; menu_dst.fileregexstr = NULL; } menu_dst.dst[GEANY_GBG_NON_FT] = &non_ft_proj; @@ -2277,6 +2279,7 @@ static void show_build_commands_dialog(void) response = gtk_dialog_run(GTK_DIALOG(dialog)); prefdsts.dst[GEANY_GBG_NON_FT] = &non_ft_pref; + prefdsts.dst[GEANY_GBG_EXEC_IND] = NULL; if (ft != NULL) { prefdsts.dst[GEANY_GBG_FT] = &(ft->priv->homefilecmds); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ca8490: Use g_print for PRINTBUILDCMDS and add info
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: ca8490ffd969690124b0d55452598a45148c16c1 https://github.com/geany/geany/commit/ca8490ffd969690124b0d55452598a45148c1… Log Message: ----------- Use g_print for PRINTBUILDCMDS and add info printf doesn't show with MSYS. Modified Paths: -------------- src/build.c Modified: src/build.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -424,7 +424,7 @@ static GeanyBuildCommand *get_next_build_cmd(GeanyDocument *doc, if (psrc) *psrc = src; if (printbuildcmds) - printf("cmd[%u,%u]=%u\n", cmdgrp, cmdindex, src); + g_print("cmd[%u,%u]=%u below=%u; %s\n", cmdgrp, cmdindex, src, below, cmds[cmdindex].command); return &(cmds[cmdindex]); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f24d43: Call build_remove_menu_item instead of manually clearing GeanyBuildCommand
by Nick Treleaven 05 Oct '19

05 Oct '19

Branch: refs/heads/build-exec Author: Nick Treleaven <n(a)trelsoft.com> Committer: Nick Treleaven <n(a)trelsoft.com> Date: Sat, 05 Oct 2019 11:31:09 UTC Commit: f24d43e7d288a400ac7705d9b77c0c26d33762b5 https://github.com/geany/geany/commit/f24d43e7d288a400ac7705d9b77c0c26d3376… Log Message: ----------- Call build_remove_menu_item instead of manually clearing GeanyBuildCommand Modified Paths: -------------- src/build.c src/project.c Modified: src/build.c 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -2709,15 +2709,6 @@ static void on_project_close(void) { /* remove project regexen */ SETPTR(regex_proj, NULL); - - guint n = build_groups_count[GEANY_GBG_EXEC_IND]; - for (guint i = 0; i < n; i++) - { - g_free(exec_proj[i].label); - g_free(exec_proj[i].command); - g_free(exec_proj[i].working_dir); - } - memset(exec_proj, 0, sizeof(GeanyBuildCommand) * n); } Modified: src/project.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -443,6 +443,7 @@ static void destroy_project(gboolean open_default) /* remove project non filetype build menu items */ build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_NON_FT, -1); build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_EXEC, -1); + build_remove_menu_item(GEANY_BCS_PROJ, GEANY_GBG_EXEC_IND, -1); g_free(app->project->name); g_free(app->project->description); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2019