Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 17407) +++ trunk/src_plugins/fontmode/fontmode.c (revision 17408) @@ -100,8 +100,9 @@ pcb_poly_invalidate_draw(layer, np); } -static int pcb_act_FontEdit(int argc, const char **argv) +static int pcb_act_FontEdit(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_font_t *font; pcb_symbol_t *symbol; pcb_layer_t *lfont, *lorig, *lwidth, *lgrid, *lsilk; @@ -229,6 +230,7 @@ pcb_line_new_merge(lgrid, 0, y, PCB->MaxWidth, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_fontsave[] = "FontSave()"; @@ -238,8 +240,9 @@ %end-doc */ -static int pcb_act_FontSave(int argc, const char **argv) +static int pcb_act_FontSave(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_font_t *font; pcb_symbol_t *symbol; int i; @@ -352,6 +355,7 @@ pcb_hid_actionl("SaveFontTo", NULL); return 0; + PCB_OLD_ACT_END; } pcb_hid_action_t fontmode_action_list[] = { Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 17407) +++ trunk/src_plugins/hid_batch/batch.c (revision 17408) @@ -89,14 +89,17 @@ prompt = pcb_strdup("no-board"); } -static int pcb_act_help(int argc, const char **argv) +static int pcb_act_help(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_print_actions(); return 0; + PCB_OLD_ACT_END; } -static int pcb_act_info(int argc, const char **argv) +static int pcb_act_info(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; int i, j; if (!PCB || !PCB->Data || !PCB->Filename) { printf("No PCB loaded.\n"); @@ -112,6 +115,7 @@ printf(" %c %s\n", (gflg & PCB_LYT_TOP) ? 'c' : (gflg & PCB_LYT_BOTTOM) ? 's' : '-', PCB->Data->Layer[i].name); } return 0; + PCB_OLD_ACT_END; } pcb_hid_action_t batch_action_list[] = { Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 17407) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 17408) @@ -120,8 +120,9 @@ %end-doc */ -static int pcb_act_Load(int argc, const char **argv) +static int pcb_act_Load(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *function; char *name; XmString xmname, pattern; @@ -164,6 +165,7 @@ XtFree(name); return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_LoadVendor[] = "LoadVendor()"; @@ -178,8 +180,9 @@ %end-doc */ -static int pcb_act_LoadVendor(int argc, const char **argv) +static int pcb_act_LoadVendor(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; char *name; XmString xmname, pattern; @@ -214,6 +217,7 @@ XtFree(name); return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_Save[] = "Save()\n" "Save(Layout|LayoutAs)\n" "Save(AllConnections|AllUnusedPins|ElementConnections)\n" "Save(PasteBuffer)"; @@ -230,8 +234,9 @@ %end-doc */ -static int pcb_act_Save(int argc, const char **argv) +static int pcb_act_Save(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *function; char *name; XmString xmname, pattern; @@ -287,6 +292,7 @@ XtFree(name); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -454,13 +460,15 @@ return ok; } -static int pcb_act_ConfirmAction(int argc, const char **argv) +static int pcb_act_ConfirmAction(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; int rv = lesstif_confirm_dialog(argc > 0 ? argv[0] : 0, argc > 1 ? argv[1] : 0, argc > 2 ? argv[2] : 0, 0); return rv; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -577,12 +585,14 @@ %end-doc */ -static int pcb_act_PromptFor(int argc, const char **argv) +static int pcb_act_PromptFor(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; char *rv = lesstif_prompt_for(argc > 0 ? argv[0] : 0, argc > 1 ? argv[1] : 0); printf("rv = `%s'\n", rv); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -1275,8 +1285,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] : ""; if (strcmp(a, "1") == 0 || pcb_strcasecmp(a, "Layout") == 0) { } @@ -1296,6 +1307,7 @@ return 1; } return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -1311,8 +1323,9 @@ %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; static Widget about = 0; if (!about) { XmString xs; @@ -1326,6 +1339,7 @@ } wait_for_dialog(about); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -1341,8 +1355,9 @@ %end-doc */ -static int pcb_act_Print(int argc, const char **argv) +static int pcb_act_Print(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_hid_attribute_t *opts; pcb_hid_t *printer; pcb_hid_attr_val_t *vals; @@ -1362,6 +1377,7 @@ printer->do_export(vals); free(vals); return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_ExportGUI[] = "ExportGUI()"; @@ -1375,8 +1391,9 @@ %end-doc */ -static int pcb_act_ExportGUI(int argc, const char **argv) +static int pcb_act_ExportGUI(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; static Widget selector = 0; pcb_hid_attribute_t *opts; pcb_hid_t *printer, **hids; @@ -1443,6 +1460,7 @@ free(vals); pcb_exporter = NULL; return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -1545,8 +1563,9 @@ %end-doc */ -static int pcb_act_AdjustSizes(int argc, const char **argv) +static int pcb_act_AdjustSizes(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (!sizes_dialog) { Widget inf, sep; @@ -1613,6 +1632,7 @@ lesstif_sizes_reset(); XtManageChild(sizes_dialog); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -1639,10 +1659,12 @@ %end-doc */ extern void lesstif_show_layergrp_edit(void); -static int pcb_act_EditLayerGroups(int argc, const char **argv) +static int pcb_act_EditLayerGroups(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; lesstif_show_layergrp_edit(); return 1; + PCB_OLD_ACT_END; } @@ -1649,8 +1671,9 @@ static const char pcb_acts_fontsel[] = "EditLayerGroups()"; static const char pcb_acth_fontsel[] = "Let the user change fonts"; extern void lesstif_show_fontsel_edit(pcb_layer_t *txtly, pcb_text_t *txt, int type); -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); @@ -1671,6 +1694,7 @@ else lesstif_show_fontsel_edit(NULL, NULL, 0); return 0; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ @@ -1983,8 +2007,9 @@ %end-doc */ -static int pcb_act_ImportGUI(int argc, const char **argv) +static int pcb_act_ImportGUI(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; static int I_am_recursing = 0; static XmString xms_sch = 0, xms_import = 0; int rv; @@ -2051,6 +2076,7 @@ I_am_recursing = 0; return rv; + PCB_OLD_ACT_END; } /* ------------------------------------------------------------ */ Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 17407) +++ trunk/src_plugins/hid_lesstif/library.c (revision 17408) @@ -168,11 +168,13 @@ %end-doc */ -static int pcb_act_LibraryShow(int argc, const char **argv) +static int pcb_act_LibraryShow(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (build_library_dialog()) return 0; return 0; + PCB_OLD_ACT_END; } void lesstif_show_library() Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 17407) +++ trunk/src_plugins/hid_lesstif/main.c (revision 17408) @@ -435,8 +435,9 @@ %end-doc */ -static int pcb_act_Zoom(int argc, const char **argv) +static int pcb_act_Zoom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t x, y; const char *vp; double v; @@ -480,6 +481,7 @@ break; } return 0; + PCB_OLD_ACT_END; } @@ -507,8 +509,9 @@ %end-doc */ -static int pcb_act_ZoomTo(int argc, const char **argv) +static int pcb_act_ZoomTo(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t x1, y1, x2, y2; pcb_bool succ; @@ -534,12 +537,14 @@ zoom_win(x1, y1, x2, y2); return 0; + PCB_OLD_ACT_END; } static int pan_thumb_mode; -static int pcb_act_Pan(int argc, const char **argv) +static int pcb_act_Pan(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; pcb_coord_t x, y; int mode; @@ -556,6 +561,7 @@ Pan(mode, Vx(x), Vy(y)); return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_SwapSides[] = "SwapSides(|v|h|r)"; @@ -610,8 +616,9 @@ } #warning TODO: ui_zoomplan.c does the same, maybe make the code common? -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 old_shown_side = conf_core.editor.show_solder_side; pcb_layergrp_id_t comp_group = -1, solder_group = -1; pcb_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]); @@ -686,6 +693,7 @@ } lesstif_invalidate_all(); return 0; + PCB_OLD_ACT_END; } static Widget m_cmd = 0, m_cmd_label; @@ -767,12 +775,14 @@ %end-doc */ -static int pcb_act_Command(int argc, const char **argv) +static int pcb_act_Command(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; XtManageChild(m_cmd_label); XtManageChild(m_cmd); XmProcessTraversal(m_cmd, XmTRAVERSE_CURRENT); return 0; + PCB_OLD_ACT_END; } static const char pcb_acts_Benchmark[] = "Benchmark()"; @@ -787,8 +797,9 @@ %end-doc */ -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; pcb_hid_expose_ctx_t ctx; @@ -819,10 +830,12 @@ main_pixmap = save_main; return 0; + 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; pcb_hid_get_coords("Click on a location to center", &x, &y); @@ -837,6 +850,7 @@ though. */ XWarpPointer(display, window, window, 0, 0, view_width, view_height, Vx(x), Vy(y)); return 0; + PCB_OLD_ACT_END; } pcb_hid_action_t lesstif_main_action_list[] = { Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 17407) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 17408) @@ -373,8 +373,9 @@ %end-doc */ -static int pcb_act_LesstifNetlistShow(int argc, const char **argv) +static int pcb_act_LesstifNetlistShow(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; if (build_netlist_dialog()) return 0; @@ -424,6 +425,7 @@ } } return 0; + PCB_OLD_ACT_END; } void lesstif_show_netlist() Index: trunk/src_plugins/hid_lesstif/styles.c =================================================================== --- trunk/src_plugins/hid_lesstif/styles.c (revision 17407) +++ trunk/src_plugins/hid_lesstif/styles.c (revision 17408) @@ -310,8 +310,9 @@ %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 ((!mainwind) || (PCB->RouteStyle.array == NULL)) return 1; if (style_dialog == 0) { @@ -371,6 +372,7 @@ } XtManageChild(style_dialog); return 0; + PCB_OLD_ACT_END; } void LesstifRouteStylesChanged(void *user_data, int argc, pcb_event_arg_t argv[]) Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 17407) +++ trunk/src_plugins/import_dsn/dsn.c (revision 17408) @@ -206,8 +206,9 @@ static const char load_dsn_help[] = "Loads the specified routed dsn file."; -int pcb_act_LoadDsnFrom(int argc, const char **argv) +int pcb_act_LoadDsnFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; pcb_coord_t clear; FILE *f; @@ -332,6 +333,7 @@ error:; gsxl_uninit(&dom); return 0; + PCB_OLD_ACT_END; } pcb_hid_action_t dsn_action_list[] = { Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 17407) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 17408) @@ -149,8 +149,9 @@ static const char pcb_acts_LoadHpglFrom[] = "LoadHpglFrom(filename)"; static const char pcb_acth_LoadHpglFrom[] = "Loads the specified hpgl plot file to the current buffer"; -int pcb_act_LoadHpglFrom(int argc, const char **argv) +int pcb_act_LoadHpglFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; static char *default_file = NULL; @@ -169,6 +170,7 @@ } return hpgl_load(fname); + PCB_OLD_ACT_END; } pcb_hid_action_t hpgl_action_list[] = { Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 17407) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 17408) @@ -355,8 +355,9 @@ static const char pcb_acts_LoadIpc356From[] = "LoadIpc356From(filename, [nonet], [nopad], [nosubc])"; static const char pcb_acth_LoadIpc356From[] = "Loads the specified IPC356-D netlist"; -int pcb_act_LoadIpc356From(int argc, const char **argv) +int pcb_act_LoadIpc356From(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; FILE *f; static char *default_file = NULL; const char *fname; @@ -425,6 +426,7 @@ htsp_uninit(&subcs); } return res; + PCB_OLD_ACT_END; } pcb_hid_action_t import_ipcd356_action_list[] = { Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 17407) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 17408) @@ -266,8 +266,9 @@ static const char pcb_acts_LoadLtspiceFrom[] = "LoadLtspiceFrom(filename)"; static const char pcb_acth_LoadLtspiceFrom[] = "Loads the specified ltspice .net and .asc file - the netlist must be mentor netlist."; -int pcb_act_LoadLtspiceFrom(int argc, const char **argv) +int pcb_act_LoadLtspiceFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL, *end; char *fname_asc, *fname_net, *fname_base; static char *default_file = NULL; @@ -307,6 +308,7 @@ free(fname_net); return res; + PCB_OLD_ACT_END; } pcb_hid_action_t ltspice_action_list[] = { Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 17407) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 17408) @@ -257,8 +257,9 @@ static const char pcb_acts_Loadmentor_schFrom[] = "LoadMentorFrom(filename)"; static const char pcb_acth_Loadmentor_schFrom[] = "Loads the specified Mentor Graphics Design Capture schematics flat .edf file."; -int pcb_act_LoadMentorFrom(int argc, const char **argv) +int pcb_act_LoadMentorFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; static char *default_file = NULL; @@ -277,6 +278,7 @@ } return mentor_sch_load(fname); + PCB_OLD_ACT_END; } pcb_hid_action_t mentor_sch_action_list[] = { Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 17407) +++ trunk/src_plugins/import_mucs/mucs.c (revision 17408) @@ -56,8 +56,9 @@ static const char pcb_acts_LoadMucsFrom[] = "LoadMucsFrom(filename)"; static const char pcb_acth_LoadMucsFrom[] = "Loads the specified mucs routing file."; -int pcb_act_LoadMucsFrom(int argc, const char **argv) +int pcb_act_LoadMucsFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; static char *default_file = NULL; FILE *fi; @@ -147,6 +148,7 @@ } fclose(fi); return 0; + PCB_OLD_ACT_END; } pcb_hid_action_t mucs_action_list[] = { Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 17407) +++ trunk/src_plugins/import_sch/import_sch.c (revision 17408) @@ -60,7 +60,7 @@ conf_import_sch_t conf_import_sch; -extern int pcb_act_ExecuteFile(int argc, const char **argv); +extern int pcb_act_ExecuteFile(int oargc, const char **oargv); /* ---------------------------------------------------------------- */ static const char pcb_acts_Import[] = @@ -178,8 +178,9 @@ %end-doc */ -static int pcb_act_Import(int argc, const char **argv) +static int pcb_act_Import(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *mode; const char **sources = NULL; int nsources = 0; @@ -457,6 +458,7 @@ pcb_message(PCB_MSG_DEBUG, "pcb_act_Import: === Leaving pcb_act_Import ===\n"); return 0; + PCB_OLD_ACT_END; } static const char *import_sch_cookie = "import_sch plugin"; Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 17407) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 17408) @@ -172,8 +172,9 @@ static const char pcb_acts_LoadtinycadFrom[] = "LoadTinycadFrom(filename)"; static const char pcb_acth_LoadtinycadFrom[] = "Loads the specified tinycad .net file - the netlist must be tinycad netlist output."; -int pcb_act_LoadtinycadFrom(int argc, const char **argv) +int pcb_act_LoadtinycadFrom(int oargc, const char **oargv) { + PCB_OLD_ACT_BEGIN; const char *fname = NULL; static char *default_file = NULL; @@ -192,6 +193,7 @@ } return tinycad_load(fname); + PCB_OLD_ACT_END; } pcb_hid_action_t tinycad_action_list[] = {