Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 17408) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 17409) @@ -70,8 +70,9 @@ static const char load_hyp_help[] = "Loads the specified Hyperlynx file."; -int pcb_act_LoadhypFrom(int argc, const char **argv) +int pcb_act_LoadhypFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; int debug = 0; int i = 0; @@ -113,6 +114,7 @@ PCB_AFAIL(load_hyp); return 0; + PCB_OLD_ACT_END; } pcb_hid_action_t hyp_action_list[] = { Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 17408) +++ trunk/src_plugins/io_kicad/read_net.c (revision 17409) @@ -216,8 +216,9 @@ const char pcb_acts_LoadeeschemaFrom[] = "LoadEeschemaFrom(filename)"; const char pcb_acth_LoadeeschemaFrom[] = "Loads the specified eeschema .net file - the netlist must be an s-expression."; -int pcb_act_LoadeeschemaFrom(int argc, const char **argv) +int pcb_act_LoadeeschemaFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; static char *default_file = NULL; @@ -236,5 +237,6 @@ } return eeschema_load(fname); + PCB_OLD_ACT_END; } Index: trunk/src_plugins/io_kicad/read_net.h =================================================================== --- trunk/src_plugins/io_kicad/read_net.h (revision 17408) +++ trunk/src_plugins/io_kicad/read_net.h (revision 17409) @@ -2,5 +2,5 @@ extern const char pcb_acts_LoadeeschemaFrom[]; extern const char pcb_acth_LoadeeschemaFrom[]; -int pcb_act_LoadeeschemaFrom(int argc, const char **argv); +int pcb_act_LoadeeschemaFrom(int oargc, const char **oargv); Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 17408) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 17409) @@ -64,8 +64,9 @@ static const char pcb_acts_Savetedax[] = "SaveTedax(type, filename)"; static const char pcb_acth_Savetedax[] = "Saves the specific type of data in a tEDAx file. Type can be: board-footprints"; -static int pcb_act_Savetedax(int argc, const char **argv) +static int pcb_act_Savetedax(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname, *type = argv[0]; if (argc < 1) PCB_ACT_FAIL(Savetedax); @@ -76,6 +77,7 @@ return tedax_fp_save(PCB->Data, argv[1]); PCB_ACT_FAIL(Savetedax); + PCB_OLD_ACT_END; } #define gen_load(type, fname) \ @@ -96,8 +98,9 @@ static const char pcb_acts_LoadtedaxFrom[] = "LoadTedaxFrom(type, filename)"; static const char pcb_acth_LoadtedaxFrom[] = "Loads the specified block from a tedax file. Type can be: netlist or footprint."; -static int pcb_act_LoadtedaxFrom(int argc, const char **argv) +static int pcb_act_LoadtedaxFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname, *type = argv[0]; if (argc < 1) @@ -114,6 +117,7 @@ return tedax_fp_load(PCB_PASTEBUFFER->Data, fname, 0); } PCB_ACT_FAIL(Savetedax); + PCB_OLD_ACT_END; } pcb_hid_action_t tedax_action_list[] = { Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 17408) +++ trunk/src_plugins/jostle/jostle.c (revision 17409) @@ -469,8 +469,9 @@ } static const char pcb_acts_jostle[] = "Jostle(diameter)"; -static int pcb_act_jostle(int argc, const char **argv) +static int pcb_act_jostle(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t x, y; pcb_bool rel; pcb_polyarea_t *expand; @@ -516,6 +517,7 @@ pcb_board_set_changed_flag(pcb_true); pcb_undo_inc_serial(); return 0; + PCB_OLD_ACT_END; } static pcb_hid_action_t jostle_action_list[] = { Index: trunk/src_plugins/lib_gtk_hid/actions.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/actions.c (revision 17408) +++ trunk/src_plugins/lib_gtk_hid/actions.c (revision 17409) @@ -70,13 +70,15 @@ %end-doc */ -static int pcb_act_AdjustStyle(int argc, const char **argv) +static int pcb_act_AdjustStyle(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (argc > 1) PCB_ACT_FAIL(AdjustStyle); pcb_gtk_route_style_edit_dialog(&ghidgui->common, GHID_ROUTE_STYLE(ghidgui->topwin.route_style_selector)); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -83,8 +85,9 @@ static const char pcb_acts_fontsel[] = "FontSel()\n"; static const char pcb_acth_fontsel[] = "Select the font to draw new text with."; -static int pcb_act_fontsel(int argc, const char **argv) +static int pcb_act_fontsel(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (argc > 1) PCB_ACT_FAIL(fontsel); @@ -105,14 +108,17 @@ else pcb_gtk_dlg_fontsel(&ghidgui->common, NULL, NULL, 0, 0); return 0; + PCB_OLD_ACT_END; } /* ---------------------------------------------------------------------- */ -static int pcb_act_Command(int argc, const char **argv) +static int pcb_act_Command(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; ghid_handle_user_command(&ghidgui->topwin.cmd, TRUE); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -124,9 +130,9 @@ /* ------------------------------------------------------------ */ -static int pcb_act_ExportGUI(int argc, const char **argv) +static int pcb_act_ExportGUI(int oargc, const char **oargv) { - + PCB_OLD_ACT_BEGIN; /* check if layout is empty */ if (!pcb_data_is_empty(PCB->Data)) { ghid_dialog_export(ghid_port.top_window); @@ -135,12 +141,14 @@ pcb_gui->log(_("Can't export empty layout")); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ -static int pcb_act_Benchmark(int argc, const char **argv) +static int pcb_act_Benchmark(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; int i = 0; time_t start, end; GdkDisplay *display; @@ -162,6 +170,7 @@ printf(_("%g redraws per second\n"), i / 10.0); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -209,8 +218,9 @@ %end-doc */ -static int pcb_act_DoWindows(int argc, const char **argv) +static int pcb_act_DoWindows(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *a = argc >= 1 ? argv[0] : ""; gboolean raise = TRUE; @@ -249,6 +259,7 @@ } return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -264,8 +275,9 @@ in the popups subtree in the menu lht file. %end-doc */ -static int pcb_act_Popup(int argc, const char **argv) +static int pcb_act_Popup(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; GtkWidget *menu = NULL; char name[256]; const char *tn = NULL; @@ -327,6 +339,7 @@ gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); } return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -334,21 +347,26 @@ static const char pcb_acth_SaveWinGeo[] = N_("Saves window geometry in the config.\n"); -static int pcb_act_SaveWinGeo(int argc, const char **argv) +static int pcb_act_SaveWinGeo(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; ghid_wgeo_save(1, 0); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ -static int pcb_act_Zoom(int argc, const char **argv) +static int pcb_act_Zoom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; return pcb_gtk_zoom(&gport->view, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_Center(int argc, const char **argv) +static int pcb_act_Center(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t x, y; int offset_x, offset_y, pointer_x, pointer_y; GdkDisplay *display = gdk_display_get_default(); @@ -360,10 +378,12 @@ pcb_gtk_act_center(&gport->view, argc, argv, x, y, offset_x, offset_y, &pointer_x, &pointer_y); gdk_display_warp_pointer(display, screen, pointer_x, pointer_y); return 0; + PCB_OLD_ACT_END; } -static int pcb_act_SwapSides(int argc, const char **argv) +static int pcb_act_SwapSides(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; int res, oa; /* ugly workaround: turn off gui refreshes until the swap finishes to avoid triggering more events that may lead to infinite loop */ @@ -374,48 +394,63 @@ ghidgui->hid_active = oa; return res; + PCB_OLD_ACT_END; } -static int pcb_act_Scroll(int argc, const char **argv) +static int pcb_act_Scroll(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (ghidgui == NULL) return 0; return pcb_gtk_act_scroll(&gport->view, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_Pan(int argc, const char **argv) +static int pcb_act_Pan(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (ghidgui == NULL) return 0; return pcb_gtk_act_pan(&gport->view, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_NetlistShow(int argc, const char **argv) +static int pcb_act_NetlistShow(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; return pcb_gtk_act_netlistshow(&ghidgui->common, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_NetlistPresent(int argc, const char **argv) +static int pcb_act_NetlistPresent(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; return pcb_gtk_act_netlistpresent(&ghidgui->common, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_load(int argc, const char **argv) +static int pcb_act_load(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; return pcb_gtk_act_load(ghid_port.top_window, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_save(int argc, const char **argv) +static int pcb_act_save(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; return pcb_gtk_act_save(ghid_port.top_window, argc, argv); + PCB_OLD_ACT_END; } -static int pcb_act_importgui(int argc, const char **argv) +static int pcb_act_importgui(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; return pcb_gtk_act_importgui(ghid_port.top_window, argc, argv); + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ @@ -437,10 +472,12 @@ %end-doc */ -static int pcb_act_About(int argc, const char **argv) +static int pcb_act_About(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_gtk_dlg_about(gport->top_window); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -453,10 +490,12 @@ %end-doc */ -static int pcb_act_EditLayerGroups(int argc, const char **argv) +static int pcb_act_EditLayerGroups(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *args[] = {"Preferences", "1", "User PoV/Layers"}; return pcb_act_DoWindows(sizeof(args)/sizeof(args[0]), args); + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 17408) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 17409) @@ -363,8 +363,9 @@ static const char pcb_acts_PolyHatch[] = "PolyHatch([spacing], [hvcp])\nPolyHatch(interactive)\n"; static const char pcb_acth_PolyHatch[] = "hatch the selected polygon(s) with lines of the current style; lines are drawn on the current layer; flags are h:horizontal, v:vertical, c:contour, p:poly"; -static int pcb_act_PolyHatch(int argc, const char **argv) +static int pcb_act_PolyHatch(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t period = 0; pcb_cpoly_hatchdir_t dir = 0; pcb_flag_t flg; @@ -464,12 +465,14 @@ pcb_cpoly_hatch_lines(CURRENT, polygon, dir, period, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg); } PCB_ENDALL_LOOP; return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_PolyOffs[] = "PolyOffs(offset)\n"; static const char pcb_acth_PolyOffs[] = "replicate the outer contour of the selected polygon(s) with growing or shrinking them by offset; the new polygon is drawn on the current layer"; -static int pcb_act_PolyOffs(int argc, const char **argv) +static int pcb_act_PolyOffs(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t offs; pcb_bool succ; @@ -493,6 +496,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, p); } PCB_ENDALL_LOOP; return 0; + PCB_OLD_ACT_END; } Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 17408) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 17409) @@ -316,8 +316,9 @@ const char pcb_acts_topoly[] = "ToPoly()\nToPoly(outline)\n"; const char pcb_acth_topoly[] = "convert a closed loop of lines and arcs into a polygon"; -int pcb_act_topoly(int argc, const char **argv) +int pcb_act_topoly(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; void *r1, *r2, *r3; if (argc == 0) { @@ -340,4 +341,5 @@ pcb_topoly_conn(PCB, r2, 0); return 0; + PCB_OLD_ACT_END; } Index: trunk/src_plugins/lib_polyhelp/topoly.h =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.h (revision 17408) +++ trunk/src_plugins/lib_polyhelp/topoly.h (revision 17409) @@ -45,6 +45,6 @@ extern const char pcb_acts_topoly[]; extern const char pcb_acth_topoly[]; -int pcb_act_topoly(int argc, const char **argv); +int pcb_act_topoly(int oargc, const char **oargv); #endif