Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 31031) +++ trunk/src/brave.c (revision 31032) @@ -260,8 +260,8 @@ } /* look up */ - RND_PCB_ACT_CONVARG(1, FGW_STR, Brave, name = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, Brave, op = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, Brave, name = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, Brave, op = argv[2].val.str); d = find_by_name(name); if (d == NULL) { rnd_message(RND_MSG_ERROR, "Unknown brave setting: %s\n", name); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 31031) +++ trunk/src/buffer.c (revision 31032) @@ -250,9 +250,9 @@ rnd_cardinal_t len; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadFootprint, name = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadFootprint, refdes = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFootprint, value = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadFootprint, name = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, LoadFootprint, refdes = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, LoadFootprint, value = argv[3].val.str); if (!pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, NULL)) { RND_ACT_IRES(1); @@ -452,7 +452,7 @@ char *angle_s = NULL; double ang; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = rnd_strdup(argv[1].val.str)); + RND_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = rnd_strdup(argv[1].val.str)); RND_ACT_IRES(0); if (angle_s == NULL) @@ -564,7 +564,7 @@ int recurse = 0; char *end; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ScaleBuffer, sx = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, ScaleBuffer, sx = argv[1].val.str); if (sx != NULL) { x = strtod(sx, &end); @@ -582,9 +582,9 @@ th = 1; } - rnd_PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, ScaleBuffer, y = argv[2].val.nat_double); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_DOUBLE, ScaleBuffer, th = argv[3].val.nat_double); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, ScaleBuffer, recurse = (argv[4].val.str != NULL)); + RND_ACT_MAY_CONVARG(2, FGW_DOUBLE, ScaleBuffer, y = argv[2].val.nat_double); + RND_ACT_MAY_CONVARG(3, FGW_DOUBLE, ScaleBuffer, th = argv[3].val.nat_double); + RND_ACT_MAY_CONVARG(4, FGW_STR, ScaleBuffer, recurse = (argv[4].val.str != NULL)); if ((x <= 0) || (y <= 0)) { RND_ACT_IRES(-1); @@ -981,12 +981,12 @@ static int sp = 0; int number, rv; - RND_PCB_ACT_CONVARG(1, FGW_STR, PasteBuffer, tmp = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, PasteBuffer, tmp = argv[1].val.str); number = atoi(tmp); - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, PasteBuffer, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, PasteBuffer, sbufnum = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, PasteBuffer, fmt = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, PasteBuffer, forces = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, PasteBuffer, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, PasteBuffer, sbufnum = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, PasteBuffer, fmt = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, PasteBuffer, forces = argv[4].val.str); force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y')); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 31031) +++ trunk/src/change_act.c (revision 31032) @@ -80,9 +80,9 @@ rnd_coord_t x, y; int got_coords = 0; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChangeClearSize, function = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ChangeClearSize, delta = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, ChangeClearSize, units = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, ChangeClearSize, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, ChangeClearSize, delta = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, ChangeClearSize, units = argv[3].val.str); if (function && delta) { int funcid = rnd_funchash_get(function, NULL); @@ -158,9 +158,9 @@ const char *flag; int value; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChangeFlag, function = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, ChangeFlag, flag = argv[2].val.str); - RND_PCB_ACT_CONVARG(2, FGW_INT, ChangeFlag, value = argv[3].val.nat_int); + RND_ACT_CONVARG(1, FGW_STR, ChangeFlag, function = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, ChangeFlag, flag = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_INT, ChangeFlag, value = argv[3].val.nat_int); if (value != 0 && value != 1) RND_ACT_FAIL(ChangeFlag); @@ -280,9 +280,9 @@ int type = PCB_OBJ_VOID, tostyle = 0; void *ptr1, *ptr2, *ptr3; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChangeSize, function = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, ChangeSize, delta = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, ChangeSize, units = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, ChangeSize, function = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, ChangeSize, delta = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, ChangeSize, units = argv[3].val.str); if (function && delta) { @@ -376,9 +376,9 @@ rnd_bool absolute; rnd_coord_t value; - RND_PCB_ACT_CONVARG(1, FGW_STR, Change2ndSize, function = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, Change2ndSize, delta = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, Change2ndSize, units = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, Change2ndSize, function = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, Change2ndSize, delta = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, Change2ndSize, units = argv[3].val.str); if (function && delta) { int funcid = rnd_funchash_get(function, NULL); @@ -435,9 +435,9 @@ rnd_cardinal_t changed = 0; const char *refdes, *pinnum, *pinname; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChangePinName, refdes = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, ChangePinName, pinnum = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, ChangePinName, pinname = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, ChangePinName, refdes = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, ChangePinName, pinnum = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, ChangePinName, pinname = argv[3].val.str); PCB_SUBC_LOOP(PCB_ACT_BOARD->Data); { @@ -483,7 +483,7 @@ char *name; pcb_objtype_t type; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeName, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, ChangeName, op = fgw_keyword(&argv[1])); switch(op) { /* change the refdes of a subcircuit */ @@ -563,7 +563,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); switch(op) { case F_ToggleObject: @@ -611,7 +611,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); switch(op) { case F_ToggleObject: @@ -664,8 +664,8 @@ int err = 0; rnd_coord_t gx, gy; - RND_PCB_ACT_CONVARG(1, FGW_STR, SetThermal, function = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, SetThermal, style = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, SetThermal, function = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, SetThermal, style = argv[2].val.str); if (function && *function && style && *style) { rnd_bool absolute; @@ -719,8 +719,8 @@ const char *function; const char *flag; - RND_PCB_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str); ChangeFlag(function, flag, 1, "SetFlag"); @@ -742,8 +742,8 @@ const char *function; const char *flag; - RND_PCB_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str); ChangeFlag(function, flag, 0, "ClrFlag"); @@ -762,13 +762,13 @@ double value; int err = 0; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1])); if (fnc_id == F_Grid) return rnd_actionv_bin(RND_ACT_HIDLIB, "setgrid", res, argc-1, argv+1); - RND_PCB_ACT_CONVARG(2, FGW_STR, SetValue, val = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, SetValue, units = argv[3].val.str); + RND_ACT_CONVARG(2, FGW_STR, SetValue, val = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, SetValue, units = argv[3].val.str); value = rnd_get_value(val, units, &absolute, NULL); @@ -812,9 +812,9 @@ int funcid, type = PCB_OBJ_VOID, which; void *ptr1, *ptr2, *ptr3; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeAngle, funcid = fgw_keyword(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_STR, ChangeAngle, prim = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, ChangeAngle, delta = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, ChangeAngle, funcid = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(2, FGW_STR, ChangeAngle, prim = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, ChangeAngle, delta = argv[3].val.str); if (rnd_strcasecmp(prim, "start") == 0) which = 0; @@ -890,10 +890,10 @@ int funcid, type = PCB_OBJ_VOID, which; void *ptr1, *ptr2, *ptr3; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeRadius, funcid = fgw_keyword(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_STR, ChangeRadius, prim = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, ChangeRadius, delta = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, ChangeRadius, units = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, ChangeRadius, funcid = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(2, FGW_STR, ChangeRadius, prim = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, ChangeRadius, delta = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, ChangeRadius, units = argv[4].val.str); if ((rnd_strcasecmp(prim, "width") == 0) || (rnd_strcasecmp(prim, "x") == 0)) which = 0; else if ((rnd_strcasecmp(prim, "height") == 0) || (rnd_strcasecmp(prim, "y") == 0)) which = 1; Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 31031) +++ trunk/src/conf_act.c (revision 31032) @@ -51,7 +51,7 @@ if (have == NULL) have = ""; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkSubcID, expected = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, ChkSubcID, expected = argv[1].val.str); RND_ACT_IRES(strcmp(expected, have) == 0); return 0; @@ -65,7 +65,7 @@ if (have == NULL) have = ""; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkTermID, expected = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, ChkTermID, expected = argv[1].val.str); RND_ACT_IRES(strcmp(expected, have) == 0); return 0; @@ -76,7 +76,7 @@ static fgw_error_t pcb_act_ChkBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int expected; - RND_PCB_ACT_CONVARG(1, FGW_INT, ChkBuffer, expected = argv[1].val.nat_int); + RND_ACT_CONVARG(1, FGW_INT, ChkBuffer, expected = argv[1].val.nat_int); RND_ACT_IRES((conf_core.editor.buffer_number + 1) == expected); return 0; } Index: trunk/src/drc.c =================================================================== --- trunk/src/drc.c (revision 31031) +++ trunk/src/drc.c (revision 31032) @@ -161,7 +161,7 @@ static fgw_error_t pcb_act_DRC(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *dlg_type = "list"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DRC, dlg_type = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, DRC, dlg_type = argv[1].val.str); return view_dlg(res, argc, argv, dlg_type, "drcdialog", &pcb_drc_lst, pcb_drc_all); } @@ -172,8 +172,8 @@ const char *dlg_type = "list"; const char *aauto = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatList, dlg_type = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, IOIncompatList, aauto = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatList, dlg_type = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, IOIncompatList, aauto = argv[2].val.str); if ((aauto != NULL) && (strcmp(aauto, "auto") == 0)) { if (rnd_conf.rc.quiet && !RND_HAVE_GUI_ATTR_DLG) { Index: trunk/src/extobj_act.c =================================================================== --- trunk/src/extobj_act.c (revision 31031) +++ trunk/src/extobj_act.c (revision 31032) @@ -80,8 +80,8 @@ pcb_subc_t *sc; pcb_any_obj_t *obj; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ExtobjConvFrom, op = fgw_keyword(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_STR, ExtobjConvFrom, eoname = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, ExtobjConvFrom, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(2, FGW_STR, ExtobjConvFrom, eoname = argv[2].val.str); if (strcmp(eoname, "@gui") != 0) { eo = pcb_extobj_lookup(eoname); @@ -104,7 +104,7 @@ case F_Object: if (argc > 3) { /* convert by idpath */ pcb_idpath_t *idp; - RND_PCB_ACT_CONVARG(3, FGW_IDPATH, ExtobjConvFrom, idp = fgw_idpath(&argv[2])); + RND_ACT_CONVARG(3, FGW_IDPATH, ExtobjConvFrom, idp = fgw_idpath(&argv[2])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); @@ -159,13 +159,13 @@ int op = F_Object; pcb_subc_t *obj; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, ExtobjGUIPropEdit, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, ExtobjGUIPropEdit, op = fgw_keyword(&argv[1])); switch(op) { case F_Object: if (argc > 2) { /* convert by idpath */ pcb_idpath_t *idp; - RND_PCB_ACT_CONVARG(2, FGW_IDPATH, ExtobjGUIPropEdit, idp = fgw_idpath(&argv[2])); + RND_ACT_CONVARG(2, FGW_IDPATH, ExtobjGUIPropEdit, idp = fgw_idpath(&argv[2])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = (pcb_subc_t *)pcb_idpath2obj(PCB, idp); Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 31031) +++ trunk/src/file_act.c (revision 31032) @@ -65,9 +65,9 @@ const char *name, *format = NULL; int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, LoadFrom, op = fgw_keyword(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_STR, LoadFrom, name = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFrom, format = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, LoadFrom, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(2, FGW_STR, LoadFrom, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, LoadFrom, format = argv[3].val.str); switch(op) { case F_ElementToBuffer: @@ -134,7 +134,7 @@ const char *argument_name = NULL; char *name = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str); if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) { if (argument_name) @@ -191,7 +191,7 @@ { const char *target = "board"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, normalize, target = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, normalize, target = argv[1].val.str); if (strcmp(target, "board") == 0) RND_ACT_IRES(pcb_board_normalize(PCB)); @@ -240,9 +240,9 @@ const char *name = NULL; const char *fmt = NULL; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, SaveTo, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, SaveTo, name = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveTo, fmt = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, SaveTo, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, SaveTo, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, SaveTo, fmt = argv[3].val.str); RND_ACT_IRES(0); if ((op != F_Layout) && (name == NULL)) @@ -356,10 +356,10 @@ const char *method, *source, *fn = NULL, *fmt = NULL; pcb_data_t *src; - RND_PCB_ACT_CONVARG(1, FGW_STR, SaveLib, method = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, SaveLib, source = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveLib, fn = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, SaveLib, fmt = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_STR, SaveLib, method = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, SaveLib, source = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, SaveLib, fn = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, SaveLib, fmt = argv[4].val.str); if (rnd_strcasecmp(source, "board") == 0) src = PCB->Data; else if (rnd_strcasecmp(source, "buffer") == 0) src = PCB_PASTEBUFFER->Data; @@ -468,7 +468,7 @@ static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *force = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Quit, force = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Quit, force = argv[1].val.str); if ((force != NULL) && (rnd_strcasecmp(force, "force") == 0)) exit(0); @@ -499,7 +499,7 @@ args[0] = NULL; for(n = 1; n < argc; n++) - RND_PCB_ACT_CONVARG(n, FGW_STR, Export, args[n-1] = argv[n].val.str); + RND_ACT_CONVARG(n, FGW_STR, Export, args[n-1] = argv[n].val.str); rnd_exporter = rnd_hid_find_exporter(args[0]); if (rnd_exporter == NULL) { Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 31031) +++ trunk/src/font_act.c (revision 31032) @@ -46,8 +46,8 @@ pcb_font_t *fnt; int r; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[2].val.str); if (sid != NULL) { char *end; @@ -123,8 +123,8 @@ pcb_font_t *fnt; int r; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[1].val.str); if (sid != NULL) { char *end; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 31031) +++ trunk/src/gui_act.c (revision 31032) @@ -107,8 +107,8 @@ int err = 0; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Display, str_dir = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, Display, str_dir = argv[2].val.str); if (id == F_SubcID) { /* change the displayed name of subcircuits */ if (argc > 1) @@ -471,7 +471,7 @@ int id = -2; RND_ACT_IRES(0); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); if (id == -1) { /* invalid */ RND_ACT_FAIL(MarkCrosshair); @@ -524,7 +524,7 @@ int number; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1, FGW_STR, RouteStyle, str = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, RouteStyle, str = argv[1].val.str); number = strtol(str, &end, 10); @@ -634,7 +634,7 @@ for(n = 1; n < argc; n++) { const char *arg; - RND_PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); + RND_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); if (!explicit && (*arg == '@')) { rnd_layer_id_t lid = pcb_layer_by_name(PCB->Data, arg+1); if (lid < 0) { @@ -735,7 +735,7 @@ for(n = 1; n < argc; n++) { const char *arg; - RND_PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); + RND_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); if (!explicit && (*arg == '@')) { rnd_layergrp_id_t gid; if (arg[1] == '\0') @@ -837,7 +837,7 @@ if (PCB_CURRLAYER(PCB_ACT_BOARD) != NULL) g = pcb_get_layergrp(PCB, PCB_CURRLAYER(PCB_ACT_BOARD)->meta.real.grp); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DelGroup, name = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, DelGroup, name = argv[1].val.str); if (*name == '@') { gid = pcb_actd_EditGroup_gid; if (name[1] != '\0') @@ -869,12 +869,12 @@ pcb_layergrp_t *g = NULL; pcb_layer_type_t ltype = 0, lloc = 0; - RND_PCB_ACT_CONVARG(1, FGW_STR, NewGroup, stype = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, NewGroup, sloc = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, NewGroup, spurp = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, NewGroup, scomb = argv[4].val.str); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, NewGroup, name = argv[5].val.str); - rnd_PCB_ACT_MAY_CONVARG(6, FGW_STR, NewGroup, attr = argv[6].val.str); + RND_ACT_CONVARG(1, FGW_STR, NewGroup, stype = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, NewGroup, sloc = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, NewGroup, spurp = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, NewGroup, scomb = argv[4].val.str); + RND_ACT_MAY_CONVARG(5, FGW_STR, NewGroup, name = argv[5].val.str); + RND_ACT_MAY_CONVARG(6, FGW_STR, NewGroup, attr = argv[6].val.str); ltype = pcb_layer_type_str2bit(stype) & PCB_LYT_ANYTHING; if (ltype == 0) { @@ -984,7 +984,7 @@ if (PCB_CURRLAYER(PCB_ACT_BOARD) != NULL) g = pcb_get_layergrp(PCB, PCB_CURRLAYER(PCB_ACT_BOARD)->meta.real.grp); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DupGroup, name = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, DupGroup, name = argv[1].val.str); if (*name == '@') { gid = pcb_actd_EditGroup_gid; if (name[1] != '\0') @@ -1038,7 +1038,7 @@ char *name; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1, FGW_STR, selectlayer, name = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, selectlayer, name = argv[1].val.str); if (rnd_strcasecmp(name, "silk") == 0) { PCB->RatDraw = 0; @@ -1084,7 +1084,7 @@ const char *name; const pcb_menu_layers_t *ml; - RND_PCB_ACT_CONVARG(1, FGW_STR, chklayer, name = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, chklayer, name = argv[1].val.str); lid = strtol(name, &end, 10); if (*end != '\0') { @@ -1130,14 +1130,14 @@ rnd_layer_id_t lid; const char *name; - RND_PCB_ACT_CONVARG(1, FGW_STR, toggleview, name = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, toggleview, name = argv[1].val.str); RND_ACT_IRES(0); if (rnd_strcasecmp(name, "all") == 0) { rnd_bool_op_t open = RND_BOOL_PRESERVE, vis = RND_BOOL_PRESERVE, user = RND_BOOL_PRESERVE; const char *cmd, *suser; - RND_PCB_ACT_CONVARG(2, FGW_STR, toggleview, cmd = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, toggleview, suser = argv[3].val.str); + RND_ACT_CONVARG(2, FGW_STR, toggleview, cmd = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, toggleview, suser = argv[3].val.str); user = rnd_str2boolop(suser); if (user == RND_BOOL_INVALID) @@ -1216,7 +1216,7 @@ char *end; const char *name; - RND_PCB_ACT_CONVARG(1, FGW_STR, chkview, name = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, chkview, name = argv[1].val.str); if (strncmp(name, "ui:", 3) == 0) { pcb_layer_t *ly = pcb_uilayer_get(atoi(name+3)); @@ -1338,8 +1338,8 @@ { int op1, op2; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, LayerByStack, op1 = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, LayerByStack, op2 = fgw_keyword(&argv[2])); + RND_ACT_CONVARG(1, FGW_KEYWORD, LayerByStack, op1 = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_KEYWORD, LayerByStack, op2 = fgw_keyword(&argv[2])); RND_ACT_IRES(0); switch(op1) { @@ -1365,7 +1365,7 @@ int rid; pcb_route_style_t *rst; - RND_PCB_ACT_CONVARG(1, FGW_INT, chkrst, rid = argv[1].val.nat_int); + RND_ACT_CONVARG(1, FGW_INT, chkrst, rid = argv[1].val.nat_int); rst = vtroutestyle_get(&PCB->RouteStyle, rid, 0); if (rst == NULL) @@ -1383,7 +1383,7 @@ int op = -2; rnd_bool smirror; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, boardflip, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, boardflip, op = fgw_keyword(&argv[1])); smirror = (op == F_Sides); pcb_data_mirror(PCB->Data, 0, smirror ? PCB_TXM_SIDE : PCB_TXM_COORD, smirror, 1); @@ -1401,7 +1401,7 @@ const char *op; char tmp[2]; - RND_PCB_ACT_CONVARG(1, FGW_STR, ClipInhibit, op = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ClipInhibit, op = argv[1].val.str); if (strcmp(op, "check") == 0) { RND_ACT_IRES(is_on); Index: trunk/src/librnd/core/actions.h =================================================================== --- trunk/src/librnd/core/actions.h (revision 31031) +++ trunk/src/librnd/core/actions.h (revision 31032) @@ -172,7 +172,7 @@ rnd_act_result(res, func(res, argc, argv)) /* Require argument idx to exist and convert it to type; on success, also execute stmt */ -#define RND_PCB_ACT_CONVARG(idx, type, aname, stmt) \ +#define RND_ACT_CONVARG(idx, type, aname, stmt) \ do { \ if (argc <= idx) { \ RND_ACT_FAIL(aname); \ @@ -186,7 +186,7 @@ } while(0) /* If argument idx exists, convert it to type; on success, also execute stmt */ -#define rnd_PCB_ACT_MAY_CONVARG(idx, type, aname, stmt) \ +#define RND_ACT_MAY_CONVARG(idx, type, aname, stmt) \ do { \ if (argc > idx) { \ if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 31031) +++ trunk/src/librnd/core/conf_act.c (revision 31032) @@ -59,11 +59,11 @@ int op; const char *a1, *a2, *a3, *a4; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Conf, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Conf, a1 = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, Conf, a2 = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, Conf, a3 = argv[4].val.str); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, Conf, a4 = argv[5].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, Conf, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, Conf, a1 = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, Conf, a2 = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, Conf, a3 = argv[4].val.str); + RND_ACT_MAY_CONVARG(5, FGW_STR, Conf, a4 = argv[5].val.str); if ((op == F_Set) || (op == F_Delta)) { const char *path, *val; @@ -238,7 +238,7 @@ const char *dst; rnd_toolid_t id; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChkMode, dst = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ChkMode, dst = argv[1].val.str); id = rnd_tool_lookup(dst); if (id >= 0) { @@ -259,7 +259,7 @@ { const char *dst; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChkGridSize, dst = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ChkGridSize, dst = argv[1].val.str); if (strcmp(dst, "none") == 0) { RND_ACT_IRES(RND_ACT_HIDLIB->grid <= 300); @@ -276,7 +276,7 @@ static fgw_error_t pcb_act_ChkGridUnits(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *expected; - RND_PCB_ACT_CONVARG(1, FGW_STR, ChkGridUnits, expected = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ChkGridUnits, expected = argv[1].val.str); RND_ACT_IRES(strcmp(rnd_conf.editor.grid_unit->suffix, expected) == 0); return 0; } @@ -290,8 +290,8 @@ rnd_bool absolute; double value; - RND_PCB_ACT_CONVARG(1, FGW_STR, SetGrid, val = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, SetGrid, units = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, SetGrid, val = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, SetGrid, units = argv[2].val.str); RND_ACT_IRES(0); @@ -339,7 +339,7 @@ const rnd_unit_t *new_unit; const char *name; - RND_PCB_ACT_CONVARG(1, FGW_STR, setunits, name = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, setunits, name = argv[1].val.str); RND_ACT_IRES(0); new_unit = rnd_get_unit_struct(name); Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 31031) +++ trunk/src/librnd/core/error.c (revision 31032) @@ -207,12 +207,12 @@ int ret; const char *op = ""; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Log, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Log, op = argv[1].val.str); if (rnd_strcasecmp(op, "Clear") == 0) { unsigned long from = -1, to = -1; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_ULONG, Log, from = fgw_keyword(&argv[2])); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_ULONG, Log, from = fgw_keyword(&argv[3])); + RND_ACT_MAY_CONVARG(2, FGW_ULONG, Log, from = fgw_keyword(&argv[2])); + RND_ACT_MAY_CONVARG(3, FGW_ULONG, Log, from = fgw_keyword(&argv[3])); rnd_log_del_range(from, to); rnd_event(NULL, RND_EVENT_LOG_CLEAR, "pp", &from, &to); ret = 0; @@ -258,7 +258,7 @@ i = 1; if (argc > 2) { const char *hows; - rnd_PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, hows = argv[i].val.str); + RND_ACT_MAY_CONVARG(i, FGW_STR, Message, hows = argv[i].val.str); if (strcmp(hows, "ERROR") == 0) { i++; how = RND_MSG_ERROR; } else if (strcmp(hows, "WARNING") == 0) { i++; how = RND_MSG_WARNING; } else if (strcmp(hows, "INFO") == 0) { i++; how = RND_MSG_INFO; } @@ -268,7 +268,7 @@ RND_ACT_IRES(0); for(; i < argc; i++) { char *s = NULL; - rnd_PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, s = argv[i].val.str); + RND_ACT_MAY_CONVARG(i, FGW_STR, Message, s = argv[i].val.str); if ((s != NULL) && (*s != '\0')) rnd_message(how, s); rnd_message(how, "\n"); Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 31031) +++ trunk/src/librnd/core/gui_act.c (revision 31032) @@ -55,10 +55,10 @@ return 0; } - RND_PCB_ACT_CONVARG(1, FGW_STR, CreateMenu, ;); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, CreateMenu, ;); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, CreateMenu, ;); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, CreateMenu, ;); + RND_ACT_CONVARG(1, FGW_STR, CreateMenu, ;); + RND_ACT_MAY_CONVARG(2, FGW_STR, CreateMenu, ;); + RND_ACT_MAY_CONVARG(3, FGW_STR, CreateMenu, ;); + RND_ACT_MAY_CONVARG(4, FGW_STR, CreateMenu, ;); if (argc > 1) { rnd_menu_prop_t props; @@ -95,7 +95,7 @@ return 0; } - RND_PCB_ACT_CONVARG(1, FGW_STR, RemoveMenu, ;); + RND_ACT_CONVARG(1, FGW_STR, RemoveMenu, ;); if (rnd_gui->remove_menu(rnd_gui, argv[1].val.str) != 0) { rnd_message(RND_MSG_ERROR, "failed to remove some of the menu items\n"); RND_ACT_IRES(-1); @@ -112,7 +112,7 @@ static fgw_error_t pcb_act_FullScreen(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *cmd = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FullScreen, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, FullScreen, cmd = argv[1].val.str); if ((cmd == NULL) || (rnd_strcasecmp(cmd, "Toggle") == 0)) rnd_conf_setf(RND_CFR_DESIGN, "editor/fullscreen", -1, "%d", !rnd_conf.editor.fullscreen, RND_POL_OVERWRITE); @@ -164,10 +164,10 @@ extra_units_x[1].scale = view_width; extra_units_y[1].scale = view_height; - RND_PCB_ACT_CONVARG(1, FGW_STR, Cursor, op = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, Cursor, a1 = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, Cursor, a2 = argv[3].val.str); - RND_PCB_ACT_CONVARG(4, FGW_STR, Cursor, a3 = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_STR, Cursor, op = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, Cursor, a1 = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, Cursor, a2 = argv[3].val.str); + RND_ACT_CONVARG(4, FGW_STR, Cursor, a3 = argv[4].val.str); switch(*op) { case 'p': case 'P': /* Pan */ @@ -233,8 +233,8 @@ rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; rnd_coord_t x, y; - RND_PCB_ACT_CONVARG(1, FGW_COORD, Cursor, x = fgw_coord(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_COORD, Cursor, y = fgw_coord(&argv[2])); + RND_ACT_CONVARG(1, FGW_COORD, Cursor, x = fgw_coord(&argv[1])); + RND_ACT_CONVARG(2, FGW_COORD, Cursor, y = fgw_coord(&argv[2])); rnd_hidcore_crosshair_move_to(RND_ACT_HIDLIB, x, y, 0); rnd_gui->set_crosshair(rnd_gui, hidlib->ch_x, hidlib->ch_y, HID_SC_PAN_VIEWPORT); @@ -252,12 +252,12 @@ { const char *op, *a; - RND_PCB_ACT_CONVARG(1, FGW_STR, grid, op = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, grid, op = argv[1].val.str); RND_ACT_IRES(0); if (strcmp(op, "set") == 0) { rnd_grid_t dst; - RND_PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); if (!rnd_grid_parse(&dst, a)) RND_ACT_FAIL(grid); rnd_grid_set(RND_ACT_HIDLIB, &dst); @@ -268,7 +268,7 @@ else if ((strcmp(op, "down") == 0) || (strcmp(op, "-") == 0)) rnd_grid_list_step(RND_ACT_HIDLIB, -1); else if (strcmp(op, "idx") == 0) { - RND_PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); rnd_grid_list_jump(RND_ACT_HIDLIB, atoi(a)); } else if (op[0] == '#') { @@ -288,8 +288,8 @@ rnd_coord_t x, y; const char *op = NULL, *msg = "Click to enter a coordinate."; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, GetXY, msg = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, GetXY, op = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, GetXY, msg = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, GetXY, op = argv[2].val.str); rnd_hid_get_coords(msg, &x, &y, 0); Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 31031) +++ trunk/src/librnd/core/hid_nogui.c (revision 31032) @@ -258,9 +258,9 @@ const char *label, *default_str = "", *title = NULL; const char *pcb_acts_cli_PromptFor = pcb_acth_cli; - RND_PCB_ACT_CONVARG(1, FGW_STR, cli_PromptFor, label = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, cli_PromptFor, default_str = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, cli_PromptFor, title = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, cli_PromptFor, label = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, cli_PromptFor, default_str = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, cli_PromptFor, title = argv[3].val.str); if (!rnd_conf.rc.quiet) { char *tmp; @@ -299,9 +299,9 @@ return 0; } - RND_PCB_ACT_CONVARG(1, FGW_STR, cli_MessageBox, icon = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, cli_MessageBox, title = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, cli_MessageBox, label = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, cli_MessageBox, icon = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, cli_MessageBox, title = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, cli_MessageBox, label = argv[3].val.str); printf("[%s] *** %s ***\n", icon, title); @@ -308,7 +308,7 @@ retry:; printf("%s:\n", label); for(n = 4; n < argc; n+=2) { - RND_PCB_ACT_CONVARG(n+0, FGW_STR, cli_MessageBox, txt = argv[n+0].val.str); + RND_ACT_CONVARG(n+0, FGW_STR, cli_MessageBox, txt = argv[n+0].val.str); printf(" %d = %s\n", (n - 4)/2+1, txt); } printf("\nChose a number from above: "); @@ -324,7 +324,7 @@ goto retry; } n = (ret-1)*2+5; - RND_PCB_ACT_CONVARG(n, FGW_INT, cli_MessageBox, res->val.nat_int = argv[n].val.nat_int); + RND_ACT_CONVARG(n, FGW_INT, cli_MessageBox, res->val.nat_int = argv[n].val.nat_int); return 0; } Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 31031) +++ trunk/src/librnd/core/tool.c (revision 31032) @@ -299,7 +299,7 @@ rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; const char *cmd; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1, FGW_STR, Tool, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, Tool, cmd = argv[1].val.str); /* it is okay to use crosshair directly here, the mode command is called from a click when it needs coords */ hidlib->tool_x = hidlib->ch_x; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31031) +++ trunk/src/librnd/pcb_compat.h (revision 31032) @@ -52,7 +52,7 @@ #define pcb_aname rnd_aname #define pcb_act_result rnd_act_result #define PCB_ACT_CALL_C RND_ACT_CALL_C -#define PCB_ACT_CONVARG RND_PCB_ACT_CONVARG +#define PCB_ACT_CONVARG RND_ACT_CONVARG #define PCB_ACT_IRES RND_ACT_IRES #define PCB_ACT_DRES RND_ACT_DRES #define PCB_ACT_FAIL RND_ACT_FAIL Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 31031) +++ trunk/src/main_act.c (revision 31032) @@ -144,7 +144,7 @@ fgw_error_t pcb_act_PrintUsage(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *topic = NULL, *subt = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, PrintUsage, topic = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, PrintUsage, topic = argv[1].val.str); RND_ACT_IRES(0); u(""); @@ -157,7 +157,7 @@ for (i = 0; hl[i]; i++) { if ((hl[i]->usage != NULL) && (strcmp(topic, hl[i]->name) == 0)) { - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, PrintUsage, subt = argv[2].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, PrintUsage, subt = argv[2].val.str); RND_ACT_IRES(hl[i]->usage(hl[i], subt)); return 0; } @@ -272,7 +272,7 @@ char tmp[128]; const char *cmd; - RND_PCB_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); RND_ACT_IRES(0); rnd_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_HIDLIB->filename == NULL ? "" : RND_ACT_HIDLIB->filename, 1); @@ -292,7 +292,7 @@ { const char *fname; - RND_PCB_ACT_CONVARG(1, FGW_STR, ExecuteFile, fname = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ExecuteFile, fname = argv[1].val.str); RND_ACT_IRES(pcb_act_execute_file(RND_ACT_HIDLIB, fname)); return 0; } Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 31031) +++ trunk/src/netlist_act.c (revision 31032) @@ -359,9 +359,9 @@ unsigned net_found = 0; unsigned pin_found = 0; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Netlist, a1 = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, Netlist, a2 = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, Netlist, a1 = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, Netlist, a2 = argv[3].val.str); RND_ACT_IRES(0); if (!PCB) @@ -543,8 +543,8 @@ pcb_net_t *net; char *netname = NULL, *free_netname = NULL; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Netlist, netname = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, Netlist, netname = argv[2].val.str); RND_ACT_IRES(0); vtp0_init(&termlist); Index: trunk/src/obj_pstk_act.c =================================================================== --- trunk/src/obj_pstk_act.c (revision 31031) +++ trunk/src/obj_pstk_act.c (revision 31032) @@ -46,13 +46,13 @@ rnd_cardinal_t pid; pcb_pstk_proto_t tmp, *p; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); switch(op) { case F_Selected: if (argc > 3) { - RND_PCB_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2])); - RND_PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3])); + RND_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2])); + RND_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3])); } else { rnd_hid_get_coords("Click at padstack origin", &x, &y, 0); @@ -108,7 +108,7 @@ fgw_error_t pcb_act_padstackbreakup(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); RND_ACT_IRES(-1); switch(op) { @@ -171,11 +171,11 @@ pcb_pstk_t *ps; rnd_coord_t x, y; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, padstackplace, pids = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, padstackplace, pids = argv[1].val.str); if (argc > 3) { - RND_PCB_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2])); - RND_PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3])); + RND_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2])); + RND_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3])); } else { rnd_hid_get_coords("Click at padstack origin", &x, &y, 0); Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 31031) +++ trunk/src/object_act.c (revision 31032) @@ -72,8 +72,8 @@ const char *layername; char *buf; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Attributes, id = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Attributes, layername = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, Attributes, id = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_STR, Attributes, layername = argv[1].val.str); RND_ACT_IRES(0); if (!rnd_gui->edit_attributes) { @@ -218,7 +218,7 @@ rnd_coord_t minx = GAP, miny = GAP, maxy = GAP, dx, dy; int all = 0, id; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, DisperseElements, id = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, DisperseElements, id = fgw_keyword(&argv[1])); RND_ACT_IRES(0); switch(id) { @@ -263,7 +263,7 @@ int id; void *ptrtmp; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Flip, id = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Flip, id = fgw_keyword(&argv[1])); RND_ACT_IRES(0); rnd_hid_get_coords("Click on Object or Flip Point", &x, &y, 0); @@ -304,10 +304,10 @@ void *ptr1, *ptr2, *ptr3; int type; - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, MoveObject, units = argv[3].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, MoveObject, units = argv[3].val.str); fgw_str2coord_unit_set(saved, units); - RND_PCB_ACT_CONVARG(1, FGW_COORDS, MoveObject, nx = fgw_coords(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_COORDS, MoveObject, ny = fgw_coords(&argv[2])); + RND_ACT_CONVARG(1, FGW_COORDS, MoveObject, nx = fgw_coords(&argv[1])); + RND_ACT_CONVARG(2, FGW_COORDS, MoveObject, ny = fgw_coords(&argv[2])); fgw_str2coord_unit_restore(saved); @@ -344,7 +344,7 @@ pcb_board_t *pcb = PCB_ACT_BOARD; int id; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, MoveToCurrentLayer, id = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, MoveToCurrentLayer, id = fgw_keyword(&argv[1])); RND_ACT_IRES(0); switch(id) { @@ -594,7 +594,7 @@ int fx, fy, fs; static placer_t plc; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ElementList, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, ElementList, op = fgw_keyword(&argv[1])); #ifdef DEBUG printf("Entered pcb_act_ElementList, executing function %s\n", function); @@ -630,9 +630,9 @@ if (op != F_Need) RND_ACT_FAIL(ElementList); - RND_PCB_ACT_CONVARG(2, FGW_STR, ElementList, refdes = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, ElementList, footprint = argv[3].val.str); - RND_PCB_ACT_CONVARG(4, FGW_STR, ElementList, value = argv[4].val.str); + RND_ACT_CONVARG(2, FGW_STR, ElementList, refdes = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, ElementList, footprint = argv[3].val.str); + RND_ACT_CONVARG(4, FGW_STR, ElementList, value = argv[4].val.str); args[0].type = FGW_FUNC; args[0].val.argv0.func = NULL; @@ -770,9 +770,9 @@ pcb_subc_t *sc; const char *refdes, *name, *value; - RND_PCB_ACT_CONVARG(1, FGW_STR, ElementList, refdes = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, ElementList, name = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, ElementList, value = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, ElementList, refdes = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, ElementList, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, ElementList, value = argv[3].val.str); sc = pcb_subc_by_refdes(pcb->Data, refdes); if (sc == NULL) { @@ -799,7 +799,7 @@ int op; rnd_bool changed = rnd_false; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, RipUp, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, RipUp, op = fgw_keyword(&argv[1])); switch(op) { case F_All: @@ -930,9 +930,9 @@ rnd_coord_t value; int flags; - RND_PCB_ACT_CONVARG(1, FGW_STR, MinClearGap, function = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, MinClearGap, delta = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, MinClearGap, delta = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, MinClearGap, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, MinClearGap, delta = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, MinClearGap, delta = argv[3].val.str); if (rnd_strcasecmp(function, "Selected") == 0) flags = PCB_FLAG_SELECTED; @@ -961,8 +961,8 @@ int old_index, new_index; pcb_board_t *pcb = PCB_ACT_BOARD; - RND_PCB_ACT_CONVARG(1, FGW_STR, MoveLayer, a0 = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, MoveLayer, a1 = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, MoveLayer, a0 = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, MoveLayer, a1 = argv[2].val.str); if (strcmp(a0, "c") == 0) old_index = PCB_CURRLID(pcb); @@ -984,7 +984,7 @@ } else if (strcmp(a1, "group") == 0) { long gid; - RND_PCB_ACT_CONVARG(3, FGW_LONG, MoveLayer, gid = argv[3].val.nat_long); + RND_ACT_CONVARG(3, FGW_LONG, MoveLayer, gid = argv[3].val.nat_long); pcb_layer_move_to_group(pcb, old_index, gid); RND_ACT_IRES(0); return 0; @@ -1050,13 +1050,13 @@ int fid, dir, scale; pcb_text_t *t; - RND_PCB_ACT_CONVARG(1, FGW_LAYER, CreateText, ly = fgw_layer(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_INT, CreateText, fid = argv[2].val.nat_int); - RND_PCB_ACT_CONVARG(3, FGW_COORD, CreateText, x = fgw_coord(&argv[3])); - RND_PCB_ACT_CONVARG(4, FGW_COORD, CreateText, y = fgw_coord(&argv[4])); - RND_PCB_ACT_CONVARG(5, FGW_INT, CreateText, dir = argv[5].val.nat_int); - RND_PCB_ACT_CONVARG(6, FGW_INT, CreateText, scale = argv[6].val.nat_int); - RND_PCB_ACT_CONVARG(7, FGW_STR, CreateText, txt = argv[7].val.str); + RND_ACT_CONVARG(1, FGW_LAYER, CreateText, ly = fgw_layer(&argv[1])); + RND_ACT_CONVARG(2, FGW_INT, CreateText, fid = argv[2].val.nat_int); + RND_ACT_CONVARG(3, FGW_COORD, CreateText, x = fgw_coord(&argv[3])); + RND_ACT_CONVARG(4, FGW_COORD, CreateText, y = fgw_coord(&argv[4])); + RND_ACT_CONVARG(5, FGW_INT, CreateText, dir = argv[5].val.nat_int); + RND_ACT_CONVARG(6, FGW_INT, CreateText, scale = argv[6].val.nat_int); + RND_ACT_CONVARG(7, FGW_STR, CreateText, txt = argv[7].val.str); if (scale < 1) { rnd_message(RND_MSG_ERROR, "Invalid scale (must be larger than zero)\n"); @@ -1084,8 +1084,8 @@ pcb_board_t *pcb = PCB_ACT_BOARD; int op1, op2 = -2; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, subc, op1 = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, subc, op2 = fgw_keyword(&argv[2])); + RND_ACT_CONVARG(1, FGW_KEYWORD, subc, op1 = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_KEYWORD, subc, op2 = fgw_keyword(&argv[2])); RND_ACT_IRES(0); switch(op1) { @@ -1183,7 +1183,7 @@ int steps; rnd_coord_t x, y; - RND_PCB_ACT_CONVARG(1, FGW_INT, Rotate90, steps = argv[1].val.nat_int); + RND_ACT_CONVARG(1, FGW_INT, Rotate90, steps = argv[1].val.nat_int); RND_ACT_IRES(0); rnd_hid_get_coords("Select an Object", &x, &y, 0); Index: trunk/src/plug_footprint_act.c =================================================================== --- trunk/src/plug_footprint_act.c (revision 31031) +++ trunk/src/plug_footprint_act.c (revision 31032) @@ -39,7 +39,7 @@ const char *name = NULL; pcb_fplibrary_t *l; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, fp_rehash, name = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, fp_rehash, name = argv[1].val.str); RND_ACT_IRES(0); if (name == NULL) { Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 31031) +++ trunk/src/polygon_act.c (revision 31032) @@ -56,7 +56,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, MorphPolygon, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, MorphPolygon, op = fgw_keyword(&argv[1])); switch(op) { case F_Object: @@ -96,7 +96,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1])); if ((argc > 1) && ((rnd_conf.editor.mode == pcb_crosshair.tool_poly) || (rnd_conf.editor.mode == pcb_crosshair.tool_poly_hole))) { rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 31031) +++ trunk/src/rats_act.c (revision 31032) @@ -59,7 +59,7 @@ pcb_rat_t *shorty; float len, small; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, AddRats, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, AddRats, op = fgw_keyword(&argv[1])); if (conf_core.temp.rat_warn) { pcb_data_clear_flag(PCB->Data, PCB_FLAG_WARN, 1, 0); @@ -112,7 +112,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Connection, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Connection, op = fgw_keyword(&argv[1])); switch(op) { case F_Find: @@ -170,7 +170,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, DeleteRats, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, DeleteRats, op = fgw_keyword(&argv[1])); if (conf_core.temp.rat_warn) { pcb_data_clear_flag(PCB->Data, PCB_FLAG_WARN, 1, 0); Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 31031) +++ trunk/src/rats_patch.c (revision 31032) @@ -560,7 +560,7 @@ pcb_subc_t *olds = NULL, *news; int dumb = 0, op = F_Selected; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, ReplaceFootprint, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, ReplaceFootprint, op = fgw_keyword(&argv[1])); if (act_replace_footprint_dst(op, &olds) != 0) { RND_ACT_IRES(1); @@ -568,13 +568,13 @@ } /* fetch the name of the new footprint */ - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ReplaceFootprint, fpname = rnd_strdup(argv[2].val.str)); + RND_ACT_MAY_CONVARG(2, FGW_STR, ReplaceFootprint, fpname = rnd_strdup(argv[2].val.str)); if (act_replace_footprint_src(fpname, &news) != 0) { RND_ACT_IRES(1); return 0; } - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, ReplaceFootprint, dumbs = argv[3].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, ReplaceFootprint, dumbs = argv[3].val.str); if ((dumbs != NULL) && (strcmp(dumbs, "dumb") == 0)) dumb = 1; @@ -591,7 +591,7 @@ const char *fn = NULL; FILE *f; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, SavePatch, fn = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, SavePatch, fn = argv[1].val.str); if (fn == NULL) { char *default_file; Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 31031) +++ trunk/src/remove_act.c (revision 31032) @@ -49,7 +49,7 @@ { int id; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1])); if (id == -1) { /* no arg */ if (pcb_remove_selected(rnd_false) == rnd_false) @@ -61,7 +61,7 @@ if (argc > 2) { /* delete by idpath */ pcb_idpath_t *idp; pcb_any_obj_t *obj; - RND_PCB_ACT_CONVARG(2, FGW_IDPATH, Delete, idp = fgw_idpath(&argv[2])); + RND_ACT_CONVARG(2, FGW_IDPATH, Delete, idp = fgw_idpath(&argv[2])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 31031) +++ trunk/src/select_act.c (revision 31032) @@ -62,7 +62,7 @@ static fgw_error_t pcb_act_Select(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Select, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Select, op = fgw_keyword(&argv[1])); switch(op) { @@ -71,7 +71,7 @@ if (argc > 2) { /* select by idpath */ pcb_idpath_t *idp; pcb_any_obj_t *obj; - RND_PCB_ACT_CONVARG(2, FGW_IDPATH, Select, idp = fgw_idpath(&argv[2])); + RND_ACT_CONVARG(2, FGW_IDPATH, Select, idp = fgw_idpath(&argv[2])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); @@ -190,7 +190,7 @@ static fgw_error_t pcb_act_Unselect(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Unselect, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Unselect, op = fgw_keyword(&argv[1])); switch(op) { Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 31031) +++ trunk/src/undo_act.c (revision 31032) @@ -56,7 +56,7 @@ fgw_error_t pcb_act_Atomic(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Atomic, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, Atomic, op = fgw_keyword(&argv[1])); switch (op) { case F_Save: @@ -101,7 +101,7 @@ fgw_error_t pcb_act_Undo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *function = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str); if (!function || !*function) { rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); if (rnd_tool_undo_act(RND_ACT_HIDLIB)) Index: trunk/src_plugins/act_draw/act_draw.c =================================================================== --- trunk/src_plugins/act_draw/act_draw.c (revision 31031) +++ trunk/src_plugins/act_draw/act_draw.c (revision 31032) @@ -77,15 +77,15 @@ DRAWOPTARG; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, LineNew, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, LineNew, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, LineNew, x1 = fgw_coord(&argv[3+ao])); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, LineNew, y1 = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_COORD, LineNew, x2 = fgw_coord(&argv[5+ao])); - RND_PCB_ACT_CONVARG(6+ao, FGW_COORD, LineNew, y2 = fgw_coord(&argv[6+ao])); - RND_PCB_ACT_CONVARG(7+ao, FGW_COORD, LineNew, th = fgw_coord(&argv[7+ao])); - RND_PCB_ACT_CONVARG(8+ao, FGW_COORD, LineNew, cl = fgw_coord(&argv[8+ao])); - RND_PCB_ACT_CONVARG(9+ao, FGW_STR, LineNew, sflg = argv[9+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, LineNew, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, LineNew, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_COORD, LineNew, x1 = fgw_coord(&argv[3+ao])); + RND_ACT_CONVARG(4+ao, FGW_COORD, LineNew, y1 = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_COORD, LineNew, x2 = fgw_coord(&argv[5+ao])); + RND_ACT_CONVARG(6+ao, FGW_COORD, LineNew, y2 = fgw_coord(&argv[6+ao])); + RND_ACT_CONVARG(7+ao, FGW_COORD, LineNew, th = fgw_coord(&argv[7+ao])); + RND_ACT_CONVARG(8+ao, FGW_COORD, LineNew, cl = fgw_coord(&argv[8+ao])); + RND_ACT_CONVARG(9+ao, FGW_STR, LineNew, sflg = argv[9+ao].val.str); if ((data != PCB->Data) || (layer == NULL)) return 0; @@ -115,17 +115,17 @@ DRAWOPTARG; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, ArcNew, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, ArcNew, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, ArcNew, cx = fgw_coord(&argv[3+ao])); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, ArcNew, cy = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_COORD, ArcNew, wr = fgw_coord(&argv[5+ao])); - RND_PCB_ACT_CONVARG(6+ao, FGW_COORD, ArcNew, hr = fgw_coord(&argv[6+ao])); - RND_PCB_ACT_CONVARG(7+ao, FGW_DOUBLE, ArcNew, sa = argv[7+ao].val.nat_double); - RND_PCB_ACT_CONVARG(8+ao, FGW_DOUBLE, ArcNew, da = argv[8+ao].val.nat_double); - RND_PCB_ACT_CONVARG(9+ao, FGW_COORD, ArcNew, th = fgw_coord(&argv[9+ao])); - RND_PCB_ACT_CONVARG(10+ao, FGW_COORD, ArcNew, cl = fgw_coord(&argv[10+ao])); - RND_PCB_ACT_CONVARG(11+ao, FGW_STR, ArcNew, sflg = argv[11+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, ArcNew, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, ArcNew, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_COORD, ArcNew, cx = fgw_coord(&argv[3+ao])); + RND_ACT_CONVARG(4+ao, FGW_COORD, ArcNew, cy = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_COORD, ArcNew, wr = fgw_coord(&argv[5+ao])); + RND_ACT_CONVARG(6+ao, FGW_COORD, ArcNew, hr = fgw_coord(&argv[6+ao])); + RND_ACT_CONVARG(7+ao, FGW_DOUBLE, ArcNew, sa = argv[7+ao].val.nat_double); + RND_ACT_CONVARG(8+ao, FGW_DOUBLE, ArcNew, da = argv[8+ao].val.nat_double); + RND_ACT_CONVARG(9+ao, FGW_COORD, ArcNew, th = fgw_coord(&argv[9+ao])); + RND_ACT_CONVARG(10+ao, FGW_COORD, ArcNew, cl = fgw_coord(&argv[10+ao])); + RND_ACT_CONVARG(11+ao, FGW_STR, ArcNew, sflg = argv[11+ao].val.str); if ((data != PCB->Data) || (layer == NULL)) return 0; @@ -157,16 +157,16 @@ DRAWOPTARG; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, TextNew, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, TextNew, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_INT, TextNew, fontid = argv[3+ao].val.nat_int); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, TextNew, x = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_COORD, TextNew, y = fgw_coord(&argv[5+ao])); - RND_PCB_ACT_CONVARG(6+ao, FGW_DOUBLE, TextNew, rot = argv[6+ao].val.nat_double); - RND_PCB_ACT_CONVARG(7+ao, FGW_INT, TextNew, scale = argv[7+ao].val.nat_int); - RND_PCB_ACT_CONVARG(8+ao, FGW_COORD, TextNew, th = fgw_coord(&argv[8+ao])); - RND_PCB_ACT_CONVARG(9+ao, FGW_STR, TextNew, str = argv[9+ao].val.str); - RND_PCB_ACT_CONVARG(10+ao, FGW_STR, TextNew, sflg = argv[10+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, TextNew, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, TextNew, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_INT, TextNew, fontid = argv[3+ao].val.nat_int); + RND_ACT_CONVARG(4+ao, FGW_COORD, TextNew, x = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_COORD, TextNew, y = fgw_coord(&argv[5+ao])); + RND_ACT_CONVARG(6+ao, FGW_DOUBLE, TextNew, rot = argv[6+ao].val.nat_double); + RND_ACT_CONVARG(7+ao, FGW_INT, TextNew, scale = argv[7+ao].val.nat_int); + RND_ACT_CONVARG(8+ao, FGW_COORD, TextNew, th = fgw_coord(&argv[8+ao])); + RND_ACT_CONVARG(9+ao, FGW_STR, TextNew, str = argv[9+ao].val.str); + RND_ACT_CONVARG(10+ao, FGW_STR, TextNew, sflg = argv[10+ao].val.str); if ((data != PCB->Data) || (layer == NULL)) return 0; @@ -200,12 +200,12 @@ DRAWOPTARG; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, PstkNew, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LONG, PstkNew, proto = argv[2+ao].val.nat_int); - RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, PstkNew, x = fgw_coord(&argv[3+ao])); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, PstkNew, y = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_COORD, PstkNew, cl = fgw_coord(&argv[5+ao])); - RND_PCB_ACT_CONVARG(6+ao, FGW_STR, PstkNew, sflg = argv[6+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, PstkNew, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LONG, PstkNew, proto = argv[2+ao].val.nat_int); + RND_ACT_CONVARG(3+ao, FGW_COORD, PstkNew, x = fgw_coord(&argv[3+ao])); + RND_ACT_CONVARG(4+ao, FGW_COORD, PstkNew, y = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_COORD, PstkNew, cl = fgw_coord(&argv[5+ao])); + RND_ACT_CONVARG(6+ao, FGW_STR, PstkNew, sflg = argv[6+ao].val.str); flags = pcb_strflg_s2f(sflg, flg_error, NULL, 0); pstk = pcb_pstk_new(data, -1, proto, x, y, cl, flags); @@ -231,14 +231,14 @@ DRAWOPTARG; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromRectangle, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromRectangle, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, PolyNewFromRectangle, x1 = fgw_coord(&argv[3+ao])); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, PolyNewFromRectangle, y1 = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_COORD, PolyNewFromRectangle, x2 = fgw_coord(&argv[5+ao])); - RND_PCB_ACT_CONVARG(6+ao, FGW_COORD, PolyNewFromRectangle, y2 = fgw_coord(&argv[6+ao])); - RND_PCB_ACT_CONVARG(7+ao, FGW_COORD, PolyNewFromRectangle, cl = fgw_coord(&argv[7+ao])); - RND_PCB_ACT_CONVARG(8+ao, FGW_STR, PolyNewFromRectangle, sflg = argv[8+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromRectangle, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromRectangle, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_COORD, PolyNewFromRectangle, x1 = fgw_coord(&argv[3+ao])); + RND_ACT_CONVARG(4+ao, FGW_COORD, PolyNewFromRectangle, y1 = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_COORD, PolyNewFromRectangle, x2 = fgw_coord(&argv[5+ao])); + RND_ACT_CONVARG(6+ao, FGW_COORD, PolyNewFromRectangle, y2 = fgw_coord(&argv[6+ao])); + RND_ACT_CONVARG(7+ao, FGW_COORD, PolyNewFromRectangle, cl = fgw_coord(&argv[7+ao])); + RND_ACT_CONVARG(8+ao, FGW_STR, PolyNewFromRectangle, sflg = argv[8+ao].val.str); if (data != PCB->Data) return 0; @@ -302,11 +302,11 @@ DRAWOPTARG; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_STR, PolyNewFromPoints, ptlist = argv[3+ao].val.str); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, PolyNewFromPoints, cl = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_STR, PolyNewFromPoints, sflg = argv[5+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_STR, PolyNewFromPoints, ptlist = argv[3+ao].val.str); + RND_ACT_CONVARG(4+ao, FGW_COORD, PolyNewFromPoints, cl = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_STR, PolyNewFromPoints, sflg = argv[5+ao].val.str); if (data != PCB->Data) return 0; @@ -340,10 +340,10 @@ (void)noundo; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, PolyNewFromPoints, cl = fgw_coord(&argv[3+ao])); - RND_PCB_ACT_CONVARG(4+ao, FGW_STR, PolyNewFromPoints, sflg = argv[4+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_COORD, PolyNewFromPoints, cl = fgw_coord(&argv[3+ao])); + RND_ACT_CONVARG(4+ao, FGW_STR, PolyNewFromPoints, sflg = argv[4+ao].val.str); if (data != PCB->Data) return 0; @@ -365,8 +365,8 @@ DRAWOPTARG; (void)noundo; - RND_PCB_ACT_CONVARG(1+ao, FGW_PTR, PolyNewPoints, poly = argv[1+ao].val.ptr_void); - RND_PCB_ACT_CONVARG(2+ao, FGW_STR, PolyNewPoints, ptlist = argv[2+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_PTR, PolyNewPoints, poly = argv[1+ao].val.ptr_void); + RND_ACT_CONVARG(2+ao, FGW_STR, PolyNewPoints, ptlist = argv[2+ao].val.str); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) { rnd_message(RND_MSG_ERROR, "PolyNewPoints: invalid polygon pointer\n"); RND_ACT_IRES(-1); @@ -390,9 +390,9 @@ pcb_layer_t *layer; DRAWOPTARG; - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_PTR, PolyNewPoints, poly = argv[3+ao].val.ptr_void); + RND_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_PTR, PolyNewPoints, poly = argv[3+ao].val.ptr_void); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) { rnd_message(RND_MSG_ERROR, "PolyNewEnd: invalid polygon pointer\n"); RND_ACT_IRES(0); @@ -428,9 +428,9 @@ (void)noundo; RND_ACT_IRES(0); - RND_PCB_ACT_CONVARG(1+ao, FGW_DATA, LayerObjDup, data = fgw_data(&argv[1+ao])); - RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, LayerObjDup, layer = fgw_layer(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_PTR, LayerObjDup, idp = argv[3+ao].val.ptr_void); + RND_ACT_CONVARG(1+ao, FGW_DATA, LayerObjDup, data = fgw_data(&argv[1+ao])); + RND_ACT_CONVARG(2+ao, FGW_LAYER, LayerObjDup, layer = fgw_layer(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_PTR, LayerObjDup, idp = argv[3+ao].val.ptr_void); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) { rnd_message(RND_MSG_ERROR, "LayerObjDup: invalid object pointer\n"); return FGW_ERR_PTR_DOMAIN; Index: trunk/src_plugins/act_draw/act_pstk_proto.c =================================================================== --- trunk/src_plugins/act_draw/act_pstk_proto.c (revision 31031) +++ trunk/src_plugins/act_draw/act_pstk_proto.c (revision 31032) @@ -45,12 +45,12 @@ pcb_idpath_t *idp; if (((argv[aidx].type & FGW_STR) == FGW_STR) && (argv[aidx].val.str[0] == 'b') && ((argv[aidx].val.str[1] == 'u') || (argv[aidx].val.str[1] == 'o'))) { - RND_PCB_ACT_CONVARG(aidx, FGW_DATA, PstkProtoTmp, *data_out = fgw_data(&argv[aidx])); + RND_ACT_CONVARG(aidx, FGW_DATA, PstkProtoTmp, *data_out = fgw_data(&argv[aidx])); *obj_out = NULL; return 0; } - RND_PCB_ACT_CONVARG(aidx, FGW_IDPATH, PstkProtoTmp, idp = fgw_idpath(&argv[aidx])); + RND_ACT_CONVARG(aidx, FGW_IDPATH, PstkProtoTmp, idp = fgw_idpath(&argv[aidx])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[aidx], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); @@ -74,7 +74,7 @@ res->type = FGW_PTR | FGW_STRUCT; res->val.ptr_void = NULL; - RND_PCB_ACT_CONVARG(1+ao, FGW_STR, PstkProtoTmp, cmd = argv[1+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_STR, PstkProtoTmp, cmd = argv[1+ao].val.str); cmdi = act_draw_keywords_sphash(cmd); switch(cmdi) { @@ -95,8 +95,8 @@ src = pcb_pstk_get_proto((pcb_pstk_t *)obj); } else { - RND_PCB_ACT_CONVARG(2+ao, FGW_DATA, PstkProtoTmp, data = fgw_data(&argv[2+ao])); - RND_PCB_ACT_CONVARG(3+ao, FGW_LONG, PstkProtoTmp, src_id = argv[3+ao].val.nat_long); + RND_ACT_CONVARG(2+ao, FGW_DATA, PstkProtoTmp, data = fgw_data(&argv[2+ao])); + RND_ACT_CONVARG(3+ao, FGW_LONG, PstkProtoTmp, src_id = argv[3+ao].val.nat_long); if (data == NULL) return 0; src = pcb_pstk_get_proto_(data, src_id); @@ -117,7 +117,7 @@ RND_ACT_IRES(-1); return 0; } - RND_PCB_ACT_CONVARG(3+ao, FGW_PTR, PstkProtoTmp, proto = argv[3+ao].val.ptr_void); + RND_ACT_CONVARG(3+ao, FGW_PTR, PstkProtoTmp, proto = argv[3+ao].val.ptr_void); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) { rnd_message(RND_MSG_ERROR, "PstkProtoTmp: invalid proto pointer\n"); RND_ACT_IRES(-1); @@ -159,8 +159,8 @@ rnd_coord_t crd; DRAWOPTARG; - RND_PCB_ACT_CONVARG(1+ao, FGW_PTR, PstkProtoEdit, proto = argv[1+ao].val.ptr_void); - RND_PCB_ACT_CONVARG(2+ao, FGW_STR, PstkProtoEdit, cmd = argv[2+ao].val.str); + RND_ACT_CONVARG(1+ao, FGW_PTR, PstkProtoEdit, proto = argv[1+ao].val.ptr_void); + RND_ACT_CONVARG(2+ao, FGW_STR, PstkProtoEdit, cmd = argv[2+ao].val.str); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) { rnd_message(RND_MSG_ERROR, "PstkProtoEdit: invalid proto pointer\n"); @@ -171,7 +171,7 @@ switch(act_draw_keywords_sphash(cmd)) { case act_draw_keywords_remove: - RND_PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); + RND_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); if (pcb_layer_typecomb_str2bits(tmp, &dlyt, &dlyc, 1) != 0) return FGW_ERR_ARG_CONV; pcb_pstk_proto_del_shape(proto, dlyt, dlyc); @@ -178,10 +178,10 @@ break; case act_draw_keywords_copy: - RND_PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); + RND_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); if (pcb_layer_typecomb_str2bits(tmp, &dlyt, &dlyc, 1) != 0) return FGW_ERR_ARG_CONV; - RND_PCB_ACT_CONVARG(4+ao, FGW_STR, PstkProtoEdit, tmp = argv[4+ao].val.str); + RND_ACT_CONVARG(4+ao, FGW_STR, PstkProtoEdit, tmp = argv[4+ao].val.str); if (pcb_layer_typecomb_str2bits(tmp, &slyt, &slyc, 1) != 0) return FGW_ERR_ARG_CONV; @@ -206,7 +206,7 @@ case act_draw_keywords_hdia: - RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, PstkProtoEdit, crd = fgw_coord(&argv[3+ao])); + RND_ACT_CONVARG(3+ao, FGW_COORD, PstkProtoEdit, crd = fgw_coord(&argv[3+ao])); proto->hdia = crd; pcb_pstk_proto_update(proto); RND_ACT_IRES(0); @@ -217,17 +217,17 @@ rnd_coord_t x1, y1, x2, y2, th; int sq = 0; - RND_PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); - RND_PCB_ACT_CONVARG(4+ao, FGW_COORD, PstkProtoEdit, x1 = fgw_coord(&argv[4+ao])); - RND_PCB_ACT_CONVARG(5+ao, FGW_COORD, PstkProtoEdit, y1 = fgw_coord(&argv[5+ao])); - RND_PCB_ACT_CONVARG(6+ao, FGW_COORD, PstkProtoEdit, x2 = fgw_coord(&argv[6+ao])); - RND_PCB_ACT_CONVARG(7+ao, FGW_COORD, PstkProtoEdit, y2 = fgw_coord(&argv[7+ao])); - RND_PCB_ACT_CONVARG(8+ao, FGW_COORD, PstkProtoEdit, th = fgw_coord(&argv[8+ao])); + RND_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); + RND_ACT_CONVARG(4+ao, FGW_COORD, PstkProtoEdit, x1 = fgw_coord(&argv[4+ao])); + RND_ACT_CONVARG(5+ao, FGW_COORD, PstkProtoEdit, y1 = fgw_coord(&argv[5+ao])); + RND_ACT_CONVARG(6+ao, FGW_COORD, PstkProtoEdit, x2 = fgw_coord(&argv[6+ao])); + RND_ACT_CONVARG(7+ao, FGW_COORD, PstkProtoEdit, y2 = fgw_coord(&argv[7+ao])); + RND_ACT_CONVARG(8+ao, FGW_COORD, PstkProtoEdit, th = fgw_coord(&argv[8+ao])); if (pcb_layer_typecomb_str2bits(tmp, &dlyt, &dlyc, 1) != 0) return FGW_ERR_ARG_CONV; tmp = NULL; - rnd_PCB_ACT_MAY_CONVARG(9+ao, FGW_STR, PstkProtoEdit, tmp = argv[9+ao].val.str); + RND_ACT_MAY_CONVARG(9+ao, FGW_STR, PstkProtoEdit, tmp = argv[9+ao].val.str); if ((tmp != NULL) && (*tmp == 's')) sq = 1; Index: trunk/src_plugins/act_read/act_geo.c =================================================================== --- trunk/src_plugins/act_read/act_geo.c (revision 31031) +++ trunk/src_plugins/act_read/act_geo.c (revision 31032) @@ -42,10 +42,10 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; - RND_PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnLine, x = fgw_coord(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnLine, y = fgw_coord(&argv[2])); - RND_PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnLine, r = fgw_coord(&argv[3])); - RND_PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnLine, idp = fgw_idpath(&argv[4])); + RND_ACT_CONVARG(1, FGW_COORD, IsPointOnLine, x = fgw_coord(&argv[1])); + RND_ACT_CONVARG(2, FGW_COORD, IsPointOnLine, y = fgw_coord(&argv[2])); + RND_ACT_CONVARG(3, FGW_COORD, IsPointOnLine, r = fgw_coord(&argv[3])); + RND_ACT_CONVARG(4, FGW_IDPATH, IsPointOnLine, idp = fgw_idpath(&argv[4])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[4], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); @@ -65,10 +65,10 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; - RND_PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnArc, x = fgw_coord(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnArc, y = fgw_coord(&argv[2])); - RND_PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnArc, r = fgw_coord(&argv[3])); - RND_PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnArc, idp = fgw_idpath(&argv[4])); + RND_ACT_CONVARG(1, FGW_COORD, IsPointOnArc, x = fgw_coord(&argv[1])); + RND_ACT_CONVARG(2, FGW_COORD, IsPointOnArc, y = fgw_coord(&argv[2])); + RND_ACT_CONVARG(3, FGW_COORD, IsPointOnArc, r = fgw_coord(&argv[3])); + RND_ACT_CONVARG(4, FGW_IDPATH, IsPointOnArc, idp = fgw_idpath(&argv[4])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[4], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); @@ -87,8 +87,8 @@ pcb_idpath_t *idp1, *idp2; pcb_any_obj_t *obj1, *obj2; - RND_PCB_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2])); + RND_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1])); + RND_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2])); if ((idp1 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[1], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; if ((idp2 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) Index: trunk/src_plugins/act_read/act_idpath.c =================================================================== --- trunk/src_plugins/act_read/act_idpath.c (revision 31031) +++ trunk/src_plugins/act_read/act_idpath.c (revision 31032) @@ -41,7 +41,7 @@ int cmd; long idx; - RND_PCB_ACT_CONVARG(1, FGW_STR, IDPList, cmd_ = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, IDPList, cmd_ = argv[1].val.str); cmd = act_read_keywords_sphash(cmd_); if (cmd == act_read_keywords_alloc) { @@ -49,7 +49,7 @@ fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list); return 0; } - RND_PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, IDPList, list = fgw_idpath_list(&argv[2])); + RND_ACT_CONVARG(2, FGW_IDPATH_LIST, IDPList, list = fgw_idpath_list(&argv[2])); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST)) return FGW_ERR_PTR_DOMAIN; @@ -74,7 +74,7 @@ case act_read_keywords_append: case act_read_keywords_push: case act_read_keywords_prepend: - RND_PCB_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3])); + RND_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3])); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; if (cmd == act_read_keywords_append) @@ -85,7 +85,7 @@ return 0; case act_read_keywords_remove: - RND_PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); + RND_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); idp = pcb_idpath_list_nth(list, idx); if (idp == NULL) { RND_ACT_IRES(-1); @@ -96,7 +96,7 @@ return 0; case act_read_keywords_get: - RND_PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); + RND_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); idp = pcb_idpath_list_nth(list, idx); if (idp == NULL) { res->type = FGW_PTR; @@ -133,8 +133,8 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; - RND_PCB_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2])); + RND_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; @@ -176,11 +176,11 @@ res->val.ptr_void = NULL; if (argc > 2) { - RND_PCB_ACT_CONVARG(1, FGW_DATA, GetParentData, root_data = fgw_data(&argv[1])); + RND_ACT_CONVARG(1, FGW_DATA, GetParentData, root_data = fgw_data(&argv[1])); iidx++; } - RND_PCB_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx])); + RND_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[iidx], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; Index: trunk/src_plugins/act_read/act_layer.c =================================================================== --- trunk/src_plugins/act_read/act_layer.c (revision 31031) +++ trunk/src_plugins/act_read/act_layer.c (revision 31032) @@ -61,7 +61,7 @@ pcb_layer_type_t lyt; long idx; - RND_PCB_ACT_CONVARG(1, FGW_STR, ReadGroup, cmds = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ReadGroup, cmds = argv[1].val.str); cmd = act_read_keywords_sphash(cmds); switch(cmd) { case act_read_keywords_length: @@ -68,21 +68,21 @@ res->type = FGW_LONG; res->val.nat_long = pcb->LayerGroups.len; return 0; case act_read_keywords_layerid: - RND_PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2])); + RND_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2])); grp = pcb_get_layergrp(pcb, gid); if (grp == NULL) return FGW_ERR_ARG_CONV; - RND_PCB_ACT_CONVARG(3, FGW_LONG, ReadGroup, idx = argv[3].val.nat_long); + RND_ACT_CONVARG(3, FGW_LONG, ReadGroup, idx = argv[3].val.nat_long); if ((idx < 0) || (idx >= grp->len)) return FGW_ERR_ARG_CONV; res->type = FGW_LONG; res->val.nat_long = grp->lid[idx]; return 0; case act_read_keywords_field: - RND_PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2])); + RND_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2])); grp = pcb_get_layergrp(pcb, gid); if (grp == NULL) return FGW_ERR_ARG_CONV; - RND_PCB_ACT_CONVARG(3, FGW_STR, ReadGroup, flds = argv[3].val.str); + RND_ACT_CONVARG(3, FGW_STR, ReadGroup, flds = argv[3].val.str); fld = act_read_keywords_sphash(flds); switch(fld) { case act_read_keywords_name: Index: trunk/src_plugins/act_read/act_read.c =================================================================== --- trunk/src_plugins/act_read/act_read.c (revision 31031) +++ trunk/src_plugins/act_read/act_read.c (revision 31032) @@ -51,10 +51,10 @@ double v; rnd_bool success; - RND_PCB_ACT_CONVARG(1, FGW_STR, GetValue, input = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, GetValue, units = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_INT, GetValue, relative = argv[3].val.nat_int); - RND_PCB_ACT_CONVARG(4, FGW_STR, GetValue, def_unit = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, GetValue, input = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, GetValue, units = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_INT, GetValue, relative = argv[3].val.nat_int); + RND_ACT_CONVARG(4, FGW_STR, GetValue, def_unit = argv[1].val.str); if (*units == '\0') units = NULL; @@ -74,7 +74,7 @@ { const char *cmd; - RND_PCB_ACT_CONVARG(1, FGW_STR, GetMark, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, GetMark, cmd = argv[1].val.str); switch(*cmd) { case 'a': res->type = FGW_INT; res->val.nat_int = pcb_marked.status; break; case 'u': res->type = FGW_INT; res->val.nat_int = pcb_marked.user_placed; break; Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c =================================================================== --- trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 31031) +++ trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 31032) @@ -292,7 +292,7 @@ FILE *f; cpcb_layers_t stk; - RND_PCB_ACT_CONVARG(1, FGW_STR, import_cpcb, fn = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, import_cpcb, fn = argv[1].val.str); f = rnd_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { @@ -319,7 +319,7 @@ cpcb_layers_t stk; cpcb_netmap_t nmap; - RND_PCB_ACT_CONVARG(1, FGW_STR, export_cpcb, fn = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, export_cpcb, fn = argv[1].val.str); f = rnd_fopen(&PCB->hidlib, fn, "w"); if (f == NULL) { @@ -355,8 +355,8 @@ cpcb_layers_t stk; cpcb_netmap_t nmap; - RND_PCB_ACT_CONVARG(1, FGW_STR, cpcb, scope = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, cpcb, cmd = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, cpcb, scope = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, cpcb, cmd = argv[2].val.str); if (strcmp(scope, "board") != 0) { rnd_message(RND_MSG_ERROR, "Only board routing is supported at the moment\n"); Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 31031) +++ trunk/src_plugins/autoroute/action.c (revision 31032) @@ -46,7 +46,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, AutoRoute, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, AutoRoute, op = fgw_keyword(&argv[1])); rnd_hid_busy(PCB, 1); switch(op) { Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 31031) +++ trunk/src_plugins/cam/cam.c (revision 31032) @@ -162,12 +162,12 @@ const char *cmd = "gui", *arg = NULL, *opt; int n, rs = -1; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, cam, cmd = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, cam, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, cam, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, cam, arg = argv[2].val.str); cam_init_inst(&ctx); for(n = 3; n < argc; n++) { - RND_PCB_ACT_CONVARG(n, FGW_STR, cam, opt = argv[n].val.str); + RND_ACT_CONVARG(n, FGW_STR, cam, opt = argv[n].val.str); if (cam_parse_opt(&ctx, opt) != 0) { rnd_message(RND_MSG_ERROR, "cam: invalid action option '%s'\n", opt); cam_uninit_inst(&ctx); Index: trunk/src_plugins/ddraft/cli.c =================================================================== --- trunk/src_plugins/ddraft/cli.c (revision 31031) +++ trunk/src_plugins/ddraft/cli.c (revision 31032) @@ -510,7 +510,7 @@ return 0; } - RND_PCB_ACT_CONVARG(1, FGW_STR, ddraft, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ddraft, cmd = argv[1].val.str); if (strcmp(cmd, "/exit") == 0) { rnd_cli_leave(); RND_ACT_IRES(0); Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 31031) +++ trunk/src_plugins/ddraft/ddraft.c (revision 31032) @@ -129,8 +129,8 @@ rnd_coord_t x, y; vtp0_t edges; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, trim_split, kwcut = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, trim_split, kwobj = fgw_keyword(&argv[2])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, trim_split, kwcut = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_KEYWORD, trim_split, kwobj = fgw_keyword(&argv[2])); vtp0_init(&edges); @@ -199,7 +199,7 @@ for(n = 1; n < 3; n++) { vect = (n == 1) ? &edges : &objs; - RND_PCB_ACT_CONVARG(n, FGW_IDPATH, split_idp, idp = fgw_idpath(&argv[n])); + RND_ACT_CONVARG(n, FGW_IDPATH, split_idp, idp = fgw_idpath(&argv[n])); if (idp == NULL) goto invptr; if (fgw_ptr_in_domain(&rnd_fgw, &argv[n], RND_PTR_DOMAIN_IDPATH)) { @@ -259,7 +259,7 @@ } \ ctr = 0; \ for(n = 2; n < argc; n++) { \ - RND_PCB_ACT_CONVARG(n, fgw_type_, constraint, arr[ctr] = fgw_val_); \ + RND_ACT_CONVARG(n, fgw_type_, constraint, arr[ctr] = fgw_val_); \ ctr++; \ } \ } while(0) @@ -271,7 +271,7 @@ char *stype = NULL; int type; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, constraint, stype = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, constraint, stype = argv[1].val.str); if (stype == NULL) { RND_ACT_IRES(constraint_gui()); return 0; @@ -288,12 +288,12 @@ break; case ddraft_fields_line_angle_mod: cons.line_angle_mod = 0; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.line_angle_mod = argv[2].val.nat_double); + RND_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.line_angle_mod = argv[2].val.nat_double); cons_changed(); break; case ddraft_fields_move_angle_mod: cons.move_angle_mod = 0; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.move_angle_mod = argv[2].val.nat_double); + RND_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.move_angle_mod = argv[2].val.nat_double); cons_changed(); break; case ddraft_fields_line_length: @@ -306,12 +306,12 @@ break; case ddraft_fields_line_length_mod: cons.line_length_mod = 0; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.line_length_mod = fgw_coord(&argv[2])); + RND_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.line_length_mod = fgw_coord(&argv[2])); cons_changed(); break; case ddraft_fields_move_length_mod: cons.move_length_mod = 0; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.move_length_mod = fgw_coord(&argv[2])); + RND_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.move_length_mod = fgw_coord(&argv[2])); cons_changed(); break; Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 31031) +++ trunk/src_plugins/diag/diag.c (revision 31032) @@ -63,7 +63,7 @@ { int op; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, DumpConf, op = fgw_keyword(&argv[1])); + RND_ACT_CONVARG(1, FGW_KEYWORD, DumpConf, op = fgw_keyword(&argv[1])); switch(op) { case F_Native: @@ -70,8 +70,8 @@ { int verbose = 0; const char *prefix = ""; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_INT, DumpConf, verbose = argv[2].val.nat_int); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); + RND_ACT_MAY_CONVARG(2, FGW_INT, DumpConf, verbose = argv[2].val.nat_int); + RND_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); conf_dump(stdout, prefix, verbose, NULL); } break; @@ -79,8 +79,8 @@ { rnd_conf_role_t role; const char *srole, *prefix = ""; - RND_PCB_ACT_CONVARG(2, FGW_STR, DumpConf, srole = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); + RND_ACT_CONVARG(2, FGW_STR, DumpConf, srole = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); role = rnd_conf_role_parse(srole); if (role == RND_CFR_invalid) { rnd_message(RND_MSG_ERROR, "Invalid role: '%s'\n", argv[1]); @@ -119,7 +119,7 @@ rnd_conf_native_t *nat; int role; - RND_PCB_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str); nat = rnd_conf_get_field(path); if (nat == NULL) { @@ -169,7 +169,7 @@ rnd_layer_id_t arr[128]; /* WARNING: this assumes we won't have more than 128 layers */ rnd_layergrp_id_t garr[128]; /* WARNING: this assumes we won't have more than 128 layers */ - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, DumpLayers, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, DumpLayers, op = fgw_keyword(&argv[1])); if (op == F_All) { printf("Per group:\n"); @@ -380,7 +380,7 @@ const char *default_fmt = "%m (%M %N) for %t:\n %H\n"; const char *fmt = default_fmt; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, dumpflags, fmt = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, dumpflags, fmt = argv[1].val.str); for(n = 0; n < pcb_object_flagbits_len; n++) { char *tmp; @@ -495,10 +495,10 @@ pcb_fp_fopen_ctx_t fctx; int n, want_bbox = 0, want_origin = 0; - RND_PCB_ACT_CONVARG(1, FGW_STR, DumpLibFootprint, fpn = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, DumpLibFootprint, fpn = argv[1].val.str); for(n = 2; n < argc; n++) { - RND_PCB_ACT_CONVARG(n, FGW_STR, DumpLibFootprint, opt = argv[n].val.str); + RND_ACT_CONVARG(n, FGW_STR, DumpLibFootprint, opt = argv[n].val.str); if (strcmp(opt, "bbox") == 0) want_bbox = 1; else if (strcmp(opt, "origin") == 0) want_origin = 1; else RND_ACT_FAIL(DumpLibFootprint); @@ -555,7 +555,7 @@ void *ptr1, *ptr2, *ptr3; const char *new_color; - RND_PCB_ACT_CONVARG(1, FGW_STR, forcecolor, new_color = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, forcecolor, new_color = argv[1].val.str); rnd_hid_get_coords("Click on object to change", &x, &y, 0); Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 31032) @@ -92,7 +92,7 @@ memset(&ctx, 0, sizeof(ctx)); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, FlagEdit, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, FlagEdit, op = fgw_keyword(&argv[1])); if (op == F_Object) { rnd_coord_t x, y; Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 31032) @@ -208,7 +208,7 @@ if (argc > 2) RND_ACT_FAIL(Fontsel); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Fontsel, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Fontsel, op = argv[1].val.str); if (op != NULL) { if (rnd_strcasecmp(op, "Object") == 0) { Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 31032) @@ -61,7 +61,7 @@ return 0; } - RND_PCB_ACT_CONVARG(1, FGW_STR, InfoBarFileChanged, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, InfoBarFileChanged, cmd = argv[1].val.str); if (strcmp(cmd, "open") == 0) { if (!active) { Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 31032) @@ -261,7 +261,7 @@ rnd_hid_attr_val_t val; memset(&ctx, 0, sizeof(ctx)); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, LayerBinding, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, LayerBinding, op = fgw_keyword(&argv[1])); if (op == F_Object) { rnd_coord_t x, y; Index: trunk/src_plugins/dialogs/dlg_layer_flags.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 31032) @@ -43,7 +43,7 @@ rnd_layer_id_t lid; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, LayerPropGui, lid = argv[1].val.nat_long); + RND_ACT_MAY_CONVARG(1, FGW_LONG, LayerPropGui, lid = argv[1].val.nat_long); ly = pcb_get_layer(PCB->Data, lid); RND_DAD_BEGIN_VBOX(dlg); @@ -106,7 +106,7 @@ pcb_layer_type_t ltype_bits[] = { PCB_LYT_TOP, PCB_LYT_BOTTOM, PCB_LYT_INTERN, 0 }; #define LOC_TYPES (PCB_LYT_DOC) - rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, GroupPropGui, gid = argv[1].val.nat_long); + RND_ACT_MAY_CONVARG(1, FGW_LONG, GroupPropGui, gid = argv[1].val.nat_long); g = pcb_get_layergrp(PCB, gid); if (g->ltype & LOC_TYPES) { Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 31032) @@ -631,7 +631,7 @@ { long id = -1; const char *cmd = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, pstklib, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, pstklib, cmd = argv[1].val.str); if ((cmd != NULL) && (strcmp(cmd, "object") == 0)) { rnd_coord_t x, y; void *r1, *r2, *r3; @@ -647,7 +647,7 @@ id = sc->ID; } else - rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, pstklib, id = argv[1].val.nat_long); + RND_ACT_MAY_CONVARG(1, FGW_LONG, pstklib, id = argv[1].val.nat_long); if (pcb_dlg_pstklib(PCB, id, rnd_false, NULL) == PCB_PADSTACK_INVALID) RND_ACT_IRES(-1); else Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 31032) @@ -68,7 +68,7 @@ if (argc > 2) return RND_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); if (rnd_strcasecmp(function, "Netlist") == 0) name = rnd_gui->fileselect(rnd_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", RND_HID_FSD_READ, NULL); @@ -403,7 +403,7 @@ if (cwd == NULL) cwd = dup_cwd(); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); is_dialog = (function != NULL) && (rnd_strncasecmp(function, "Dialog", 6) == 0); @@ -419,10 +419,10 @@ if (is_dialog) { const char *siot, *sext; - RND_PCB_ACT_CONVARG(2, FGW_STR, Save, siot = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, Save, sext = argv[3].val.str); - RND_PCB_ACT_CONVARG(4, FGW_STR, Save, prompt = argv[4].val.str); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, Save, default_pattern = argv[5].val.str); + RND_ACT_CONVARG(2, FGW_STR, Save, siot = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, Save, sext = argv[3].val.str); + RND_ACT_CONVARG(4, FGW_STR, Save, prompt = argv[4].val.str); + RND_ACT_MAY_CONVARG(5, FGW_STR, Save, default_pattern = argv[5].val.str); if (rnd_strcasecmp(siot, "pcb") == 0) list_iot = PCB_IOT_PCB; else if (rnd_strcasecmp(siot, "footprint") == 0) list_iot = PCB_IOT_FOOTPRINT; Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 31032) @@ -1008,8 +1008,8 @@ memset(&pse, 0, sizeof(pse)); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, PadstackEdit, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_INT, PadstackEdit, target_tab = argv[2].val.nat_int); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, PadstackEdit, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_INT, PadstackEdit, target_tab = argv[2].val.nat_int); RND_ACT_IRES(0); if (op == F_Object) { Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 31032) @@ -392,8 +392,8 @@ fgw_error_t pcb_act_Preferences(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *tab = NULL, *tabarg = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Preferences, tab = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Preferences, tabarg = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Preferences, tab = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, Preferences, tabarg = argv[2].val.str); pcb_dlg_pref(tab, tabarg); RND_ACT_IRES(0); return 0; Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 31031) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 31032) @@ -738,7 +738,7 @@ fgw_error_t pcb_act_DrcDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *dlg_type = "list"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DrcDialog, dlg_type = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, DrcDialog, dlg_type = argv[1].val.str); if (!drc_gui_ctx.active) { drc_gui_ctx.pcb = PCB; @@ -763,7 +763,7 @@ fgw_error_t pcb_act_IOIncompatListDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *dlg_type = "list"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatListDialog, dlg_type = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatListDialog, dlg_type = argv[1].val.str); if (!io_gui_ctx.active) { io_gui_ctx.pcb = PCB; @@ -787,9 +787,9 @@ view_ctx_t *ctx; void *lst = NULL; const char *name = "view list", *winid = "viewlist"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ViewList, name = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ViewList, winid = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_PTR, ViewList, lst = argv[3].val.ptr_void); + RND_ACT_MAY_CONVARG(1, FGW_STR, ViewList, name = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, ViewList, winid = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_PTR, ViewList, lst = argv[3].val.ptr_void); if ((lst != NULL) && (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], PCB_PTR_DOMAIN_VIEWLIST))) { rnd_message(RND_MSG_ERROR, "invalid list pointer"); Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 31031) +++ trunk/src_plugins/distalign/distalign.c (revision 31032) @@ -267,10 +267,10 @@ RND_ACT_FAIL(align); } - RND_PCB_ACT_CONVARG(1, FGW_STR, align, a0 = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, align, a1 = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, align, a2 = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, align, a3 = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_STR, align, a0 = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, align, a1 = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, align, a2 = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, align, a3 = argv[4].val.str); /* parse direction arg */ switch ((dir = keyword(a0))) { @@ -384,11 +384,11 @@ RND_ACT_FAIL(distribute); } - RND_PCB_ACT_CONVARG(1, FGW_STR, distribute, a0 = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, distribute, a1 = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, distribute, a2 = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, distribute, a3 = argv[4].val.str); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, distribute, a4 = argv[5].val.str); + RND_ACT_CONVARG(1, FGW_STR, distribute, a0 = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, distribute, a1 = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, distribute, a2 = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, distribute, a3 = argv[4].val.str); + RND_ACT_MAY_CONVARG(5, FGW_STR, distribute, a4 = argv[5].val.str); /* parse direction arg */ Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 31031) +++ trunk/src_plugins/djopt/djopt.c (revision 31032) @@ -2439,7 +2439,7 @@ int layn, saved = 0; corner_s *c; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DJopt, arg = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, DJopt, arg = argv[1].val.str); #ifdef ENDIF SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, rnd_false); Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 31031) +++ trunk/src_plugins/drc_query/dlg.c (revision 31032) @@ -329,9 +329,9 @@ const char *srole, *spath, *srule = NULL; rnd_conf_role_t role; - RND_PCB_ACT_CONVARG(1, FGW_STR, DrcQueryEditRule, srole = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, DrcQueryEditRule, spath = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, DrcQueryEditRule, srule = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, DrcQueryEditRule, srole = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, DrcQueryEditRule, spath = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, DrcQueryEditRule, srule = argv[3].val.str); if (srule == NULL) srule = spath; Index: trunk/src_plugins/export_oldconn/oldconn.c =================================================================== --- trunk/src_plugins/export_oldconn/oldconn.c (revision 31031) +++ trunk/src_plugins/export_oldconn/oldconn.c (revision 31032) @@ -265,8 +265,8 @@ void *ptrtmp; rnd_coord_t x, y; - RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ExportOldConn, op = fgw_keyword(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ExportOldConn, name = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_KEYWORD, ExportOldConn, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_STR, ExportOldConn, name = argv[2].val.str); RND_ACT_IRES(0); switch(op) { Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 31031) +++ trunk/src_plugins/export_openems/excitation.c (revision 31032) @@ -461,8 +461,8 @@ { const char *op = "interactive", *a1 = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, OpenemsExcitation, op = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, OpenemsExcitation, a1 = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, OpenemsExcitation, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, OpenemsExcitation, a1 = argv[2].val.str); RND_ACT_IRES(0); @@ -489,8 +489,8 @@ goto error; } - RND_PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); - RND_PCB_ACT_CONVARG(start+1, FGW_STR, OpenemsExcitation, val = argv[start+1].val.str); + RND_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); + RND_ACT_CONVARG(start+1, FGW_STR, OpenemsExcitation, val = argv[start+1].val.str); attrkey = rnd_strdup_printf(AEPREFIX "%s::%s", a1, key); rnd_attribute_put(&PCB->Attributes, attrkey, val); @@ -510,7 +510,7 @@ goto error; } - RND_PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); + RND_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); attrkey = rnd_strdup_printf(AEPREFIX "%s::%s", a1, key); res->type = FGW_STR; Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 31031) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 31032) @@ -609,7 +609,7 @@ FILE *f; const char *name; - RND_PCB_ACT_CONVARG(1, FGW_STR, scad_export_poly, name = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, scad_export_poly, name = argv[1].val.str); f = rnd_fopen_askovr(&PCB->hidlib, name, "w", NULL); if (f == NULL) { Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 31031) +++ trunk/src_plugins/extedit/extedit.c (revision 31032) @@ -180,8 +180,8 @@ int paste = 0, del_selected = 0; rnd_coord_t pastex = 0, pastey = 0; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, extedit, cmd = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, extedit, method = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, extedit, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, extedit, method = argv[2].val.str); /* pick up the object to edit */ if ((cmd == NULL) || (rnd_strcasecmp(cmd, "object") == 0)) { Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 31031) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 31032) @@ -849,7 +849,7 @@ static fgw_error_t pcb_act_DoWindows(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *a = ""; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str); if (strcmp(a, "1") == 0 || rnd_strcasecmp(a, "Layout") == 0) { } else if (strcmp(a, "2") == 0 || rnd_strcasecmp(a, "Library") == 0) { Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 31031) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 31032) @@ -380,7 +380,7 @@ return 0; } - RND_PCB_ACT_CONVARG(1, FGW_STR, LesstifNetlistShow, nn = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, LesstifNetlistShow, nn = argv[1].val.str); if (argc == 2) { pcb_net_term_t *term; Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 31031) +++ trunk/src_plugins/import_calay/calay.c (revision 31032) @@ -199,7 +199,7 @@ static char *default_file = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadCalayFrom, fname_net = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadCalayFrom, fname_net = argv[1].val.str); if (!fname_net || !*fname_net) { fname_net = rnd_gui->fileselect(rnd_gui, Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 31031) +++ trunk/src_plugins/import_dsn/dsn.c (revision 31032) @@ -216,7 +216,7 @@ gsxl_node_t *wiring, *w, *routes, *nout, *n; dsn_type_t type; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { fname = rnd_gui->fileselect(rnd_gui, Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 31031) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 31032) @@ -168,7 +168,7 @@ const char *fname = NULL; static char *default_file = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 31031) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 31032) @@ -153,7 +153,7 @@ const char *fname = NULL; static char *default_file = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, "Load HP-GL file...", Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31031) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31032) @@ -365,7 +365,7 @@ htsp_t subcs, *scs = NULL; htsp_entry_t *e; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { fname = rnd_gui->fileselect(rnd_gui, "Load IPC-D-356 netlist...", @@ -390,7 +390,7 @@ for(n = 2; n < argc; n++) { const char *s; - rnd_PCB_ACT_MAY_CONVARG(n, FGW_STR, LoadIpc356From, s = argv[n].val.str); + RND_ACT_MAY_CONVARG(n, FGW_STR, LoadIpc356From, s = argv[n].val.str); if (strcmp(s, "nonet") == 0) want_net = 0; if (strcmp(s, "nopad") == 0) want_pads = 0; if (strcmp(s, "nosubc") == 0) want_subc = 0; Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 31031) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 31032) @@ -294,7 +294,7 @@ static char *default_file = NULL; int rs; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, "Load ltspice net+asc file pair...", Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 31031) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 31032) @@ -262,7 +262,7 @@ const char *fname = NULL; static char *default_file = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, "Load mentor edf netlist file...", Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 31031) +++ trunk/src_plugins/import_mucs/mucs.c (revision 31032) @@ -64,7 +64,7 @@ rnd_coord_t x1, y1, x2, y2, r; pcb_pstk_t *ps; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadMucsFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadMucsFrom, fname = argv[1].val.str); if (!(pcb_layer_flags(PCB, PCB_CURRLID(PCB)) & PCB_LYT_COPPER)) { rnd_message(RND_MSG_ERROR, "The currently active layer is not a copper layer.\n"); Index: trunk/src_plugins/import_sch2/import_sch.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch.c (revision 31031) +++ trunk/src_plugins/import_sch2/import_sch.c (revision 31032) @@ -197,7 +197,7 @@ { const char *cmd = "reimport"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ImportSch, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, ImportSch, cmd = argv[1].val.str); if (strcmp(cmd, "reimport") == 0) { RND_ACT_IRES(do_import()); Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 31031) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 31032) @@ -178,7 +178,7 @@ const char *fname = NULL; static char *default_file = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, "Load tinycad netlist file...", Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 31031) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 31032) @@ -76,7 +76,7 @@ int debug = 0; rnd_bool_t retval; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { fname = rnd_gui->fileselect(rnd_gui, Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 31031) +++ trunk/src_plugins/io_kicad/read_net.c (revision 31032) @@ -221,7 +221,7 @@ const char *fname = NULL; static char *default_file = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, "Load eeschema netlist file...", Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 31031) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 31032) @@ -71,8 +71,8 @@ { const char *fname = NULL, *type; - RND_PCB_ACT_CONVARG(1, FGW_STR, Savetedax, type = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Savetedax, fname = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, Savetedax, type = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, Savetedax, fname = argv[2].val.str); if (rnd_strcasecmp(type, "netlist") == 0) { RND_ACT_IRES(tedax_net_save(PCB, NULL, fname)); @@ -137,10 +137,10 @@ const char *fname = NULL, *type, *id = NULL, *silents = NULL; int silent; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadtedaxFrom, type = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadtedaxFrom, fname = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadtedaxFrom, id = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, LoadtedaxFrom, silents = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadtedaxFrom, type = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, LoadtedaxFrom, fname = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, LoadtedaxFrom, id = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, LoadtedaxFrom, silents = argv[4].val.str); silent = (silents != NULL) && (rnd_strcasecmp(silents, "silent") == 0); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 31031) +++ trunk/src_plugins/jostle/jostle.c (revision 31032) @@ -476,7 +476,7 @@ struct info info; int found; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, jostle, value = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, jostle, value = fgw_keyword(&argv[1])); x = pcb_crosshair.X; y = pcb_crosshair.Y; Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 31031) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 31032) @@ -207,8 +207,8 @@ dad_t *dad; int rv = 0; - RND_PCB_ACT_CONVARG(1, FGW_STR, dad, dlgname = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, dad, cmd = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, dad, dlgname = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, dad, cmd = argv[2].val.str); if (rnd_strcasecmp(cmd, "new") == 0) { RND_ACT_IRES(dad_new(RND_ACT_HIDLIB, dlgname)); @@ -230,13 +230,13 @@ if (rnd_strcasecmp(cmd, "label") == 0) { if (dad->running) goto cant_chg; - RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); RND_DAD_LABEL(dad->dlg, txt); rv = RND_DAD_CURRENT(dad->dlg); } else if (rnd_strcasecmp(cmd, "button") == 0) { if (dad->running) goto cant_chg; - RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); RND_DAD_BUTTON(dad->dlg, tmp_str_dup(dad, txt)); rv = RND_DAD_CURRENT(dad->dlg); } @@ -250,8 +250,8 @@ RND_DAD_COMPFLAG(dad->dlg, RND_HATF_EXPFILL); RND_DAD_END(dad->dlg); for(n = 3; n < argc; n+=2) { - RND_PCB_ACT_CONVARG(n+0, FGW_STR, dad, txt = argv[n+0].val.str); - RND_PCB_ACT_CONVARG(n+1, FGW_INT, dad, ret = argv[n+1].val.nat_int); + RND_ACT_CONVARG(n+0, FGW_STR, dad, txt = argv[n+0].val.str); + RND_ACT_CONVARG(n+1, FGW_INT, dad, ret = argv[n+1].val.nat_int); RND_DAD_BUTTON_CLOSE(dad->dlg, tmp_str_dup(dad, txt), ret); rv = RND_DAD_CURRENT(dad->dlg); @@ -261,7 +261,7 @@ else if (rnd_strcasecmp(cmd, "bool") == 0) { if (dad->running) goto cant_chg; txt = ""; - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); RND_DAD_BOOL(dad->dlg, txt); rv = RND_DAD_CURRENT(dad->dlg); } @@ -269,9 +269,9 @@ long vmin, vmax; if (dad->running) goto cant_chg; txt = ""; - RND_PCB_ACT_CONVARG(3, FGW_LONG, dad, vmin = argv[3].val.nat_long); - RND_PCB_ACT_CONVARG(4, FGW_LONG, dad, vmax = argv[4].val.nat_long); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + RND_ACT_CONVARG(3, FGW_LONG, dad, vmin = argv[3].val.nat_long); + RND_ACT_CONVARG(4, FGW_LONG, dad, vmax = argv[4].val.nat_long); + RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); RND_DAD_INTEGER(dad->dlg, txt); RND_DAD_MINMAX(dad->dlg, vmin, vmax); rv = RND_DAD_CURRENT(dad->dlg); @@ -280,9 +280,9 @@ double vmin, vmax; if (dad->running) goto cant_chg; txt = ""; - RND_PCB_ACT_CONVARG(3, FGW_DOUBLE, dad, vmin = argv[3].val.nat_double); - RND_PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, vmax = argv[4].val.nat_double); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + RND_ACT_CONVARG(3, FGW_DOUBLE, dad, vmin = argv[3].val.nat_double); + RND_ACT_CONVARG(4, FGW_DOUBLE, dad, vmax = argv[4].val.nat_double); + RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); RND_DAD_REAL(dad->dlg, txt); RND_DAD_MINMAX(dad->dlg, vmin, vmax); rv = RND_DAD_CURRENT(dad->dlg); @@ -291,9 +291,9 @@ rnd_coord_t vmin, vmax; if (dad->running) goto cant_chg; txt = ""; - RND_PCB_ACT_CONVARG(3, FGW_COORD_, dad, vmin = fgw_coord(&argv[3])); - RND_PCB_ACT_CONVARG(4, FGW_COORD_, dad, vmax = fgw_coord(&argv[4])); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + RND_ACT_CONVARG(3, FGW_COORD_, dad, vmin = fgw_coord(&argv[3])); + RND_ACT_CONVARG(4, FGW_COORD_, dad, vmax = fgw_coord(&argv[4])); + RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); RND_DAD_COORD(dad->dlg, txt); RND_DAD_MINMAX(dad->dlg, vmin, vmax); rv = RND_DAD_CURRENT(dad->dlg); @@ -313,7 +313,7 @@ if (dad->running) goto cant_chg; - RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); if (split_tablist(dad, values, txt, cmd) == 0) { if (*cmd == 'b') { @@ -334,9 +334,9 @@ if (dad->running) goto cant_chg; txt = NULL; - RND_PCB_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); - RND_PCB_ACT_CONVARG(4, FGW_INT, dad, istree = argv[4].val.nat_int); - rnd_PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + RND_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); + RND_ACT_CONVARG(4, FGW_INT, dad, istree = argv[4].val.nat_int); + RND_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); if ((txt == NULL) || (split_tablist(dad, values, txt, cmd) == 0)) { RND_DAD_TREE(dad->dlg, cols, istree, (const char **)values); @@ -353,8 +353,8 @@ if (dad->running) goto cant_chg; - RND_PCB_ACT_CONVARG(3, FGW_PTR, dad, row = argv[3].val.ptr_void); - RND_PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); + RND_ACT_CONVARG(3, FGW_PTR, dad, row = argv[3].val.ptr_void); + RND_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); if (row != NULL) { if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], dad->row_domain)) { @@ -406,7 +406,7 @@ if (dad->running) goto cant_chg; - RND_PCB_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); + RND_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); RND_DAD_BEGIN_TABLE(dad->dlg, cols); dad->level++; rv = RND_DAD_CURRENT(dad->dlg); @@ -425,7 +425,7 @@ if (dad->running) goto cant_chg; for(n = 3; n < argc; n++) { - RND_PCB_ACT_CONVARG(n, FGW_STR, dad, txt = argv[n].val.str); + RND_ACT_CONVARG(n, FGW_STR, dad, txt = argv[n].val.str); if ((*txt == '\0') || (*txt == '0')) continue; tmp = rnd_hid_compflag_name2bit(txt); @@ -437,7 +437,7 @@ rv = RND_DAD_CURRENT(dad->dlg); } else if (rnd_strcasecmp(cmd, "onchange") == 0) { - RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); RND_DAD_CHANGE_CB(dad->dlg, dad_change_cb); vts0_set(&dad->change_cb, RND_DAD_CURRENT(dad->dlg), tmp_str_dup(dad, txt)); rv = 0; @@ -448,7 +448,7 @@ rnd_coord_t c; rnd_hid_attr_type_t wtype; - RND_PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); + RND_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); if ((wid < 0) || (wid >= dad->dlg_len)) { rnd_message(RND_MSG_ERROR, "Invalid widget ID %d (set ignored)\n", wid); RND_ACT_IRES(-1); @@ -461,23 +461,23 @@ switch(wtype) { case RND_HATT_COORD: - RND_PCB_ACT_CONVARG(4, FGW_COORD, dad, c = fgw_coord(&argv[4])); + RND_ACT_CONVARG(4, FGW_COORD, dad, c = fgw_coord(&argv[4])); RND_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, crd, c); break; case RND_HATT_REAL: case RND_HATT_PROGRESS: - RND_PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, d = argv[4].val.nat_double); + RND_ACT_CONVARG(4, FGW_DOUBLE, dad, d = argv[4].val.nat_double); RND_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, dbl, d); break; case RND_HATT_INTEGER: case RND_HATT_BOOL: - RND_PCB_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); + RND_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); RND_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, lng, i); break; case RND_HATT_STRING: case RND_HATT_LABEL: case RND_HATT_BUTTON: - RND_PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); + RND_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); RND_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, str, txt); break; default: @@ -491,7 +491,7 @@ int wid; rnd_hid_attr_type_t wtype; - RND_PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); + RND_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); if ((wid < 0) || (wid >= dad->dlg_len)) { rnd_message(RND_MSG_ERROR, "Invalid widget ID %d (get ignored)\n", wid); return FGW_ERR_NOT_FOUND; @@ -504,7 +504,7 @@ switch(wtype) { case RND_HATT_COORD: txt = NULL; - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); if (txt != NULL) { const rnd_unit_t *u = rnd_get_unit_struct(txt); if (u == NULL) { @@ -539,7 +539,7 @@ } else if ((rnd_strcasecmp(cmd, "run") == 0) || (rnd_strcasecmp(cmd, "run_modal") == 0)) { if (dad->running) goto cant_chg; - RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); if (dad->level != 0) { rnd_message(RND_MSG_ERROR, "Invalid DAD dialog structure: %d levels not closed (missing 'end' calls)\n", dad->level); Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 31031) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 31032) @@ -53,9 +53,9 @@ rnd_hid_dad_buttons_t clbtn[] = {{"ok", 0}, {NULL, 0}}; RND_DAD_DECL(dlg); - RND_PCB_ACT_CONVARG(1, FGW_STR, gui_PromptFor, label = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, gui_PromptFor, default_str = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, gui_PromptFor, title = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, gui_PromptFor, label = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, gui_PromptFor, default_str = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, gui_PromptFor, title = argv[3].val.str); RND_DAD_BEGIN_VBOX(dlg); RND_DAD_LABEL(dlg, label); @@ -97,9 +97,9 @@ RND_DAD_DECL(dlg); - RND_PCB_ACT_CONVARG(1, FGW_STR, gui_MessageBox, icon = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, gui_MessageBox, title = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, gui_MessageBox, label = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, gui_MessageBox, icon = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, gui_MessageBox, title = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, gui_MessageBox, label = argv[3].val.str); RND_DAD_BEGIN_VBOX(dlg); /* icon and label */ @@ -116,8 +116,8 @@ RND_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL); RND_DAD_END(dlg); for(n = 4; n < argc; n+=2) { - RND_PCB_ACT_CONVARG(n+0, FGW_STR, gui_MessageBox, txt = argv[n+0].val.str); - RND_PCB_ACT_CONVARG(n+1, FGW_INT, gui_MessageBox, ret = argv[n+1].val.nat_int); + RND_ACT_CONVARG(n+0, FGW_STR, gui_MessageBox, txt = argv[n+0].val.str); + RND_ACT_CONVARG(n+1, FGW_INT, gui_MessageBox, ret = argv[n+1].val.nat_int); RND_DAD_BUTTON_CLOSE(dlg, txt, ret); } RND_DAD_END(dlg); @@ -164,7 +164,7 @@ clrpick_t ctx; rnd_hid_attr_val_t val; - RND_PCB_ACT_CONVARG(1, FGW_STR, gui_PromptFor, sclr = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, gui_PromptFor, sclr = argv[1].val.str); memset(&ctx, 0, sizeof(ctx)); if (rnd_color_load_str(&ctx.clr, sclr) != 0) @@ -239,8 +239,8 @@ } hidlib = RND_ACT_HIDLIB; - RND_PCB_ACT_CONVARG(1, FGW_STR, gui_MayOverwriteFile, fn = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_INT, gui_MayOverwriteFile, multi = argv[2].val.nat_int); + RND_ACT_CONVARG(1, FGW_STR, gui_MayOverwriteFile, fn = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_INT, gui_MayOverwriteFile, multi = argv[2].val.nat_int); RND_DAD_BEGIN_VBOX(dlg); /* icon and label */ Index: trunk/src_plugins/lib_hid_common/zoompan.c =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.c (revision 31031) +++ trunk/src_plugins/lib_hid_common/zoompan.c (revision 31032) @@ -53,10 +53,10 @@ if (argc == 5) { rnd_coord_t x1, y1, x2, y2; - RND_PCB_ACT_CONVARG(1, FGW_COORD, Zoom, x1 = fgw_coord(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_COORD, Zoom, y1 = fgw_coord(&argv[2])); - RND_PCB_ACT_CONVARG(3, FGW_COORD, Zoom, x2 = fgw_coord(&argv[3])); - RND_PCB_ACT_CONVARG(4, FGW_COORD, Zoom, y2 = fgw_coord(&argv[4])); + RND_ACT_CONVARG(1, FGW_COORD, Zoom, x1 = fgw_coord(&argv[1])); + RND_ACT_CONVARG(2, FGW_COORD, Zoom, y1 = fgw_coord(&argv[2])); + RND_ACT_CONVARG(3, FGW_COORD, Zoom, x2 = fgw_coord(&argv[3])); + RND_ACT_CONVARG(4, FGW_COORD, Zoom, y2 = fgw_coord(&argv[4])); rnd_gui->zoom_win(rnd_gui, x1, y1, x2, y2, 1); return 0; @@ -65,7 +65,7 @@ if (argc > 2) RND_ACT_FAIL(Zoom); - RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, ovp = vp = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, Zoom, ovp = vp = argv[1].val.str); if (*vp == '?') { rnd_message(RND_MSG_INFO, "Current zoom level (coord-per-pix): %$mm\n", rnd_gui->coord_per_pix); @@ -114,7 +114,7 @@ rnd_hid_get_coords("Click on a place to pan", &x, &y, 0); - RND_PCB_ACT_CONVARG(1, FGW_INT, Pan, mode = argv[1].val.nat_int); + RND_ACT_CONVARG(1, FGW_INT, Pan, mode = argv[1].val.nat_int); rnd_gui->pan_mode(rnd_gui, x, y, mode); RND_ACT_IRES(0); @@ -148,8 +148,8 @@ const char *op; double dx = 0.0, dy = 0.0, pixels = 100.0; - RND_PCB_ACT_CONVARG(1, FGW_STR, Scroll, op = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, Scroll, pixels = argv[2].val.nat_double); + RND_ACT_CONVARG(1, FGW_STR, Scroll, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_DOUBLE, Scroll, pixels = argv[2].val.nat_double); if (rnd_strcasecmp(op, "up") == 0) dy = -rnd_gui->coord_per_pix * pixels; Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 31031) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 31032) @@ -57,7 +57,7 @@ if (argc == 2) { const char *vp; - RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str); if (rnd_strcasecmp(vp, "selected") == 0) { rnd_rnd_box_t sb; @@ -119,8 +119,8 @@ rnd_layer_id_t lid; pcb_layer_type_t lyt; - RND_PCB_ACT_CONVARG(1, FGW_STR, SwapSides, a = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, SwapSides, a = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str); switch (a[0]) { case 'h': case 'H': rnd_conf_toggle_heditor_("view/flip_x", view.flip_x); @@ -202,8 +202,8 @@ if (argc != 2 && argc != 3) RND_ACT_FAIL(Popup); - RND_PCB_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str); *name = '\0'; *name2 = '\0'; @@ -274,8 +274,8 @@ fgw_error_t er; fgw_arg_t r, args[4]; - RND_PCB_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1])); - RND_PCB_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1])); + RND_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str); if (rnd_strcasecmp(op, "select") == 0) { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; } else if (rnd_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; } Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 31031) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 31032) @@ -339,7 +339,7 @@ if (argc > 2) RND_ACT_FAIL(AdjustStyle); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long); + RND_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long); if (idx >= (long)vtroutestyle_len(&PCB->RouteStyle)) { rnd_message(RND_MSG_ERROR, "Invalid route style %ld index; max value: %ld\n", idx, vtroutestyle_len(&PCB->RouteStyle)-1); Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 31031) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 31032) @@ -348,7 +348,7 @@ if (argc > 2) RND_ACT_FAIL(StatusSetText); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str); if (text != NULL) { rnd_hid_attr_val_t hv; @@ -411,8 +411,8 @@ if (argc > 3) RND_ACT_FAIL(StatusSetText); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_COORD, StatusSetText, x = fgw_coord(&argv[1])); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_COORD, StatusSetText, y = fgw_coord(&argv[2])); + RND_ACT_MAY_CONVARG(1, FGW_COORD, StatusSetText, x = fgw_coord(&argv[1])); + RND_ACT_MAY_CONVARG(2, FGW_COORD, StatusSetText, y = fgw_coord(&argv[2])); /* check if there are any pins or pads at that position */ rattype = pcb_search_obj_by_location(PCB_OBJ_RAT, &rptr1, &rptr2, &rptr3, x, y, 0); Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31031) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31032) @@ -441,8 +441,8 @@ pcb_flag_t flg; int want_contour = 0, want_poly = 0, cont_specd = 0; - RND_PCB_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str); if (rnd_strcasecmp(op, "interactive") == 0) { if (polyhatch_gui(&period, &dir, &flg, &want_contour) != 0) { @@ -510,7 +510,7 @@ { rnd_coord_t offs; - RND_PCB_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1])); + RND_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1])); PCB_POLY_ALL_LOOP(PCB->Data); { pcb_poly_t *p; Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 31031) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 31032) @@ -342,7 +342,7 @@ const char *op = NULL; void *r1, *r2, *r3; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str); if (op == NULL) { rnd_coord_t x, y; Index: trunk/src_plugins/millpath/millpath.c =================================================================== --- trunk/src_plugins/millpath/millpath.c (revision 31031) +++ trunk/src_plugins/millpath/millpath.c (revision 31032) @@ -51,7 +51,7 @@ ctx.edge_clearance = RND_MM_TO_COORD(0.05); ctx.tools = &tools; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, mill, script = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, mill, script = argv[1].val.str); if (script == NULL) RND_ACT_IRES(pcb_tlp_mill_copper_layer(pcb, &ctx, pcb_get_layergrp(pcb, PCB_CURRLAYER(PCB)->meta.real.grp))); Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 31031) +++ trunk/src_plugins/oldactions/oldactions.c (revision 31032) @@ -147,7 +147,7 @@ printf("Debug:"); for (i = 1; i < argc; i++) { const char *s; - RND_PCB_ACT_CONVARG(i, FGW_STR, debugxy, s = argv[i].val.str); + RND_ACT_CONVARG(i, FGW_STR, debugxy, s = argv[i].val.str); printf(" [%d] `%s'", i, s); } rnd_hid_get_coords("Click X,Y for Debug", &x, &y, 0); @@ -255,7 +255,7 @@ { const char *rv = NULL; RND_ACT_IRES(0); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, PCBChanged, rv = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, PCBChanged, rv = argv[1].val.str); pcb_board_changed((rv != NULL) && (rnd_strcasecmp(rv, "revert") == 0)); return 0; } Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 31031) +++ trunk/src_plugins/order/order.c (revision 31032) @@ -65,7 +65,7 @@ { const char *cmd = "gui"; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, OrderPCB, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, OrderPCB, cmd = argv[1].val.str); if (strcmp(cmd, "gui") == 0) { RND_ACT_IRES(order_dialog()); Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 31031) +++ trunk/src_plugins/propedit/propdlg.c (revision 31032) @@ -665,7 +665,7 @@ if (argc > 1) { for(a = 1; a < argc; a++) { const char *cmd; - RND_PCB_ACT_CONVARG(a, FGW_STR, propedit, cmd = argv[a].val.str); + RND_ACT_CONVARG(a, FGW_STR, propedit, cmd = argv[a].val.str); r = prop_scope_add(&ctx->pe, cmd, 0); if (r != 0) return r; Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 31031) +++ trunk/src_plugins/propedit/propedit.c (revision 31032) @@ -183,15 +183,15 @@ pcb_props_init(&ctx, PCB); - RND_PCB_ACT_CONVARG(1, FGW_STR, propset, first = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, propset, first = argv[1].val.str); if (prop_scope_add(&ctx, first, 1) == 0) { - RND_PCB_ACT_CONVARG(2, FGW_STR, propset, name = argv[2].val.str); - RND_PCB_ACT_CONVARG(3, FGW_STR, propset, val = argv[3].val.str); + RND_ACT_CONVARG(2, FGW_STR, propset, name = argv[2].val.str); + RND_ACT_CONVARG(3, FGW_STR, propset, val = argv[3].val.str); } else { name = first; ctx.selection = 1; - RND_PCB_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str); } RND_ACT_IRES(pcb_propsel_set_str(&ctx, name, val)); @@ -214,15 +214,15 @@ pcb_props_init(&ctx, PCB); - RND_PCB_ACT_CONVARG(1, FGW_STR, propget, first = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, propget, first = argv[1].val.str); if (prop_scope_add(&ctx, first, 1) == 0) { - RND_PCB_ACT_CONVARG(2, FGW_STR, propget, name = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, propget, stty = argv[3].val.str); + RND_ACT_CONVARG(2, FGW_STR, propget, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, propget, stty = argv[3].val.str); } else { name = first; ctx.selection = 1; - RND_PCB_ACT_CONVARG(2, FGW_STR, propget, stty = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, propget, stty = argv[2].val.str); } ctx.geo = 1; @@ -285,7 +285,7 @@ pcb_props_init(&ctx, PCB); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, propset, scope = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, propset, scope = argv[1].val.str); if (scope != NULL) { if (prop_scope_add(&ctx, scope, 0) != 0) return FGW_ERR_ARG_CONV; Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 31031) +++ trunk/src_plugins/puller/puller.c (revision 31032) @@ -2079,7 +2079,7 @@ nloops = 0; npulled = 0; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, GlobalPuller, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, GlobalPuller, op = fgw_keyword(&argv[1])); switch(op) { case F_Selected: select_flags = PCB_FLAG_SELECTED; break; Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 31031) +++ trunk/src_plugins/query/query_act.c (revision 31032) @@ -214,8 +214,8 @@ sel.cnt = 0; - RND_PCB_ACT_CONVARG(1, FGW_STR, query, cmd = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, query, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); if (strcmp(cmd, "version") == 0) { RND_ACT_IRES(0100); /* 1.0 */ @@ -225,7 +225,7 @@ if (strcmp(cmd, "dump") == 0) { pcb_qry_node_t *prg = NULL; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); printf("Script dump: '%s'\n", arg); pcb_qry_set_input(arg); qry_parse(&prg); @@ -239,8 +239,8 @@ int errs; eval_stat_t st; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); memset(&st, 0, sizeof(st)); st.print_idpath = (cmd[4] != '\0'); @@ -269,8 +269,8 @@ } } - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); if (pcb_qry_run_script(NULL, PCB_ACT_BOARD, arg, scope, flagop_cb, &sel) < 0) printf("Failed to run the query\n"); @@ -297,8 +297,8 @@ } } - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); if (pcb_qry_run_script(NULL, PCB_ACT_BOARD, arg, scope, flagop_cb, &sel) < 0) printf("Failed to run the query\n"); @@ -314,9 +314,9 @@ if (strcmp(cmd, "append") == 0) { pcb_idpath_list_t *list; - RND_PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, query, list = fgw_idpath_list(&argv[2])); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, query, arg = argv[3].val.str); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, query, scope = argv[4].val.str); + RND_ACT_CONVARG(2, FGW_IDPATH_LIST, query, list = fgw_idpath_list(&argv[2])); + RND_ACT_MAY_CONVARG(3, FGW_STR, query, arg = argv[3].val.str); + RND_ACT_MAY_CONVARG(4, FGW_STR, query, scope = argv[4].val.str); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST)) return FGW_ERR_PTR_DOMAIN; @@ -331,7 +331,7 @@ if (strcmp(cmd, "view") == 0) { fgw_arg_t args[4], ares; pcb_view_list_t *view = calloc(sizeof(pcb_view_list_t), 1); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); if (pcb_qry_run_script(NULL, PCB_ACT_BOARD, arg, scope, view_cb, view) >= 0) { args[1].type = FGW_STR; args[1].val.str = "advanced search results"; args[2].type = FGW_STR; args[2].val.str = "search_res"; @@ -460,11 +460,11 @@ pcb_qry_val_t val; int free_fld = 0; - RND_PCB_ACT_CONVARG(1, FGW_IDPATH, QueryObj, idp = fgw_idpath(&argv[1])); + RND_ACT_CONVARG(1, FGW_IDPATH, QueryObj, idp = fgw_idpath(&argv[1])); if ((argv[2].type & FGW_STR) == FGW_STR) { const char *field; - RND_PCB_ACT_CONVARG(2, FGW_STR, QueryObj, field = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, QueryObj, field = argv[2].val.str); if (field == NULL) goto err; if (*field != '.') @@ -474,7 +474,7 @@ } else if ((argv[2].type & FGW_PTR) == FGW_PTR) { id:; - RND_PCB_ACT_CONVARG(2, FGW_PTR, QueryObj, fld = argv[2].val.ptr_void); + RND_ACT_CONVARG(2, FGW_PTR, QueryObj, fld = argv[2].val.ptr_void); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], PTR_DOMAIN_PCFIELD)) return FGW_ERR_PTR_DOMAIN; } @@ -525,10 +525,10 @@ const char *cmd, *fname; pcb_qry_node_t *fld; - RND_PCB_ACT_CONVARG(1, FGW_STR, QueryCompileField, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, QueryCompileField, cmd = argv[1].val.str); switch(*cmd) { case 'c': /* compile */ - RND_PCB_ACT_CONVARG(2, FGW_STR, QueryCompileField, fname = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, QueryCompileField, fname = argv[2].val.str); fld = field_comp(fname); fgw_ptr_reg(&rnd_fgw, res, PTR_DOMAIN_PCFIELD, FGW_PTR | FGW_STRUCT, fld); return 0; @@ -535,7 +535,7 @@ case 'f': /* free */ if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], PTR_DOMAIN_PCFIELD)) return FGW_ERR_PTR_DOMAIN; - RND_PCB_ACT_CONVARG(2, FGW_PTR, QueryCompileField, fld = argv[2].val.ptr_void); + RND_ACT_CONVARG(2, FGW_PTR, QueryCompileField, fld = argv[2].val.ptr_void); fgw_ptr_unreg(&rnd_fgw, &argv[2], PTR_DOMAIN_PCFIELD); field_free(fld); break; Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 31031) +++ trunk/src_plugins/renumber/renumber.c (revision 31032) @@ -81,7 +81,7 @@ int ok; rnd_bool free_name = rnd_false; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str); if (name == NULL) { /* Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 31031) +++ trunk/src_plugins/renumber/renumberblock.c (revision 31032) @@ -33,8 +33,8 @@ char num_buf[15]; int old_base, new_base; - RND_PCB_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int); - RND_PCB_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int); + RND_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int); + RND_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int); rnd_conf_set_editor(name_on_pcb, 1); @@ -78,8 +78,8 @@ char num_buf[15]; int old_base, new_base; - RND_PCB_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int); - RND_PCB_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int); + RND_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int); + RND_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int); rnd_conf_set_editor(name_on_pcb, 1); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 31031) +++ trunk/src_plugins/report/report.c (revision 31032) @@ -369,8 +369,8 @@ rnd_coord_t x, y; rnd_hid_get_coords("Click on object to report on", &x, &y, 0); - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, reportdialog, op = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, reportdialog, how = argv[2].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, reportdialog, op = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, reportdialog, how = argv[2].val.str); gds_init(&tmp); @@ -550,7 +550,7 @@ rnd_coord_t x = 0, y = 0; gds_t err; - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Report, units_name = argv[2].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, Report, units_name = argv[2].val.str); pcb_obj_center(term, &x, &y); @@ -767,7 +767,7 @@ const char *cmd, *name; rnd_coord_t x, y; - RND_PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str); if (rnd_strcasecmp(cmd, "Object") == 0) { rnd_hid_get_coords("Click on an object", &x, &y, 0); @@ -791,7 +791,7 @@ else if (rnd_strcasecmp(cmd, "AllNetLengths") == 0) return report_all_net_lengths(res, argc, argv); else if (rnd_strcasecmp(cmd, "NetLength") == 0) { - RND_PCB_ACT_CONVARG(2, FGW_STR, Report, name = argv[2].val.str); + RND_ACT_CONVARG(2, FGW_STR, Report, name = argv[2].val.str); return report_net_length_by_name(name); } Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 31031) +++ trunk/src_plugins/script/live_script.c (revision 31032) @@ -439,9 +439,9 @@ live_script_t *lvs; const char *cmd = "new", *name = NULL, *arg = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LiveScript, cmd = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LiveScript, name = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LiveScript, arg = argv[3].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LiveScript, cmd = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, LiveScript, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, LiveScript, arg = argv[3].val.str); if (rnd_strcasecmp(cmd, "new") == 0) { if (name == NULL) name = "default"; Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 31031) +++ trunk/src_plugins/script/script_act.c (revision 31032) @@ -308,9 +308,9 @@ static fgw_error_t pcb_act_LoadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *id, *fn, *lang = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadScript, id = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, LoadScript, fn = argv[2].val.str); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadScript, lang = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadScript, id = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, LoadScript, fn = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, LoadScript, lang = argv[3].val.str); ID_VALIDATE(id, LoadScript); @@ -325,7 +325,7 @@ static fgw_error_t pcb_act_UnloadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *id = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); ID_VALIDATE(id, UnloadScript); @@ -339,7 +339,7 @@ static fgw_error_t pcb_act_ReloadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *id = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); ID_VALIDATE(id, ReloadScript); @@ -354,7 +354,7 @@ static fgw_error_t pcb_act_ScriptPersistency(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *cmd = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, ScriptPersistency, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, ScriptPersistency, cmd = argv[1].val.str); return script_persistency(res, cmd); } @@ -364,7 +364,7 @@ static fgw_error_t pcb_act_ListScripts(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *pat = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ListScripts, pat = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, ListScripts, pat = argv[1].val.str); script_list(pat); @@ -402,8 +402,8 @@ if (strcmp(lang, "oneliner") == 0) { /* call to oneliner(lang, script) */ - RND_PCB_ACT_CONVARG(1, FGW_STR, Oneliner, lang = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_STR, Oneliner, scr = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, Oneliner, lang = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, Oneliner, scr = argv[2].val.str); } else if (strcmp(lang, "/exit") == 0) { RND_ACT_IRES(rnd_cli_leave()); @@ -411,10 +411,10 @@ } else { /* call to lang(script) */ - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, scr = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, scr = argv[1].val.str); } - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, first = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, first = argv[1].val.str); if (first != NULL) { if (*first == '/') { if (rnd_strcasecmp(scr, "/exit") == 0) { @@ -449,7 +449,7 @@ const char *actname = argv[0].val.func->name; double a; - RND_PCB_ACT_CONVARG(1, FGW_DOUBLE, pcb_math1, a = argv[1].val.nat_double); + RND_ACT_CONVARG(1, FGW_DOUBLE, pcb_math1, a = argv[1].val.nat_double); res->type = FGW_DOUBLE; switch(actname[4]) { case 'a': @@ -478,8 +478,8 @@ const char *actname = argv[0].val.func->name; double a, b; - RND_PCB_ACT_CONVARG(1, FGW_DOUBLE, pcb_math2, a = argv[1].val.nat_double); - RND_PCB_ACT_CONVARG(2, FGW_DOUBLE, pcb_math2, b = argv[2].val.nat_double); + RND_ACT_CONVARG(1, FGW_DOUBLE, pcb_math2, a = argv[1].val.nat_double); + RND_ACT_CONVARG(2, FGW_DOUBLE, pcb_math2, b = argv[2].val.nat_double); res->type = FGW_DOUBLE; switch(actname[4]) { case 'a': res->val.nat_double = atan2(a, b); return 0; Index: trunk/src_plugins/script/timer.c =================================================================== --- trunk/src_plugins/script/timer.c (revision 31031) +++ trunk/src_plugins/script/timer.c (revision 31032) @@ -126,10 +126,10 @@ char fn[RND_ACTION_NAME_MAX]; script_timer_t *t; - RND_PCB_ACT_CONVARG(1, FGW_STR, AddTimer, act = argv[1].val.str); - RND_PCB_ACT_CONVARG(2, FGW_DOUBLE, AddTimer, period = argv[2].val.nat_double); - rnd_PCB_ACT_MAY_CONVARG(3, FGW_INT, AddTimer, count = argv[3].val.nat_int); - rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, AddTimer, user_data = argv[4].val.str); + RND_ACT_CONVARG(1, FGW_STR, AddTimer, act = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_DOUBLE, AddTimer, period = argv[2].val.nat_double); + RND_ACT_MAY_CONVARG(3, FGW_INT, AddTimer, count = argv[3].val.nat_int); + RND_ACT_MAY_CONVARG(4, FGW_STR, AddTimer, user_data = argv[4].val.str); rnd_aname(fn, act); len = strlen(fn); Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 31031) +++ trunk/src_plugins/shand_cmd/command.c (revision 31032) @@ -74,8 +74,8 @@ { const char *filename, *format = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadLayout, filename = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayout, format = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadLayout, filename = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, LoadLayout, format = argv[2].val.str); if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Load data lose", "OK to override layout data?", "cancel", 0, "ok", 1, NULL) == 1)) pcb_load_pcb(filename, format, rnd_true, 0); @@ -91,7 +91,7 @@ { const char *filename; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadElementToBuffer, filename = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadElementToBuffer, filename = argv[1].val.str); if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, filename, NULL)) rnd_tool_select_by_name(&PCB->hidlib, "buffer"); @@ -107,8 +107,8 @@ { const char *filename, *format = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadLayoutToBuffer, filename = argv[1].val.str); - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayoutToBuffer, format = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadLayoutToBuffer, filename = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, LoadLayoutToBuffer, format = argv[2].val.str); if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, filename, format)) rnd_tool_select_by_name(&PCB->hidlib, "buffer"); @@ -145,7 +145,7 @@ { const char *filename; - RND_PCB_ACT_CONVARG(1, FGW_STR, LoadNetlist, filename = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadNetlist, filename = argv[1].val.str); if (PCB->Netlistname) free(PCB->Netlistname); @@ -162,7 +162,7 @@ { const char *filename = NULL; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, SaveLayout, filename = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, SaveLayout, filename = argv[1].val.str); if (filename == NULL) { if (PCB->hidlib.filename) { Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 31031) +++ trunk/src_plugins/shape/shape.c (revision 31032) @@ -400,7 +400,7 @@ memset(args, 0, sizeof(args)); for(n = 1; n < argc; n++) - rnd_PCB_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str); + RND_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str); a = get_where(args[0], &data, &x, &y, &have_coords); if (a < 0) { @@ -471,7 +471,7 @@ memset(args, 0, sizeof(args)); for(n = 1; n < argc; n++) - rnd_PCB_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str); + RND_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str); if (argc > 2) { a = get_where(args[0], &data, &x, &y, &have_coords); @@ -583,7 +583,7 @@ memset(args, 0, sizeof(args)); for(n = 1; n < argc; n++) - rnd_PCB_ACT_MAY_CONVARG(n, FGW_STR, circle, args[n-1] = argv[n].val.str); + RND_ACT_MAY_CONVARG(n, FGW_STR, circle, args[n-1] = argv[n].val.str); a = get_where(args[0], &data, &x, &y, &have_coords); if (a < 0) { Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 31031) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 31032) @@ -109,7 +109,7 @@ int all; htsp_entry_t *e; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, smartdisperse, op = fgw_keyword(&argv[1])); + RND_ACT_MAY_CONVARG(1, FGW_KEYWORD, smartdisperse, op = fgw_keyword(&argv[1])); switch(op) { case -2: Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 31031) +++ trunk/src_plugins/stroke/stroke.c (revision 31032) @@ -114,10 +114,10 @@ { const char *cmd, *arg = NULL; - RND_PCB_ACT_CONVARG(1, FGW_STR, stroke, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, stroke, cmd = argv[1].val.str); if (strcmp(cmd, "gesture") == 0) { - rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, stroke, arg = argv[2].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, stroke, arg = argv[2].val.str); if (arg == NULL) RND_ACT_FAIL(stroke); pcb_stroke_exec(RND_ACT_HIDLIB, arg); Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 31031) +++ trunk/src_plugins/vendordrill/vendor.c (revision 31032) @@ -141,7 +141,7 @@ cached_drill = -1; - rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = rnd_gui->fileselect(rnd_gui, "Load Vendor Resource File...",