Index: trunk/doc/developer/plugin/template_pup/ext_foo.c =================================================================== --- trunk/doc/developer/plugin/template_pup/ext_foo.c (revision 30899) +++ trunk/doc/developer/plugin/template_pup/ext_foo.c (revision 30900) @@ -37,7 +37,7 @@ static fgw_error_t pcb_act_ExtFoo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_message(PCB_MSG_ERROR, "PLEASE CONSIDER DEVELOPING A CORE PLUGIN INSTEAD!\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 30899) +++ trunk/src/brave.c (revision 30900) @@ -254,17 +254,17 @@ desc_t *d; const char *name, *op; if (argc <= 1) { - PCB_ACT_IRES(brave_interact()); + RND_ACT_IRES(brave_interact()); return 0; } /* look up */ - PCB_ACT_CONVARG(1, FGW_STR, Brave, name = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, Brave, op = argv[2].val.str); + 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); d = find_by_name(name); if (d == NULL) { pcb_message(PCB_MSG_ERROR, "Unknown brave setting: %s\n", name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } brave_set(d->bit, (pcb_strcasecmp(op, "on") == 0)); @@ -271,7 +271,7 @@ pcb_message(PCB_MSG_INFO, "Brave setting: %s in %s\n", name, (pcb_brave & d->bit) ? "on" : "off"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30899) +++ trunk/src/buffer.c (revision 30900) @@ -250,12 +250,12 @@ pcb_cardinal_t len; - PCB_ACT_CONVARG(1, FGW_STR, LoadFootprint, name = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadFootprint, refdes = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFootprint, value = argv[3].val.str); + 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); if (!pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, NULL)) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -263,12 +263,12 @@ if (len == 0) { pcb_message(PCB_MSG_ERROR, "Footprint %s contains no subcircuits", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (len > 1) { pcb_message(PCB_MSG_ERROR, "Footprint %s contains multiple subcircuits", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -277,7 +277,7 @@ pcb_attribute_put(&s->Attributes, "footprint", name); pcb_attribute_put(&s->Attributes, "value", value); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -452,35 +452,35 @@ char *angle_s = NULL; double ang; - PCB_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = pcb_strdup(argv[1].val.str)); - PCB_ACT_IRES(0); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = pcb_strdup(argv[1].val.str)); + RND_ACT_IRES(0); if (angle_s == NULL) - angle_s = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "Enter Rotation (degrees, CCW):", "0", "Rotation angle"); + angle_s = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter Rotation (degrees, CCW):", "0", "Rotation angle"); if ((angle_s == NULL) || (*angle_s == '\0')) { free(angle_s); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); ang = strtod(angle_s, 0); free(angle_s); if (ang == 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if ((ang < -360000) || (ang > +360000)) { pcb_message(PCB_MSG_ERROR, "Angle too large\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); pcb_buffer_rotate(PCB_PASTEBUFFER, ang); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return 0; } @@ -564,38 +564,38 @@ int recurse = 0; char *end; - PCB_ACT_MAY_CONVARG(1, FGW_STR, ScaleBuffer, sx = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ScaleBuffer, sx = argv[1].val.str); if (sx != NULL) { x = strtod(sx, &end); if (*end != '\0') { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } y = th = x; } else { - if (pcb_actgui_ScaleBuffer(PCB_ACT_HIDLIB, &x, &y) != 0) { - PCB_ACT_IRES(-1); + if (pcb_actgui_ScaleBuffer(RND_ACT_HIDLIB, &x, &y) != 0) { + RND_ACT_IRES(-1); return 0; } th = 1; } - PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, ScaleBuffer, y = argv[2].val.nat_double); - PCB_ACT_MAY_CONVARG(3, FGW_DOUBLE, ScaleBuffer, th = argv[3].val.nat_double); - PCB_ACT_MAY_CONVARG(4, FGW_STR, ScaleBuffer, recurse = (argv[4].val.str != NULL)); + 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)); if ((x <= 0) || (y <= 0)) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); pcb_buffer_scale(PCB_PASTEBUFFER, x, y, th, recurse); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return 0; } @@ -981,16 +981,16 @@ static int sp = 0; int number, rv; - PCB_ACT_CONVARG(1, FGW_STR, PasteBuffer, tmp = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, PasteBuffer, tmp = argv[1].val.str); number = atoi(tmp); - PCB_ACT_CONVARG(1, FGW_KEYWORD, PasteBuffer, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, PasteBuffer, sbufnum = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, PasteBuffer, fmt = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, PasteBuffer, forces = argv[4].val.str); + 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); force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y')); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); switch (op) { /* clear contents of paste buffer */ case F_Clear: @@ -1076,9 +1076,9 @@ { FILE *exist; - if ((!force) && ((exist = pcb_fopen(PCB_ACT_HIDLIB, name, "r")))) { + if ((!force) && ((exist = pcb_fopen(RND_ACT_HIDLIB, name, "r")))) { fclose(exist); - if (pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "Buffer: overwrite file", "File exists! Ok to overwrite?", "cancel", 0, "yes", 1, NULL) == 1) + if (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Buffer: overwrite file", "File exists! Ok to overwrite?", "cancel", 0, "yes", 1, NULL) == 1) pcb_save_buffer(name, fmt); } else @@ -1107,18 +1107,18 @@ else name = sbufnum; - if (pcb_load_buffer(PCB_ACT_HIDLIB, PCB_PASTEBUFFER, name, NULL) != 0) { + if (pcb_load_buffer(RND_ACT_HIDLIB, PCB_PASTEBUFFER, name, NULL) != 0) { pcb_message(PCB_MSG_ERROR, "Failed to load buffer from %s\n", name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } else - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "buffer"); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "buffer"); break; case F_Save: name = sbufnum; - rv = rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + rv = rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return rv; case F_ToLayout: @@ -1143,8 +1143,8 @@ } else { - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - PCB_ACT_FAIL(PasteBuffer); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + RND_ACT_FAIL(PasteBuffer); } oldx = x; @@ -1166,13 +1166,13 @@ number = strtol(sbufnum, &end, 10); if (*end != 0) { pcb_message(PCB_MSG_ERROR, "invalid buffer number '%s': should be an integer\n", sbufnum); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return FGW_ERR_ARG_CONV; } number--; if ((number < 0) || (number >= PCB_MAX_BUFFER)) { pcb_message(PCB_MSG_ERROR, "invalid buffer number '%d': out of range 1..%d\n", number+1, PCB_MAX_BUFFER); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return FGW_ERR_ARG_CONV; } } @@ -1180,7 +1180,7 @@ number = conf_core.editor.buffer_number; res->type = FGW_STR; res->val.str = pcb_buffers[number].source_path; - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return 0; /* set number */ @@ -1194,13 +1194,13 @@ } } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - PCB_ACT_IRES(0); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + RND_ACT_IRES(0); return 0; error:; - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - PCB_ACT_IRES(-1); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + RND_ACT_IRES(-1); return 0; } Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 30899) +++ trunk/src/change_act.c (revision 30900) @@ -80,9 +80,9 @@ pcb_coord_t x, y; int got_coords = 0; - PCB_ACT_CONVARG(1, FGW_STR, ChangeClearSize, function = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, ChangeClearSize, delta = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, ChangeClearSize, units = argv[3].val.str); + 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); if (function && delta) { int funcid = pcb_funchash_get(function, NULL); @@ -102,7 +102,7 @@ if ((type == PCB_OBJ_VOID) || (type == PCB_OBJ_POLY)) /* workaround: pcb_search_screen(PCB_CHANGECLEARSIZE_TYPES) wouldn't return elements */ type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); if (pcb_get_style_size(funcid, &value, type, 2) != 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } absolute = 1; @@ -139,7 +139,7 @@ break; } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -158,15 +158,15 @@ const char *flag; int value; - PCB_ACT_CONVARG(1, FGW_STR, ChangeFlag, function = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, ChangeFlag, flag = argv[2].val.str); - PCB_ACT_CONVARG(2, FGW_INT, ChangeFlag, value = argv[3].val.nat_int); + 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); if (value != 0 && value != 1) - PCB_ACT_FAIL(ChangeFlag); + RND_ACT_FAIL(ChangeFlag); ChangeFlag(function, flag, value, "ChangeFlag"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -257,7 +257,7 @@ c = pcb_act_ChangeClearSize(res, argc, argv); pcb_undo_restore_serial(); pcb_undo_inc_serial(); - PCB_ACT_IRES(!(!a || !b || !c)); + RND_ACT_IRES(!(!a || !b || !c)); return 0; } @@ -280,9 +280,9 @@ int type = PCB_OBJ_VOID, tostyle = 0; void *ptr1, *ptr2, *ptr3; - PCB_ACT_CONVARG(1, FGW_STR, ChangeSize, function = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, ChangeSize, delta = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, ChangeSize, units = argv[3].val.str); + 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); if (function && delta) { @@ -355,7 +355,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -376,9 +376,9 @@ pcb_bool absolute; pcb_coord_t value; - PCB_ACT_CONVARG(1, FGW_STR, Change2ndSize, function = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, Change2ndSize, delta = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, Change2ndSize, units = argv[3].val.str); + 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); if (function && delta) { int funcid = pcb_funchash_get(function, NULL); @@ -421,7 +421,7 @@ break; } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -435,9 +435,9 @@ pcb_cardinal_t changed = 0; const char *refdes, *pinnum, *pinname; - PCB_ACT_CONVARG(1, FGW_STR, ChangePinName, refdes = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, ChangePinName, pinnum = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, ChangePinName, pinname = argv[3].val.str); + 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); PCB_SUBC_LOOP(PCB_ACT_BOARD->Data); { @@ -470,7 +470,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -483,7 +483,7 @@ char *name; pcb_objtype_t type; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeName, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeName, op = fgw_keyword(&argv[1])); switch(op) { /* change the refdes of a subcircuit */ @@ -509,7 +509,7 @@ if (pcb_chg_obj_name_query(ptr2)) { pcb_hid_redraw(PCB); pcb_board_set_changed_flag(pcb_true); - rnd_actionva(PCB_ACT_HIDLIB, "DeleteRats", "AllRats", NULL); + rnd_actionva(RND_ACT_HIDLIB, "DeleteRats", "AllRats", NULL); } if (op == F_Object) { pcb_subc_t *subc = pcb_obj_parent_subc(ptr2); @@ -527,7 +527,7 @@ /* change the layout's name */ case F_Layout: - name = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "Enter the layout name:", PCB_EMPTY(PCB_ACT_HIDLIB->name), "Layout name"); + name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", PCB_EMPTY(RND_ACT_HIDLIB->name), "Layout name"); /* NB: ChangeLayoutName takes ownership of the passed memory */ if (name && pcb_board_change_name(name)) pcb_board_set_changed_flag(pcb_true); @@ -535,7 +535,7 @@ /* change the name of the active layer */ case F_Layer: - name = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "Enter the layer name:", PCB_EMPTY(PCB_CURRLAYER(PCB_ACT_BOARD)->name), "Layer name"); + name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layer name:", PCB_EMPTY(PCB_CURRLAYER(PCB_ACT_BOARD)->name), "Layer name"); /* NB: pcb_layer_rename_ takes ownership of the passed memory */ if (name && (pcb_layer_rename_(PCB_CURRLAYER(PCB_ACT_BOARD), name, 1) == 0)) pcb_board_set_changed_flag(pcb_true); @@ -547,7 +547,7 @@ return FGW_ERR_ARG_CONV; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -563,7 +563,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); switch(op) { case F_ToggleObject: @@ -600,7 +600,7 @@ return FGW_ERR_ARG_CONV; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -611,7 +611,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1])); switch(op) { case F_ToggleObject: @@ -640,7 +640,7 @@ return FGW_ERR_ARG_CONV; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -664,8 +664,8 @@ int err = 0; pcb_coord_t gx, gy; - PCB_ACT_CONVARG(1, FGW_STR, SetThermal, function = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, SetThermal, style = argv[2].val.str); + 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); if (function && *function && style && *style) { pcb_bool absolute; @@ -696,12 +696,12 @@ else err = 1; if (!err) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } } - PCB_ACT_FAIL(SetThermal); + RND_ACT_FAIL(SetThermal); } @@ -719,12 +719,12 @@ const char *function; const char *flag; - PCB_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str); + 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); ChangeFlag(function, flag, 1, "SetFlag"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -742,12 +742,12 @@ const char *function; const char *flag; - PCB_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str); + 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); ChangeFlag(function, flag, 0, "ClrFlag"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -762,13 +762,13 @@ double value; int err = 0; - PCB_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1])); if (fnc_id == F_Grid) - return rnd_actionv_bin(PCB_ACT_HIDLIB, "setgrid", res, argc-1, argv+1); + return rnd_actionv_bin(RND_ACT_HIDLIB, "setgrid", res, argc-1, argv+1); - PCB_ACT_CONVARG(2, FGW_STR, SetValue, val = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, SetValue, units = argv[3].val.str); + 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); value = pcb_get_value(val, units, &absolute, NULL); @@ -776,7 +776,7 @@ case F_LineSize: case F_Line: pcb_board_set_line_width(absolute ? value : value + conf_core.design.line_thickness); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case F_Text: @@ -789,11 +789,11 @@ break; } if (!err) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } - PCB_ACT_FAIL(SetValue); + RND_ACT_FAIL(SetValue); } /* --------------------------------------------------------------------------- */ @@ -812,9 +812,9 @@ int funcid, type = PCB_OBJ_VOID, which; void *ptr1, *ptr2, *ptr3; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeAngle, funcid = fgw_keyword(&argv[1])); - PCB_ACT_CONVARG(2, FGW_STR, ChangeAngle, prim = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, ChangeAngle, delta = argv[3].val.str); + 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); if (pcb_strcasecmp(prim, "start") == 0) which = 0; @@ -869,7 +869,7 @@ break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -890,10 +890,10 @@ int funcid, type = PCB_OBJ_VOID, which; void *ptr1, *ptr2, *ptr3; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeRadius, funcid = fgw_keyword(&argv[1])); - PCB_ACT_CONVARG(2, FGW_STR, ChangeRadius, prim = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, ChangeRadius, delta = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, ChangeRadius, units = argv[4].val.str); + 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); if ((pcb_strcasecmp(prim, "width") == 0) || (pcb_strcasecmp(prim, "x") == 0)) which = 0; else if ((pcb_strcasecmp(prim, "height") == 0) || (pcb_strcasecmp(prim, "y") == 0)) which = 1; @@ -938,7 +938,7 @@ break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 30899) +++ trunk/src/conf_act.c (revision 30900) @@ -39,7 +39,7 @@ static const char pcb_acth_GetStyle[] = "Return integer index (>=0) of the currently active style or -1 if no style is selected (== custom style)"; fgw_error_t pcb_act_GetStyle(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - PCB_ACT_IRES(pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL)); + RND_ACT_IRES(pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL)); return 0; } @@ -51,9 +51,9 @@ if (have == NULL) have = ""; - PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkSubcID, expected = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkSubcID, expected = argv[1].val.str); - PCB_ACT_IRES(strcmp(expected, have) == 0); + RND_ACT_IRES(strcmp(expected, have) == 0); return 0; } @@ -65,9 +65,9 @@ if (have == NULL) have = ""; - PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkTermID, expected = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkTermID, expected = argv[1].val.str); - PCB_ACT_IRES(strcmp(expected, have) == 0); + RND_ACT_IRES(strcmp(expected, have) == 0); return 0; } @@ -76,8 +76,8 @@ static fgw_error_t pcb_act_ChkBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int expected; - PCB_ACT_CONVARG(1, FGW_INT, ChkBuffer, expected = argv[1].val.nat_int); - PCB_ACT_IRES((conf_core.editor.buffer_number + 1) == expected); + RND_PCB_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 30899) +++ trunk/src/drc.c (revision 30900) @@ -73,7 +73,7 @@ if (pcb_strcasecmp(dlg_type, "list") == 0) { if (PCB_HAVE_GUI_ATTR_DLG) { args[1].val.str = "list"; - return rnd_actionv_bin(PCB_ACT_HIDLIB, dlgact, res, 2, args); + return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args); } dlg_type = "print"; } @@ -81,13 +81,13 @@ if (pcb_strcasecmp(dlg_type, "simple") == 0) { if (PCB_HAVE_GUI_ATTR_DLG) { args[1].val.str = "simple"; - return rnd_actionv_bin(PCB_ACT_HIDLIB, dlgact, res, 2, args); + return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args); } dlg_type = "print"; } - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); if (refresh != NULL) refresh(); @@ -140,7 +140,7 @@ } } else if (pcb_strcasecmp(dlg_type, "count") == 0) - PCB_ACT_IRES(pcb_view_list_length(lst)); + RND_ACT_IRES(pcb_view_list_length(lst)); if (refresh != NULL) @@ -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"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, DRC, dlg_type = argv[1].val.str); + rnd_PCB_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,13 +172,13 @@ const char *dlg_type = "list"; const char *aauto = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatList, dlg_type = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, IOIncompatList, aauto = argv[2].val.str); + 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); if ((aauto != NULL) && (strcmp(aauto, "auto") == 0)) { if (pcbhl_conf.rc.quiet && !PCB_HAVE_GUI_ATTR_DLG) { /* if not explicitly asked for a listing style and we are on CLI and quiet is set, don't print anything */ - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } } Index: trunk/src/extobj_act.c =================================================================== --- trunk/src/extobj_act.c (revision 30899) +++ trunk/src/extobj_act.c (revision 30900) @@ -80,14 +80,14 @@ pcb_subc_t *sc; pcb_any_obj_t *obj; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ExtobjConvFrom, op = fgw_keyword(&argv[1])); - PCB_ACT_CONVARG(2, FGW_STR, ExtobjConvFrom, eoname = argv[2].val.str); + 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); if (strcmp(eoname, "@gui") != 0) { eo = pcb_extobj_lookup(eoname); if (eo == NULL) { pcb_message(PCB_MSG_ERROR, "ExtobjConvFrom: extended object '%s' is not available\n", eoname); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -94,7 +94,7 @@ else { int idx = extobj_pick_gui(); if (idx <= 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } eo = pcb_extobj_i2o.array[idx]; @@ -104,7 +104,7 @@ case F_Object: if (argc > 3) { /* convert by idpath */ pcb_idpath_t *idp; - PCB_ACT_CONVARG(3, FGW_IDPATH, ExtobjConvFrom, idp = fgw_idpath(&argv[2])); + RND_PCB_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); @@ -116,13 +116,13 @@ obj = NULL; if (pcb_search_screen(x, y, PCB_OBJ_CLASS_REAL, &p1, (void **)&obj, &p3) == 0) { pcb_message(PCB_MSG_ERROR, "ExtobjConvFrom: object not found (no object under the cursor)\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } if ((obj == NULL) || ((obj->type & PCB_OBJ_CLASS_REAL) == 0)) { pcb_message(PCB_MSG_ERROR, "ExtobjConvFrom: object not found\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } sc = pcb_extobj_conv_obj(pcb, eo, pcb->Data, obj, 1); @@ -137,16 +137,16 @@ break; default: - PCB_ACT_FAIL(ExtobjConvFrom); + RND_ACT_FAIL(ExtobjConvFrom); } if (sc == NULL) { pcb_message(PCB_MSG_ERROR, "ExtobjConvFrom: failed to create the extended object\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -159,13 +159,13 @@ int op = F_Object; pcb_subc_t *obj; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, ExtobjGUIPropEdit, op = fgw_keyword(&argv[1])); + rnd_PCB_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; - PCB_ACT_CONVARG(2, FGW_IDPATH, ExtobjGUIPropEdit, idp = fgw_idpath(&argv[2])); + RND_PCB_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); @@ -177,24 +177,24 @@ obj = NULL; if (pcb_search_screen(x, y, PCB_OBJ_SUBC, &p1, (void **)&obj, &p3) == 0) { pcb_message(PCB_MSG_ERROR, "ExtobjConvFrom: object not found (no object under the cursor)\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } if ((obj == NULL) || ((obj->type & PCB_OBJ_CLASS_REAL) == 0)) { pcb_message(PCB_MSG_ERROR, "ExtobjConvFrom: object not found\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } break; default: - PCB_ACT_FAIL(ExtobjConvFrom); + RND_ACT_FAIL(ExtobjConvFrom); } if ((obj == NULL) || (obj->type != PCB_OBJ_SUBC) || (obj->extobj == NULL)) { pcb_message(PCB_MSG_ERROR, "Object is not an extended object"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -201,7 +201,7 @@ eo = pcb_extobj_get(obj); if (eo == NULL) { pcb_message(PCB_MSG_ERROR, "Extended object '%s' is not available", obj->extobj); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -210,7 +210,7 @@ else pcb_message(PCB_MSG_ERROR, "Extended object '%s' does not implement GUI property editor", obj->extobj); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30899) +++ trunk/src/file_act.c (revision 30900) @@ -65,9 +65,9 @@ const char *name, *format = NULL; int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, LoadFrom, op = fgw_keyword(&argv[1])); - PCB_ACT_CONVARG(2, FGW_STR, LoadFrom, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFrom, format = argv[3].val.str); + 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); switch(op) { case F_ElementToBuffer: @@ -76,21 +76,21 @@ case F_SubcToBuffer: case F_Subcircuit: case F_Footprint: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, format)) - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "buffer"); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "buffer"); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_LayoutToBuffer: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, name, format)) - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "buffer"); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "buffer"); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_Layout: - if (!PCB->Changed || pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "File overwrite", "OK to override layout data?", "cancel", 0, "ok", 1, NULL)) + if (!PCB->Changed || pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "File overwrite", "OK to override layout data?", "cancel", 0, "ok", 1, NULL)) pcb_load_pcb(name, format, pcb_true, 0); break; @@ -105,7 +105,7 @@ pcb_netlist_init(&(PCB->netlist[i])); } } - if (!pcb_import_netlist(PCB_ACT_HIDLIB, PCB->Netlistname)) + if (!pcb_import_netlist(RND_ACT_HIDLIB, PCB->Netlistname)) pcb_netlist_changed(1); else pcb_message(PCB_MSG_ERROR, "None of the netlist import plugins could handle that file (unknown or broken file format?)\n"); @@ -112,17 +112,17 @@ break; case F_Revert: - if (PCB_ACT_HIDLIB->filename && (!PCB->Changed || (pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1))) + if (RND_ACT_HIDLIB->filename && (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1))) pcb_revert_pcb(); break; default: pcb_message(PCB_MSG_ERROR, "LoadFrom(): invalid command (first arg)\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -134,13 +134,13 @@ const char *argument_name = NULL; char *name = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str); - if (!PCB->Changed || (pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) { + if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) { if (argument_name) name = pcb_strdup(argument_name); else - name = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "Enter the layout name:", "", "Layout name"); + name = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", "", "Layout name"); if (!name) return 1; @@ -148,7 +148,7 @@ /* PCB usgae: at the moment, while having only one global PCB, this function legitimately uses that */ - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); /* do emergency saving * clear the old struct and allocate memory for the new one */ @@ -176,11 +176,11 @@ pcb_center_display(PCB->hidlib.size_x / 2, PCB->hidlib.size_y / 2); pcb_board_changed(0); pcb_hid_redraw(PCB); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - PCB_ACT_IRES(0); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + RND_ACT_IRES(0); return 0; } - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -191,10 +191,10 @@ { const char *target = "board"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, normalize, target = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, normalize, target = argv[1].val.str); if (strcmp(target, "board") == 0) - PCB_ACT_IRES(pcb_board_normalize(PCB)); + RND_ACT_IRES(pcb_board_normalize(PCB)); else if (strncmp(target, "buffer", 6) == 0) { int bn; char *end; @@ -204,12 +204,12 @@ bn = strtol(target, &end, 10); if (*end != '\0') { pcb_message(PCB_MSG_ERROR, "Expected buffer number, got '%s'\n", target); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } bn--; if ((bn < 0) || (bn >= PCB_MAX_BUFFER)) { pcb_message(PCB_MSG_ERROR, "Buffer number out of range\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } } else @@ -221,10 +221,10 @@ } pcb_buffers[bn].X = pcb_buffers[bn].Y = 0; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); } else - PCB_ACT_FAIL(normalize); + RND_ACT_FAIL(normalize); return 0; } @@ -240,13 +240,13 @@ const char *name = NULL; const char *fmt = NULL; - PCB_ACT_CONVARG(1, FGW_KEYWORD, SaveTo, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, SaveTo, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveTo, fmt = argv[3].val.str); - PCB_ACT_IRES(0); + 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_IRES(0); if ((op != F_Layout) && (name == NULL)) - PCB_ACT_FAIL(SaveTo); + RND_ACT_FAIL(SaveTo); switch(op) { case F_Layout: @@ -254,17 +254,17 @@ pcb_message(PCB_MSG_ERROR, "SaveTo(Layout) doesn't take file name or format - did you mean SaveTo(LayoutAs)?\n"); return FGW_ERR_ARGC; } - if (pcb_save_pcb(PCB_ACT_HIDLIB->filename, NULL) == 0) + if (pcb_save_pcb(RND_ACT_HIDLIB->filename, NULL) == 0) pcb_board_set_changed_flag(pcb_false); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_BOARD_FN_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_BOARD_FN_CHANGED, NULL); return 0; case F_LayoutAs: if (pcb_save_pcb(name, fmt) == 0) { pcb_board_set_changed_flag(pcb_false); - free(PCB_ACT_HIDLIB->filename); - PCB_ACT_HIDLIB->filename = pcb_strdup(name); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_BOARD_FN_CHANGED, NULL); + free(RND_ACT_HIDLIB->filename); + RND_ACT_HIDLIB->filename = pcb_strdup(name); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_BOARD_FN_CHANGED, NULL); } return 0; @@ -272,30 +272,30 @@ case F_PasteBuffer: if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) == 0) { pcb_message(PCB_MSG_ERROR, "Can not save subcircuit: there is no subcircuit in the paste buffer.\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } else if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) > 1) { pcb_message(PCB_MSG_ERROR, "Can not save subcircuit: there are more than one subcircuits in the paste buffer.\nDid you mean saving a library instead?\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } else - PCB_ACT_IRES(pcb_save_buffer_subcs(name, fmt, 0)); + RND_ACT_IRES(pcb_save_buffer_subcs(name, fmt, 0)); return 0; /* shorthand kept only for compatibility reasons - do not use */ case F_AllConnections: pcb_message(PCB_MSG_WARNING, "Please use action ExportOldConn() instead of SaveTo() for connections.\n"); - return rnd_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "AllConnections", name, NULL); + return rnd_actionva(RND_ACT_HIDLIB, "ExportOldConn", "AllConnections", name, NULL); case F_AllUnusedPins: pcb_message(PCB_MSG_WARNING, "Please use action ExportOldConn() instead of SaveTo() for connections.\n"); - return rnd_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "AllUnusedPins", name, NULL); + return rnd_actionva(RND_ACT_HIDLIB, "ExportOldConn", "AllUnusedPins", name, NULL); case F_ElementConnections: case F_SubcConnections: pcb_message(PCB_MSG_WARNING, "Please use action ExportOldConn() instead of SaveTo() for connections.\n"); - return rnd_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "SubcConnections", name, NULL); + return rnd_actionva(RND_ACT_HIDLIB, "ExportOldConn", "SubcConnections", name, NULL); } - PCB_ACT_FAIL(SaveTo); + RND_ACT_FAIL(SaveTo); } /* Run the save dialog, either the full version from the dialogs plugin @@ -303,7 +303,7 @@ name_out and fmt_out. */ static int save_fmt_dialog(const char *title, const char *descr, char **default_file, const char *history_tag, pcb_hid_fsd_flags_t flags, char **name_out, const char **fmt_out) { - const fgw_func_t *f = pcb_act_lookup("save"); + const fgw_func_t *f = rnd_act_lookup("save"); *name_out = NULL; *fmt_out = NULL; @@ -356,15 +356,15 @@ const char *method, *source, *fn = NULL, *fmt = NULL; pcb_data_t *src; - PCB_ACT_CONVARG(1, FGW_STR, SaveLib, method = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, SaveLib, source = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveLib, fn = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, SaveLib, fmt = argv[4].val.str); + 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); if (pcb_strcasecmp(source, "board") == 0) src = PCB->Data; else if (pcb_strcasecmp(source, "buffer") == 0) src = PCB_PASTEBUFFER->Data; else - PCB_ACT_FAIL(SaveLib); + RND_ACT_FAIL(SaveLib); if (pcb_strcasecmp(method, "file") == 0) { char *name; @@ -375,7 +375,7 @@ int sr = save_fmt_dialog("Save footprint lib to file ...", "Choose a file to save all subcircuits to.\n", &default_file, "save_lib_file", PCB_HID_FSD_MAY_NOT_EXIST, &name, &fmt); if (sr != 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -382,15 +382,15 @@ else name = pcb_strdup(fn); - f = pcb_fopen(PCB_ACT_HIDLIB, name, "w"); + f = pcb_fopen(RND_ACT_HIDLIB, name, "w"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Failed to open %s for write\n", name); free(name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } free(name); - PCB_ACT_IRES(pcb_write_footprint_data(f, src, fmt, -1)); + RND_ACT_IRES(pcb_write_footprint_data(f, src, fmt, -1)); } else if (pcb_strcasecmp(method, "dir") == 0) { unsigned int ares = 0; @@ -407,7 +407,7 @@ int sr = save_fmt_dialog("Save footprint lib to directory ...", "Choose a file name pattern to save all subcircuits to.\n", &default_file, "save_lib_dir", PCB_HID_FSD_IS_TEMPLATE, &name, &fmt); if (sr != 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -420,7 +420,7 @@ pcb_message(PCB_MSG_ERROR, "Failed to find a plugin that can write subcircuits", fmt); else pcb_message(PCB_MSG_ERROR, "Failed to find a plugin for format %s", fmt); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -439,7 +439,7 @@ FILE *f; char *fullname = pcb_strdup_printf("%s.%ld%s%s", name, (long)sit.count, sep, ending); - f = pcb_fopen(PCB_ACT_HIDLIB, fullname, "w"); + f = pcb_fopen(RND_ACT_HIDLIB, fullname, "w"); free(fullname); if (f != NULL) { if (p->write_subcs_head(p, &udata, f, 0, 1) == 0) { @@ -453,11 +453,11 @@ if (ares != 0) pcb_message(PCB_MSG_ERROR, "Some of the subcircuits failed to export\n"); - PCB_ACT_IRES(ares); + RND_ACT_IRES(ares); free(name); } else - PCB_ACT_FAIL(SaveLib); + RND_ACT_FAIL(SaveLib); return 0; } @@ -468,13 +468,13 @@ static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *force = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, Quit, force = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Quit, force = argv[1].val.str); if ((force != NULL) && (pcb_strcasecmp(force, "force") == 0)) exit(0); - if (!PCB->Changed || (pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) + if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) pcb_quit_app(); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -499,7 +499,7 @@ args[0] = NULL; for(n = 1; n < argc; n++) - PCB_ACT_CONVARG(n, FGW_STR, Export, args[n-1] = argv[n].val.str); + RND_PCB_ACT_CONVARG(n, FGW_STR, Export, args[n-1] = argv[n].val.str); pcb_exporter = pcb_hid_find_exporter(args[0]); if (pcb_exporter == NULL) { @@ -511,15 +511,15 @@ argc-=2; /* call the exporter */ - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_EXPORT_SESSION_BEGIN, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_EXPORT_SESSION_BEGIN, NULL); a = args; a++; pcb_exporter->parse_arguments(pcb_exporter, &argc, &a); pcb_exporter->do_export(pcb_exporter, NULL); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_EXPORT_SESSION_END, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_EXPORT_SESSION_END, NULL); pcb_exporter = NULL; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -528,7 +528,7 @@ static fgw_error_t pcb_act_Backup(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_backup(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 30899) +++ trunk/src/font_act.c (revision 30900) @@ -46,8 +46,8 @@ pcb_font_t *fnt; int r; - PCB_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[2].val.str); + 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); if (sid != NULL) { char *end; @@ -94,7 +94,7 @@ } r = pcb_parse_font(fnt, fname); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_FONT_CHANGED, "i", fnt->id); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_FONT_CHANGED, "i", fnt->id); if (r != 0) { pcb_message(PCB_MSG_ERROR, "LoadFontFrom(): failed to load font from %s\n", fname); pcb_del_font(&PCB_ACT_BOARD->fontkit, fnt->id); @@ -107,7 +107,7 @@ fid = dst_fid == 0 ? 0 : fnt->id; pcb_message(PCB_MSG_INFO, "LoadFontFrom(): new font (ID %d) successfully loaded from file %s\n", fid, fname); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -123,8 +123,8 @@ pcb_font_t *fnt; int r; - PCB_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[1].val.str); + 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); if (sid != NULL) { char *end; @@ -152,7 +152,7 @@ "Picks a PCB font file to save.\n", default_file, ".font", NULL, "pcbfont", PCB_HID_FSD_MAY_NOT_EXIST, NULL); if (fname == NULL) - PCB_ACT_FAIL(save_font_to); + RND_ACT_FAIL(save_font_to); if (default_file != NULL) { free(default_file); default_file = NULL; @@ -165,7 +165,7 @@ return 1; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30899) +++ trunk/src/gui_act.c (revision 30900) @@ -106,9 +106,9 @@ int id; int err = 0; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Display, str_dir = argv[2].val.str); + 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); if (id == F_SubcID) { /* change the displayed name of subcircuits */ if (argc > 1) @@ -144,11 +144,11 @@ /* toggle line-adjust flag */ case F_ToggleAllDirections: conf_toggle_editor(all_direction_lines); - pcb_tool_adjust_attached(PCB_ACT_HIDLIB); + pcb_tool_adjust_attached(RND_ACT_HIDLIB); break; case F_CycleClip: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); if (conf_core.editor.all_direction_lines) { conf_toggle_editor(all_direction_lines); pcb_conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",0); @@ -156,28 +156,28 @@ else { pcb_conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3); } - pcb_tool_adjust_attached(PCB_ACT_HIDLIB); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_tool_adjust_attached(RND_ACT_HIDLIB); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_CycleCrosshair: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); pcb_conf_setf(CFR_CLI, "editor/crosshair_shape_idx", 0, "%d", CrosshairShapeIncrement(pcbhl_conf.editor.crosshair_shape_idx)); if (pcb_ch_shape_NUM == pcbhl_conf.editor.crosshair_shape_idx) pcb_conf_set(CFR_CLI, "editor/crosshair_shape_idx", 0, "0", POL_OVERWRITE); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleRubberBandMode: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); conf_toggle_editor(rubber_band_mode); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleStartDirection: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); conf_toggle_editor(swap_start_direction); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleUniqueNames: @@ -185,21 +185,21 @@ break; case F_ToggleSnapPin: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); conf_toggle_editor(snap_pin); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleSnapOffGridLine: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); conf_toggle_editor(snap_offgrid_line); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleHighlightOnPoint: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); conf_toggle_editor(highlight_on_point); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleLocalRef: @@ -244,7 +244,7 @@ break; case F_ToggleAutoDRC: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); conf_toggle_editor(auto_drc); if (conf_core.editor.auto_drc && pcbhl_conf.editor.mode == pcb_crosshair.tool_line) { if (pcb_data_clear_flag(PCB->Data, PCB_FLAG_FOUND, 1, 1) > 0) { @@ -260,7 +260,7 @@ pcb_find_free(&fctx); } } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleCheckPlanes: @@ -288,12 +288,12 @@ /* shift grid alignment */ case F_ToggleGrid: { - pcb_coord_t oldGrid = PCB_ACT_HIDLIB->grid; + pcb_coord_t oldGrid = RND_ACT_HIDLIB->grid; - PCB_ACT_HIDLIB->grid = 1; + RND_ACT_HIDLIB->grid = 1; if (pcb_crosshair_move_absolute(pcb_crosshair.X, pcb_crosshair.Y)) - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */ - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, oldGrid, pcb_true, pcb_crosshair.X, pcb_crosshair.Y); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); /* first notify was in MoveCrosshairAbs */ + pcb_hidlib_set_grid(RND_ACT_HIDLIB, oldGrid, pcb_true, pcb_crosshair.X, pcb_crosshair.Y); pcb_grid_inval(); } break; @@ -306,7 +306,7 @@ /* display the pinout of a subcircuit */ case F_Pinout: - return rnd_actionva(PCB_ACT_HIDLIB, "pinout", NULL); + return rnd_actionva(RND_ACT_HIDLIB, "pinout", NULL); /* toggle displaying of terminal names */ case F_PinOrPadName: @@ -360,11 +360,11 @@ case F_ToggleGrid: if (argc > 3) { if (fgw_arg_conv(&rnd_fgw, &argv[3], FGW_KEYWORD) != 0) { - PCB_ACT_FAIL(Display); + RND_ACT_FAIL(Display); return FGW_ERR_ARG_CONV; } - PCB_ACT_HIDLIB->grid_ox = pcb_get_value(argv[2].val.str, NULL, NULL, NULL); - PCB_ACT_HIDLIB->grid_oy = pcb_get_value(argv[3].val.str, NULL, NULL, NULL); + RND_ACT_HIDLIB->grid_ox = pcb_get_value(argv[2].val.str, NULL, NULL, NULL); + RND_ACT_HIDLIB->grid_oy = pcb_get_value(argv[3].val.str, NULL, NULL, NULL); if (pcbhl_conf.editor.draw_grid) pcb_hid_redraw(PCB); } @@ -379,7 +379,7 @@ if (!err) return 0; - PCB_ACT_FAIL(Display); + RND_ACT_FAIL(Display); } /* ---------------------------------------------------------------- */ @@ -389,11 +389,11 @@ #define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (PCB_SLOP * pcb_pixel_slop)) : ((a)-(b) > -(PCB_SLOP * pcb_pixel_slop))) static fgw_error_t pcb_act_CycleDrag(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; + pcb_hidlib_t *hidlib = RND_ACT_HIDLIB; void *ptr1, *ptr2, *ptr3; int over = 0; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); if (pcb_crosshair.drags == NULL) return 0; @@ -451,11 +451,11 @@ } while (over <= 1); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; switched:; - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_RUBBER_RESET, NULL); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_RESET, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); return 0; } @@ -470,11 +470,11 @@ { int id = -2; - PCB_ACT_IRES(0); - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); + RND_ACT_IRES(0); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1])); if (id == -1) { /* invalid */ - PCB_ACT_FAIL(MarkCrosshair); + RND_ACT_FAIL(MarkCrosshair); return FGW_ERR_ARGV_TYPE; } else if (id == -2) { /* empty */ @@ -523,8 +523,8 @@ pcb_route_style_t *rts; int number; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1, FGW_STR, RouteStyle, str = argv[1].val.str); + RND_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_STR, RouteStyle, str = argv[1].val.str); number = strtol(str, &end, 10); @@ -548,7 +548,7 @@ pcb_board_set_clearance(rts->Clearance); } else { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); pcb_message(PCB_MSG_ERROR, "Error: invalid route style name or index\n"); } return 0; @@ -588,23 +588,23 @@ /* set layer current and size from line or arc */ switch (type) { case PCB_OBJ_LINE: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); set_same_(((pcb_line_t *) ptr2)->Thickness, -1, -1, ((pcb_line_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; if (pcbhl_conf.editor.mode != pcb_crosshair.tool_line) - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "line"); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "line"); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case PCB_OBJ_ARC: - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); set_same_(((pcb_arc_t *) ptr2)->Thickness, -1, -1, ((pcb_arc_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; if (pcbhl_conf.editor.mode != pcb_crosshair.tool_arc) - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "arc"); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "arc"); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case PCB_OBJ_POLY: @@ -612,14 +612,14 @@ break; default: - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (layer != PCB_CURRLAYER(PCB_ACT_BOARD)) { - pcb_layervis_change_group_vis(PCB_ACT_HIDLIB, pcb_layer_id(PCB_ACT_BOARD->Data, layer), pcb_true, pcb_true); + pcb_layervis_change_group_vis(RND_ACT_HIDLIB, pcb_layer_id(PCB_ACT_BOARD->Data, layer), pcb_true, pcb_true); pcb_hid_redraw(PCB); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -634,7 +634,7 @@ for(n = 1; n < argc; n++) { const char *arg; - PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); + RND_PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); if (!explicit && (*arg == '@')) { pcb_layer_id_t lid = pcb_layer_by_name(PCB->Data, arg+1); if (lid < 0) { @@ -690,7 +690,7 @@ } else { pcb_message(PCB_MSG_ERROR, "Invalid EditLayer() command: %s\n", arg); - PCB_ACT_FAIL(EditLayer); + RND_ACT_FAIL(EditLayer); } } @@ -698,13 +698,13 @@ char fn[PCB_ACTION_NAME_MAX]; fgw_arg_t args[2]; args[0].type = FGW_FUNC; - args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, pcb_aname(fn, "LayerPropGui")); - args[0].val.argv0.user_call_ctx = PCB_ACT_HIDLIB; + args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, rnd_aname(fn, "LayerPropGui")); + args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; if (args[0].val.func != NULL) { args[1].type = FGW_LONG; args[1].val.nat_long = pcb_layer_id(PCB->Data, ly); ret = rnd_actionv_(args[0].val.func, res, 2, args); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); } else return FGW_ERR_NOT_FOUND; @@ -711,8 +711,8 @@ return ret; } - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); - PCB_ACT_IRES(0); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + RND_ACT_IRES(0); return ret; } @@ -726,7 +726,7 @@ if (PCB_CURRLAYER(PCB_ACT_BOARD)->is_bound) { pcb_message(PCB_MSG_ERROR, "Can't edit bound layers yet\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -735,7 +735,7 @@ for(n = 1; n < argc; n++) { const char *arg; - PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); + RND_PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str); if (!explicit && (*arg == '@')) { pcb_layergrp_id_t gid; if (arg[1] == '\0') @@ -744,7 +744,7 @@ gid = pcb_layergrp_by_name(PCB, arg+1); if (gid < 0) { pcb_message(PCB_MSG_ERROR, "Can't find layer group named %s\n", arg+1); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } g = pcb_get_layergrp(PCB, gid); @@ -764,7 +764,7 @@ } if (bit == 0) { pcb_message(PCB_MSG_ERROR, "Unknown type bit %s\n", sbit+1); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } switch(*sbit) { @@ -780,7 +780,7 @@ n++; if (n >= argc) { pcb_message(PCB_MSG_ERROR, "Need an attribute name=value\n", arg+1); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } key = pcb_strdup(arg); @@ -799,7 +799,7 @@ } else { pcb_message(PCB_MSG_ERROR, "Invalid EditGroup() command: %s\n", arg); - PCB_ACT_FAIL(EditLayer); + RND_ACT_FAIL(EditLayer); } } @@ -807,13 +807,13 @@ char fn[PCB_ACTION_NAME_MAX]; fgw_arg_t args[2]; args[0].type = FGW_FUNC; - args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, pcb_aname(fn, "GroupPropGui")); - args[0].val.argv0.user_call_ctx = PCB_ACT_HIDLIB; + args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, rnd_aname(fn, "GroupPropGui")); + args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; if (args[0].val.func != NULL) { args[1].type = FGW_LONG; args[1].val.nat_long = pcb_layergrp_id(PCB, g); ret = rnd_actionv_(args[0].val.func, res, 2, args); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); } else return FGW_ERR_NOT_FOUND; @@ -821,8 +821,8 @@ } - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); - PCB_ACT_IRES(0); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + RND_ACT_IRES(0); return ret; } @@ -837,7 +837,7 @@ if (PCB_CURRLAYER(PCB_ACT_BOARD) != NULL) g = pcb_get_layergrp(PCB, PCB_CURRLAYER(PCB_ACT_BOARD)->meta.real.grp); - PCB_ACT_MAY_CONVARG(1, FGW_STR, DelGroup, name = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DelGroup, name = argv[1].val.str); if (*name == '@') { gid = pcb_actd_EditGroup_gid; if (name[1] != '\0') @@ -844,7 +844,7 @@ gid = pcb_layergrp_by_name(PCB, name+1); if (gid < 0) { pcb_message(PCB_MSG_ERROR, "Can't find layer group named %s\n", name+1); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -851,13 +851,13 @@ else { if (g == NULL) { pcb_message(PCB_MSG_ERROR, "Can't find layer group\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } gid = pcb_layergrp_id(PCB, g); } - PCB_ACT_IRES(pcb_layergrp_del(PCB, gid, 1, 1)); + RND_ACT_IRES(pcb_layergrp_del(PCB, gid, 1, 1)); return 0; } @@ -869,23 +869,23 @@ pcb_layergrp_t *g = NULL; pcb_layer_type_t ltype = 0, lloc = 0; - PCB_ACT_CONVARG(1, FGW_STR, NewGroup, stype = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, NewGroup, sloc = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, NewGroup, spurp = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, NewGroup, scomb = argv[4].val.str); - PCB_ACT_MAY_CONVARG(5, FGW_STR, NewGroup, name = argv[5].val.str); - PCB_ACT_MAY_CONVARG(6, FGW_STR, NewGroup, attr = argv[6].val.str); + 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); ltype = pcb_layer_type_str2bit(stype) & PCB_LYT_ANYTHING; if (ltype == 0) { pcb_message(PCB_MSG_ERROR, "Invalid type: '%s'\n", sloc); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if ((ltype == PCB_LYT_COPPER) || (ltype == PCB_LYT_SUBSTRATE)) { pcb_message(PCB_MSG_ERROR, "Can not create this type of layer group: '%s'\n", sloc); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -894,7 +894,7 @@ lloc = pcb_layer_type_str2bit(sloc) & PCB_LYT_ANYWHERE; if (lloc == 0) { pcb_message(PCB_MSG_ERROR, "Invalid location: '%s'\n", sloc); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -946,7 +946,7 @@ pcb_undo_inc_serial(); if (lid >= 0) { pcb_layer_t *ly; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); ly = &PCB->Data->Layer[lid]; ly->meta.real.vis = 1; if (scomb != NULL) { @@ -959,14 +959,14 @@ } } else - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } else - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); pcb_layergrp_inhibit_dec(); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); if ((pcb_gui != NULL) && (pcb_exporter == NULL)) pcb_gui->invalidate_all(pcb_gui); @@ -984,7 +984,7 @@ if (PCB_CURRLAYER(PCB_ACT_BOARD) != NULL) g = pcb_get_layergrp(PCB, PCB_CURRLAYER(PCB_ACT_BOARD)->meta.real.grp); - PCB_ACT_MAY_CONVARG(1, FGW_STR, DupGroup, name = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DupGroup, name = argv[1].val.str); if (*name == '@') { gid = pcb_actd_EditGroup_gid; if (name[1] != '\0') @@ -991,7 +991,7 @@ gid = pcb_layergrp_by_name(PCB, name+1); if (gid < 0) { pcb_message(PCB_MSG_ERROR, "Can't find layer group named %s\n", name+1); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -998,7 +998,7 @@ else { if (g == NULL) { pcb_message(PCB_MSG_ERROR, "Can't find layer group\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } gid = pcb_layergrp_id(PCB, g); @@ -1010,19 +1010,19 @@ if (ng >= 0) { pcb_layer_id_t lid = pcb_layer_create(PCB, ng, g->name, 1); if (lid >= 0) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); PCB->Data->Layer[lid].meta.real.vis = 1; } else - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } else - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); pcb_undo_unfreeze_serial(); pcb_undo_inc_serial(); pcb_layergrp_inhibit_dec(); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); if ((pcb_gui != NULL) && (pcb_exporter == NULL)) pcb_gui->invalidate_all(pcb_gui); return 0; @@ -1037,17 +1037,17 @@ const pcb_menu_layers_t *ml; char *name; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1, FGW_STR, selectlayer, name = argv[1].val.str); + RND_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_STR, selectlayer, name = argv[1].val.str); if (pcb_strcasecmp(name, "silk") == 0) { PCB->RatDraw = 0; if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) { - pcb_layervis_change_group_vis(PCB_ACT_HIDLIB, lid, 1, 1); + pcb_layervis_change_group_vis(RND_ACT_HIDLIB, lid, 1, 1); } else { pcb_message(PCB_MSG_ERROR, "Can't find this-side silk layer\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } return 0; } @@ -1058,18 +1058,18 @@ pcb_bool *s = (pcb_bool *)((char *)PCB + ml->sel_offs); if (ml->sel_offs == 0) { pcb_message(PCB_MSG_ERROR, "Virtual layer '%s' (%s) can not be selected\n", ml->name, ml->abbrev); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } *s = *v = 1; - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } PCB->RatDraw = 0; - pcb_layervis_change_group_vis(PCB_ACT_HIDLIB, atoi(name)-1, 1, 1); + pcb_layervis_change_group_vis(RND_ACT_HIDLIB, atoi(name)-1, 1, 1); pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } @@ -1084,7 +1084,7 @@ const char *name; const pcb_menu_layers_t *ml; - PCB_ACT_CONVARG(1, FGW_STR, chklayer, name = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, chklayer, name = argv[1].val.str); lid = strtol(name, &end, 10); if (*end != '\0') { @@ -1092,14 +1092,14 @@ if (ml != NULL) { if (ml->sel_offs != 0) { pcb_bool *s = (pcb_bool *)((char *)PCB + ml->sel_offs); - PCB_ACT_IRES(*s); + RND_ACT_IRES(*s); } else - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } pcb_message(PCB_MSG_ERROR, "pcb_act_ChkLayer: '%s' is not a valid layer ID - check your menu file!\n", argv[0]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -1107,7 +1107,7 @@ for(ml = pcb_menu_layers; ml->name != NULL; ml++) { pcb_bool *s = (pcb_bool *)((char *)PCB + ml->sel_offs); if ((ml->sel_offs != 0) && (*s)) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } } @@ -1115,9 +1115,9 @@ lid--; ly = pcb_get_layer(PCB->Data, lid); if (ly == NULL) - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); else - PCB_ACT_IRES(ly == PCB_CURRLAYER(PCB_ACT_BOARD)); + RND_ACT_IRES(ly == PCB_CURRLAYER(PCB_ACT_BOARD)); return 0; } @@ -1130,32 +1130,32 @@ pcb_layer_id_t lid; const char *name; - PCB_ACT_CONVARG(1, FGW_STR, toggleview, name = argv[1].val.str); - PCB_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_STR, toggleview, name = argv[1].val.str); + RND_ACT_IRES(0); if (pcb_strcasecmp(name, "all") == 0) { pcb_bool_op_t open = PCB_BOOL_PRESERVE, vis = PCB_BOOL_PRESERVE, user = PCB_BOOL_PRESERVE; const char *cmd, *suser; - PCB_ACT_CONVARG(2, FGW_STR, toggleview, cmd = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, toggleview, suser = argv[3].val.str); + 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); user = pcb_str2boolop(suser); if (user == PCB_BOOL_INVALID) - PCB_ACT_FAIL(toggleview); + RND_ACT_FAIL(toggleview); if (pcb_strcasecmp(cmd, "open") == 0) open = user; else if (pcb_strcasecmp(cmd, "vis") == 0) vis = user; else - PCB_ACT_FAIL(toggleview); + RND_ACT_FAIL(toggleview); pcb_layer_vis_change_all(PCB, open, vis); pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } else if (pcb_strcasecmp(name, "silk") == 0) { if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) - pcb_layervis_change_group_vis(PCB_ACT_HIDLIB, lid, -1, 0); + pcb_layervis_change_group_vis(RND_ACT_HIDLIB, lid, -1, 0); else pcb_message(PCB_MSG_ERROR, "Can't find this-side silk layer\n"); } @@ -1162,31 +1162,31 @@ else if ((pcb_strcasecmp(name, "padstacks") == 0) || (pcb_strcasecmp(name, "vias") == 0) || (pcb_strcasecmp(name, "pins") == 0) || (pcb_strcasecmp(name, "pads") == 0)) { PCB->pstk_on = !PCB->pstk_on; pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else if (pcb_strcasecmp(name, "BackSide") == 0) { PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn; pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else if (strncmp(name, "ui:", 3) == 0) { pcb_layer_t *ly = pcb_uilayer_get(atoi(name+3)); if (ly == NULL) { pcb_message(PCB_MSG_ERROR, "Invalid ui layer id: '%s'\n", name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } ly->meta.real.vis = !ly->meta.real.vis; pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else { char *end; int id = strtol(name, &end, 10) - 1; if (*end == '\0') { /* integer layer */ - pcb_layervis_change_group_vis(PCB_ACT_HIDLIB, id, -1, 0); + pcb_layervis_change_group_vis(RND_ACT_HIDLIB, id, -1, 0); pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } else { /* virtual menu layer */ @@ -1195,7 +1195,7 @@ pcb_bool *v = (pcb_bool *)((char *)PCB + ml->vis_offs); *v = !(*v); pcb_gui->invalidate_all(pcb_gui); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } pcb_message(PCB_MSG_ERROR, "Invalid layer id: '%s'\n", name); @@ -1202,7 +1202,7 @@ } } - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -1216,15 +1216,15 @@ char *end; const char *name; - PCB_ACT_CONVARG(1, FGW_STR, chkview, name = argv[1].val.str); + RND_PCB_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)); if (ly == NULL) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(ly->meta.real.vis); + RND_ACT_IRES(ly->meta.real.vis); return 0; } @@ -1235,7 +1235,7 @@ if (ml != NULL) { pcb_bool *v = (pcb_bool *)((char *)PCB + ml->vis_offs); - PCB_ACT_IRES(*v); + RND_ACT_IRES(*v); return 0; } @@ -1246,11 +1246,11 @@ lid--; ly = pcb_get_layer(PCB->Data, lid); if (ly == NULL) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(ly->meta.real.vis); + RND_ACT_IRES(ly->meta.real.vis); return 0; } @@ -1338,20 +1338,20 @@ { int op1, op2; - PCB_ACT_CONVARG(1, FGW_KEYWORD, LayerByStack, op1 = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, LayerByStack, op2 = fgw_keyword(&argv[2])); - PCB_ACT_IRES(0); + 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_IRES(0); switch(op1) { case F_Select: switch(op2) { - case F_Prev: PCB_ACT_IRES(layer_select_delta(PCB_ACT_BOARD, -1)); return 0; - case F_Next: PCB_ACT_IRES(layer_select_delta(PCB_ACT_BOARD, +1)); return 0; + case F_Prev: RND_ACT_IRES(layer_select_delta(PCB_ACT_BOARD, -1)); return 0; + case F_Next: RND_ACT_IRES(layer_select_delta(PCB_ACT_BOARD, +1)); return 0; } } - PCB_ACT_FAIL(LayerByStack); - PCB_ACT_IRES(1); + RND_ACT_FAIL(LayerByStack); + RND_ACT_IRES(1); return 0; } @@ -1365,13 +1365,13 @@ int rid; pcb_route_style_t *rst; - PCB_ACT_CONVARG(1, FGW_INT, chkrst, rid = argv[1].val.nat_int); + RND_PCB_ACT_CONVARG(1, FGW_INT, chkrst, rid = argv[1].val.nat_int); rst = vtroutestyle_get(&PCB->RouteStyle, rid, 0); if (rst == NULL) - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); else - PCB_ACT_IRES(pcb_route_style_match(rst, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL)); + RND_ACT_IRES(pcb_route_style_match(rst, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL)); return 0; } @@ -1383,12 +1383,12 @@ int op = -2; pcb_bool smirror; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, boardflip, op = fgw_keyword(&argv[1])); + rnd_PCB_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); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -1401,10 +1401,10 @@ const char *op; char tmp[2]; - PCB_ACT_CONVARG(1, FGW_STR, ClipInhibit, op = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, ClipInhibit, op = argv[1].val.str); if (strcmp(op, "check") == 0) { - PCB_ACT_IRES(is_on); + RND_ACT_IRES(is_on); return 0; } @@ -1414,17 +1414,17 @@ } else { if (op[0] != 'o') - PCB_ACT_FAIL(ClipInhibit); + RND_ACT_FAIL(ClipInhibit); switch(op[1]) { case 'n': target = 1; break; case 'f': target = 0; break; - default: PCB_ACT_FAIL(ClipInhibit); + default: RND_ACT_FAIL(ClipInhibit); } } if (is_on == target) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -1439,7 +1439,7 @@ pcb_conf_set(CFR_CLI, "temp/clip_inhibit_chg", 0, tmp, POL_OVERWRITE); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -1447,10 +1447,10 @@ static const char pcb_acth_LayerVisReset[] = "Reset layer visibility to safe defaults."; static fgw_error_t pcb_act_LayerVisReset(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_layervis_reset_stack(PCB_ACT_HIDLIB); + pcb_layervis_reset_stack(RND_ACT_HIDLIB); pcb_layer_vis_historical_hides(PCB_ACT_BOARD); - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); - PCB_ACT_IRES(0); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + RND_ACT_IRES(0); return 0; } Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 30899) +++ trunk/src/librnd/core/actions.c (revision 30900) @@ -64,7 +64,7 @@ return NULL; } -char *pcb_make_action_name(char *out, const char *inp, int inp_len) +char *rnd_make_action_name(char *out, const char *inp, int inp_len) { char *s; @@ -103,7 +103,7 @@ ca->cookie = cookie; ca->action = a+i; - pcb_make_action_name(fn, a[i].name, len); + rnd_make_action_name(fn, a[i].name, len); f = fgw_func_reg(pcb_fgw_obj, fn, a[i].trigger_cb); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Failed to register action \"%s\" (already registered?)\n", a[i].name); @@ -126,10 +126,10 @@ free(ca); } -fgw_func_t *pcb_act_lookup(const char *aname) +fgw_func_t *rnd_act_lookup(const char *aname) { char fn[PCB_ACTION_NAME_MAX]; - fgw_func_t *f = fgw_func_lookup(&rnd_fgw, pcb_aname(fn, aname)); + fgw_func_t *f = fgw_func_lookup(&rnd_fgw, rnd_aname(fn, aname)); return f; } @@ -138,7 +138,7 @@ int i; for (i = 0; i < n; i++) { - fgw_func_t *f = pcb_act_lookup(a[i].name); + fgw_func_t *f = rnd_act_lookup(a[i].name); if (f == NULL) { pcb_message(PCB_MSG_WARNING, "Failed to remove action \"%s\" (is it registered?)\n", a[i].name); continue; @@ -168,7 +168,7 @@ if (name == NULL) return NULL; - f = pcb_act_lookup(name); + f = rnd_act_lookup(name); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "unknown action `%s'\n", name); return NULL; @@ -313,7 +313,7 @@ fgw_error_t rnd_actionv_bin(pcb_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv) { - fgw_func_t *f = pcb_act_lookup(name); + fgw_func_t *f = rnd_act_lookup(name); if (f == NULL) return FGW_ERR_NOT_FOUND; @@ -330,18 +330,18 @@ int rnd_actionv(pcb_hidlib_t *hl, const char *name, int argc, const char **argsv) { fgw_func_t *f; - fgw_arg_t res, argv[PCB_ACTION_MAX_ARGS+1]; + fgw_arg_t res, argv[RND_ACTION_MAX_ARGS+1]; int n; if (name == NULL) return 1; - if (argc >= PCB_ACTION_MAX_ARGS) { - pcb_message(PCB_MSG_ERROR, "can not call action %s with this many arguments (%d >= %d)\n", name, argc, PCB_ACTION_MAX_ARGS); + if (argc >= RND_ACTION_MAX_ARGS) { + pcb_message(PCB_MSG_ERROR, "can not call action %s with this many arguments (%d >= %d)\n", name, argc, RND_ACTION_MAX_ARGS); return 1; } - f = pcb_act_lookup(name); + f = rnd_act_lookup(name); if (f == NULL) { int i; pcb_message(PCB_MSG_ERROR, "no action %s(", name); Index: trunk/src/librnd/core/actions.h =================================================================== --- trunk/src/librnd/core/actions.h (revision 30899) +++ trunk/src/librnd/core/actions.h (revision 30900) @@ -137,22 +137,22 @@ requested it. */ void rnd_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force); -#define PCB_ACTION_MAX_ARGS 16 +#define RND_ACTION_MAX_ARGS 16 /* Read and execute an action script from a file; return 0 if all actions returned 0 */ int rnd_act_execute_file(pcb_hidlib_t *hidlib, const char *fn); /* low level action function lookup */ -fgw_func_t *pcb_act_lookup(const char *aname); +fgw_func_t *rnd_act_lookup(const char *aname); -char *pcb_make_action_name(char *out, const char *inp, int inp_len); -PCB_INLINE char *pcb_aname(char *out, const char *inp) +char *rnd_make_action_name(char *out, const char *inp, int inp_len); +PCB_INLINE char *rnd_aname(char *out, const char *inp) { - return pcb_make_action_name(out, inp, strlen(inp)); + return rnd_make_action_name(out, inp, strlen(inp)); } /* Return 0 on success after an action call */ -PCB_INLINE int pcb_act_result(fgw_arg_t *res, fgw_error_t ret) +PCB_INLINE int rnd_act_result(fgw_arg_t *res, fgw_error_t ret) { if (ret != 0) return -1; @@ -164,22 +164,22 @@ } /* Retrieve the (pcb_hidlib_t *) context from argv[0] within an action */ -#define PCB_ACT_HIDLIB ((pcb_hidlib_t *)argv[0].val.argv0.user_call_ctx) +#define RND_ACT_HIDLIB ((pcb_hidlib_t *)argv[0].val.argv0.user_call_ctx) /* Call an action function directly, bypassing fungw; evaluates to an int that is 0 on success */ -#define PCB_ACT_CALL_C(func, res, argc, argv) \ - pcb_act_result(res, func(res, argc, argv)) +#define RND_ACT_CALL_C(func, res, argc, argv) \ + rnd_act_result(res, func(res, argc, argv)) /* Require argument idx to exist and convert it to type; on success, also execute stmt */ -#define PCB_ACT_CONVARG(idx, type, aname, stmt) \ +#define RND_PCB_ACT_CONVARG(idx, type, aname, stmt) \ do { \ if (argc <= idx) { \ - PCB_ACT_FAIL(aname); \ + RND_ACT_FAIL(aname); \ return FGW_ERR_ARGC; \ } \ if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ - PCB_ACT_FAIL(aname); \ + RND_ACT_FAIL(aname); \ return FGW_ERR_ARG_CONV; \ } \ { stmt; } \ @@ -186,11 +186,11 @@ } while(0) /* If argument idx exists, convert it to type; on success, also execute stmt */ -#define PCB_ACT_MAY_CONVARG(idx, type, aname, stmt) \ +#define rnd_PCB_ACT_MAY_CONVARG(idx, type, aname, stmt) \ do { \ if (argc > idx) { \ if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ - PCB_ACT_FAIL(aname); \ + RND_ACT_FAIL(aname); \ return FGW_ERR_ARG_CONV; \ } \ { stmt; } \ @@ -198,7 +198,7 @@ } while(0) /* Set integer res value */ -#define PCB_ACT_IRES(v) \ +#define RND_ACT_IRES(v) \ do { \ res->type = FGW_INT; \ res->val.nat_int = v; \ @@ -205,13 +205,13 @@ } while(0) /* Set double res value */ -#define PCB_ACT_DRES(v) \ +#define RND_ACT_DRES(v) \ do { \ res->type = FGW_DOUBLE; \ res->val.nat_double = v; \ } while(0) -#define PCB_ACT_FAIL(x) { pcb_message(PCB_MSG_ERROR, "Syntax error. Usage:\n%s\n", (pcb_acts_ ## x)); return FGW_ERR_ARG_CONV; } +#define RND_ACT_FAIL(x) { pcb_message(PCB_MSG_ERROR, "Syntax error. Usage:\n%s\n", (pcb_acts_ ## x)); return FGW_ERR_ARG_CONV; } /*** The default unit to use when a coord value doesn't have its own unit ***/ extern char *fgw_str2coord_unit; /* saved is char * too */ Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 30899) +++ trunk/src/librnd/core/conf_act.c (revision 30900) @@ -59,11 +59,11 @@ int op; const char *a1, *a2, *a3, *a4; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Conf, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Conf, a1 = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, Conf, a2 = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, Conf, a3 = argv[4].val.str); - PCB_ACT_MAY_CONVARG(5, FGW_STR, Conf, a4 = argv[5].val.str); + 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); if ((op == F_Set) || (op == F_Delta)) { const char *path, *val; @@ -166,7 +166,7 @@ /* printf("iseq: %s %s==%s %d\n", path, nval.array, val, rs);*/ gds_uninit(&nval); - PCB_ACT_IRES(rs); + RND_ACT_IRES(rs); return 0; } @@ -227,7 +227,7 @@ return FGW_ERR_ARG_CONV; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -238,14 +238,14 @@ const char *dst; pcb_toolid_t id; - PCB_ACT_CONVARG(1, FGW_STR, ChkMode, dst = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, ChkMode, dst = argv[1].val.str); id = pcb_tool_lookup(dst); if (id >= 0) { - PCB_ACT_IRES(pcbhl_conf.editor.mode == id); + RND_ACT_IRES(pcbhl_conf.editor.mode == id); return 0; } - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -259,14 +259,14 @@ { const char *dst; - PCB_ACT_CONVARG(1, FGW_STR, ChkGridSize, dst = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, ChkGridSize, dst = argv[1].val.str); if (strcmp(dst, "none") == 0) { - PCB_ACT_IRES(PCB_ACT_HIDLIB->grid <= 300); + RND_ACT_IRES(RND_ACT_HIDLIB->grid <= 300); return 0; } - PCB_ACT_IRES(PCB_ACT_HIDLIB->grid == pcb_get_value_ex(dst, NULL, NULL, NULL, NULL, NULL)); + RND_ACT_IRES(RND_ACT_HIDLIB->grid == pcb_get_value_ex(dst, NULL, NULL, NULL, NULL, NULL)); return 0; } @@ -276,8 +276,8 @@ static fgw_error_t pcb_act_ChkGridUnits(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *expected; - PCB_ACT_CONVARG(1, FGW_STR, ChkGridUnits, expected = argv[1].val.str); - PCB_ACT_IRES(strcmp(pcbhl_conf.editor.grid_unit->suffix, expected) == 0); + RND_PCB_ACT_CONVARG(1, FGW_STR, ChkGridUnits, expected = argv[1].val.str); + RND_ACT_IRES(strcmp(pcbhl_conf.editor.grid_unit->suffix, expected) == 0); return 0; } @@ -290,10 +290,10 @@ pcb_bool absolute; double value; - PCB_ACT_CONVARG(1, FGW_STR, SetGrid, val = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, SetGrid, units = argv[2].val.str); + 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); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); /* special case: can't convert with pcb_get_value() */ if ((val[0] == '*') || (val[0] == '/')) { @@ -307,9 +307,9 @@ } pcb_grid_inval(); if (val[0] == '*') - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, pcb_round(PCB_ACT_HIDLIB->grid * d), pcb_false, 0, 0); + pcb_hidlib_set_grid(RND_ACT_HIDLIB, pcb_round(RND_ACT_HIDLIB->grid * d), pcb_false, 0, 0); else - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, pcb_round(PCB_ACT_HIDLIB->grid / d), pcb_false, 0, 0); + pcb_hidlib_set_grid(RND_ACT_HIDLIB, pcb_round(RND_ACT_HIDLIB->grid / d), pcb_false, 0, 0); return 0; } @@ -317,15 +317,15 @@ pcb_grid_inval(); if (absolute) - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, value, pcb_false, 0, 0); + pcb_hidlib_set_grid(RND_ACT_HIDLIB, value, pcb_false, 0, 0); else { /* On the way down, until the minimum unit (1) */ - if ((value + PCB_ACT_HIDLIB->grid) < 1) - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, 1, pcb_false, 0, 0); - else if (PCB_ACT_HIDLIB->grid == 1) - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, value, pcb_false, 0, 0); + if ((value + RND_ACT_HIDLIB->grid) < 1) + pcb_hidlib_set_grid(RND_ACT_HIDLIB, 1, pcb_false, 0, 0); + else if (RND_ACT_HIDLIB->grid == 1) + pcb_hidlib_set_grid(RND_ACT_HIDLIB, value, pcb_false, 0, 0); else - pcb_hidlib_set_grid(PCB_ACT_HIDLIB, value + PCB_ACT_HIDLIB->grid, pcb_false, 0, 0); + pcb_hidlib_set_grid(RND_ACT_HIDLIB, value + RND_ACT_HIDLIB->grid, pcb_false, 0, 0); } return 0; } @@ -339,11 +339,11 @@ const pcb_unit_t *new_unit; const char *name; - PCB_ACT_CONVARG(1, FGW_STR, setunits, name = argv[1].val.str); - PCB_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_STR, setunits, name = argv[1].val.str); + RND_ACT_IRES(0); new_unit = get_unit_struct(name); - pcb_hidlib_set_unit(PCB_ACT_HIDLIB, new_unit); + pcb_hidlib_set_unit(RND_ACT_HIDLIB, new_unit); return 0; } Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 30899) +++ trunk/src/librnd/core/error.c (revision 30900) @@ -207,12 +207,12 @@ int ret; const char *op = ""; - PCB_ACT_MAY_CONVARG(1, FGW_STR, Log, op = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Log, op = argv[1].val.str); if (pcb_strcasecmp(op, "Clear") == 0) { unsigned long from = -1, to = -1; - PCB_ACT_MAY_CONVARG(2, FGW_ULONG, Log, from = fgw_keyword(&argv[2])); - PCB_ACT_MAY_CONVARG(3, FGW_ULONG, Log, from = fgw_keyword(&argv[3])); + 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])); pcb_log_del_range(from, to); pcb_event(NULL, PCB_EVENT_LOG_CLEAR, "pp", &from, &to); ret = 0; @@ -237,11 +237,11 @@ ret = 0; } else { - PCB_ACT_FAIL(Log); + RND_ACT_FAIL(Log); ret = -1; } - PCB_ACT_IRES(ret); + RND_ACT_IRES(ret); return 0; } @@ -253,12 +253,12 @@ int i, how = PCB_MSG_INFO; if (argc < 2) - PCB_ACT_FAIL(Message); + RND_ACT_FAIL(Message); i = 1; if (argc > 2) { const char *hows; - PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, hows = argv[i].val.str); + rnd_PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, hows = argv[i].val.str); if (strcmp(hows, "ERROR") == 0) { i++; how = PCB_MSG_ERROR; } else if (strcmp(hows, "WARNING") == 0) { i++; how = PCB_MSG_WARNING; } else if (strcmp(hows, "INFO") == 0) { i++; how = PCB_MSG_INFO; } @@ -265,10 +265,10 @@ else if (strcmp(hows, "DEBUG") == 0) { i++; how = PCB_MSG_DEBUG; } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); for(; i < argc; i++) { char *s = NULL; - PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, s = argv[i].val.str); + rnd_PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, s = argv[i].val.str); if ((s != NULL) && (*s != '\0')) pcb_message(how, s); pcb_message(how, "\n"); Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30899) +++ trunk/src/librnd/core/gui_act.c (revision 30900) @@ -51,14 +51,14 @@ { if (pcb_gui == NULL) { pcb_message(PCB_MSG_ERROR, "Error: can't create menu, there's no GUI hid loaded\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_CONVARG(1, FGW_STR, CreateMenu, ;); - PCB_ACT_MAY_CONVARG(2, FGW_STR, CreateMenu, ;); - PCB_ACT_MAY_CONVARG(3, FGW_STR, CreateMenu, ;); - PCB_ACT_MAY_CONVARG(4, FGW_STR, CreateMenu, ;); + 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, ;); if (argc > 1) { pcb_menu_prop_t props; @@ -70,11 +70,11 @@ pcb_gui->create_menu(pcb_gui, argv[1].val.str, &props); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } - PCB_ACT_FAIL(CreateMenu); + RND_ACT_FAIL(CreateMenu); } /* --------------------------------------------------------------------------- */ @@ -85,23 +85,23 @@ { if (pcb_gui == NULL) { pcb_message(PCB_MSG_ERROR, "can't remove menu, there's no GUI hid loaded\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (pcb_gui->remove_menu == NULL) { pcb_message(PCB_MSG_ERROR, "can't remove menu, the GUI doesn't support it\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_CONVARG(1, FGW_STR, RemoveMenu, ;); + RND_PCB_ACT_CONVARG(1, FGW_STR, RemoveMenu, ;); if (pcb_gui->remove_menu(pcb_gui, argv[1].val.str) != 0) { pcb_message(PCB_MSG_ERROR, "failed to remove some of the menu items\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } else - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -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; - PCB_ACT_MAY_CONVARG(1, FGW_STR, FullScreen, cmd = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FullScreen, cmd = argv[1].val.str); if ((cmd == NULL) || (pcb_strcasecmp(cmd, "Toggle") == 0)) pcb_conf_setf(CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, POL_OVERWRITE); @@ -121,9 +121,9 @@ else if (pcb_strcasecmp(cmd, "Off") == 0) pcb_conf_set(CFR_DESIGN, "editor/fullscreen", -1, "0", POL_OVERWRITE); else - PCB_ACT_FAIL(FullScreen); + RND_ACT_FAIL(FullScreen); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -132,7 +132,7 @@ /* DOC: cursor.html */ static fgw_error_t pcb_act_Cursor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; + pcb_hidlib_t *hidlib = RND_ACT_HIDLIB; pcb_unit_list_t extra_units_x = { {"grid", 0, 0}, {"view", 0, PCB_UNIT_PERCENT}, @@ -151,11 +151,11 @@ const char *a1, *a2, *a3, *op; pcb_box_t vbx; - extra_units_x[0].scale = PCB_ACT_HIDLIB->grid; - extra_units_x[2].scale = PCB_ACT_HIDLIB->size_x; + extra_units_x[0].scale = RND_ACT_HIDLIB->grid; + extra_units_x[2].scale = RND_ACT_HIDLIB->size_x; - extra_units_y[0].scale = PCB_ACT_HIDLIB->grid; - extra_units_y[2].scale = PCB_ACT_HIDLIB->size_y; + extra_units_y[0].scale = RND_ACT_HIDLIB->grid; + extra_units_y[2].scale = RND_ACT_HIDLIB->size_y; pcb_gui->view_get(pcb_gui, &vbx); view_width = vbx.X2 - vbx.X1; @@ -164,10 +164,10 @@ extra_units_x[1].scale = view_width; extra_units_y[1].scale = view_height; - PCB_ACT_CONVARG(1, FGW_STR, Cursor, op = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, Cursor, a1 = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, Cursor, a2 = argv[3].val.str); - PCB_ACT_CONVARG(4, FGW_STR, Cursor, a3 = argv[4].val.str); + 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); switch(*op) { case 'p': case 'P': /* Pan */ @@ -177,7 +177,7 @@ pan_warp = HID_SC_WARP_POINTER; break; default: - PCB_ACT_FAIL(Cursor); + RND_ACT_FAIL(Cursor); } if (pcb_strcasecmp(a3, "grid") == 0) { @@ -222,7 +222,7 @@ pcb_hidcore_crosshair_move_to(hidlib, dx, dy, 1); pcb_gui->set_crosshair(pcb_gui, hidlib->ch_x, hidlib->ch_y, pan_warp); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -230,16 +230,16 @@ static const char pcb_acth_MoveCursorTo[] = "Move the cursor to absolute coords, pan the view as needed."; static fgw_error_t pcb_act_MoveCursorTo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; + pcb_hidlib_t *hidlib = RND_ACT_HIDLIB; pcb_coord_t x, y; - PCB_ACT_CONVARG(1, FGW_COORD, Cursor, x = fgw_coord(&argv[1])); - PCB_ACT_CONVARG(2, FGW_COORD, Cursor, y = fgw_coord(&argv[2])); + 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])); - pcb_hidcore_crosshair_move_to(PCB_ACT_HIDLIB, x, y, 0); + pcb_hidcore_crosshair_move_to(RND_ACT_HIDLIB, x, y, 0); pcb_gui->set_crosshair(pcb_gui, hidlib->ch_x, hidlib->ch_y, HID_SC_PAN_VIEWPORT); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -252,30 +252,30 @@ { const char *op, *a; - PCB_ACT_CONVARG(1, FGW_STR, grid, op = argv[1].val.str); - PCB_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_STR, grid, op = argv[1].val.str); + RND_ACT_IRES(0); if (strcmp(op, "set") == 0) { pcb_grid_t dst; - PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); + RND_PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); if (!pcb_grid_parse(&dst, a)) - PCB_ACT_FAIL(grid); - pcb_grid_set(PCB_ACT_HIDLIB, &dst); + RND_ACT_FAIL(grid); + pcb_grid_set(RND_ACT_HIDLIB, &dst); pcb_grid_free(&dst); } else if ((strcmp(op, "up") == 0) || (strcmp(op, "+") == 0)) - pcb_grid_list_step(PCB_ACT_HIDLIB, +1); + pcb_grid_list_step(RND_ACT_HIDLIB, +1); else if ((strcmp(op, "down") == 0) || (strcmp(op, "-") == 0)) - pcb_grid_list_step(PCB_ACT_HIDLIB, -1); + pcb_grid_list_step(RND_ACT_HIDLIB, -1); else if (strcmp(op, "idx") == 0) { - PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); - pcb_grid_list_jump(PCB_ACT_HIDLIB, atoi(a)); + RND_PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str); + pcb_grid_list_jump(RND_ACT_HIDLIB, atoi(a)); } else if (op[0] == '#') { - pcb_grid_list_jump(PCB_ACT_HIDLIB, atoi(op+1)); + pcb_grid_list_jump(RND_ACT_HIDLIB, atoi(op+1)); } else - PCB_ACT_FAIL(grid); + RND_ACT_FAIL(grid); return 0; } @@ -288,12 +288,12 @@ pcb_coord_t x, y; const char *op = NULL, *msg = "Click to enter a coordinate."; - PCB_ACT_MAY_CONVARG(1, FGW_STR, GetXY, msg = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, GetXY, op = argv[2].val.str); + 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_hid_get_coords(msg, &x, &y, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); if (op != NULL) { if (((op[0] == 'x') || (op[0] == 'X')) && op[1] == '\0') { res->type = FGW_COORD; @@ -304,7 +304,7 @@ fgw_coord(res) = y; } else - PCB_ACT_FAIL(GetXY); + RND_ACT_FAIL(GetXY); } return 0; @@ -324,7 +324,7 @@ else pcb_message(PCB_MSG_ERROR, "benchmark is not available in the current HID\n"); - PCB_ACT_DRES(fps); + RND_ACT_DRES(fps); return 0; } @@ -333,7 +333,7 @@ static fgw_error_t pcb_act_Help(fgw_arg_t *res, int argc, fgw_arg_t *argv) { rnd_print_actions(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -342,7 +342,7 @@ static fgw_error_t pcb_act_Redraw(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_gui->invalidate_all(pcb_gui); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 30899) +++ trunk/src/librnd/core/hid_dlg.c (revision 30900) @@ -49,11 +49,11 @@ strcpy(tmp, "gui_"); strncpy(tmp+4, act_name, sizeof(tmp)-5); if (PCB_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, tmp) != NULL)) - return rnd_actionv_bin(PCB_ACT_HIDLIB, tmp, res, argc, argv); + return rnd_actionv_bin(RND_ACT_HIDLIB, tmp, res, argc, argv); tmp[0] = 'c'; tmp[1] = 'l'; if (fgw_func_lookup(&rnd_fgw, tmp) != NULL) - return rnd_actionv_bin(PCB_ACT_HIDLIB, tmp, res, argc, argv); + return rnd_actionv_bin(RND_ACT_HIDLIB, tmp, res, argc, argv); return FGW_ERR_NOT_FOUND; } @@ -260,7 +260,7 @@ static fgw_error_t pcb_act_Print(fgw_arg_t *res, int argc, fgw_arg_t *argv) { if (PCB_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, "printgui") != NULL)) - return rnd_actionv_bin(PCB_ACT_HIDLIB, "printgui", res, argc, argv); + return rnd_actionv_bin(RND_ACT_HIDLIB, "printgui", res, argc, argv); pcb_message(PCB_MSG_ERROR, "action Print() is available only under a GUI HID. Please use the lpr exporter instead.\n"); return FGW_ERR_NOT_FOUND; } Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 30899) +++ trunk/src/librnd/core/hid_nogui.c (revision 30900) @@ -258,9 +258,9 @@ const char *label, *default_str = "", *title = NULL; const char *pcb_acts_cli_PromptFor = pcb_acth_cli; - PCB_ACT_CONVARG(1, FGW_STR, cli_PromptFor, label = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, cli_PromptFor, default_str = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, cli_PromptFor, title = argv[3].val.str); + 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); if (!pcbhl_conf.rc.quiet) { char *tmp; @@ -299,9 +299,9 @@ return 0; } - PCB_ACT_CONVARG(1, FGW_STR, cli_MessageBox, icon = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, cli_MessageBox, title = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, cli_MessageBox, label = argv[3].val.str); + 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); printf("[%s] *** %s ***\n", icon, title); @@ -308,7 +308,7 @@ retry:; printf("%s:\n", label); for(n = 4; n < argc; n+=2) { - PCB_ACT_CONVARG(n+0, FGW_STR, cli_MessageBox, txt = argv[n+0].val.str); + RND_PCB_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; - PCB_ACT_CONVARG(n, FGW_INT, cli_MessageBox, res->val.nat_int = argv[n].val.nat_int); + RND_PCB_ACT_CONVARG(n, FGW_INT, cli_MessageBox, res->val.nat_int = argv[n].val.nat_int); return 0; } Index: trunk/src/librnd/core/main_act.c =================================================================== --- trunk/src/librnd/core/main_act.c (revision 30899) +++ trunk/src/librnd/core/main_act.c (revision 30900) @@ -49,7 +49,7 @@ fgw_error_t pcb_act_PrintActions(fgw_arg_t *res, int argc, fgw_arg_t *argv) { rnd_print_actions(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -58,7 +58,7 @@ fgw_error_t pcb_act_DumpActions(fgw_arg_t *res, int argc, fgw_arg_t *argv) { rnd_dump_actions(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -79,7 +79,7 @@ printf("# Data files loaded\n"); for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) print_cat(e->value); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -103,7 +103,7 @@ if (pup_lookup(&pcb_pup, (*bu)->name) == NULL) printf("unloaded buildin\t%s\t1\t0\t0\t\n", (*bu)->name); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -116,7 +116,7 @@ for(p = pcb_pup_paths; *p != NULL; p++) printf("%s\n", *p); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 30899) +++ trunk/src/librnd/core/safe_fs.c (revision 30900) @@ -109,7 +109,7 @@ if (hidlib->batch_ask_ovr != NULL) all = hidlib->batch_ask_ovr; if (strchr(mode, 'w') != NULL) { - fgw_func_t *fun = pcb_act_lookup("gui_mayoverwritefile"); + fgw_func_t *fun = rnd_act_lookup("gui_mayoverwritefile"); /* if the action does not exist, use the old behavor: just overwrite anything */ if (fun != NULL) { Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 30899) +++ trunk/src/librnd/core/tool.c (revision 30900) @@ -296,17 +296,17 @@ /* DOC: tool.html */ static fgw_error_t pcb_act_Tool(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; + pcb_hidlib_t *hidlib = RND_ACT_HIDLIB; const char *cmd; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1, FGW_STR, Tool, cmd = argv[1].val.str); + RND_ACT_IRES(0); + RND_PCB_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; hidlib->tool_y = hidlib->ch_y; - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); if (pcb_strcasecmp(cmd, "Cancel") == 0) { - pcb_tool_select_by_id(PCB_ACT_HIDLIB, pcbhl_conf.editor.mode); + pcb_tool_select_by_id(RND_ACT_HIDLIB, pcbhl_conf.editor.mode); } else if (pcb_strcasecmp(cmd, "Escape") == 0) { const pcb_tool_t *t; @@ -313,47 +313,47 @@ escape:; t = pcb_tool_get(pcbhl_conf.editor.mode); if ((t == NULL) || (t->escape == NULL)) { - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "arrow"); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "arrow"); hidlib->tool_hit = hidlib->tool_click = 0; /* if the mouse button is still pressed, don't start selecting a box */ } else - t->escape(PCB_ACT_HIDLIB); + t->escape(RND_ACT_HIDLIB); } else if ((pcb_strcasecmp(cmd, "Press") == 0) || (pcb_strcasecmp(cmd, "Notify") == 0)) { - pcb_tool_do_press(PCB_ACT_HIDLIB); + pcb_tool_do_press(RND_ACT_HIDLIB); } else if (pcb_strcasecmp(cmd, "Release") == 0) { if (pcbhl_conf.editor.enable_stroke) { int handled = 0; - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_STROKE_FINISH, "p", &handled); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_STROKE_FINISH, "p", &handled); if (handled) { /* Ugly hack: returning 1 here will break execution of the action script, so actions after this one could do things that would be executed only after non-recognized gestures */ - do_release(PCB_ACT_HIDLIB); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + do_release(RND_ACT_HIDLIB); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return 1; } } - do_release(PCB_ACT_HIDLIB); + do_release(RND_ACT_HIDLIB); } else if (pcb_strcasecmp(cmd, "Stroke") == 0) { if (pcbhl_conf.editor.enable_stroke) - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_STROKE_START, "cc", hidlib->tool_x, hidlib->tool_y); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_STROKE_START, "cc", hidlib->tool_x, hidlib->tool_y); else goto escape; /* Right mouse button restarts drawing mode. */ } else if (pcb_strcasecmp(cmd, "Restore") == 0) { /* restore the last saved tool */ - pcb_tool_restore(PCB_ACT_HIDLIB); + pcb_tool_restore(RND_ACT_HIDLIB); } else if (pcb_strcasecmp(cmd, "Save") == 0) { /* save currently selected tool */ - pcb_tool_save(PCB_ACT_HIDLIB); + pcb_tool_save(RND_ACT_HIDLIB); } else { - if (pcb_tool_select_by_name(PCB_ACT_HIDLIB, cmd) != 0) + if (pcb_tool_select_by_name(RND_ACT_HIDLIB, cmd) != 0) pcb_message(PCB_MSG_ERROR, "No such tool: '%s'\n", cmd); } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); return 0; } Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30899) +++ trunk/src/librnd/pcb_compat.h (revision 30900) @@ -39,3 +39,16 @@ #define pcb_cli_mouse rnd_cli_mouse #define pcb_cli_uninit rnd_cli_uninit #define pcb_hid_get_coords rnd_hid_get_coords +#define PCB_ACTION_MAX_ARGS RND_ACTION_MAX_ARGS +#define PCB_ACT_HIDLIB RND_ACT_HIDLIB +#define pcb_act_lookup rnd_act_lookup +#define pcb_make_action_name rnd_make_action_name +#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_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 30899) +++ trunk/src/main_act.c (revision 30900) @@ -144,8 +144,8 @@ fgw_error_t pcb_act_PrintUsage(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *topic = NULL, *subt = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, PrintUsage, topic = argv[1].val.str); - PCB_ACT_IRES(0); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, PrintUsage, topic = argv[1].val.str); + RND_ACT_IRES(0); u(""); if (topic != NULL) { @@ -157,13 +157,13 @@ for (i = 0; hl[i]; i++) { if ((hl[i]->usage != NULL) && (strcmp(topic, hl[i]->name) == 0)) { - PCB_ACT_MAY_CONVARG(2, FGW_STR, PrintUsage, subt = argv[2].val.str); - PCB_ACT_IRES(hl[i]->usage(hl[i], subt)); + rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, PrintUsage, subt = argv[2].val.str); + RND_ACT_IRES(hl[i]->usage(hl[i], subt)); return 0; } } fprintf(stderr, "No help available for %s\n", topic); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } else @@ -177,7 +177,7 @@ fgw_error_t pcb_act_PrintVersion(fgw_arg_t *res, int argc, fgw_arg_t *argv) { printf("%s\n", pcb_get_info_program()); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -187,7 +187,7 @@ { printf("%s\n", PCB_VERSION); printf("%s\n", PCB_REVISION); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -209,7 +209,7 @@ printf(" You should have received a copy of the GNU General Public License\n" " along with this program; if not, write to the Free Software\n" " Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -238,7 +238,7 @@ printf("rc/default_font_file ="); print_list(&conf_core.rc.default_font_file); printf("rc/library_search_paths ="); print_list(&conf_core.rc.library_search_paths); printf("rc/library_shell = \"%s\"\n", conf_core.rc.library_shell); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -261,7 +261,7 @@ pcb_strflg_map(0x7fffffff, ot, NULL, dumpoflg); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -272,16 +272,16 @@ char tmp[128]; const char *cmd; - PCB_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); - PCB_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); + RND_ACT_IRES(0); - pcb_setenv("PCB_RND_BOARD_FILE_NAME", PCB_ACT_HIDLIB->filename == NULL ? "" : PCB_ACT_HIDLIB->filename, 1); + pcb_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_HIDLIB->filename == NULL ? "" : RND_ACT_HIDLIB->filename, 1); pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.X); pcb_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1); pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y); pcb_setenv("PCB_RND_CROSSHAIR_Y_MM", tmp, 1); pcb_setenv("PCB_RND_CURRENT_LAYER_NAME", PCB_CURRLAYER(PCB_ACT_BOARD)->name, 1); - PCB_ACT_IRES(pcb_system(PCB_ACT_HIDLIB, cmd)); + RND_ACT_IRES(pcb_system(RND_ACT_HIDLIB, cmd)); return 0; } @@ -292,8 +292,8 @@ { const char *fname; - PCB_ACT_CONVARG(1, FGW_STR, ExecuteFile, fname = argv[1].val.str); - PCB_ACT_IRES(pcb_act_execute_file(PCB_ACT_HIDLIB, fname)); + RND_PCB_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 30899) +++ trunk/src/netlist_act.c (revision 30900) @@ -359,10 +359,10 @@ unsigned net_found = 0; unsigned pin_found = 0; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Netlist, a1 = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, Netlist, a2 = argv[3].val.str); - PCB_ACT_IRES(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_IRES(0); if (!PCB) return 1; @@ -370,28 +370,28 @@ switch(op) { case F_Rename: if (a1 == NULL) - PCB_ACT_FAIL(Netlist); + RND_ACT_FAIL(Netlist); if (a2 == NULL) { - a2 = a2free = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "New name of the network", NULL, "net rename"); + a2 = a2free = pcb_hid_prompt_for(RND_ACT_HIDLIB, "New name of the network", NULL, "net rename"); if (a2 == NULL) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } - PCB_ACT_IRES(netlist_merge(PCB, a1, a2, 0)); + RND_ACT_IRES(netlist_merge(PCB, a1, a2, 0)); free(a2free); return 0; case F_Merge: if (a1 == NULL) - PCB_ACT_FAIL(Netlist); + RND_ACT_FAIL(Netlist); if (a2 == NULL) { - a2 = a2free = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "Network name to merge into", NULL, "net merge"); + a2 = a2free = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Network name to merge into", NULL, "net merge"); if (a2 == NULL) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } - PCB_ACT_IRES(netlist_merge(PCB, a1, a2, 1)); + RND_ACT_IRES(netlist_merge(PCB, a1, a2, 1)); free(a2free); return 0; case F_Find: func = pcb_netlist_find; break; @@ -428,7 +428,7 @@ pcb_netlist_changed(0); return 0; default: - PCB_ACT_FAIL(Netlist); + RND_ACT_FAIL(Netlist); } netlist_freeze(PCB); @@ -543,9 +543,9 @@ pcb_net_t *net; char *netname = NULL, *free_netname = NULL; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Netlist, netname = argv[2].val.str); - PCB_ACT_IRES(0); + 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_IRES(0); vtp0_init(&termlist); switch(op) { @@ -573,21 +573,21 @@ break; default: vtp0_uninit(&termlist); - PCB_ACT_FAIL(ClaimNet); + RND_ACT_FAIL(ClaimNet); } if (termlist.used < 1) { vtp0_uninit(&termlist); pcb_message(PCB_MSG_ERROR, "Can not claim network: no terminal found.\nPlease pick objects that have terminals with refdes-termID.\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (netname == NULL) { - free_netname = netname = pcb_hid_prompt_for(PCB_ACT_HIDLIB, "Name of the new network", NULL, "net name"); + free_netname = netname = pcb_hid_prompt_for(RND_ACT_HIDLIB, "Name of the new network", NULL, "net name"); if (netname == NULL) { vtp0_uninit(&termlist); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -596,7 +596,7 @@ free(free_netname); vtp0_uninit(&termlist); pcb_message(PCB_MSG_ERROR, "Can not claim network: '%s' is an existing network\n", netname); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -606,7 +606,7 @@ if (net == NULL) { vtp0_uninit(&termlist); pcb_message(PCB_MSG_ERROR, "Can not claim network: failed to create net '%s'\n", netname); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } Index: trunk/src/obj_pstk_act.c =================================================================== --- trunk/src/obj_pstk_act.c (revision 30899) +++ trunk/src/obj_pstk_act.c (revision 30900) @@ -46,13 +46,13 @@ pcb_cardinal_t pid; pcb_pstk_proto_t tmp, *p; - PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); switch(op) { case F_Selected: if (argc > 3) { - PCB_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2])); - PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[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])); } else { rnd_hid_get_coords("Click at padstack origin", &x, &y, 0); @@ -85,7 +85,7 @@ } break; default: - PCB_ACT_FAIL(padstackconvert); + RND_ACT_FAIL(padstackconvert); } if (pid != PCB_PADSTACK_INVALID) { @@ -93,11 +93,11 @@ pcb_pstk_new(PCB_PASTEBUFFER->Data, -1, pid, 0, 0, conf_core.design.clearance, pcb_flag_make(PCB_FLAG_CLEARLINE)); pcb_set_buffer_bbox(PCB_PASTEBUFFER); PCB_PASTEBUFFER->X = PCB_PASTEBUFFER->Y = 0; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); } else { pcb_message(PCB_MSG_ERROR, "(failed to convert to padstack)\n", pid); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); } return 0; @@ -108,8 +108,8 @@ fgw_error_t pcb_act_padstackbreakup(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); - PCB_ACT_IRES(-1); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1])); + RND_ACT_IRES(-1); switch(op) { case F_Object: @@ -129,7 +129,7 @@ pcb_message(PCB_MSG_ERROR, "Sorry, that padstack is locked\n"); break; } - PCB_ACT_IRES(pcb_pstk_proto_breakup(PCB->Data, ps, 1)); + RND_ACT_IRES(pcb_pstk_proto_breakup(PCB->Data, ps, 1)); } break; case F_Selected: @@ -143,7 +143,7 @@ pcb_data_list_by_flag(PCB->Data, &objs, PCB_OBJ_PSTK, PCB_FLAG_SELECTED); for(n = 0, o = (pcb_any_obj_t **)objs.array; n < vtp0_len(&objs); n++,o++) ret |= pcb_pstk_proto_breakup(PCB->Data, (pcb_pstk_t *)*o, 1); - PCB_ACT_IRES(ret); + RND_ACT_IRES(ret); vtp0_uninit(&objs); } break; @@ -153,11 +153,11 @@ PCB_PADSTACK_LOOP(PCB_PASTEBUFFER->Data) { ret |= pcb_pstk_proto_breakup(PCB_PASTEBUFFER->Data, padstack, 1); } PCB_END_LOOP; - PCB_ACT_IRES(ret); + RND_ACT_IRES(ret); } break; default: - PCB_ACT_FAIL(padstackbreakup); + RND_ACT_FAIL(padstackbreakup); } return 0; } @@ -171,11 +171,11 @@ pcb_pstk_t *ps; pcb_coord_t x, y; - PCB_ACT_MAY_CONVARG(1, FGW_STR, padstackplace, pids = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, padstackplace, pids = argv[1].val.str); if (argc > 3) { - PCB_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2])); - PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[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])); } else { rnd_hid_get_coords("Click at padstack origin", &x, &y, 0); @@ -208,7 +208,7 @@ return -1; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 30899) +++ trunk/src/object_act.c (revision 30900) @@ -72,9 +72,9 @@ const char *layername; char *buf; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Attributes, id = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(1, FGW_STR, Attributes, layername = argv[1].val.str); - PCB_ACT_IRES(0); + 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_IRES(0); if (!pcb_gui->edit_attributes) { pcb_message(PCB_MSG_ERROR, "This GUI doesn't support Attribute Editing\n"); @@ -133,7 +133,7 @@ s = (pcb_subc_t *)ptrtmp; else { pcb_message(PCB_MSG_ERROR, "No subcircuit found there\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -149,7 +149,7 @@ } default: - PCB_ACT_FAIL(Attributes); + RND_ACT_FAIL(Attributes); } return 0; @@ -218,13 +218,13 @@ pcb_coord_t minx = GAP, miny = GAP, maxy = GAP, dx, dy; int all = 0, id; - PCB_ACT_CONVARG(1, FGW_KEYWORD, DisperseElements, id = fgw_keyword(&argv[1])); - PCB_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, DisperseElements, id = fgw_keyword(&argv[1])); + RND_ACT_IRES(0); switch(id) { case F_All: all = 1; break; case F_Selected: all = 0; break; - default: PCB_ACT_FAIL(DisperseElements); + default: RND_ACT_FAIL(DisperseElements); } pcb_draw_inhibit_inc(); @@ -263,8 +263,8 @@ int id; void *ptrtmp; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Flip, id = fgw_keyword(&argv[1])); - PCB_ACT_IRES(0); + RND_PCB_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); @@ -273,7 +273,7 @@ if ((pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) { pcb_subc_t *subc = (pcb_subc_t *)ptrtmp; pcb_undo_freeze_serial(); - pcb_subc_change_side(subc, 2 * pcb_crosshair.Y - PCB_ACT_HIDLIB->size_y); + pcb_subc_change_side(subc, 2 * pcb_crosshair.Y - RND_ACT_HIDLIB->size_y); pcb_undo_unfreeze_serial(); pcb_undo_inc_serial(); pcb_draw(); @@ -288,7 +288,7 @@ pcb_draw(); break; default: - PCB_ACT_FAIL(Flip); + RND_ACT_FAIL(Flip); } return 0; } @@ -304,10 +304,10 @@ void *ptr1, *ptr2, *ptr3; int type; - PCB_ACT_MAY_CONVARG(3, FGW_STR, MoveObject, units = argv[3].val.str); + rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, MoveObject, units = argv[3].val.str); fgw_str2coord_unit_set(saved, units); - PCB_ACT_CONVARG(1, FGW_COORDS, MoveObject, nx = fgw_coords(&argv[1])); - PCB_ACT_CONVARG(2, FGW_COORDS, MoveObject, ny = fgw_coords(&argv[2])); + 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])); fgw_str2coord_unit_restore(saved); @@ -324,15 +324,15 @@ if (ny->absolute[0]) ny->c[0] -= pcb_crosshair.Y; - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_RUBBER_RESET, NULL); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_RESET, NULL); if (conf_core.editor.rubber_band_mode) - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); if (type == PCB_OBJ_SUBC) - pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); + pcb_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); pcb_move_obj_and_rubberband(type, ptr1, ptr2, ptr3, nx->c[0], ny->c[0]); pcb_board_set_changed_flag(pcb_true); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -344,8 +344,8 @@ pcb_board_t *pcb = PCB_ACT_BOARD; int id; - PCB_ACT_CONVARG(1, FGW_KEYWORD, MoveToCurrentLayer, id = fgw_keyword(&argv[1])); - PCB_ACT_IRES(0); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, MoveToCurrentLayer, id = fgw_keyword(&argv[1])); + RND_ACT_IRES(0); switch(id) { case F_Object: @@ -594,7 +594,7 @@ int fx, fy, fs; static placer_t plc; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ElementList, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, ElementList, op = fgw_keyword(&argv[1])); #ifdef DEBUG printf("Entered pcb_act_ElementList, executing function %s\n", function); @@ -628,15 +628,15 @@ } if (op != F_Need) - PCB_ACT_FAIL(ElementList); + RND_ACT_FAIL(ElementList); - PCB_ACT_CONVARG(2, FGW_STR, ElementList, refdes = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, ElementList, footprint = argv[3].val.str); - PCB_ACT_CONVARG(4, FGW_STR, ElementList, value = argv[4].val.str); + 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); args[0].type = FGW_FUNC; args[0].val.argv0.func = NULL; - args[0].val.argv0.user_call_ctx = PCB_ACT_HIDLIB; + args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; args[1] = argv[3]; args[2] = argv[2]; args[3] = argv[4]; @@ -665,9 +665,9 @@ printf(" ... Footprint not on board, need to add it.\n"); #endif /* Not on board, need to add it. */ - if (PCB_ACT_CALL_C(pcb_act_LoadFootprint, &rs, argc, args) != 0) { + if (RND_ACT_CALL_C(pcb_act_LoadFootprint, &rs, argc, args) != 0) { number_of_footprints_not_found++; - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -687,9 +687,9 @@ double orig_rot; /* Different footprint, we need to swap them out. */ - if (PCB_ACT_CALL_C(pcb_act_LoadFootprint, &rs, argc, args) != 0) { + if (RND_ACT_CALL_C(pcb_act_LoadFootprint, &rs, argc, args) != 0) { number_of_footprints_not_found++; - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -712,7 +712,7 @@ pcb_coord_t pcx = 0, pcy = 0; pcb_subc_get_origin(psc, &pcx, &pcy); if (!orig_on_top) - pcb_subc_change_side(psc, pcy * 2 - PCB_ACT_HIDLIB->size_y); + pcb_subc_change_side(psc, pcy * 2 - RND_ACT_HIDLIB->size_y); if (orig_rot != 0) { double cosa, sina; cosa = cos(orig_rot / PCB_RAD_TO_DEG); @@ -757,7 +757,7 @@ conf_force_set_bool(pcbhl_conf.editor.view.flip_y, fy); conf_force_set_bool(conf_core.editor.show_solder_side, fs); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -770,14 +770,14 @@ pcb_subc_t *sc; const char *refdes, *name, *value; - PCB_ACT_CONVARG(1, FGW_STR, ElementList, refdes = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, ElementList, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, ElementList, value = argv[3].val.str); + 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); sc = pcb_subc_by_refdes(pcb->Data, refdes); if (sc == NULL) { pcb_message(PCB_MSG_ERROR, "Can't find subcircuit with refdes '%s'\n", refdes); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -786,7 +786,7 @@ else pcb_attribute_remove(&sc->Attributes, name); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -799,7 +799,7 @@ int op; pcb_bool changed = pcb_false; - PCB_ACT_CONVARG(1, FGW_KEYWORD, RipUp, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, RipUp, op = fgw_keyword(&argv[1])); switch(op) { case F_All: @@ -860,7 +860,7 @@ } break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -930,9 +930,9 @@ pcb_coord_t value; int flags; - PCB_ACT_CONVARG(1, FGW_STR, MinClearGap, function = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, MinClearGap, delta = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, MinClearGap, delta = argv[3].val.str); + 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); if (pcb_strcasecmp(function, "Selected") == 0) flags = PCB_FLAG_SELECTED; @@ -947,7 +947,7 @@ minclr(pcb->Data, value, flags); pcb_undo_restore_serial(); pcb_undo_inc_serial(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -961,8 +961,8 @@ int old_index, new_index; pcb_board_t *pcb = PCB_ACT_BOARD; - PCB_ACT_CONVARG(1, FGW_STR, MoveLayer, a0 = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, MoveLayer, a1 = argv[2].val.str); + 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); if (strcmp(a0, "c") == 0) old_index = PCB_CURRLID(pcb); @@ -975,24 +975,24 @@ new_index = 0; } else if (strcmp(a1, "gi") == 0) { - PCB_ACT_IRES(pcb_layer_move(pcb, -1, 0, pcb_actd_EditGroup_gid, 1)); + RND_ACT_IRES(pcb_layer_move(pcb, -1, 0, pcb_actd_EditGroup_gid, 1)); return 0; } else if (strcmp(a1, "ga") == 0) { - PCB_ACT_IRES(pcb_layer_move(pcb, -1, 1, pcb_actd_EditGroup_gid, 1)); + RND_ACT_IRES(pcb_layer_move(pcb, -1, 1, pcb_actd_EditGroup_gid, 1)); return 0; } else if (strcmp(a1, "group") == 0) { long gid; - PCB_ACT_CONVARG(3, FGW_LONG, MoveLayer, gid = argv[3].val.nat_long); + RND_PCB_ACT_CONVARG(3, FGW_LONG, MoveLayer, gid = argv[3].val.nat_long); pcb_layer_move_to_group(pcb, old_index, gid); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } else if (strcmp(a1, "up") == 0) { new_index = PCB_CURRLID(pcb) - 1; if (new_index < 0) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -999,7 +999,7 @@ else if (strcmp(a1, "down") == 0) { new_index = PCB_CURRLID(pcb) + 1; if (new_index >= pcb_max_layer(pcb)) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -1011,10 +1011,10 @@ return 1; } - PCB_ACT_IRES(1); + RND_ACT_IRES(1); switch(a1[4]) { - case '+': PCB_ACT_IRES(pcb_layergrp_step_layer(pcb, g, pcb_layer_id(pcb->Data, l), +1)); break; - case '-': PCB_ACT_IRES(pcb_layergrp_step_layer(pcb, g, pcb_layer_id(pcb->Data, l), -1)); break; + case '+': RND_ACT_IRES(pcb_layergrp_step_layer(pcb, g, pcb_layer_id(pcb->Data, l), +1)); break; + case '-': RND_ACT_IRES(pcb_layergrp_step_layer(pcb, g, pcb_layer_id(pcb->Data, l), -1)); break; default: pcb_message(PCB_MSG_ERROR, "Invalid step direction\n"); } return 0; @@ -1029,13 +1029,13 @@ pcb_layergrp_t *g = pcb_get_layergrp(pcb, l->meta.real.grp); if (g->len == 1) { pcb_message(PCB_MSG_ERROR, "Removing this layer would result in an empty top or bottom silk group, which is not possible at the moment.\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } } - PCB_ACT_IRES(pcb_layer_move(pcb, old_index, new_index, -1, 1)); + RND_ACT_IRES(pcb_layer_move(pcb, old_index, new_index, -1, 1)); return 0; } @@ -1050,13 +1050,13 @@ int fid, dir, scale; pcb_text_t *t; - PCB_ACT_CONVARG(1, FGW_LAYER, CreateText, ly = fgw_layer(&argv[1])); - PCB_ACT_CONVARG(2, FGW_INT, CreateText, fid = argv[2].val.nat_int); - PCB_ACT_CONVARG(3, FGW_COORD, CreateText, x = fgw_coord(&argv[3])); - PCB_ACT_CONVARG(4, FGW_COORD, CreateText, y = fgw_coord(&argv[4])); - PCB_ACT_CONVARG(5, FGW_INT, CreateText, dir = argv[5].val.nat_int); - PCB_ACT_CONVARG(6, FGW_INT, CreateText, scale = argv[6].val.nat_int); - PCB_ACT_CONVARG(7, FGW_STR, CreateText, txt = argv[7].val.str); + 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); if (scale < 1) { pcb_message(PCB_MSG_ERROR, "Invalid scale (must be larger than zero)\n"); @@ -1084,9 +1084,9 @@ pcb_board_t *pcb = PCB_ACT_BOARD; int op1, op2 = -2; - PCB_ACT_CONVARG(1, FGW_KEYWORD, subc, op1 = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, subc, op2 = fgw_keyword(&argv[2])); - PCB_ACT_IRES(0); + 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_IRES(0); switch(op1) { case F_Loose: @@ -1095,8 +1095,8 @@ case F_Toggle: pcb->loose_subc = !pcb->loose_subc; break; case F_On: pcb->loose_subc = 1; break; case F_Off: pcb->loose_subc = 0; break; - case F_Check: PCB_ACT_IRES(pcb->loose_subc); return 0; - default: PCB_ACT_FAIL(subc); return 1; + case F_Check: RND_ACT_IRES(pcb->loose_subc); return 0; + default: RND_ACT_FAIL(subc); return 1; } /* have to manually trigger the update as it is not a conf item */ if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL)) @@ -1111,7 +1111,7 @@ switch(op2) { case -2: break; case F_Selected: selected_only = 1; break; - default: PCB_ACT_FAIL(subc); return 1; + default: RND_ACT_FAIL(subc); return 1; } polylist_foreach(&pcb->Data->subc, &it, sc) { @@ -1136,7 +1136,7 @@ switch(op2) { case -2: break; case F_Selected: selected_only = 1; break; - default: PCB_ACT_FAIL(subc); return 1; + default: RND_ACT_FAIL(subc); return 1; } polylist_foreach(&pcb->Data->subc, &it, sc) { unsigned int hash; @@ -1183,8 +1183,8 @@ int steps; pcb_coord_t x, y; - PCB_ACT_CONVARG(1, FGW_INT, Rotate90, steps = argv[1].val.nat_int); - PCB_ACT_IRES(0); + RND_PCB_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 30899) +++ trunk/src/plug_footprint_act.c (revision 30900) @@ -39,11 +39,11 @@ const char *name = NULL; pcb_fplibrary_t *l; - PCB_ACT_MAY_CONVARG(1, FGW_STR, fp_rehash, name = argv[1].val.str); - PCB_ACT_IRES(0); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, fp_rehash, name = argv[1].val.str); + RND_ACT_IRES(0); if (name == NULL) { - pcb_fp_rehash(PCB_ACT_HIDLIB, NULL); + pcb_fp_rehash(RND_ACT_HIDLIB, NULL); return 0; } @@ -50,25 +50,25 @@ l = pcb_fp_lib_search(&pcb_library, name); if (l == NULL) { pcb_message(PCB_MSG_ERROR, "Can't find library path %s\n", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (l->type != PCB_LIB_DIR) { pcb_message(PCB_MSG_ERROR, "Library path %s is not a directory\n", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (l->data.dir.backend == NULL) { pcb_message(PCB_MSG_ERROR, "Library path %s is not a top level directory of a fp_ plugin\n", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - if (pcb_fp_rehash(PCB_ACT_HIDLIB, l) != 0) { + if (pcb_fp_rehash(RND_ACT_HIDLIB, l) != 0) { pcb_message(PCB_MSG_ERROR, "Failed to rehash %s\n", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30899) +++ trunk/src/plug_io.c (revision 30900) @@ -588,7 +588,7 @@ { extern fgw_error_t pcb_act_GetStyle(fgw_arg_t *res, int argc, fgw_arg_t *argv); fgw_arg_t res, argv; - if (PCB_ACT_CALL_C(pcb_act_GetStyle, &res, 1, &argv) < 0) + if (RND_ACT_CALL_C(pcb_act_GetStyle, &res, 1, &argv) < 0) pcb_use_route_style_idx(&PCB->RouteStyle, 0); } Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 30899) +++ trunk/src/polygon_act.c (revision 30900) @@ -56,7 +56,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, MorphPolygon, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, MorphPolygon, op = fgw_keyword(&argv[1])); switch(op) { case F_Object: @@ -85,7 +85,7 @@ pcb_undo_inc_serial(); break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -96,10 +96,10 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1])); if ((argc > 1) && ((pcbhl_conf.editor.mode == pcb_crosshair.tool_poly) || (pcbhl_conf.editor.mode == pcb_crosshair.tool_poly_hole))) { - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); switch(op) { /* close open polygon if possible */ case F_Close: @@ -116,9 +116,9 @@ pcb_polygon_go_to_prev_point(); break; } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 30899) +++ trunk/src/rats_act.c (revision 30900) @@ -59,7 +59,7 @@ pcb_rat_t *shorty; float len, small; - PCB_ACT_CONVARG(1, FGW_KEYWORD, AddRats, op = fgw_keyword(&argv[1])); + RND_PCB_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); @@ -99,9 +99,9 @@ break; default: - PCB_ACT_FAIL(AddRats); + RND_ACT_FAIL(AddRats); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -112,7 +112,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Connection, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Connection, op = fgw_keyword(&argv[1])); switch(op) { case F_Find: @@ -155,10 +155,10 @@ break; default: - PCB_ACT_FAIL(Connection); + RND_ACT_FAIL(Connection); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -170,7 +170,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, DeleteRats, op = fgw_keyword(&argv[1])); + RND_PCB_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); @@ -188,10 +188,10 @@ break; default: - PCB_ACT_FAIL(DeleteRats); + RND_ACT_FAIL(DeleteRats); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 30899) +++ trunk/src/rats_patch.c (revision 30900) @@ -560,26 +560,26 @@ pcb_subc_t *olds = NULL, *news; int dumb = 0, op = F_Selected; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, ReplaceFootprint, op = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, ReplaceFootprint, op = fgw_keyword(&argv[1])); if (act_replace_footprint_dst(op, &olds) != 0) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } /* fetch the name of the new footprint */ - PCB_ACT_MAY_CONVARG(2, FGW_STR, ReplaceFootprint, fpname = pcb_strdup(argv[2].val.str)); + rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, ReplaceFootprint, fpname = pcb_strdup(argv[2].val.str)); if (act_replace_footprint_src(fpname, &news) != 0) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - PCB_ACT_MAY_CONVARG(3, FGW_STR, ReplaceFootprint, dumbs = argv[3].val.str); + rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, ReplaceFootprint, dumbs = argv[3].val.str); if ((dumbs != NULL) && (strcmp(dumbs, "dumb") == 0)) dumb = 1; - PCB_ACT_IRES(act_replace_footprint(op, olds, news, fpname, dumb)); + RND_ACT_IRES(act_replace_footprint(op, olds, news, fpname, dumb)); free(fpname); return 0; } @@ -591,7 +591,7 @@ const char *fn = NULL; FILE *f; - PCB_ACT_MAY_CONVARG(1, FGW_STR, SavePatch, fn = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, SavePatch, fn = argv[1].val.str); if (fn == NULL) { char *default_file; @@ -620,13 +620,13 @@ f = pcb_fopen(&PCB->hidlib, fn, "w"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Can't open netlist patch file %s for writing\n", fn); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } pcb_ratspatch_fexport(PCB, f, 0); fclose(f); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 30899) +++ trunk/src/remove_act.c (revision 30900) @@ -49,7 +49,7 @@ { int id; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1])); if (id == -1) { /* no arg */ if (pcb_remove_selected(pcb_false) == pcb_false) @@ -61,23 +61,23 @@ if (argc > 2) { /* delete by idpath */ pcb_idpath_t *idp; pcb_any_obj_t *obj; - PCB_ACT_CONVARG(2, FGW_IDPATH, Delete, idp = fgw_idpath(&argv[2])); + RND_PCB_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); if ((obj == NULL) || ((obj->type & PCB_OBJ_CLASS_REAL) == 0)) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } pcb_remove_object(obj->type, obj->parent.any, obj, obj); } else { /* interactive remove */ - pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; + pcb_hidlib_t *hidlib = RND_ACT_HIDLIB; rnd_hid_get_coords("Click on object to delete", &hidlib->tool_x, &hidlib->tool_y, 0); - pcb_tool_save(PCB_ACT_HIDLIB); - pcb_tool_select_by_name(PCB_ACT_HIDLIB, "remove"); - pcb_tool_do_press(PCB_ACT_HIDLIB); - pcb_tool_restore(PCB_ACT_HIDLIB); + pcb_tool_save(RND_ACT_HIDLIB); + pcb_tool_select_by_name(RND_ACT_HIDLIB, "remove"); + pcb_tool_do_press(RND_ACT_HIDLIB); + pcb_tool_restore(RND_ACT_HIDLIB); } break; case F_Selected: @@ -93,7 +93,7 @@ break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -103,7 +103,7 @@ { if (pcb_remove_selected(pcb_false)) pcb_board_set_changed_flag(pcb_true); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 30899) +++ trunk/src/select_act.c (revision 30900) @@ -62,7 +62,7 @@ static fgw_error_t pcb_act_Select(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Select, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Select, op = fgw_keyword(&argv[1])); switch(op) { @@ -71,12 +71,12 @@ if (argc > 2) { /* select by idpath */ pcb_idpath_t *idp; pcb_any_obj_t *obj; - PCB_ACT_CONVARG(2, FGW_IDPATH, Select, idp = fgw_idpath(&argv[2])); + RND_PCB_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); if ((obj == NULL) || ((obj->type & PCB_OBJ_CLASS_REAL) == 0)) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } pcb_undo_add_obj_to_flag(obj); @@ -102,13 +102,13 @@ box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X); box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); pcb_tool_notify_block(); if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_true, pcb_true, pcb_false)) { pcb_board_set_changed_flag(pcb_true); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); pcb_gui->invalidate_all(pcb_gui); break; } @@ -161,8 +161,8 @@ pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB, PCB_PASTEBUFFER); rnd_hid_get_coords("Select the Subcircuit's Origin (mark) Location", &x, &y, 0); - x = pcb_grid_fit(x, PCB_ACT_HIDLIB->grid, PCB_ACT_HIDLIB->grid_ox); - y = pcb_grid_fit(y, PCB_ACT_HIDLIB->grid, PCB_ACT_HIDLIB->grid_oy); + x = pcb_grid_fit(x, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_ox); + y = pcb_grid_fit(y, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_oy); pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, x, y, pcb_true, pcb_false); pcb_undo_save_serial(); pcb_remove_selected(pcb_false); @@ -174,11 +174,11 @@ break; default: - PCB_ACT_FAIL(Select); + RND_ACT_FAIL(Select); break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -190,7 +190,7 @@ static fgw_error_t pcb_act_Unselect(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Unselect, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Unselect, op = fgw_keyword(&argv[1])); switch(op) { @@ -203,13 +203,13 @@ box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X); box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); pcb_tool_notify_block(); if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_false, pcb_true, pcb_false)) { pcb_board_set_changed_flag(pcb_true); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; } @@ -237,11 +237,11 @@ break; default: - PCB_ACT_FAIL(Unselect); + RND_ACT_FAIL(Unselect); break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 30899) +++ trunk/src/undo_act.c (revision 30900) @@ -56,7 +56,7 @@ fgw_error_t pcb_act_Atomic(fgw_arg_t *res, int argc, fgw_arg_t *argv) { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, Atomic, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Atomic, op = fgw_keyword(&argv[1])); switch (op) { case F_Save: @@ -83,10 +83,10 @@ break; default: pcb_message(PCB_MSG_ERROR, "Invalid argument for Atomic()\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -101,15 +101,15 @@ fgw_error_t pcb_act_Undo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *function = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str); if (!function || !*function) { - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); - if (pcb_tool_undo_act(PCB_ACT_HIDLIB)) + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); + if (pcb_tool_undo_act(RND_ACT_HIDLIB)) if (pcb_undo(pcb_true) == 0) pcb_board_set_changed_flag(pcb_true); } else if (function) { - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); if (pcb_strcasecmp(function, "ClearList") == 0) pcb_undo_clear_list(pcb_false); else if (pcb_strcasecmp(function, "FreezeSerial") == 0) @@ -119,8 +119,8 @@ else if (pcb_strcasecmp(function, "IncSerial") == 0) pcb_undo_inc_serial(); } - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - PCB_ACT_IRES(0); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + RND_ACT_IRES(0); return 0; } @@ -134,12 +134,12 @@ fgw_error_t pcb_act_Redo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_false); - if (pcb_tool_redo_act(PCB_ACT_HIDLIB)) + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); + if (pcb_tool_redo_act(RND_ACT_HIDLIB)) if (pcb_redo(pcb_true)) pcb_board_set_changed_flag(pcb_true); - pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); - PCB_ACT_IRES(0); + pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 30899) +++ trunk/src_plugins/acompnet/acompnet.c (revision 30900) @@ -205,7 +205,7 @@ TODO("use pcb_drc_lines(), probably during A*, saving mid-point, and draw pairs of lines here"); } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/act_draw/act_draw.c =================================================================== --- trunk/src_plugins/act_draw/act_draw.c (revision 30899) +++ trunk/src_plugins/act_draw/act_draw.c (revision 30900) @@ -76,16 +76,16 @@ pcb_flag_t flags; DRAWOPTARG; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, LineNew, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, LineNew, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_COORD, LineNew, x1 = fgw_coord(&argv[3+ao])); - PCB_ACT_CONVARG(4+ao, FGW_COORD, LineNew, y1 = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_COORD, LineNew, x2 = fgw_coord(&argv[5+ao])); - PCB_ACT_CONVARG(6+ao, FGW_COORD, LineNew, y2 = fgw_coord(&argv[6+ao])); - PCB_ACT_CONVARG(7+ao, FGW_COORD, LineNew, th = fgw_coord(&argv[7+ao])); - PCB_ACT_CONVARG(8+ao, FGW_COORD, LineNew, cl = fgw_coord(&argv[8+ao])); - PCB_ACT_CONVARG(9+ao, FGW_STR, LineNew, sflg = argv[9+ao].val.str); + 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); if ((data != PCB->Data) || (layer == NULL)) return 0; @@ -114,18 +114,18 @@ pcb_flag_t flags; DRAWOPTARG; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, ArcNew, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, ArcNew, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_COORD, ArcNew, cx = fgw_coord(&argv[3+ao])); - PCB_ACT_CONVARG(4+ao, FGW_COORD, ArcNew, cy = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_COORD, ArcNew, wr = fgw_coord(&argv[5+ao])); - PCB_ACT_CONVARG(6+ao, FGW_COORD, ArcNew, hr = fgw_coord(&argv[6+ao])); - PCB_ACT_CONVARG(7+ao, FGW_DOUBLE, ArcNew, sa = argv[7+ao].val.nat_double); - PCB_ACT_CONVARG(8+ao, FGW_DOUBLE, ArcNew, da = argv[8+ao].val.nat_double); - PCB_ACT_CONVARG(9+ao, FGW_COORD, ArcNew, th = fgw_coord(&argv[9+ao])); - PCB_ACT_CONVARG(10+ao, FGW_COORD, ArcNew, cl = fgw_coord(&argv[10+ao])); - PCB_ACT_CONVARG(11+ao, FGW_STR, ArcNew, sflg = argv[11+ao].val.str); + 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); if ((data != PCB->Data) || (layer == NULL)) return 0; @@ -156,17 +156,17 @@ pcb_font_t *font; DRAWOPTARG; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, TextNew, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, TextNew, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_INT, TextNew, fontid = argv[3+ao].val.nat_int); - PCB_ACT_CONVARG(4+ao, FGW_COORD, TextNew, x = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_COORD, TextNew, y = fgw_coord(&argv[5+ao])); - PCB_ACT_CONVARG(6+ao, FGW_DOUBLE, TextNew, rot = argv[6+ao].val.nat_double); - PCB_ACT_CONVARG(7+ao, FGW_INT, TextNew, scale = argv[7+ao].val.nat_int); - PCB_ACT_CONVARG(8+ao, FGW_COORD, TextNew, th = fgw_coord(&argv[8+ao])); - PCB_ACT_CONVARG(9+ao, FGW_STR, TextNew, str = argv[9+ao].val.str); - PCB_ACT_CONVARG(10+ao, FGW_STR, TextNew, sflg = argv[10+ao].val.str); + 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); if ((data != PCB->Data) || (layer == NULL)) return 0; @@ -199,13 +199,13 @@ pcb_flag_t flags; DRAWOPTARG; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, PstkNew, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LONG, PstkNew, proto = argv[2+ao].val.nat_int); - PCB_ACT_CONVARG(3+ao, FGW_COORD, PstkNew, x = fgw_coord(&argv[3+ao])); - PCB_ACT_CONVARG(4+ao, FGW_COORD, PstkNew, y = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_COORD, PstkNew, cl = fgw_coord(&argv[5+ao])); - PCB_ACT_CONVARG(6+ao, FGW_STR, PstkNew, sflg = argv[6+ao].val.str); + 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); flags = pcb_strflg_s2f(sflg, flg_error, NULL, 0); pstk = pcb_pstk_new(data, -1, proto, x, y, cl, flags); @@ -230,15 +230,15 @@ pcb_flag_t flags; DRAWOPTARG; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromRectangle, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromRectangle, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_COORD, PolyNewFromRectangle, x1 = fgw_coord(&argv[3+ao])); - PCB_ACT_CONVARG(4+ao, FGW_COORD, PolyNewFromRectangle, y1 = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_COORD, PolyNewFromRectangle, x2 = fgw_coord(&argv[5+ao])); - PCB_ACT_CONVARG(6+ao, FGW_COORD, PolyNewFromRectangle, y2 = fgw_coord(&argv[6+ao])); - PCB_ACT_CONVARG(7+ao, FGW_COORD, PolyNewFromRectangle, cl = fgw_coord(&argv[7+ao])); - PCB_ACT_CONVARG(8+ao, FGW_STR, PolyNewFromRectangle, sflg = argv[8+ao].val.str); + 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); if (data != PCB->Data) return 0; @@ -301,12 +301,12 @@ pcb_flag_t flags; DRAWOPTARG; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_STR, PolyNewFromPoints, ptlist = argv[3+ao].val.str); - PCB_ACT_CONVARG(4+ao, FGW_COORD, PolyNewFromPoints, cl = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_STR, PolyNewFromPoints, sflg = argv[5+ao].val.str); + 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); if (data != PCB->Data) return 0; @@ -339,11 +339,11 @@ DRAWOPTARG; (void)noundo; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_COORD, PolyNewFromPoints, cl = fgw_coord(&argv[3+ao])); - PCB_ACT_CONVARG(4+ao, FGW_STR, PolyNewFromPoints, sflg = argv[4+ao].val.str); + 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); if (data != PCB->Data) return 0; @@ -365,19 +365,19 @@ DRAWOPTARG; (void)noundo; - PCB_ACT_CONVARG(1+ao, FGW_PTR, PolyNewPoints, poly = argv[1+ao].val.ptr_void); - PCB_ACT_CONVARG(2+ao, FGW_STR, PolyNewPoints, ptlist = argv[2+ao].val.str); + 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); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) { pcb_message(PCB_MSG_ERROR, "PolyNewPoints: invalid polygon pointer\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (poly_append_ptlist(poly, ptlist) < 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -390,17 +390,17 @@ pcb_layer_t *layer; DRAWOPTARG; - PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_PTR, PolyNewPoints, poly = argv[3+ao].val.ptr_void); + 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); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) { pcb_message(PCB_MSG_ERROR, "PolyNewEnd: invalid polygon pointer\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } if (poly->PointN < 3) { pcb_message(PCB_MSG_ERROR, "PolyNewEnd: can not finish polygon, need at least 3 points\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -427,10 +427,10 @@ TODO("implement noundo"); (void)noundo; - PCB_ACT_IRES(0); - PCB_ACT_CONVARG(1+ao, FGW_DATA, LayerObjDup, data = fgw_data(&argv[1+ao])); - PCB_ACT_CONVARG(2+ao, FGW_LAYER, LayerObjDup, layer = fgw_layer(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_PTR, LayerObjDup, idp = argv[3+ao].val.ptr_void); + 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); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) { pcb_message(PCB_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 30899) +++ trunk/src_plugins/act_draw/act_pstk_proto.c (revision 30900) @@ -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'))) { - PCB_ACT_CONVARG(aidx, FGW_DATA, PstkProtoTmp, *data_out = fgw_data(&argv[aidx])); + RND_PCB_ACT_CONVARG(aidx, FGW_DATA, PstkProtoTmp, *data_out = fgw_data(&argv[aidx])); *obj_out = NULL; return 0; } - PCB_ACT_CONVARG(aidx, FGW_IDPATH, PstkProtoTmp, idp = fgw_idpath(&argv[aidx])); + RND_PCB_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; - PCB_ACT_CONVARG(1+ao, FGW_STR, PstkProtoTmp, cmd = argv[1+ao].val.str); + RND_PCB_ACT_CONVARG(1+ao, FGW_STR, PstkProtoTmp, cmd = argv[1+ao].val.str); cmdi = act_draw_keywords_sphash(cmd); switch(cmdi) { @@ -89,14 +89,14 @@ case act_draw_keywords_dup: if (argc < 4) { if (get_obj_and_data_from_idp(argc, argv, 2+ao, &obj, &data) != 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } src = pcb_pstk_get_proto((pcb_pstk_t *)obj); } else { - PCB_ACT_CONVARG(2+ao, FGW_DATA, PstkProtoTmp, data = fgw_data(&argv[2+ao])); - PCB_ACT_CONVARG(3+ao, FGW_LONG, PstkProtoTmp, src_id = argv[3+ao].val.nat_long); + 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); if (data == NULL) return 0; src = pcb_pstk_get_proto_(data, src_id); @@ -112,15 +112,15 @@ case act_draw_keywords_insert: case act_draw_keywords_insert_dup: if (argc < 3) - PCB_ACT_FAIL(PstkProtoTmp); + RND_ACT_FAIL(PstkProtoTmp); if (get_obj_and_data_from_idp(argc, argv, 2+ao, &obj, &data) != 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } - PCB_ACT_CONVARG(3+ao, FGW_PTR, PstkProtoTmp, proto = argv[3+ao].val.ptr_void); + RND_PCB_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)) { pcb_message(PCB_MSG_ERROR, "PstkProtoTmp: invalid proto pointer\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } res->type = FGW_LONG; @@ -159,12 +159,12 @@ pcb_coord_t crd; DRAWOPTARG; - PCB_ACT_CONVARG(1+ao, FGW_PTR, PstkProtoEdit, proto = argv[1+ao].val.ptr_void); - PCB_ACT_CONVARG(2+ao, FGW_STR, PstkProtoEdit, cmd = argv[2+ao].val.str); + 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); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) { pcb_message(PCB_MSG_ERROR, "PstkProtoEdit: invalid proto pointer\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } ts = &proto->tr.array[0]; @@ -171,7 +171,7 @@ switch(act_draw_keywords_sphash(cmd)) { case act_draw_keywords_remove: - PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); + RND_PCB_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,16 +178,16 @@ break; case act_draw_keywords_copy: - PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); + RND_PCB_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_ACT_CONVARG(4+ao, FGW_STR, PstkProtoEdit, tmp = argv[4+ao].val.str); + RND_PCB_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; src_idx = pcb_pstk_get_shape_idx(ts, slyt, slyc); if (src_idx < 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } dst_idx = pcb_pstk_get_shape_idx(ts, dlyt, dlyc); @@ -201,15 +201,15 @@ proto->tr.array[n].shape[dst_idx].comb = dlyc; } pcb_pstk_proto_update(proto); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_draw_keywords_hdia: - PCB_ACT_CONVARG(3+ao, FGW_COORD, PstkProtoEdit, crd = fgw_coord(&argv[3+ao])); + RND_PCB_ACT_CONVARG(3+ao, FGW_COORD, PstkProtoEdit, crd = fgw_coord(&argv[3+ao])); proto->hdia = crd; pcb_pstk_proto_update(proto); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_draw_keywords_shape_line: @@ -217,17 +217,17 @@ pcb_coord_t x1, y1, x2, y2, th; int sq = 0; - PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str); - PCB_ACT_CONVARG(4+ao, FGW_COORD, PstkProtoEdit, x1 = fgw_coord(&argv[4+ao])); - PCB_ACT_CONVARG(5+ao, FGW_COORD, PstkProtoEdit, y1 = fgw_coord(&argv[5+ao])); - PCB_ACT_CONVARG(6+ao, FGW_COORD, PstkProtoEdit, x2 = fgw_coord(&argv[6+ao])); - PCB_ACT_CONVARG(7+ao, FGW_COORD, PstkProtoEdit, y2 = fgw_coord(&argv[7+ao])); - PCB_ACT_CONVARG(8+ao, FGW_COORD, PstkProtoEdit, th = fgw_coord(&argv[8+ao])); + 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])); if (pcb_layer_typecomb_str2bits(tmp, &dlyt, &dlyc, 1) != 0) return FGW_ERR_ARG_CONV; tmp = NULL; - PCB_ACT_MAY_CONVARG(9+ao, FGW_STR, PstkProtoEdit, tmp = argv[9+ao].val.str); + rnd_PCB_ACT_MAY_CONVARG(9+ao, FGW_STR, PstkProtoEdit, tmp = argv[9+ao].val.str); if ((tmp != NULL) && (*tmp == 's')) sq = 1; @@ -252,6 +252,6 @@ return FGW_ERR_ARG_CONV; } - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } Index: trunk/src_plugins/act_read/act_geo.c =================================================================== --- trunk/src_plugins/act_read/act_geo.c (revision 30899) +++ trunk/src_plugins/act_read/act_geo.c (revision 30900) @@ -42,10 +42,10 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; - PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnLine, x = fgw_coord(&argv[1])); - PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnLine, y = fgw_coord(&argv[2])); - PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnLine, r = fgw_coord(&argv[3])); - PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnLine, idp = fgw_idpath(&argv[4])); + 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])); 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); @@ -52,7 +52,7 @@ if ((obj == NULL) || (obj->type != PCB_OBJ_LINE)) return FGW_ERR_ARG_CONV; - PCB_ACT_IRES(pcb_is_point_on_line(x, y, r, (pcb_line_t *)obj)); + RND_ACT_IRES(pcb_is_point_on_line(x, y, r, (pcb_line_t *)obj)); return 0; } @@ -65,10 +65,10 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; - PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnArc, x = fgw_coord(&argv[1])); - PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnArc, y = fgw_coord(&argv[2])); - PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnArc, r = fgw_coord(&argv[3])); - PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnArc, idp = fgw_idpath(&argv[4])); + 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])); 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); @@ -75,7 +75,7 @@ if ((obj == NULL) || (obj->type != PCB_OBJ_ARC)) return FGW_ERR_ARG_CONV; - PCB_ACT_IRES(pcb_is_point_on_arc(x, y, r, (pcb_arc_t *)obj)); + RND_ACT_IRES(pcb_is_point_on_arc(x, y, r, (pcb_arc_t *)obj)); return 0; } @@ -87,8 +87,8 @@ pcb_idpath_t *idp1, *idp2; pcb_any_obj_t *obj1, *obj2; - PCB_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1])); - PCB_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2])); + 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])); 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)) @@ -98,7 +98,7 @@ if ((obj1 == NULL) || ((obj1->type & PCB_OBJ_CLASS_REAL) == 0) || (obj2 == NULL) || ((obj2->type & PCB_OBJ_CLASS_REAL) == 0)) return FGW_ERR_ARG_CONV; - PCB_ACT_IRES(pcb_intersect_obj_obj(pcb_find0, obj1, obj2)); + RND_ACT_IRES(pcb_intersect_obj_obj(pcb_find0, obj1, obj2)); return 0; } Index: trunk/src_plugins/act_read/act_idpath.c =================================================================== --- trunk/src_plugins/act_read/act_idpath.c (revision 30899) +++ trunk/src_plugins/act_read/act_idpath.c (revision 30900) @@ -41,7 +41,7 @@ int cmd; long idx; - PCB_ACT_CONVARG(1, FGW_STR, IDPList, cmd_ = argv[1].val.str); + RND_PCB_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; } - PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, IDPList, list = fgw_idpath_list(&argv[2])); + RND_PCB_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; @@ -57,11 +57,11 @@ switch(cmd) { case act_read_keywords_clear: pcb_idpath_list_clear(list); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_read_keywords_length: - PCB_ACT_IRES(pcb_idpath_list_length(list)); + RND_ACT_IRES(pcb_idpath_list_length(list)); return 0; case act_read_keywords_free: @@ -68,13 +68,13 @@ fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST); pcb_idpath_list_clear(list); free(list); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_read_keywords_append: case act_read_keywords_push: case act_read_keywords_prepend: - PCB_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3])); + RND_PCB_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) @@ -81,22 +81,22 @@ pcb_idpath_list_append(list, idp); else /* prepend or push */ pcb_idpath_list_insert(list, idp); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_read_keywords_remove: - PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); + RND_PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); idp = pcb_idpath_list_nth(list, idx); if (idp == NULL) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } pcb_idpath_list_remove(idp); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_read_keywords_get: - PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long); + RND_PCB_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; - PCB_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2])); + 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])); if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; @@ -144,7 +144,7 @@ pcb_idpath_list_remove(idp); fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH); free(idp); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; case act_read_keywords_dup: @@ -176,11 +176,11 @@ res->val.ptr_void = NULL; if (argc > 2) { - PCB_ACT_CONVARG(1, FGW_DATA, GetParentData, root_data = fgw_data(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_DATA, GetParentData, root_data = fgw_data(&argv[1])); iidx++; } - PCB_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx])); + RND_PCB_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 30899) +++ trunk/src_plugins/act_read/act_layer.c (revision 30900) @@ -61,7 +61,7 @@ pcb_layer_type_t lyt; long idx; - PCB_ACT_CONVARG(1, FGW_STR, ReadGroup, cmds = argv[1].val.str); + RND_PCB_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: - PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2])); + RND_PCB_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; - PCB_ACT_CONVARG(3, FGW_LONG, ReadGroup, idx = argv[3].val.nat_long); + RND_PCB_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: - PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2])); + RND_PCB_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; - PCB_ACT_CONVARG(3, FGW_STR, ReadGroup, flds = argv[3].val.str); + RND_PCB_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 30899) +++ trunk/src_plugins/act_read/act_read.c (revision 30900) @@ -51,10 +51,10 @@ double v; pcb_bool success; - PCB_ACT_CONVARG(1, FGW_STR, GetValue, input = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, GetValue, units = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_INT, GetValue, relative = argv[3].val.nat_int); - PCB_ACT_CONVARG(4, FGW_STR, GetValue, def_unit = argv[1].val.str); + 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); if (*units == '\0') units = NULL; @@ -74,7 +74,7 @@ { const char *cmd; - PCB_ACT_CONVARG(1, FGW_STR, GetMark, cmd = argv[1].val.str); + RND_PCB_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; @@ -81,7 +81,7 @@ case 'x': res->type = FGW_DOUBLE; res->val.nat_double = pcb_marked.X; break; case 'y': res->type = FGW_DOUBLE; res->val.nat_double = pcb_marked.Y; break; default: - PCB_ACT_FAIL(GetMark); + RND_ACT_FAIL(GetMark); } return 0; } Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c =================================================================== --- trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 30899) +++ trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 30900) @@ -292,12 +292,12 @@ FILE *f; cpcb_layers_t stk; - PCB_ACT_CONVARG(1, FGW_STR, import_cpcb, fn = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, import_cpcb, fn = argv[1].val.str); f = pcb_fopen(&PCB->hidlib, fn, "r"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Can not open %s for read\n", fn); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -306,7 +306,7 @@ fclose(f); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -319,12 +319,12 @@ cpcb_layers_t stk; cpcb_netmap_t nmap; - PCB_ACT_CONVARG(1, FGW_STR, export_cpcb, fn = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, export_cpcb, fn = argv[1].val.str); f = pcb_fopen(&PCB->hidlib, fn, "w"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Can not open %s for write\n", fn); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -331,7 +331,7 @@ if (cpcb_map_nets(PCB, &nmap) != 0) { fclose(f); pcb_message(PCB_MSG_ERROR, "Failed to map nets\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -341,7 +341,7 @@ fclose(f); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -355,12 +355,12 @@ cpcb_layers_t stk; cpcb_netmap_t nmap; - PCB_ACT_CONVARG(1, FGW_STR, cpcb, scope = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, cpcb, cmd = argv[2].val.str); + 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); if (strcmp(scope, "board") != 0) { pcb_message(PCB_MSG_ERROR, "Only board routing is supported at the moment\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -367,7 +367,7 @@ f = pcb_fopen(&PCB->hidlib, tmpfn, "w"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Can not open temp file %s for write\n", tmpfn); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -374,7 +374,7 @@ if (cpcb_map_nets(PCB, &nmap) != 0) { fclose(f); pcb_message(PCB_MSG_ERROR, "Failed to map nets\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -387,11 +387,11 @@ if (f != NULL) { cpcb_load(PCB, f, &stk, NULL); pclose(f); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); } else { pcb_message(PCB_MSG_ERROR, "Failed to execute c-pcb\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30899) +++ trunk/src_plugins/asm/asm.c (revision 30900) @@ -524,7 +524,7 @@ pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; if (asm_ctx.active) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -621,7 +621,7 @@ for(g = (group_t **)asm_ctx.grps.array, n = 0; n < asm_ctx.grps.used; g++,n++) pcb_dad_tree_expcoll(&asm_ctx.dlg[asm_ctx.wtbl], (*g)->row, 1, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 30899) +++ trunk/src_plugins/autocrop/autocrop.c (revision 30900) @@ -68,7 +68,7 @@ pcb_hid_redraw(PCB); pcb_board_set_changed_flag(1); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 30899) +++ trunk/src_plugins/autoplace/action.c (revision 30900) @@ -45,12 +45,12 @@ static fgw_error_t pcb_act_AutoPlaceSelected(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_hid_busy(PCB, 1); - if (pcb_hid_message_box(PCB_ACT_HIDLIB, "question", "Autoplace start", "Auto-placement can NOT be undone.\nDo you want to continue anyway?", "no", 0, "yes", 1, NULL) == 1) { + if (pcb_hid_message_box(RND_ACT_HIDLIB, "question", "Autoplace start", "Auto-placement can NOT be undone.\nDo you want to continue anyway?", "no", 0, "yes", 1, NULL) == 1) { if (AutoPlaceSelected()) pcb_board_set_changed_flag(pcb_true); } pcb_hid_busy(PCB, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 30899) +++ trunk/src_plugins/autoroute/action.c (revision 30900) @@ -46,7 +46,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, AutoRoute, op = fgw_keyword(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, AutoRoute, op = fgw_keyword(&argv[1])); pcb_hid_busy(PCB, 1); switch(op) { @@ -61,11 +61,11 @@ pcb_board_set_changed_flag(pcb_true); break; default: - PCB_ACT_FAIL(AutoRoute); + RND_ACT_FAIL(AutoRoute); return 1; } pcb_hid_busy(PCB, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30899) +++ trunk/src_plugins/cam/cam.c (revision 30900) @@ -162,28 +162,28 @@ const char *cmd = "gui", *arg = NULL, *opt; int n, rs = -1; - PCB_ACT_MAY_CONVARG(1, FGW_STR, cam, cmd = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, cam, arg = argv[2].val.str); + 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); cam_init_inst(&ctx); for(n = 3; n < argc; n++) { - PCB_ACT_CONVARG(n, FGW_STR, cam, opt = argv[n].val.str); + RND_PCB_ACT_CONVARG(n, FGW_STR, cam, opt = argv[n].val.str); if (cam_parse_opt(&ctx, opt) != 0) { pcb_message(PCB_MSG_ERROR, "cam: invalid action option '%s'\n", opt); cam_uninit_inst(&ctx); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } if (pcb_strcasecmp(cmd, "gui") == 0) { - rs = cam_gui(PCB_ACT_HIDLIB, arg); + rs = cam_gui(RND_ACT_HIDLIB, arg); } else { if (arg == NULL) { pcb_message(PCB_MSG_ERROR, "cam: need one more argument for '%s'\n", cmd); cam_uninit_inst(&ctx); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (pcb_strcasecmp(cmd, "exec") == 0) { @@ -196,7 +196,7 @@ } cam_uninit_inst(&ctx); - PCB_ACT_IRES(rs); + RND_ACT_IRES(rs); return 0; } Index: trunk/src_plugins/ddraft/cli.c =================================================================== --- trunk/src_plugins/ddraft/cli.c (revision 30899) +++ trunk/src_plugins/ddraft/cli.c (revision 30900) @@ -506,14 +506,14 @@ if (argc == 1) { rnd_cli_enter("ddraft", "ddraft"); pcb_tool_select_by_id(&PCB->hidlib, pcb_ddraft_tool); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } - PCB_ACT_CONVARG(1, FGW_STR, ddraft, cmd = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, ddraft, cmd = argv[1].val.str); if (strcmp(cmd, "/exit") == 0) { rnd_cli_leave(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -527,7 +527,7 @@ while(isspace(*cline)) cline++; if ((*cline == '\n') || (*cline == '#') || (*cline == '\0')) { /* empty or comment */ - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -551,7 +551,7 @@ if (opp == NULL) { if (strcmp(cmd, "/edit") != 0) pcb_message(PCB_MSG_ERROR, "ddraft: unknown operator '%s'\n", op); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); goto ret0; } @@ -560,20 +560,20 @@ if (*cmd == '/') { if (strcmp(cmd, "/click") == 0) { - PCB_ACT_IRES(opp->click(line, cursor, ndlen, nd)); + RND_ACT_IRES(opp->click(line, cursor, ndlen, nd)); cmd = "/edit"; goto reparse; } else if (strcmp(cmd, "/tab") == 0) - PCB_ACT_IRES(opp->tab(line, cursor, ndlen, nd)); + RND_ACT_IRES(opp->tab(line, cursor, ndlen, nd)); else if (strcmp(cmd, "/edit") == 0) - PCB_ACT_IRES(opp->edit(line, cursor, ndlen, nd)); + RND_ACT_IRES(opp->edit(line, cursor, ndlen, nd)); else - PCB_ACT_IRES(0); /* ignore anything unhandled */ + RND_ACT_IRES(0); /* ignore anything unhandled */ goto ret0; } - PCB_ACT_IRES(opp->exec(line, ndlen, nd)); + RND_ACT_IRES(opp->exec(line, ndlen, nd)); ret0:; if (line != sline) Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 30899) +++ trunk/src_plugins/ddraft/ddraft.c (revision 30900) @@ -129,8 +129,8 @@ pcb_coord_t x, y; vtp0_t edges; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, trim_split, kwcut = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, trim_split, kwobj = fgw_keyword(&argv[2])); + 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])); vtp0_init(&edges); @@ -169,12 +169,12 @@ if (do_trim_split(&edges, kwobj, (*actname == 't')) < 0) goto err; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); vtp0_uninit(&edges); return 0; err:; - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); vtp0_uninit(&edges); return 0; } @@ -199,7 +199,7 @@ for(n = 1; n < 3; n++) { vect = (n == 1) ? &edges : &objs; - PCB_ACT_CONVARG(n, FGW_IDPATH, split_idp, idp = fgw_idpath(&argv[n])); + RND_PCB_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)) { @@ -254,12 +254,12 @@ int n; \ if (argc-2 >= sizeof(arr) / sizeof(arr[0])) { \ pcb_message(PCB_MSG_ERROR, "constraint: Too many " msg "\n"); \ - PCB_ACT_IRES(-1); \ + RND_ACT_IRES(-1); \ return 0; \ } \ ctr = 0; \ for(n = 2; n < argc; n++) { \ - PCB_ACT_CONVARG(n, fgw_type_, constraint, arr[ctr] = fgw_val_); \ + RND_PCB_ACT_CONVARG(n, fgw_type_, constraint, arr[ctr] = fgw_val_); \ ctr++; \ } \ } while(0) @@ -271,9 +271,9 @@ char *stype = NULL; int type; - PCB_ACT_MAY_CONVARG(1, FGW_STR, constraint, stype = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, constraint, stype = argv[1].val.str); if (stype == NULL) { - PCB_ACT_IRES(constraint_gui()); + RND_ACT_IRES(constraint_gui()); return 0; } type = ddraft_fields_sphash(stype); @@ -288,12 +288,12 @@ break; case ddraft_fields_line_angle_mod: cons.line_angle_mod = 0; - PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.line_angle_mod = argv[2].val.nat_double); + rnd_PCB_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; - PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.move_angle_mod = argv[2].val.nat_double); + rnd_PCB_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; - PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.line_length_mod = fgw_coord(&argv[2])); + rnd_PCB_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; - PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.move_length_mod = fgw_coord(&argv[2])); + rnd_PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.move_length_mod = fgw_coord(&argv[2])); cons_changed(); break; @@ -321,12 +321,12 @@ break; case ddraft_fields_SPHASH_INVALID: pcb_message(PCB_MSG_ERROR, "constraint: invalid field '%s'\n", stype); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -351,7 +351,7 @@ if (type != PCB_OBJ_LINE) { pcb_message(PCB_MSG_ERROR, "%s: target object must be a line\n", actname); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -360,7 +360,7 @@ dy = line->Point2.Y - line->Point1.Y; if ((dx == 0.0) && (dy == 0.0)) { pcb_message(PCB_MSG_ERROR, "%s: target line must be longer than 0\n", actname); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -371,7 +371,7 @@ cons.line_angle[1] = fmod(cons.line_angle[0]+180, 360); cons_changed(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -391,7 +391,7 @@ if (((pcb_crosshair.AttachedLine.State != PCB_CH_STATE_SECOND) && (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_THIRD)) || (pcb_crosshair.Route.size < 1)) { err_nonline:; pcb_message(PCB_MSG_ERROR, "tang: must be in line drawing mode with the first point already set\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -410,7 +410,7 @@ if (type != PCB_OBJ_ARC) { pcb_message(PCB_MSG_ERROR, "tang: target object must be an arc\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -417,7 +417,7 @@ arc = (pcb_arc_t *)ptr2; if (fabs((double)(arc->Height - arc->Width)) > 100) { pcb_message(PCB_MSG_ERROR, "tang: elliptical arcs are not supported (%$mm != %$mm)\n", arc->Height, arc->Width); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -426,7 +426,7 @@ if (d <= r) { pcb_message(PCB_MSG_ERROR, "tang: line must start outside of the circle\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -437,7 +437,7 @@ cons.line_angle[1] = (base + asin(-r / d)) * PCB_RAD_TO_DEG; cons_changed(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 30899) +++ trunk/src_plugins/diag/diag.c (revision 30900) @@ -63,7 +63,7 @@ { int op; - PCB_ACT_CONVARG(1, FGW_KEYWORD, DumpConf, op = fgw_keyword(&argv[1])); + RND_PCB_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 = ""; - PCB_ACT_MAY_CONVARG(2, FGW_INT, DumpConf, verbose = argv[2].val.nat_int); - PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); + 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); conf_dump(stdout, prefix, verbose, NULL); } break; @@ -79,12 +79,12 @@ { conf_role_t role; const char *srole, *prefix = ""; - PCB_ACT_CONVARG(2, FGW_STR, DumpConf, srole = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str); + 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); role = pcb_conf_role_parse(srole); if (role == CFR_invalid) { pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'\n", argv[1]); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (pcb_conf_main_root[role] != NULL) { @@ -100,11 +100,11 @@ } break; default: - PCB_ACT_FAIL(DumpConf); + RND_ACT_FAIL(DumpConf); return 1; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -119,12 +119,12 @@ conf_native_t *nat; int role; - PCB_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str); nat = pcb_conf_get_field(path); if (nat == NULL) { pcb_message(PCB_MSG_ERROR, "EvalConf: invalid path %s - no such config setting\n", path); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -155,7 +155,7 @@ printf(" Native:\n"); pcb_conf_print_native((conf_pfn)pcb_fprintf, stdout, " ", 1, nat); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -169,7 +169,7 @@ pcb_layer_id_t arr[128]; /* WARNING: this assumes we won't have more than 128 layers */ pcb_layergrp_id_t garr[128]; /* WARNING: this assumes we won't have more than 128 layers */ - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, DumpLayers, op = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, DumpLayers, op = fgw_keyword(&argv[1])); if (op == F_All) { printf("Per group:\n"); @@ -206,7 +206,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -238,7 +238,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -274,7 +274,7 @@ } else printf(" \n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -286,7 +286,7 @@ { printf("Undo:\n"); undo_dump(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } #endif @@ -344,7 +344,7 @@ printf("DumpData:\n"); dump_data(PCB->Data, what, 0, NULL); printf("\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -353,7 +353,7 @@ static fgw_error_t pcb_act_integrity(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_check_integrity(PCB); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -380,7 +380,7 @@ const char *default_fmt = "%m (%M %N) for %t:\n %H\n"; const char *fmt = default_fmt; - PCB_ACT_MAY_CONVARG(1, FGW_STR, dumpflags, fmt = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, dumpflags, fmt = argv[1].val.str); for(n = 0; n < pcb_object_flagbits_len; n++) { char *tmp; @@ -389,7 +389,7 @@ free(tmp); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -415,12 +415,12 @@ pcb_gfx_t *g = pcb_gfx_new(PCB_CURRLAYER(pcb), PCB_MIL_TO_COORD(500), PCB_MIL_TO_COORD(500), PCB_MIL_TO_COORD(233), PCB_MIL_TO_COORD(233), 15, pcb_flag_make(0)); - pxm = rnd_pixmap_load(PCB_ACT_HIDLIB, "A.pnm"); + pxm = rnd_pixmap_load(RND_ACT_HIDLIB, "A.pnm"); pcb_trace("pxm=%p\n", pxm); pcb_gfx_set_pixmap_free(g, pxm, 1); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -439,7 +439,7 @@ printf("%ld: %p %ld %s%s\n", e->key, (void *)o, o->ID, pcb_obj_type_name(o->type), (o->ID == e->key) ? "" : " BROKEN"); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -479,7 +479,7 @@ now = pcb_dtime(); } while(now < end); pcb_message(PCB_MSG_INFO, "find2.c peformance: %d %f pin find per second\n", its, (double)its * (double)pins / (now-from)); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -495,13 +495,13 @@ pcb_fp_fopen_ctx_t fctx; int n, want_bbox = 0, want_origin = 0; - PCB_ACT_CONVARG(1, FGW_STR, DumpLibFootprint, fpn = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, DumpLibFootprint, fpn = argv[1].val.str); for(n = 2; n < argc; n++) { - PCB_ACT_CONVARG(n, FGW_STR, DumpLibFootprint, opt = argv[n].val.str); + RND_PCB_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 PCB_ACT_FAIL(DumpLibFootprint); + else RND_ACT_FAIL(DumpLibFootprint); } f = pcb_fp_fopen(&conf_core.rc.library_search_paths, fpn, &fctx, PCB->Data); @@ -522,7 +522,7 @@ if (want_bbox || want_origin) { pcb_buffer_clear(PCB, &SCRATCH); if (!pcb_buffer_load_footprint(&SCRATCH, fctx.filename, NULL)) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -532,12 +532,12 @@ if (want_origin) pcb_printf(DLF_PREFIX "origin mm %mm %mm\n", SCRATCH.X, SCRATCH.Y); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); } else { pcb_fp_fclose(f, &fctx); printf(DLF_PREFIX "error file not found\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); } return 0; @@ -558,7 +558,7 @@ pcb_message(PCB_MSG_ERROR, "pcb_acth_forcecolor() is temporarily disabled.\n"); return -1; - PCB_ACT_CONVARG(1, FGW_STR, forcecolor, new_color = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, forcecolor, new_color = argv[1].val.str); rnd_hid_get_coords("Click on object to change", &x, &y, 0); @@ -567,7 +567,7 @@ /* strncpy(((pcb_any_obj_t *)ptr2)->override_color, new_color, sizeof(((pcb_any_obj_t *)ptr2)->override_color)-1);*/ } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_about.c =================================================================== --- trunk/src_plugins/dialogs/dlg_about.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_about.c (revision 30900) @@ -113,6 +113,6 @@ fgw_error_t pcb_act_About(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_dlg_about(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30900) @@ -92,7 +92,7 @@ memset(&ctx, 0, sizeof(ctx)); - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, FlagEdit, op = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, FlagEdit, op = fgw_keyword(&argv[1])); if (op == F_Object) { pcb_coord_t x, y; @@ -104,11 +104,11 @@ ctx.obj_type = (type & 0xFFFF) | (type & PCB_OBJ_PSTK); } else - PCB_ACT_FAIL(FlagEdit); + RND_ACT_FAIL(FlagEdit); if ((ctx.obj_type != 0) && (PCB_FLAG_TEST(PCB_FLAG_LOCK, ctx.obj))) { pcb_message(PCB_MSG_ERROR, "Can't edit the flags of a locked object, unlock first.\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -158,6 +158,6 @@ pcb_undo_inc_serial(); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30900) @@ -206,9 +206,9 @@ pcb_text_t *txt_obj = NULL; if (argc > 2) - PCB_ACT_FAIL(Fontsel); + RND_ACT_FAIL(Fontsel); - PCB_ACT_MAY_CONVARG(1, FGW_STR, Fontsel, op = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Fontsel, op = argv[1].val.str); if (op != NULL) { if (pcb_strcasecmp(op, "Object") == 0) { @@ -223,7 +223,7 @@ } } else - PCB_ACT_FAIL(Fontsel); + RND_ACT_FAIL(Fontsel); } pcb_dlg_fontsel(PCB, modal, global, txt_obj); return 0; Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 30900) @@ -57,11 +57,11 @@ const char *cmd; if (!PCB_HAVE_GUI_ATTR_DLG) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } - PCB_ACT_CONVARG(1, FGW_STR, InfoBarFileChanged, cmd = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, InfoBarFileChanged, cmd = argv[1].val.str); if (strcmp(cmd, "open") == 0) { if (!active) { @@ -90,7 +90,7 @@ PCB_DAD_END(sub.dlg); PCB_DAD_END(sub.dlg); if (pcb_hid_dock_enter(&sub, PCB_HID_DOCK_TOP_INFOBAR, "file_changed") != 0) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } active = 1; @@ -111,8 +111,8 @@ } } else - PCB_ACT_FAIL(InfoBarFileChanged); + RND_ACT_FAIL(InfoBarFileChanged); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30900) @@ -261,7 +261,7 @@ pcb_hid_attr_val_t val; memset(&ctx, 0, sizeof(ctx)); - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, LayerBinding, op = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, LayerBinding, op = fgw_keyword(&argv[1])); if (op == F_Object) { pcb_coord_t x, y; @@ -285,7 +285,7 @@ ctx.data = PCB_PASTEBUFFER->Data; } else - PCB_ACT_FAIL(LayerBinding); + RND_ACT_FAIL(LayerBinding); { /* interactive mode */ int n; @@ -381,6 +381,6 @@ free(ctx.layer_names); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_layer_flags.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 30900) @@ -43,7 +43,7 @@ pcb_layer_id_t lid; - PCB_ACT_MAY_CONVARG(1, FGW_LONG, LayerPropGui, lid = argv[1].val.nat_long); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, LayerPropGui, lid = argv[1].val.nat_long); ly = pcb_get_layer(PCB->Data, lid); PCB_DAD_BEGIN_VBOX(dlg); @@ -88,7 +88,7 @@ ar = 1; PCB_DAD_FREE(dlg); - PCB_ACT_IRES(ar); + RND_ACT_IRES(ar); return 0; } @@ -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) - PCB_ACT_MAY_CONVARG(1, FGW_LONG, GroupPropGui, gid = argv[1].val.nat_long); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, GroupPropGui, gid = argv[1].val.nat_long); g = pcb_get_layergrp(PCB, gid); if (g->ltype & LOC_TYPES) { @@ -216,7 +216,7 @@ PCB_DAD_FREE(dlg); - PCB_ACT_IRES(ar); + RND_ACT_IRES(ar); return 0; } #undef LOC_TYPES Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30900) @@ -631,7 +631,7 @@ { long id = -1; const char *cmd = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, pstklib, cmd = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, pstklib, cmd = argv[1].val.str); if ((cmd != NULL) && (strcmp(cmd, "object") == 0)) { pcb_coord_t x, y; void *r1, *r2, *r3; @@ -640,7 +640,7 @@ rnd_hid_get_coords("Pick a subcircuit for padstack lib editing", &x, &y, 0); type = pcb_search_obj_by_location(PCB_OBJ_SUBC, &r1, &r2, &r3, x, y, PCB_SLOP * pcb_pixel_slop); if (type != PCB_OBJ_SUBC) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } sc = r2; @@ -647,11 +647,11 @@ id = sc->ID; } else - PCB_ACT_MAY_CONVARG(1, FGW_LONG, pstklib, id = argv[1].val.nat_long); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, pstklib, id = argv[1].val.nat_long); if (pcb_dlg_pstklib(PCB, id, pcb_false, NULL) == PCB_PADSTACK_INVALID) - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); else - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30900) @@ -66,9 +66,9 @@ /* Called with both function and file name -> no gui */ if (argc > 2) - return PCB_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv); + return RND_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv); - PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); if (pcb_strcasecmp(function, "Netlist") == 0) name = pcb_gui->fileselect(pcb_gui, "Load netlist file", "Import netlist from file", last_netlist, ".net", NULL, "netlist", PCB_HID_FSD_READ, NULL); @@ -80,7 +80,7 @@ name = pcb_gui->fileselect(pcb_gui, "Load layout file", "load layout (board) as board to edit", last_layout, NULL, NULL, "board", PCB_HID_FSD_READ, NULL); else { pcb_message(PCB_MSG_ERROR, "Invalid subcommand for Load(): '%s'\n", function); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -87,11 +87,11 @@ if (name != NULL) { if (pcbhl_conf.rc.verbose) fprintf(stderr, "Load: Calling LoadFrom(%s, %s)\n", function, name); - rnd_actionva(PCB_ACT_HIDLIB, "LoadFrom", function, name, NULL); + rnd_actionva(RND_ACT_HIDLIB, "LoadFrom", function, name, NULL); free(name); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -403,37 +403,37 @@ if (cwd == NULL) cwd = dup_cwd(); - PCB_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); is_dialog = (function != NULL) && (pcb_strncasecmp(function, "Dialog", 6) == 0); if ((!is_dialog) && (argc > 2)) - return PCB_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv); + return RND_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv); memset(&save, 0, sizeof(save)); if (pcb_strcasecmp(function, "Layout") == 0) if (PCB->hidlib.filename != NULL) - return rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", "Layout", NULL); + return rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "Layout", NULL); if (is_dialog) { const char *siot, *sext; - PCB_ACT_CONVARG(2, FGW_STR, Save, siot = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, Save, sext = argv[3].val.str); - PCB_ACT_CONVARG(4, FGW_STR, Save, prompt = argv[4].val.str); - PCB_ACT_MAY_CONVARG(5, FGW_STR, Save, default_pattern = argv[5].val.str); + 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); if (pcb_strcasecmp(siot, "pcb") == 0) list_iot = PCB_IOT_PCB; else if (pcb_strcasecmp(siot, "footprint") == 0) list_iot = PCB_IOT_FOOTPRINT; else if (pcb_strcasecmp(siot, "font") == 0) list_iot = PCB_IOT_FONT; else if (pcb_strcasecmp(siot, "buffer") == 0) list_iot = PCB_IOT_BUFFER; - else PCB_ACT_FAIL(Save); + else RND_ACT_FAIL(Save); if (pcb_strcasecmp(sext, "none") == 0) list_ext = PCB_IOL_EXT_NONE; else if (pcb_strcasecmp(sext, "board") == 0) list_ext = PCB_IOL_EXT_BOARD; else if (pcb_strcasecmp(sext, "fp") == 0) list_ext = PCB_IOL_EXT_FP; - else PCB_ACT_FAIL(Save); + else RND_ACT_FAIL(Save); } if (pcb_strcasecmp(function, "PasteBuffer") == 0) { @@ -495,7 +495,7 @@ } else { pcb_message(PCB_MSG_ERROR, "Error: no IO plugin avaialble for saving a buffer."); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -519,7 +519,7 @@ } else { pcb_message(PCB_MSG_ERROR, "Error: no IO plugin avaialble for saving a buffer."); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -581,7 +581,7 @@ if (final_name == NULL) { /* cancel */ pcb_io_list_free(&avail); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -593,7 +593,7 @@ const char *sfmt = avail.plug[fmt]->description; if (fmt_param != NULL) sfmt = avail.plug[save.pick]->description; - rnd_actionva(PCB_ACT_HIDLIB, "PasteBuffer", "Save", final_name, sfmt, NULL); + rnd_actionva(RND_ACT_HIDLIB, "PasteBuffer", "Save", final_name, sfmt, NULL); } else { const char *sfmt = NULL; @@ -606,13 +606,13 @@ * just obtained. */ if (pcb_strcasecmp(function, "Layout") == 0) - rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", "LayoutAs", final_name, sfmt, NULL); + rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "LayoutAs", final_name, sfmt, NULL); else - rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", function, final_name, sfmt, NULL); + rnd_actionva(RND_ACT_HIDLIB, "SaveTo", function, final_name, sfmt, NULL); } free(final_name); pcb_io_list_free(&avail); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30900) @@ -446,10 +446,10 @@ static fgw_error_t pcb_act_NetlistDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { if (strcmp(pcb_gui->name, "lesstif") == 0) - rnd_actionva(PCB_ACT_HIDLIB, "DoWindows", "netlist"); + rnd_actionva(RND_ACT_HIDLIB, "DoWindows", "netlist"); else pcb_dlg_netlist(PCB); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 30900) @@ -1008,9 +1008,9 @@ memset(&pse, 0, sizeof(pse)); - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, PadstackEdit, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_INT, PadstackEdit, target_tab = argv[2].val.nat_int); - PCB_ACT_IRES(0); + 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_IRES(0); if (op == F_Object) { pcb_coord_t x, y; @@ -1020,13 +1020,13 @@ type = pcb_search_screen(x, y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART | PCB_LOOSE_SUBC(PCB), &ptr1, &ptr2, &ptr3); if (type != PCB_OBJ_PSTK) { pcb_message(PCB_MSG_ERROR, "Need a padstack.\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } pse.ps = ptr2; } else - PCB_ACT_FAIL(PadstackEdit); + RND_ACT_FAIL(PadstackEdit); pse.pcb = pcb_data_get_top(pse.ps->parent.data); if (pse.pcb == NULL) @@ -1037,7 +1037,7 @@ pcb_pstkedit_dialog(&pse, target_tab); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 30900) @@ -184,11 +184,11 @@ if (type == PCB_OBJ_SUBC) { pcb_subc_t *sc = r2; pcb_dlg_pinout(PCB, PCB->Data, sc); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); } else { pcb_message(PCB_MSG_ERROR, "pinout dialog: there's no subcircuit there\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } return 0; } Index: trunk/src_plugins/dialogs/dlg_plugins.c =================================================================== --- trunk/src_plugins/dialogs/dlg_plugins.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_plugins.c (revision 30900) @@ -84,6 +84,6 @@ PCB_DAD_FREE(dlg); gds_uninit(&str); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30900) @@ -392,9 +392,9 @@ fgw_error_t pcb_act_Preferences(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *tab = NULL, *tabarg = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, Preferences, tab = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Preferences, tabarg = argv[2].val.str); + 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); pcb_dlg_pref(tab, tabarg); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_printcalib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_printcalib.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_printcalib.c (revision 30900) @@ -46,7 +46,7 @@ if (printer == NULL) { pcb_message(PCB_MSG_ERROR, "No printer available\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } printer->calibrate(printer, 0.0, 0.0); @@ -54,6 +54,6 @@ if (pcb_attribute_dialog("printer_calibrate", printer_calibrate_attrs, 3, "Printer Calibration Values", NULL)) return 1; printer->calibrate(printer, printer_calibrate_attrs[1].val.dbl, printer_calibrate_attrs[2].val.dbl); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 30900) @@ -422,7 +422,7 @@ fgw_error_t pcb_act_SearchDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { search_window_create(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 30900) @@ -281,7 +281,7 @@ PCB_DAD_FREE(ctx.dlg); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 30900) @@ -153,7 +153,7 @@ static fgw_error_t pcb_act_UndoDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_dlg_undo(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30899) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30900) @@ -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"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, DrcDialog, dlg_type = argv[1].val.str); + rnd_PCB_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"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatListDialog, dlg_type = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, IOIncompatListDialog, dlg_type = argv[1].val.str); if (!io_gui_ctx.active) { io_gui_ctx.pcb = PCB; @@ -787,17 +787,17 @@ view_ctx_t *ctx; void *lst = NULL; const char *name = "view list", *winid = "viewlist"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, ViewList, name = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, ViewList, winid = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_PTR, ViewList, lst = argv[3].val.ptr_void); + 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); if ((lst != NULL) && (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], PCB_PTR_DOMAIN_VIEWLIST))) { pcb_message(PCB_MSG_ERROR, "invalid list pointer"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); ctx = calloc(sizeof(view_ctx_t), 1); ctx->pcb = PCB; if (lst != NULL) Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 30899) +++ trunk/src_plugins/distalign/distalign.c (revision 30900) @@ -264,13 +264,13 @@ pcb_any_obj_t *obj; if (argc < 2 || argc > 5) { - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } - PCB_ACT_CONVARG(1, FGW_STR, align, a0 = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, align, a1 = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, align, a2 = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, align, a3 = argv[4].val.str); + 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); /* parse direction arg */ switch ((dir = keyword(a0))) { @@ -278,7 +278,7 @@ case K_Y: break; default: - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } /* parse point (within each object) which will be aligned */ switch ((point = keyword(a1))) { @@ -288,13 +288,13 @@ case K_Lefts: case K_Rights: if (dir == K_Y) { - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } break; case K_Tops: case K_Bottoms: if (dir == K_X) { - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } break; case K_none: @@ -301,7 +301,7 @@ point = K_Marks; /* default value */ break; default: - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } /* parse reference which will determine alignment coordinates */ switch ((reference = keyword(a2))) { @@ -314,7 +314,7 @@ reference = K_First; /* default value */ break; default: - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } /* optionally work off the grid (solar cells!) */ switch (keyword(a3)) { @@ -325,7 +325,7 @@ gridless = 0; break; default: - PCB_ACT_FAIL(align); + RND_ACT_FAIL(align); } /* find the final alignment coordinate using the above options */ q = reference_coord(K_align, pcb_crosshair.X, pcb_crosshair.Y, dir, point, reference); @@ -362,7 +362,7 @@ } free_objs_by_pos(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -381,14 +381,14 @@ int i; if (argc < 2 || argc == 4 || argc > 6) { - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } - PCB_ACT_CONVARG(1, FGW_STR, distribute, a0 = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, distribute, a1 = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, distribute, a2 = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, distribute, a3 = argv[4].val.str); - PCB_ACT_MAY_CONVARG(5, FGW_STR, distribute, a4 = argv[5].val.str); + 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); /* parse direction arg */ @@ -397,7 +397,7 @@ case K_Y: break; default: - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } /* parse point (within each objects) which will be distributed */ switch ((point = keyword(a1))) { @@ -408,13 +408,13 @@ case K_Lefts: case K_Rights: if (dir == K_Y) { - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } break; case K_Tops: case K_Bottoms: if (dir == K_X) { - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } break; case K_none: @@ -421,7 +421,7 @@ point = K_Marks; /* default value */ break; default: - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } /* parse reference which will determine first distribution coordinate */ switch ((refa = keyword(a2))) { @@ -434,7 +434,7 @@ refa = K_First; /* default value */ break; default: - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } /* parse reference which will determine final distribution coordinate */ switch ((refb = keyword(a3))) { @@ -447,10 +447,10 @@ refb = K_Last; /* default value */ break; default: - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } if (refa == refb) { - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } /* optionally work off the grid (solar cells!) */ switch (keyword(a4)) { @@ -461,7 +461,7 @@ gridless = 0; break; default: - PCB_ACT_FAIL(distribute); + RND_ACT_FAIL(distribute); } /* build list of objects in orthogonal axis order */ sort_objs_by_pos(K_distribute, dir, point, refb); @@ -529,7 +529,7 @@ pcb_board_set_changed_flag(1); } free_objs_by_pos(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 30899) +++ trunk/src_plugins/djopt/djopt.c (revision 30900) @@ -2439,7 +2439,7 @@ int layn, saved = 0; corner_s *c; - PCB_ACT_MAY_CONVARG(1, FGW_STR, DJopt, arg = argv[1].val.str); + rnd_PCB_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, pcb_false); @@ -2556,7 +2556,7 @@ pcb_undo_inc_serial(); pcb_hid_busy(PCB, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 30899) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 30900) @@ -934,7 +934,7 @@ printf(" *** broken layer-to-group cross reference: %ld\n", l->meta.real.grp); } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30899) +++ trunk/src_plugins/drc_query/dlg.c (revision 30900) @@ -329,9 +329,9 @@ const char *srole, *spath, *srule = NULL; conf_role_t role; - PCB_ACT_CONVARG(1, FGW_STR, DrcQueryEditRule, srole = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, DrcQueryEditRule, spath = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, DrcQueryEditRule, srule = argv[3].val.str); + 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); if (srule == NULL) srule = spath; @@ -338,9 +338,9 @@ role = pcb_conf_role_parse(srole); if (role == CFR_invalid) - PCB_ACT_FAIL(DrcQueryEditRule); + RND_ACT_FAIL(DrcQueryEditRule); - PCB_ACT_IRES(pcb_dlg_rule_edit(role, srule)); + RND_ACT_IRES(pcb_dlg_rule_edit(role, srule)); return 0; } @@ -630,6 +630,6 @@ static const char pcb_acth_DrcQueryListRules[] = "List all drc rules implemented in drc_query"; static fgw_error_t pcb_act_DrcQueryListRules(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - PCB_ACT_IRES(pcb_dlg_drc_rlist()); + RND_ACT_IRES(pcb_dlg_drc_rlist()); return 0; } Index: trunk/src_plugins/expfeat/expfeat.c =================================================================== --- trunk/src_plugins/expfeat/expfeat.c (revision 30899) +++ trunk/src_plugins/expfeat/expfeat.c (revision 30900) @@ -43,7 +43,7 @@ static fgw_error_t pcb_act_ExpFeatTmp(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_message(PCB_MSG_INFO, "Hello world from expfeat!\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/export_oldconn/oldconn.c =================================================================== --- trunk/src_plugins/export_oldconn/oldconn.c (revision 30899) +++ trunk/src_plugins/export_oldconn/oldconn.c (revision 30900) @@ -265,9 +265,9 @@ void *ptrtmp; pcb_coord_t x, y; - PCB_ACT_CONVARG(1, FGW_KEYWORD, ExportOldConn, op = fgw_keyword(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_STR, ExportOldConn, name = argv[2].val.str); - PCB_ACT_IRES(0); + 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_IRES(0); switch(op) { case F_AllConnections: @@ -300,7 +300,7 @@ } return 0; } - PCB_ACT_FAIL(ExportOldConn); + RND_ACT_FAIL(ExportOldConn); } static rnd_action_t oldconn_action_list[] = { Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 30899) +++ trunk/src_plugins/export_openems/excitation.c (revision 30900) @@ -461,10 +461,10 @@ { const char *op = "interactive", *a1 = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, OpenemsExcitation, op = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, OpenemsExcitation, a1 = argv[2].val.str); + 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); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); if (strcmp(op, "interactive") == 0) pcb_dlg_exc(); @@ -489,8 +489,8 @@ goto error; } - PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); - PCB_ACT_CONVARG(start+1, FGW_STR, OpenemsExcitation, val = argv[start+1].val.str); + 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); attrkey = pcb_strdup_printf(AEPREFIX "%s::%s", a1, key); pcb_attribute_put(&PCB->Attributes, attrkey, val); @@ -510,7 +510,7 @@ goto error; } - PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); + RND_PCB_ACT_CONVARG(start+0, FGW_STR, OpenemsExcitation, key = argv[start+0].val.str); attrkey = pcb_strdup_printf(AEPREFIX "%s::%s", a1, key); res->type = FGW_STR; @@ -521,7 +521,7 @@ return 0; error:; - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 30899) +++ trunk/src_plugins/export_openems/mesh.c (revision 30900) @@ -1233,6 +1233,6 @@ fgw_error_t pcb_act_mesh(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_mesh_interactive(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30899) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30900) @@ -609,12 +609,12 @@ FILE *f; const char *name; - PCB_ACT_CONVARG(1, FGW_STR, scad_export_poly, name = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, scad_export_poly, name = argv[1].val.str); f = pcb_fopen_askovr(&PCB->hidlib, name, "w", NULL); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Failed to open %s for writing\n", name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -648,7 +648,7 @@ fclose(f); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 30899) +++ trunk/src_plugins/extedit/extedit.c (revision 30900) @@ -180,8 +180,8 @@ int paste = 0, del_selected = 0; pcb_coord_t pastex = 0, pastey = 0; - PCB_ACT_MAY_CONVARG(1, FGW_STR, extedit, cmd = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, extedit, method = argv[2].val.str); + 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); /* pick up the object to edit */ if ((cmd == NULL) || (pcb_strcasecmp(cmd, "object") == 0)) { @@ -332,7 +332,7 @@ pcb_tempfile_unlink(tmp_cfg_fn); quit0:; pcb_buffer_set_number(obn); - PCB_ACT_IRES(ret); + RND_ACT_IRES(ret); return 0; } Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 30899) +++ trunk/src_plugins/fontmode/fontmode.c (revision 30900) @@ -112,7 +112,7 @@ return 1; } - if (rnd_actionva(PCB_ACT_HIDLIB, "New", "Font", 0)) + if (rnd_actionva(RND_ACT_HIDLIB, "New", "Font", 0)) return 1; pcb_conf_set(CFR_DESIGN, "editor/grid_unit", -1, "mil", POL_OVERWRITE); @@ -221,7 +221,7 @@ int y = (l + 1) * CELL_SIZE; pcb_line_new_merge(lgrid, 0, y, PCB->hidlib.size_x, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -338,9 +338,9 @@ } pcb_font_set_info(font); - rnd_actionva(PCB_ACT_HIDLIB, "SaveFontTo", NULL); + rnd_actionva(RND_ACT_HIDLIB, "SaveFontTo", NULL); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30899) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30900) @@ -849,7 +849,7 @@ static fgw_error_t pcb_act_DoWindows(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *a = ""; - PCB_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str); if (strcmp(a, "1") == 0 || pcb_strcasecmp(a, "Layout") == 0) { } else if (strcmp(a, "2") == 0 || pcb_strcasecmp(a, "Library") == 0) { @@ -862,11 +862,11 @@ lesstif_show_netlist(); } else { - PCB_ACT_FAIL(DoWindows); - PCB_ACT_IRES(1); + RND_ACT_FAIL(DoWindows); + RND_ACT_IRES(1); return 1; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -875,7 +875,7 @@ static fgw_error_t pcb_act_AdjustSizes(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_message(PCB_MSG_ERROR, "AdjustSizes() is not supported anymore, please use the Preferences() action\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 30899) +++ trunk/src_plugins/hid_lesstif/library.c (revision 30900) @@ -169,7 +169,7 @@ static const char pcb_acth_LibraryShow[] = "[DEPRECATED] Displays the library window."; static fgw_error_t pcb_act_LibraryShow(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - PCB_ACT_IRES(build_library_dialog()); + RND_ACT_IRES(build_library_dialog()); return 0; } Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 30899) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 30900) @@ -376,11 +376,11 @@ const char *nn; if (build_netlist_dialog()) { - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } - PCB_ACT_CONVARG(1, FGW_STR, LesstifNetlistShow, nn = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, LesstifNetlistShow, nn = argv[1].val.str); if (argc == 2) { pcb_net_term_t *term; @@ -427,7 +427,7 @@ } } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 30899) +++ trunk/src_plugins/import_calay/calay.c (revision 30900) @@ -199,7 +199,7 @@ static char *default_file = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadCalayFrom, fname_net = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadCalayFrom, fname_net = argv[1].val.str); if (!fname_net || !*fname_net) { fname_net = pcb_gui->fileselect(pcb_gui, @@ -220,7 +220,7 @@ end = fname_cmp + strlen(fname_cmp); strcpy(end, CMPEXT); - PCB_ACT_IRES(calay_load(fname_net, fname_cmp)); + RND_ACT_IRES(calay_load(fname_net, fname_cmp)); free(fname_cmp); return 0; } Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 30899) +++ trunk/src_plugins/import_dsn/dsn.c (revision 30900) @@ -216,7 +216,7 @@ gsxl_node_t *wiring, *w, *routes, *nout, *n; dsn_type_t type; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect(pcb_gui, @@ -325,13 +325,13 @@ pcb_message(PCB_MSG_INFO, "import_dsn: loaded %ld wires and %ld vias\n", nlines, nvias); gsxl_uninit(&dom); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; error:; gsxl_uninit(&dom); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30899) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30900) @@ -168,7 +168,7 @@ const char *fname = NULL; static char *default_file = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, @@ -182,7 +182,7 @@ } } - PCB_ACT_IRES(fpcb_nl_load(fname)); + RND_ACT_IRES(fpcb_nl_load(fname)); return 0; } Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 30899) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 30900) @@ -153,7 +153,7 @@ const char *fname = NULL; static char *default_file = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load HP-GL file...", @@ -167,7 +167,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return hpgl_load(fname); } Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30899) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30900) @@ -365,7 +365,7 @@ htsp_t subcs, *scs = NULL; htsp_entry_t *e; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect(pcb_gui, "Load IPC-D-356 netlist...", @@ -372,7 +372,7 @@ "Pick an IPC-D-356 netlist file.\n", default_file, ".net", NULL, "ipcd356", PCB_HID_FSD_READ, NULL); if (fname == NULL) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (default_file != NULL) { @@ -384,13 +384,13 @@ f = pcb_fopen(&PCB->hidlib, fname, "r"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "Can't open %s for read\n", fname); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } for(n = 2; n < argc; n++) { const char *s; - PCB_ACT_MAY_CONVARG(n, FGW_STR, LoadIpc356From, s = argv[n].val.str); + rnd_PCB_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; @@ -405,15 +405,15 @@ } if (want_net) { - rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Freeze", NULL); - rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Clear", NULL); + rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Freeze", NULL); + rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Clear", NULL); } rs = ipc356_parse(PCB, f, fname, scs, want_net, want_pads); if (want_net) { - rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Sort", NULL); - rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Thaw", NULL); + rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Sort", NULL); + rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Thaw", NULL); } fclose(f); @@ -431,7 +431,7 @@ htsp_uninit(&subcs); } - PCB_ACT_IRES(rs); + RND_ACT_IRES(rs); return 0; } Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 30899) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 30900) @@ -294,7 +294,7 @@ static char *default_file = NULL; int rs; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load ltspice net+asc file pair...", @@ -315,7 +315,7 @@ free(fname_asc); free(fname_net); - PCB_ACT_IRES(rs); + RND_ACT_IRES(rs); return 0; } Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30899) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30900) @@ -262,7 +262,7 @@ const char *fname = NULL; static char *default_file = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load mentor edf netlist file...", @@ -276,7 +276,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return mentor_sch_load(fname); } Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 30899) +++ trunk/src_plugins/import_mucs/mucs.c (revision 30900) @@ -64,11 +64,11 @@ pcb_coord_t x1, y1, x2, y2, r; pcb_pstk_t *ps; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadMucsFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadMucsFrom, fname = argv[1].val.str); if (!(pcb_layer_flags(PCB, PCB_CURRLID(PCB)) & PCB_LYT_COPPER)) { pcb_message(PCB_MSG_ERROR, "The currently active layer is not a copper layer.\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -78,7 +78,7 @@ "This file could be generated by mucs-pcb\n", default_file, ".l1", NULL, "unixplot", PCB_HID_FSD_READ, NULL); if (fname == NULL) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (default_file != NULL) { @@ -93,7 +93,7 @@ fi = pcb_fopen(&PCB->hidlib, fname, "r"); if (!fi) { pcb_message(PCB_MSG_ERROR, "Can't load mucs unixplot file %s for read\n", fname); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -150,7 +150,7 @@ } } fclose(fi); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/import_sch2/import_sch.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch.c (revision 30899) +++ trunk/src_plugins/import_sch2/import_sch.c (revision 30900) @@ -197,23 +197,23 @@ { const char *cmd = "reimport"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, ImportSch, cmd = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ImportSch, cmd = argv[1].val.str); if (strcmp(cmd, "reimport") == 0) { - PCB_ACT_IRES(do_import()); + RND_ACT_IRES(do_import()); return 0; } if (strcmp(cmd, "setup") == 0) { - PCB_ACT_IRES(do_setup(argc-2, argv+2)); + RND_ACT_IRES(do_setup(argc-2, argv+2)); return 0; } if (strcmp(cmd, "dialog") == 0) { - PCB_ACT_IRES(do_dialog()); + RND_ACT_IRES(do_dialog()); return 0; } - PCB_ACT_FAIL(ImportSch); - PCB_ACT_IRES(1); + RND_ACT_FAIL(ImportSch); + RND_ACT_IRES(1); return 0; } Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 30899) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 30900) @@ -178,7 +178,7 @@ const char *fname = NULL; static char *default_file = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load tinycad netlist file...", @@ -192,7 +192,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return tinycad_load(fname); } Index: trunk/src_plugins/import_ttf/ttf.c =================================================================== --- trunk/src_plugins/import_ttf/ttf.c (revision 30899) +++ trunk/src_plugins/import_ttf/ttf.c (revision 30900) @@ -46,7 +46,7 @@ static const char pcb_acth_LoadTtfGlyphs[] = "Loads glyphs from an outline ttf in the specified source range, optionally remapping them to dstchars range in the pcb-rnd font"; fgw_error_t pcb_act_LoadTtfGlyphs(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 30899) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 30900) @@ -76,7 +76,7 @@ int debug = 0; pcb_bool_t retval; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str); if ((fname == NULL) || (*fname == '\0')) { fname = pcb_gui->fileselect(pcb_gui, @@ -85,7 +85,7 @@ } if (fname == NULL) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -114,7 +114,7 @@ pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL); pcb_event(&PCB->hidlib, PCB_EVENT_BOARD_CHANGED, NULL); - PCB_ACT_IRES(retval); + RND_ACT_IRES(retval); return 0; } Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 30899) +++ trunk/src_plugins/io_kicad/read_net.c (revision 30900) @@ -221,7 +221,7 @@ const char *fname = NULL; static char *default_file = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load eeschema netlist file...", @@ -235,7 +235,7 @@ } } - PCB_ACT_IRES(eeschema_load(fname)); + RND_ACT_IRES(eeschema_load(fname)); return 0; } Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 30899) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 30900) @@ -71,46 +71,46 @@ { const char *fname = NULL, *type; - PCB_ACT_CONVARG(1, FGW_STR, Savetedax, type = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Savetedax, fname = argv[2].val.str); + 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); if (pcb_strcasecmp(type, "netlist") == 0) { - PCB_ACT_IRES(tedax_net_save(PCB, NULL, fname)); + RND_ACT_IRES(tedax_net_save(PCB, NULL, fname)); return 0; } if (pcb_strcasecmp(type, "board-footprints") == 0) { - PCB_ACT_IRES(tedax_fp_save(PCB->Data, fname, -1)); + RND_ACT_IRES(tedax_fp_save(PCB->Data, fname, -1)); return 0; } if (pcb_strcasecmp(type, "stackup") == 0) { - PCB_ACT_IRES(tedax_stackup_save(PCB, PCB->hidlib.name, fname)); + RND_ACT_IRES(tedax_stackup_save(PCB, PCB->hidlib.name, fname)); return 0; } if (pcb_strcasecmp(type, "layer") == 0) { - PCB_ACT_IRES(tedax_layer_save(PCB, pcb_layer_get_group_(PCB_CURRLAYER(PCB)), NULL, fname)); + RND_ACT_IRES(tedax_layer_save(PCB, pcb_layer_get_group_(PCB_CURRLAYER(PCB)), NULL, fname)); return 0; } if (pcb_strcasecmp(type, "board") == 0) { - PCB_ACT_IRES(tedax_board_save(PCB, fname)); + RND_ACT_IRES(tedax_board_save(PCB, fname)); return 0; } if (pcb_strcasecmp(type, "drc") == 0) { - PCB_ACT_IRES(tedax_drc_save(PCB, NULL, fname)); + RND_ACT_IRES(tedax_drc_save(PCB, NULL, fname)); return 0; } if (pcb_strcasecmp(type, "etest") == 0) { - PCB_ACT_IRES(tedax_etest_save(PCB, NULL, fname)); + RND_ACT_IRES(tedax_etest_save(PCB, NULL, fname)); return 0; } - PCB_ACT_FAIL(Savetedax); - PCB_ACT_IRES(1); + RND_ACT_FAIL(Savetedax); + RND_ACT_IRES(1); return 0; } @@ -137,44 +137,44 @@ const char *fname = NULL, *type, *id = NULL, *silents = NULL; int silent; - PCB_ACT_CONVARG(1, FGW_STR, LoadtedaxFrom, type = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadtedaxFrom, fname = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadtedaxFrom, id = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, LoadtedaxFrom, silents = argv[4].val.str); + 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); silent = (silents != NULL) && (pcb_strcasecmp(silents, "silent") == 0); if (pcb_strcasecmp(type, "netlist") == 0) { gen_load(netlist, fname); - PCB_ACT_IRES(tedax_net_load(fname, 1, id, silent)); + RND_ACT_IRES(tedax_net_load(fname, 1, id, silent)); return 0; } if (pcb_strcasecmp(type, "board") == 0) { gen_load(board, fname); - PCB_ACT_IRES(tedax_board_load(PCB, fname, id, silent)); + RND_ACT_IRES(tedax_board_load(PCB, fname, id, silent)); return 0; } if (pcb_strcasecmp(type, "footprint") == 0) { gen_load(footprint, fname); - PCB_ACT_IRES(tedax_fp_load(PCB_PASTEBUFFER->Data, fname, 0, id, silent)); + RND_ACT_IRES(tedax_fp_load(PCB_PASTEBUFFER->Data, fname, 0, id, silent)); return 0; } if (pcb_strcasecmp(type, "stackup") == 0) { gen_load(stackup, fname); - PCB_ACT_IRES(tedax_stackup_load(PCB, fname, id, silent)); + RND_ACT_IRES(tedax_stackup_load(PCB, fname, id, silent)); return 0; } if (pcb_strcasecmp(type, "layer") == 0) { gen_load(layer, fname); - PCB_ACT_IRES(tedax_layers_load(PCB_PASTEBUFFER->Data, fname, id, silent)); + RND_ACT_IRES(tedax_layers_load(PCB_PASTEBUFFER->Data, fname, id, silent)); return 0; } if (pcb_strcasecmp(type, "drc") == 0) { gen_load(drc, fname); - PCB_ACT_IRES(tedax_drc_load(PCB, fname, id, silent)); + RND_ACT_IRES(tedax_drc_load(PCB, fname, id, silent)); return 0; } - PCB_ACT_FAIL(LoadtedaxFrom); + RND_ACT_FAIL(LoadtedaxFrom); } rnd_action_t tedax_action_list[] = { Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 30899) +++ trunk/src_plugins/jostle/jostle.c (revision 30900) @@ -476,7 +476,7 @@ struct info info; int found; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, jostle, value = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, jostle, value = fgw_keyword(&argv[1])); x = pcb_crosshair.X; y = pcb_crosshair.Y; @@ -505,7 +505,7 @@ pcb_board_set_changed_flag(pcb_true); pcb_undo_inc_serial(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30899) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30900) @@ -207,23 +207,23 @@ dad_t *dad; int rv = 0; - PCB_ACT_CONVARG(1, FGW_STR, dad, dlgname = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, dad, cmd = argv[2].val.str); + 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); if (pcb_strcasecmp(cmd, "new") == 0) { - PCB_ACT_IRES(dad_new(PCB_ACT_HIDLIB, dlgname)); + RND_ACT_IRES(dad_new(RND_ACT_HIDLIB, dlgname)); return 0; } dad = htsp_get(&dads, dlgname); if (pcb_strcasecmp(cmd, "exists") == 0) { - PCB_ACT_IRES(dad != NULL); + RND_ACT_IRES(dad != NULL); return 0; } if (dad == NULL) { pcb_message(PCB_MSG_ERROR, "Can't find named DAD dialog %s\n", dlgname); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -230,13 +230,13 @@ if (pcb_strcasecmp(cmd, "label") == 0) { if (dad->running) goto cant_chg; - PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_LABEL(dad->dlg, txt); rv = PCB_DAD_CURRENT(dad->dlg); } else if (pcb_strcasecmp(cmd, "button") == 0) { if (dad->running) goto cant_chg; - PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_BUTTON(dad->dlg, tmp_str_dup(dad, txt)); rv = PCB_DAD_CURRENT(dad->dlg); } @@ -250,8 +250,8 @@ PCB_DAD_COMPFLAG(dad->dlg, PCB_HATF_EXPFILL); PCB_DAD_END(dad->dlg); for(n = 3; n < argc; n+=2) { - PCB_ACT_CONVARG(n+0, FGW_STR, dad, txt = argv[n+0].val.str); - PCB_ACT_CONVARG(n+1, FGW_INT, dad, ret = argv[n+1].val.nat_int); + 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); PCB_DAD_BUTTON_CLOSE(dad->dlg, tmp_str_dup(dad, txt), ret); rv = PCB_DAD_CURRENT(dad->dlg); @@ -261,7 +261,7 @@ else if (pcb_strcasecmp(cmd, "bool") == 0) { if (dad->running) goto cant_chg; txt = ""; - PCB_ACT_MAY_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_BOOL(dad->dlg, txt); rv = PCB_DAD_CURRENT(dad->dlg); } @@ -269,9 +269,9 @@ long vmin, vmax; if (dad->running) goto cant_chg; txt = ""; - PCB_ACT_CONVARG(3, FGW_LONG, dad, vmin = argv[3].val.nat_long); - PCB_ACT_CONVARG(4, FGW_LONG, dad, vmax = argv[4].val.nat_long); - PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + 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); PCB_DAD_INTEGER(dad->dlg, txt); PCB_DAD_MINMAX(dad->dlg, vmin, vmax); rv = PCB_DAD_CURRENT(dad->dlg); @@ -280,9 +280,9 @@ double vmin, vmax; if (dad->running) goto cant_chg; txt = ""; - PCB_ACT_CONVARG(3, FGW_DOUBLE, dad, vmin = argv[3].val.nat_double); - PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, vmax = argv[4].val.nat_double); - PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + 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); PCB_DAD_REAL(dad->dlg, txt); PCB_DAD_MINMAX(dad->dlg, vmin, vmax); rv = PCB_DAD_CURRENT(dad->dlg); @@ -291,9 +291,9 @@ pcb_coord_t vmin, vmax; if (dad->running) goto cant_chg; txt = ""; - PCB_ACT_CONVARG(3, FGW_COORD_, dad, vmin = fgw_coord(&argv[3])); - PCB_ACT_CONVARG(4, FGW_COORD_, dad, vmax = fgw_coord(&argv[4])); - PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + 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); PCB_DAD_COORD(dad->dlg, txt); PCB_DAD_MINMAX(dad->dlg, vmin, vmax); rv = PCB_DAD_CURRENT(dad->dlg); @@ -313,7 +313,7 @@ if (dad->running) goto cant_chg; - PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_PCB_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; - PCB_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); - PCB_ACT_CONVARG(4, FGW_INT, dad, istree = argv[4].val.nat_int); - PCB_ACT_MAY_CONVARG(5, FGW_STR, dad, txt = argv[5].val.str); + 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); if ((txt == NULL) || (split_tablist(dad, values, txt, cmd) == 0)) { PCB_DAD_TREE(dad->dlg, cols, istree, (const char **)values); @@ -353,13 +353,13 @@ if (dad->running) goto cant_chg; - PCB_ACT_CONVARG(3, FGW_PTR, dad, row = argv[3].val.ptr_void); - PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); + 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); if (row != NULL) { if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], dad->row_domain)) { pcb_message(PCB_MSG_ERROR, "Invalid DAD row pointer\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -406,7 +406,7 @@ if (dad->running) goto cant_chg; - PCB_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); + RND_PCB_ACT_CONVARG(3, FGW_INT, dad, cols = argv[3].val.nat_int); PCB_DAD_BEGIN_TABLE(dad->dlg, cols); dad->level++; rv = PCB_DAD_CURRENT(dad->dlg); @@ -425,7 +425,7 @@ if (dad->running) goto cant_chg; for(n = 3; n < argc; n++) { - PCB_ACT_CONVARG(n, FGW_STR, dad, txt = argv[n].val.str); + RND_PCB_ACT_CONVARG(n, FGW_STR, dad, txt = argv[n].val.str); if ((*txt == '\0') || (*txt == '0')) continue; tmp = pcb_hid_compflag_name2bit(txt); @@ -437,7 +437,7 @@ rv = PCB_DAD_CURRENT(dad->dlg); } else if (pcb_strcasecmp(cmd, "onchange") == 0) { - PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); PCB_DAD_CHANGE_CB(dad->dlg, dad_change_cb); vts0_set(&dad->change_cb, PCB_DAD_CURRENT(dad->dlg), tmp_str_dup(dad, txt)); rv = 0; @@ -448,10 +448,10 @@ pcb_coord_t c; pcb_hid_attr_type_t wtype; - PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); + RND_PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); if ((wid < 0) || (wid >= dad->dlg_len)) { pcb_message(PCB_MSG_ERROR, "Invalid widget ID %d (set ignored)\n", wid); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -461,28 +461,28 @@ switch(wtype) { case PCB_HATT_COORD: - PCB_ACT_CONVARG(4, FGW_COORD, dad, c = fgw_coord(&argv[4])); + RND_PCB_ACT_CONVARG(4, FGW_COORD, dad, c = fgw_coord(&argv[4])); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, crd, c); break; case PCB_HATT_REAL: case PCB_HATT_PROGRESS: - PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, d = argv[4].val.nat_double); + RND_PCB_ACT_CONVARG(4, FGW_DOUBLE, dad, d = argv[4].val.nat_double); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, dbl, d); break; case PCB_HATT_INTEGER: case PCB_HATT_BOOL: - PCB_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); + RND_PCB_ACT_CONVARG(4, FGW_INT, dad, i = argv[4].val.nat_int); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, lng, i); break; case PCB_HATT_STRING: case PCB_HATT_LABEL: case PCB_HATT_BUTTON: - PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); + RND_PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); PCB_DAD_SET_VALUE(dad->dlg_hid_ctx, wid, str, txt); break; default: pcb_message(PCB_MSG_ERROR, "Invalid widget type %d - can not change value (set ignored)\n", wid); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } rv = 0; @@ -491,7 +491,7 @@ int wid; pcb_hid_attr_type_t wtype; - PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); + RND_PCB_ACT_CONVARG(3, FGW_INT, dad, wid = argv[3].val.nat_int); if ((wid < 0) || (wid >= dad->dlg_len)) { pcb_message(PCB_MSG_ERROR, "Invalid widget ID %d (get ignored)\n", wid); return FGW_ERR_NOT_FOUND; @@ -504,7 +504,7 @@ switch(wtype) { case PCB_HATT_COORD: txt = NULL; - PCB_ACT_MAY_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); + rnd_PCB_ACT_MAY_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); if (txt != NULL) { const pcb_unit_t *u = get_unit_struct(txt); if (u == NULL) { @@ -539,7 +539,7 @@ } else if ((pcb_strcasecmp(cmd, "run") == 0) || (pcb_strcasecmp(cmd, "run_modal") == 0)) { if (dad->running) goto cant_chg; - PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); + RND_PCB_ACT_CONVARG(3, FGW_STR, dad, txt = argv[3].val.str); if (dad->level != 0) { pcb_message(PCB_MSG_ERROR, "Invalid DAD dialog structure: %d levels not closed (missing 'end' calls)\n", dad->level); @@ -555,12 +555,12 @@ rv = -1; } - PCB_ACT_IRES(rv); + RND_ACT_IRES(rv); return 0; cant_chg:; pcb_message(PCB_MSG_ERROR, "Can't find named DAD dialog %s\n", dlgname); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30899) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 30900) @@ -53,9 +53,9 @@ pcb_hid_dad_buttons_t clbtn[] = {{"ok", 0}, {NULL, 0}}; PCB_DAD_DECL(dlg); - PCB_ACT_CONVARG(1, FGW_STR, gui_PromptFor, label = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, gui_PromptFor, default_str = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, gui_PromptFor, title = argv[3].val.str); + 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); PCB_DAD_BEGIN_VBOX(dlg); PCB_DAD_LABEL(dlg, label); @@ -97,9 +97,9 @@ PCB_DAD_DECL(dlg); - PCB_ACT_CONVARG(1, FGW_STR, gui_MessageBox, icon = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, gui_MessageBox, title = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, gui_MessageBox, label = argv[3].val.str); + 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); PCB_DAD_BEGIN_VBOX(dlg); /* icon and label */ @@ -116,8 +116,8 @@ PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL); PCB_DAD_END(dlg); for(n = 4; n < argc; n+=2) { - PCB_ACT_CONVARG(n+0, FGW_STR, gui_MessageBox, txt = argv[n+0].val.str); - PCB_ACT_CONVARG(n+1, FGW_INT, gui_MessageBox, ret = argv[n+1].val.nat_int); + 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); PCB_DAD_BUTTON_CLOSE(dlg, txt, ret); } PCB_DAD_END(dlg); @@ -164,7 +164,7 @@ clrpick_t ctx; pcb_hid_attr_val_t val; - PCB_ACT_CONVARG(1, FGW_STR, gui_PromptFor, sclr = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, gui_PromptFor, sclr = argv[1].val.str); memset(&ctx, 0, sizeof(ctx)); if (pcb_color_load_str(&ctx.clr, sclr) != 0) @@ -229,18 +229,18 @@ PCB_DAD_DECL(dlg); if (!PCB_HAVE_GUI_ATTR_DLG) { - PCB_ACT_IRES(0); /* no gui means auto-yes (for batch) */ + RND_ACT_IRES(0); /* no gui means auto-yes (for batch) */ return 2; } if (dialogs_conf.plugins.dialogs.file_overwrite_dialog.dont_ask) { - PCB_ACT_IRES(0); /* "don't ask" means yes to all */ + RND_ACT_IRES(0); /* "don't ask" means yes to all */ return 2; } - hidlib = PCB_ACT_HIDLIB; - PCB_ACT_CONVARG(1, FGW_STR, gui_MayOverwriteFile, fn = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_INT, gui_MayOverwriteFile, multi = argv[2].val.nat_int); + 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); PCB_DAD_BEGIN_VBOX(dlg); /* icon and label */ Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30899) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30900) @@ -188,8 +188,8 @@ const char pcb_acth_LogDialog[] = "Open the log dialog."; fgw_error_t pcb_act_LogDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - log_window_create(PCB_ACT_HIDLIB); - PCB_ACT_IRES(0); + log_window_create(RND_ACT_HIDLIB); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30899) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30900) @@ -66,7 +66,7 @@ { PCB_GUI_NOGUI(); pcb_gui->open_command(pcb_gui); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_hid_common/zoompan.c =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.c (revision 30899) +++ trunk/src_plugins/lib_hid_common/zoompan.c (revision 30900) @@ -38,7 +38,7 @@ const char pcb_acts_Zoom_default[] = pcb_gui_acts_zoom; fgw_error_t pcb_gui_act_zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; + pcb_hidlib_t *hidlib = RND_ACT_HIDLIB; const char *vp, *ovp; double v; pcb_coord_t x = 0, y = 0; @@ -53,10 +53,10 @@ if (argc == 5) { pcb_coord_t x1, y1, x2, y2; - PCB_ACT_CONVARG(1, FGW_COORD, Zoom, x1 = fgw_coord(&argv[1])); - PCB_ACT_CONVARG(2, FGW_COORD, Zoom, y1 = fgw_coord(&argv[2])); - PCB_ACT_CONVARG(3, FGW_COORD, Zoom, x2 = fgw_coord(&argv[3])); - PCB_ACT_CONVARG(4, FGW_COORD, Zoom, y2 = fgw_coord(&argv[4])); + 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])); pcb_gui->zoom_win(pcb_gui, x1, y1, x2, y2, 1); return 0; @@ -63,9 +63,9 @@ } if (argc > 2) - PCB_ACT_FAIL(Zoom); + RND_ACT_FAIL(Zoom); - PCB_ACT_CONVARG(1, FGW_STR, Zoom, ovp = vp = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, ovp = vp = argv[1].val.str); if (*vp == '?') { pcb_message(PCB_MSG_INFO, "Current zoom level (coord-per-pix): %$mm\n", pcb_gui->coord_per_pix); @@ -98,7 +98,7 @@ break; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -114,10 +114,10 @@ rnd_hid_get_coords("Click on a place to pan", &x, &y, 0); - PCB_ACT_CONVARG(1, FGW_INT, Pan, mode = argv[1].val.nat_int); + RND_PCB_ACT_CONVARG(1, FGW_INT, Pan, mode = argv[1].val.nat_int); pcb_gui->pan_mode(pcb_gui, x, y, mode); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -132,11 +132,11 @@ rnd_hid_get_coords("Click to center", &x, &y, 0); if (argc != 1) - PCB_ACT_FAIL(Center); + RND_ACT_FAIL(Center); pcb_gui->pan(pcb_gui, x, y, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -148,8 +148,8 @@ const char *op; double dx = 0.0, dy = 0.0, pixels = 100.0; - PCB_ACT_CONVARG(1, FGW_STR, Scroll, op = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, Scroll, pixels = argv[2].val.nat_double); + 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); if (pcb_strcasecmp(op, "up") == 0) dy = -pcb_gui->coord_per_pix * pixels; @@ -160,11 +160,11 @@ else if (pcb_strcasecmp(op, "left") == 0) dx = -pcb_gui->coord_per_pix * pixels; else - PCB_ACT_FAIL(Scroll); + RND_ACT_FAIL(Scroll); pcb_gui->pan(pcb_gui, dx, dy, 1); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_hid_common/zoompan.h =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.h (revision 30899) +++ trunk/src_plugins/lib_hid_common/zoompan.h (revision 30900) @@ -29,10 +29,10 @@ #define PCB_GUI_NOGUI() \ do { \ if ((pcb_gui == NULL) || (!pcb_gui->gui)) { \ - PCB_ACT_IRES(1); \ + RND_ACT_IRES(1); \ return 0; \ } \ - PCB_ACT_IRES(0); \ + RND_ACT_IRES(0); \ } while(0) Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 30899) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 30900) @@ -57,7 +57,7 @@ if (argc == 2) { const char *vp; - PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str); if (pcb_strcasecmp(vp, "selected") == 0) { pcb_box_t sb; @@ -119,8 +119,8 @@ pcb_layer_id_t lid; pcb_layer_type_t lyt; - PCB_ACT_CONVARG(1, FGW_STR, SwapSides, a = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str); + 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); switch (a[0]) { case 'h': case 'H': conf_toggle_heditor_("view/flip_x", view.flip_x); @@ -147,7 +147,7 @@ default: pcb_draw_inhibit_dec(); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -180,7 +180,7 @@ pcb_gui->invalidate_all(pcb_gui); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -200,10 +200,10 @@ PCB_GUI_NOGUI(); if (argc != 2 && argc != 3) - PCB_ACT_FAIL(Popup); + RND_ACT_FAIL(Popup); - PCB_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str); + 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); *name = '\0'; *name2 = '\0'; @@ -259,7 +259,7 @@ if ((r != 0) && (*name2 != '\0')) r = pcb_gui->open_popup(pcb_gui, name2); - PCB_ACT_IRES(r); + RND_ACT_IRES(r); return 0; } @@ -274,12 +274,12 @@ fgw_error_t er; fgw_arg_t r, args[4]; - PCB_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1])); - PCB_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str); + 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); if (pcb_strcasecmp(op, "select") == 0) { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; } else if (pcb_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; } - else PCB_ACT_FAIL(LayerHotkey); + else RND_ACT_FAIL(LayerHotkey); msg = "Layer hotkey syntax is the same as\n" @@ -295,11 +295,11 @@ args[1].type = FGW_STR; args[1].val.cstr = msg; args[2].type = FGW_STR; args[2].val.cstr = val; args[3].type = FGW_STR; args[3].val.cstr = title; - er = rnd_actionv_bin(PCB_ACT_HIDLIB, "promptfor", &r, 4, args); + er = rnd_actionv_bin(RND_ACT_HIDLIB, "promptfor", &r, 4, args); if ((er != 0) || ((r.type & FGW_STR) != FGW_STR)) { fgw_arg_free(&rnd_fgw, &r); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -306,6 +306,6 @@ pcb_attribute_put(&ly->Attributes, key, r.val.str); fgw_arg_free(&rnd_fgw, &r); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30899) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 30900) @@ -337,13 +337,13 @@ long idx = -1; if (argc > 2) - PCB_ACT_FAIL(AdjustStyle); + RND_ACT_FAIL(AdjustStyle); - PCB_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long); if (idx >= (long)vtroutestyle_len(&PCB->RouteStyle)) { pcb_message(PCB_MSG_ERROR, "Invalid route style %ld index; max value: %ld\n", idx, vtroutestyle_len(&PCB->RouteStyle)-1); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -351,10 +351,10 @@ idx = pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL); if (idx < 0) { pcb_message(PCB_MSG_ERROR, "No style selected\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); } } - PCB_ACT_IRES(pcb_dlg_rstdlg(idx)); + RND_ACT_IRES(pcb_dlg_rstdlg(idx)); return 0; } Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 30899) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 30900) @@ -346,9 +346,9 @@ const char *text = NULL; if (argc > 2) - PCB_ACT_FAIL(StatusSetText); + RND_ACT_FAIL(StatusSetText); - PCB_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str); if (text != NULL) { pcb_hid_attr_val_t hv; @@ -367,7 +367,7 @@ status_st_pcb2dlg(); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -388,10 +388,10 @@ char ids[64]; if (argc > 3) - PCB_ACT_FAIL(StatusSetText); + RND_ACT_FAIL(StatusSetText); - PCB_ACT_MAY_CONVARG(1, FGW_COORD, StatusSetText, x = fgw_coord(&argv[1])); - PCB_ACT_MAY_CONVARG(2, FGW_COORD, StatusSetText, y = fgw_coord(&argv[2])); + 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])); /* check if there are any pins or pads at that position */ type = pcb_search_obj_by_location(PCB_OBJ_CLASS_TERM, &ptr1, &ptr2, &ptr3, x, y, 0); Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 30899) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 30900) @@ -441,12 +441,12 @@ pcb_flag_t flg; int want_contour = 0, want_poly = 0, cont_specd = 0; - PCB_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str); + 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); if (pcb_strcasecmp(op, "interactive") == 0) { if (polyhatch_gui(&period, &dir, &flg, &want_contour) != 0) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -500,7 +500,7 @@ pcb_cpoly_hatch_lines(PCB_CURRLAYER(PCB), polygon, dir, period, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg); } PCB_ENDALL_LOOP; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -510,7 +510,7 @@ { pcb_coord_t offs; - PCB_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1])); PCB_POLY_ALL_LOOP(PCB->Data); { pcb_poly_t *p; @@ -521,7 +521,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, p); } PCB_ENDALL_LOOP; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 30899) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 30900) @@ -342,7 +342,7 @@ const char *op = NULL; void *r1, *r2, *r3; - PCB_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str); if (op == NULL) { pcb_coord_t x, y; @@ -349,7 +349,7 @@ rnd_hid_get_coords("Click on a line or arc of the contour loop", &x, &y, 0); if (pcb_search_screen(x, y, CONT_TYPE, &r1, &r2, &r3) == 0) { pcb_message(PCB_MSG_ERROR, "ToPoly(): failed to find a line or arc there\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -356,17 +356,17 @@ else { if (strcmp(op, "outline") == 0) { pcb_topoly_1st_outline(PCB, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } else { pcb_message(PCB_MSG_ERROR, "Invalid first argument\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } pcb_topoly_conn(PCB, r2, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/millpath/millpath.c =================================================================== --- trunk/src_plugins/millpath/millpath.c (revision 30899) +++ trunk/src_plugins/millpath/millpath.c (revision 30900) @@ -47,16 +47,16 @@ fgw_error_t pcb_act_mill(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *script = NULL; - pcb_board_t *pcb = (pcb_board_t *)PCB_ACT_HIDLIB; + pcb_board_t *pcb = (pcb_board_t *)RND_ACT_HIDLIB; ctx.edge_clearance = PCB_MM_TO_COORD(0.05); ctx.tools = &tools; - PCB_ACT_MAY_CONVARG(1, FGW_STR, mill, script = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, mill, script = argv[1].val.str); if (script == NULL) - PCB_ACT_IRES(pcb_tlp_mill_copper_layer(pcb, &ctx, pcb_get_layergrp(pcb, PCB_CURRLAYER(PCB)->meta.real.grp))); + RND_ACT_IRES(pcb_tlp_mill_copper_layer(pcb, &ctx, pcb_get_layergrp(pcb, PCB_CURRLAYER(PCB)->meta.real.grp))); else - PCB_ACT_IRES(pcb_tlp_mill_script(pcb, &ctx, pcb_get_layergrp(pcb, PCB_CURRLAYER(PCB)->meta.real.grp), script)); + RND_ACT_IRES(pcb_tlp_mill_script(pcb, &ctx, pcb_get_layergrp(pcb, PCB_CURRLAYER(PCB)->meta.real.grp), script)); return 0; } Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 30899) +++ trunk/src_plugins/oldactions/oldactions.c (revision 30900) @@ -113,7 +113,7 @@ { dump_lib_any(0, &pcb_library); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -128,7 +128,7 @@ static fgw_error_t pcb_act_Bell(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_gui->beep(pcb_gui); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -147,12 +147,12 @@ printf("Debug:"); for (i = 1; i < argc; i++) { const char *s; - PCB_ACT_CONVARG(i, FGW_STR, debugxy, s = argv[i].val.str); + RND_PCB_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); pcb_printf(" x,y %$mD\n", x, y); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -170,7 +170,7 @@ fgw_error_t pcb_act_djopt_set_auto_only(fgw_arg_t *res, int argc, fgw_arg_t *argv) { conf_toggle(CFR_DESIGN, "plugins/djopt/auto_only"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -190,7 +190,7 @@ fgw_error_t pcb_act_ToggleVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { conf_toggle(CFR_DESIGN, "plugins/vendor/enable"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -209,7 +209,7 @@ fgw_error_t pcb_act_EnableVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_conf_set(CFR_DESIGN, "plugins/vendor/enable", -1, "1", POL_OVERWRITE); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -226,7 +226,7 @@ fgw_error_t pcb_act_DisableVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_conf_set(CFR_DESIGN, "plugins/vendor/enable", -1, "0", POL_OVERWRITE); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -242,7 +242,7 @@ pcb_message(PCB_MSG_INFO, " %s\n", refdes); } PCB_END_LOOP; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -254,8 +254,8 @@ static fgw_error_t pcb_act_PCBChanged(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *rv = NULL; - PCB_ACT_IRES(0); - PCB_ACT_MAY_CONVARG(1, FGW_STR, PCBChanged, rv = argv[1].val.str); + RND_ACT_IRES(0); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, PCBChanged, rv = argv[1].val.str); pcb_board_changed((rv != NULL) && (pcb_strcasecmp(rv, "revert") == 0)); return 0; } @@ -291,7 +291,7 @@ static fgw_error_t pcb_act_ImportGUI(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_message(PCB_MSG_ERROR, "The ImportGUI() action is deprecated. Using ImportSch() instead.\nFor details see: http://repo.hu/projects/pcb-rnd/help/err0002.html\n"); - PCB_ACT_IRES(rnd_actionva(PCB_ACT_HIDLIB, "ImportSch", NULL)); + RND_ACT_IRES(rnd_actionva(RND_ACT_HIDLIB, "ImportSch", NULL)); return 0; } @@ -305,7 +305,7 @@ static fgw_error_t pcb_act_Import(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_message(PCB_MSG_ERROR, "Import() is the old, deprecated import netlist/schematics action that got removed\nPlease switch over to using the new action, ImportSch().\nFor details see: http://repo.hu/projects/pcb-rnd/help/err0002.html\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30899) +++ trunk/src_plugins/order/order.c (revision 30900) @@ -65,15 +65,15 @@ { const char *cmd = "gui"; - PCB_ACT_MAY_CONVARG(1, FGW_STR, OrderPCB, cmd = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, OrderPCB, cmd = argv[1].val.str); if (strcmp(cmd, "gui") == 0) { - PCB_ACT_IRES(order_dialog()); + RND_ACT_IRES(order_dialog()); return 0; } pcb_message(PCB_MSG_ERROR, "CLI version of OrderPCB() not yet implemented\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 30899) +++ trunk/src_plugins/polycombine/polycombine.c (revision 30900) @@ -328,7 +328,7 @@ pcb_undo_inc_serial(); pcb_draw(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 30899) +++ trunk/src_plugins/polystitch/polystitch.c (revision 30900) @@ -110,7 +110,7 @@ pcb_poly_remove(inner_poly->parent.layer, inner_poly); } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 30899) +++ trunk/src_plugins/propedit/propdlg.c (revision 30900) @@ -665,7 +665,7 @@ if (argc > 1) { for(a = 1; a < argc; a++) { const char *cmd; - PCB_ACT_CONVARG(a, FGW_STR, propedit, cmd = argv[a].val.str); + RND_PCB_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 30899) +++ trunk/src_plugins/propedit/propedit.c (revision 30900) @@ -183,18 +183,18 @@ pcb_props_init(&ctx, PCB); - PCB_ACT_CONVARG(1, FGW_STR, propset, first = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, propset, first = argv[1].val.str); if (prop_scope_add(&ctx, first, 1) == 0) { - PCB_ACT_CONVARG(2, FGW_STR, propset, name = argv[2].val.str); - PCB_ACT_CONVARG(3, FGW_STR, propset, val = argv[3].val.str); + 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); } else { name = first; ctx.selection = 1; - PCB_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str); + RND_PCB_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str); } - PCB_ACT_IRES(pcb_propsel_set_str(&ctx, name, val)); + RND_ACT_IRES(pcb_propsel_set_str(&ctx, name, val)); prop_scope_finish(&ctx); pcb_props_uninit(&ctx); @@ -214,15 +214,15 @@ pcb_props_init(&ctx, PCB); - PCB_ACT_CONVARG(1, FGW_STR, propget, first = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, propget, first = argv[1].val.str); if (prop_scope_add(&ctx, first, 1) == 0) { - PCB_ACT_CONVARG(2, FGW_STR, propget, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, propget, stty = argv[3].val.str); + 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); } else { name = first; ctx.selection = 1; - PCB_ACT_CONVARG(2, FGW_STR, propget, stty = argv[2].val.str); + RND_PCB_ACT_CONVARG(2, FGW_STR, propget, stty = argv[2].val.str); } ctx.geo = 1; @@ -285,7 +285,7 @@ pcb_props_init(&ctx, PCB); - PCB_ACT_MAY_CONVARG(1, FGW_STR, propset, scope = argv[1].val.str); + rnd_PCB_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; @@ -329,7 +329,7 @@ prop_scope_finish(&ctx); pcb_props_uninit(&ctx); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 30899) +++ trunk/src_plugins/puller/puller.c (revision 30900) @@ -353,7 +353,7 @@ if (!find_pair(pcb_crosshair.X, pcb_crosshair.Y)) { if (!find_pair(Ux, Uy)) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -370,7 +370,7 @@ #if TRACE1 printf("Line endpoint not at cursor\n"); #endif - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } ex = the_line->Point1.X; @@ -385,7 +385,7 @@ #if TRACE1 printf("arc not endpoints\n"); #endif - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -393,7 +393,7 @@ #if TRACE1 printf("line ends inside arc\n"); #endif - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -442,7 +442,7 @@ pcb_gui->invalidate_all(pcb_gui); pcb_undo_inc_serial(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -2079,7 +2079,7 @@ nloops = 0; npulled = 0; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, GlobalPuller, op = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, GlobalPuller, op = fgw_keyword(&argv[1])); switch(op) { case F_Selected: select_flags = PCB_FLAG_SELECTED; break; @@ -2086,7 +2086,7 @@ case F_Found: select_flags = PCB_FLAG_FOUND; break; case -2: select_flags = 0; break; default: - PCB_ACT_FAIL(GlobalPuller); + RND_ACT_FAIL(GlobalPuller); } /* This canonicalizes all the lines, and cleans up near-misses. */ @@ -2179,7 +2179,7 @@ g_hash_table_unref(arcs); pcb_undo_inc_serial(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 30899) +++ trunk/src_plugins/query/query_act.c (revision 30900) @@ -214,11 +214,11 @@ sel.cnt = 0; - PCB_ACT_CONVARG(1, FGW_STR, query, cmd = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + 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); if (strcmp(cmd, "version") == 0) { - PCB_ACT_IRES(0100); /* 1.0 */ + RND_ACT_IRES(0100); /* 1.0 */ return 0; } @@ -225,13 +225,13 @@ if (strcmp(cmd, "dump") == 0) { pcb_qry_node_t *prg = NULL; - PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + rnd_PCB_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); pcb_qry_dump_tree(" ", prg); pcb_qry_n_free(prg); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -239,8 +239,8 @@ int errs; eval_stat_t st; - PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); + 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); memset(&st, 0, sizeof(st)); st.print_idpath = (cmd[4] != '\0'); @@ -251,7 +251,7 @@ printf("Failed to run the query\n"); else printf("eval statistics: true=%d false=%d errors=%d\n", st.trues, st.falses, errs); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -264,13 +264,13 @@ sel.what = flg.f; if (sel.what == 0) { pcb_message(PCB_MSG_ERROR, "Invalid flag '%s'\n", cmd+8); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } } - PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); + 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); if (pcb_qry_run_script(NULL, PCB_ACT_BOARD, arg, scope, flagop_cb, &sel) < 0) printf("Failed to run the query\n"); @@ -279,7 +279,7 @@ if (PCB_HAVE_GUI_ATTR_DLG) pcb_hid_redraw(PCB); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -292,13 +292,13 @@ sel.what = flg.f; if (sel.what == 0) { pcb_message(PCB_MSG_ERROR, "Invalid flag '%s'\n", cmd+8); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } } - PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, query, scope = argv[3].val.str); + 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); if (pcb_qry_run_script(NULL, PCB_ACT_BOARD, arg, scope, flagop_cb, &sel) < 0) printf("Failed to run the query\n"); @@ -307,7 +307,7 @@ if (PCB_HAVE_GUI_ATTR_DLG) pcb_hid_redraw(PCB); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -314,17 +314,17 @@ if (strcmp(cmd, "append") == 0) { pcb_idpath_list_t *list; - PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, query, list = fgw_idpath_list(&argv[2])); - PCB_ACT_MAY_CONVARG(3, FGW_STR, query, arg = argv[3].val.str); - PCB_ACT_MAY_CONVARG(4, FGW_STR, query, scope = argv[4].val.str); + 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); if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST)) return FGW_ERR_PTR_DOMAIN; if (pcb_qry_run_script(NULL, PCB_ACT_BOARD, arg, scope, append_cb, list) < 0) - PCB_ACT_IRES(1); + RND_ACT_IRES(1); else - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -331,22 +331,22 @@ if (strcmp(cmd, "view") == 0) { fgw_arg_t args[4], ares; pcb_view_list_t *view = calloc(sizeof(pcb_view_list_t), 1); - PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str); + rnd_PCB_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"; fgw_ptr_reg(&rnd_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view); - rnd_actionv_bin(PCB_ACT_HIDLIB, "viewlist", &ares, 4, args); - PCB_ACT_IRES(0); + rnd_actionv_bin(RND_ACT_HIDLIB, "viewlist", &ares, 4, args); + RND_ACT_IRES(0); } else { free(view); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); } return 0; } - PCB_ACT_FAIL(query); + RND_ACT_FAIL(query); } static const char *PTR_DOMAIN_PCFIELD = "ptr_domain_query_precompiled_field"; @@ -460,11 +460,11 @@ pcb_qry_val_t val; int free_fld = 0; - PCB_ACT_CONVARG(1, FGW_IDPATH, QueryObj, idp = fgw_idpath(&argv[1])); + RND_PCB_ACT_CONVARG(1, FGW_IDPATH, QueryObj, idp = fgw_idpath(&argv[1])); if ((argv[2].type & FGW_STR) == FGW_STR) { const char *field; - PCB_ACT_CONVARG(2, FGW_STR, QueryObj, field = argv[2].val.str); + RND_PCB_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:; - PCB_ACT_CONVARG(2, FGW_PTR, QueryObj, fld = argv[2].val.ptr_void); + RND_PCB_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; - PCB_ACT_CONVARG(1, FGW_STR, QueryCompileField, cmd = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, QueryCompileField, cmd = argv[1].val.str); switch(*cmd) { case 'c': /* compile */ - PCB_ACT_CONVARG(2, FGW_STR, QueryCompileField, fname = argv[2].val.str); + RND_PCB_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; - PCB_ACT_CONVARG(2, FGW_PTR, QueryCompileField, fld = argv[2].val.ptr_void); + RND_PCB_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 30899) +++ trunk/src_plugins/renumber/renumber.c (revision 30900) @@ -81,7 +81,7 @@ int ok; pcb_bool free_name = pcb_false; - PCB_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str); if (name == NULL) { /* @@ -110,7 +110,7 @@ if (pcb_hid_message_box(&PCB->hidlib, "warning", "Renumber: overwrite", "File exists! Ok to overwrite?", "cancel", 0, "overwrite", 1, NULL) != 1) { if (free_name && name) free((char*)name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } } @@ -119,7 +119,7 @@ pcb_message(PCB_MSG_ERROR, "Could not open %s\n", name); if (free_name && name) free((char*)name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -339,7 +339,7 @@ free(ox_list); free(oy_list); free(cnt_list); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 30899) +++ trunk/src_plugins/renumber/renumberblock.c (revision 30900) @@ -33,8 +33,8 @@ char num_buf[15]; int old_base, new_base; - PCB_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int); - PCB_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int); + 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); conf_set_editor(name_on_pcb, 1); @@ -65,7 +65,7 @@ } PCB_END_LOOP; pcb_undo_inc_serial(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -78,8 +78,8 @@ char num_buf[15]; int old_base, new_base; - PCB_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int); - PCB_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int); + 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); conf_set_editor(name_on_pcb, 1); @@ -108,6 +108,6 @@ } PCB_END_LOOP; - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 30899) +++ trunk/src_plugins/report/report.c (revision 30900) @@ -369,8 +369,8 @@ pcb_coord_t x, y; rnd_hid_get_coords("Click on object to report on", &x, &y, 0); - PCB_ACT_MAY_CONVARG(1, FGW_STR, reportdialog, op = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, reportdialog, how = argv[2].val.str); + 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); gds_init(&tmp); @@ -395,7 +395,7 @@ case PCB_OBJ_POLY_POINT: report_point(&tmp, type, ptr1, ptr2); break; case PCB_OBJ_VOID: pcb_message(PCB_MSG_INFO, "Nothing found to report on\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; default: pcb_append_printf(&tmp, "Unknown\n"); break; } @@ -418,7 +418,7 @@ rdialog("Report", tmp.array); gds_uninit(&tmp); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -550,7 +550,7 @@ pcb_coord_t x = 0, y = 0; gds_t err; - PCB_ACT_MAY_CONVARG(2, FGW_STR, Report, units_name = argv[2].val.str); + rnd_PCB_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; pcb_coord_t x, y; - PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str); if (pcb_strcasecmp(cmd, "Object") == 0) { rnd_hid_get_coords("Click on an object", &x, &y, 0); @@ -791,11 +791,11 @@ else if (pcb_strcasecmp(cmd, "AllNetLengths") == 0) return report_all_net_lengths(res, argc, argv); else if (pcb_strcasecmp(cmd, "NetLength") == 0) { - PCB_ACT_CONVARG(2, FGW_STR, Report, name = argv[2].val.str); + RND_PCB_ACT_CONVARG(2, FGW_STR, Report, name = argv[2].val.str); return report_net_length_by_name(name); } - PCB_ACT_FAIL(Report); + RND_ACT_FAIL(Report); } static fgw_error_t pcb_act_info(fgw_arg_t *res, int argc, fgw_arg_t *argv) @@ -814,7 +814,7 @@ putchar(j == lg ? '#' : '-'); printf(" %c %s\n", (gflg & PCB_LYT_TOP) ? 'c' : (gflg & PCB_LYT_BOTTOM) ? 's' : '-', PCB->Data->Layer[i].name); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30899) +++ trunk/src_plugins/script/live_script.c (revision 30900) @@ -439,9 +439,9 @@ live_script_t *lvs; const char *cmd = "new", *name = NULL, *arg = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LiveScript, cmd = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, LiveScript, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, LiveScript, arg = argv[3].val.str); + 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); if (pcb_strcasecmp(cmd, "new") == 0) { if (name == NULL) name = "default"; @@ -448,22 +448,22 @@ lvs = htsp_get(&pcb_live_scripts, name); if (lvs != NULL) { pcb_message(PCB_MSG_ERROR, "live script '%s' is already open\n", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - lvs = pcb_dlg_live_script(PCB_ACT_HIDLIB, name); + lvs = pcb_dlg_live_script(RND_ACT_HIDLIB, name); if (lvs != NULL) { htsp_set(&pcb_live_scripts, lvs->name, lvs); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); } else - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (name == NULL) { pcb_message(PCB_MSG_ERROR, "script name (second argument) required\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -470,19 +470,19 @@ lvs = htsp_get(&pcb_live_scripts, name); if (lvs == NULL) { pcb_message(PCB_MSG_ERROR, "script '%s' does not exist\n", name); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); if (pcb_strcasecmp(cmd, "load") == 0) { - PCB_ACT_IRES(live_load(NULL, lvs, arg)); + RND_ACT_IRES(live_load(NULL, lvs, arg)); } else if (pcb_strcasecmp(cmd, "save") == 0) { - PCB_ACT_IRES(live_save(NULL, lvs, arg)); + RND_ACT_IRES(live_save(NULL, lvs, arg)); } else if (pcb_strcasecmp(cmd, "undo") == 0) { - PCB_ACT_IRES(live_undo(lvs)); + RND_ACT_IRES(live_undo(lvs)); } else if (pcb_strcasecmp(cmd, "run") == 0) { live_run(NULL, lvs); Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 30899) +++ trunk/src_plugins/script/script.c (revision 30900) @@ -175,7 +175,7 @@ fn = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, DOT_PCB_RND, PCB_DIR_SEPARATOR_S, SCRIPT_PERS, PCB_DIR_SEPARATOR_S, script_persistency_id, NULL); if (strcmp(cmd, "remove") == 0) { - PCB_ACT_IRES(pcb_remove(NULL, fn)); + RND_ACT_IRES(pcb_remove(NULL, fn)); goto succ; } @@ -213,7 +213,7 @@ pcb_message(PCB_MSG_ERROR, "Unknown command for ScriptPersistency\n"); err:; - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; succ: Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30899) +++ trunk/src_plugins/script/script_act.c (revision 30900) @@ -308,13 +308,13 @@ static fgw_error_t pcb_act_LoadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *id, *fn, *lang = NULL; - PCB_ACT_CONVARG(1, FGW_STR, LoadScript, id = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, LoadScript, fn = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadScript, lang = argv[3].val.str); + 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); ID_VALIDATE(id, LoadScript); - PCB_ACT_IRES(pcb_script_load(id, fn, lang)); + RND_ACT_IRES(pcb_script_load(id, fn, lang)); script_dlg_update(); return 0; } @@ -325,11 +325,11 @@ static fgw_error_t pcb_act_UnloadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *id = NULL; - PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); ID_VALIDATE(id, UnloadScript); - PCB_ACT_IRES(pcb_script_unload(id, "unload")); + RND_ACT_IRES(pcb_script_unload(id, "unload")); return 0; } @@ -339,11 +339,11 @@ static fgw_error_t pcb_act_ReloadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *id = NULL; - PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str); ID_VALIDATE(id, ReloadScript); - PCB_ACT_IRES(script_reload(id)); + RND_ACT_IRES(script_reload(id)); script_dlg_update(); return 0; } @@ -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; - PCB_ACT_CONVARG(1, FGW_STR, ScriptPersistency, cmd = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, ScriptPersistency, cmd = argv[1].val.str); return script_persistency(res, cmd); } @@ -364,11 +364,11 @@ static fgw_error_t pcb_act_ListScripts(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *pat = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, ListScripts, pat = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, ListScripts, pat = argv[1].val.str); script_list(pat); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -377,7 +377,7 @@ static fgw_error_t pcb_act_BrowseScripts(fgw_arg_t *res, int argc, fgw_arg_t *argv) { script_dlg_open(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -402,26 +402,26 @@ if (strcmp(lang, "oneliner") == 0) { /* call to oneliner(lang, script) */ - PCB_ACT_CONVARG(1, FGW_STR, Oneliner, lang = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, Oneliner, scr = argv[2].val.str); + 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); } else if (strcmp(lang, "/exit") == 0) { - PCB_ACT_IRES(rnd_cli_leave()); + RND_ACT_IRES(rnd_cli_leave()); return 0; } else { /* call to lang(script) */ - PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, scr = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, scr = argv[1].val.str); } - PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, first = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, first = argv[1].val.str); if (first != NULL) { if (*first == '/') { if (pcb_strcasecmp(scr, "/exit") == 0) { - PCB_ACT_IRES(rnd_cli_leave()); + RND_ACT_IRES(rnd_cli_leave()); return 0; } - PCB_ACT_IRES(-1); /* ignore /click, /tab and others for now */ + RND_ACT_IRES(-1); /* ignore /click, /tab and others for now */ return 0; } } @@ -429,16 +429,16 @@ lang = guess_lang(lang); if (scr == NULL) { - PCB_ACT_IRES(rnd_cli_enter(lang, lang)); + RND_ACT_IRES(rnd_cli_enter(lang, lang)); return 0; } if (pcb_strcasecmp(scr, "/exit") == 0) { - PCB_ACT_IRES(rnd_cli_leave()); + RND_ACT_IRES(rnd_cli_leave()); return 0; } - PCB_ACT_IRES(script_oneliner(lang, scr)); + RND_ACT_IRES(script_oneliner(lang, scr)); return 0; } @@ -449,7 +449,7 @@ const char *actname = argv[0].val.func->name; double a; - PCB_ACT_CONVARG(1, FGW_DOUBLE, pcb_math1, a = argv[1].val.nat_double); + RND_PCB_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; - PCB_ACT_CONVARG(1, FGW_DOUBLE, pcb_math2, a = argv[1].val.nat_double); - PCB_ACT_CONVARG(2, FGW_DOUBLE, pcb_math2, b = argv[2].val.nat_double); + 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); 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 30899) +++ trunk/src_plugins/script/timer.c (revision 30900) @@ -126,12 +126,12 @@ char fn[PCB_ACTION_NAME_MAX]; script_timer_t *t; - PCB_ACT_CONVARG(1, FGW_STR, AddTimer, act = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_DOUBLE, AddTimer, period = argv[2].val.nat_double); - PCB_ACT_MAY_CONVARG(3, FGW_INT, AddTimer, count = argv[3].val.nat_int); - PCB_ACT_MAY_CONVARG(4, FGW_STR, AddTimer, user_data = argv[4].val.str); + 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); - pcb_aname(fn, act); + rnd_aname(fn, act); len = strlen(fn); t = malloc(sizeof(script_timer_t) + len); t->next = pcb_dtime() + period; @@ -148,6 +148,6 @@ if (!timer_running) start_timer(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 30899) +++ trunk/src_plugins/serpentine/serpentine.c (revision 30900) @@ -431,7 +431,7 @@ fgw_error_t pcb_act_serpentine(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_tool_select_by_name(&PCB->hidlib, "serpentine"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 30899) +++ trunk/src_plugins/shand_cmd/command.c (revision 30900) @@ -63,7 +63,7 @@ " s [file] save layout\n" " w [file] save layout\n" " wq [file] save layout and quit\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -74,13 +74,13 @@ { const char *filename, *format = NULL; - PCB_ACT_CONVARG(1, FGW_STR, LoadLayout, filename = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayout, format = argv[2].val.str); + 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); - if (!PCB->Changed || (pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "Load data lose", "OK to override layout data?", "cancel", 0, "ok", 1, NULL) == 1)) + if (!PCB->Changed || (pcb_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, pcb_true, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -91,12 +91,12 @@ { const char *filename; - PCB_ACT_CONVARG(1, FGW_STR, LoadElementToBuffer, filename = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, LoadElementToBuffer, filename = argv[1].val.str); if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, filename, NULL)) pcb_tool_select_by_name(&PCB->hidlib, "buffer"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -107,13 +107,13 @@ { const char *filename, *format = NULL; - PCB_ACT_CONVARG(1, FGW_STR, LoadLayoutToBuffer, filename = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayoutToBuffer, format = argv[2].val.str); + 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); if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, filename, format)) pcb_tool_select_by_name(&PCB->hidlib, "buffer"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -122,9 +122,9 @@ /* DOC: q.html */ static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - if (!PCB->Changed || (pcb_hid_message_box(PCB_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) + if (!PCB->Changed || (pcb_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) pcb_quit_app(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -134,7 +134,7 @@ static fgw_error_t pcb_act_ReallyQuit(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_quit_app(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -145,13 +145,13 @@ { const char *filename; - PCB_ACT_CONVARG(1, FGW_STR, LoadNetlist, filename = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, LoadNetlist, filename = argv[1].val.str); if (PCB->Netlistname) free(PCB->Netlistname); PCB->Netlistname = pcb_strdup_strip_wspace(filename); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -162,7 +162,7 @@ { const char *filename = NULL; - PCB_ACT_MAY_CONVARG(1, FGW_STR, SaveLayout, filename = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, SaveLayout, filename = argv[1].val.str); if (filename == NULL) { if (PCB->hidlib.filename) { @@ -181,7 +181,7 @@ } } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -190,10 +190,10 @@ /* DOC: wq.html */ static fgw_error_t pcb_act_SaveLayoutAndQuit(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - if (PCB_ACT_CALL_C(pcb_act_SaveLayout, res, argc, argv) == 0) + if (RND_ACT_CALL_C(pcb_act_SaveLayout, res, argc, argv) == 0) return pcb_act_Quit(res, argc, argv); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 30899) +++ trunk/src_plugins/shape/shape.c (revision 30900) @@ -389,22 +389,22 @@ if (argc < 3) { pcb_message(PCB_MSG_ERROR, "regpoly() needs at least two parameters\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (argc > 5) { pcb_message(PCB_MSG_ERROR, "regpoly(): too many arguments\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } memset(args, 0, sizeof(args)); for(n = 1; n < argc; n++) - PCB_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str); + rnd_PCB_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) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -411,7 +411,7 @@ corners = strtol(args[a], &end, 10); if (*end != '\0') { pcb_message(PCB_MSG_ERROR, "regpoly(): invalid number of corners '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } a++; @@ -420,7 +420,7 @@ succ = parse2coords(args[a], &rx, &ry); if (!succ) { pcb_message(PCB_MSG_ERROR, "regpoly(): invalid radius '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } a++; @@ -429,7 +429,7 @@ rot = strtod(args[a], &end); if (*end != '\0') { pcb_message(PCB_MSG_ERROR, "regpoly(): invalid rotation '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -440,7 +440,7 @@ if (regpoly_place(data, PCB_CURRLAYER(PCB), corners, rx, ry, rot, x, y) == NULL) pcb_message(PCB_MSG_ERROR, "regpoly(): failed to create the polygon\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -460,23 +460,23 @@ if (argc < 2) { pcb_message(PCB_MSG_ERROR, "roundrect() needs at least one parameters\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (argc > 8) { pcb_message(PCB_MSG_ERROR, "roundrect(): too many arguments\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } memset(args, 0, sizeof(args)); for(n = 1; n < argc; n++) - PCB_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str); + rnd_PCB_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); if (a < 0) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -491,7 +491,7 @@ succ = parse2coords(args[a], &w, &h); if (!succ) { pcb_message(PCB_MSG_ERROR, "roundrect(): invalid width or height '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } a++; @@ -501,7 +501,7 @@ succ = parse2coords(args[a], &rx, &ry); if (!succ) { pcb_message(PCB_MSG_ERROR, "roundrect(): invalid width or height '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } a++; @@ -513,7 +513,7 @@ rot = strtod(args[a], &end); if (*end != '\0') { pcb_message(PCB_MSG_ERROR, "roundrect(): invalid rotation '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } a++; @@ -529,7 +529,7 @@ case 'c': case 'C': corner[n] = PCB_CORN_CHAMF; break; default: pcb_message(PCB_MSG_ERROR, "roundrect(): invalid corner style character '%c' - has to eb r for round, q for square or c for chamfed", *s); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } } @@ -540,7 +540,7 @@ roundres = strtod(args[a], &end); if (*end != '\0') { pcb_message(PCB_MSG_ERROR, "roundrect(): roundness '%s'\n", args[a]); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (roundres < 0.1) @@ -556,7 +556,7 @@ if (roundrect_place(data, PCB_CURRLAYER(PCB), w, h, rx, ry, rot, x, y, corner, roundres) == NULL) pcb_message(PCB_MSG_ERROR, "roundrect(): failed to create the polygon\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -572,22 +572,22 @@ if (argc < 2) { pcb_message(PCB_MSG_ERROR, "circle() needs at least one parameters (diameter)\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } if (argc > 3) { pcb_message(PCB_MSG_ERROR, "circle(): too many arguments\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } memset(args, 0, sizeof(args)); for(n = 1; n < argc; n++) - PCB_ACT_MAY_CONVARG(n, FGW_STR, circle, args[n-1] = argv[n].val.str); + rnd_PCB_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) { - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } @@ -594,13 +594,13 @@ dia = pcb_get_value(args[a], NULL, NULL, &succ); if (!succ) { pcb_message(PCB_MSG_ERROR, "circle(): failed to convert dia: invalid coord (%s)\n", args[a]); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if ((dia < 1) || (dia > (PCB->hidlib.size_x + PCB->hidlib.size_y)/4)) { pcb_message(PCB_MSG_ERROR, "circle(): invalid diameter\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -610,7 +610,7 @@ if (circle_place(PCB->Data, PCB_CURRLAYER(PCB), dia, x, y) == NULL) pcb_message(PCB_MSG_ERROR, "circle(): failed to create the polygon\n"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 30899) +++ trunk/src_plugins/shape/shape_dialog.c (revision 30900) @@ -400,7 +400,7 @@ fgw_error_t pcb_act_shape(fgw_arg_t *res, int argc, fgw_arg_t *argv) { pcb_shape_dialog(PCB, PCB_PASTEBUFFER->Data, pcb_shape_current_layer, pcb_false); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 30899) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 30900) @@ -1147,7 +1147,7 @@ sketches_uninit(); sketches_init(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -1157,7 +1157,7 @@ { pcb_tool_select_by_name(&PCB->hidlib, "skline"); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -1166,7 +1166,7 @@ fgw_error_t pcb_act_sktransform(fgw_arg_t *res, int argc, fgw_arg_t *argv) { /* TODO */ - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 30899) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 30900) @@ -109,7 +109,7 @@ int all; htsp_entry_t *e; - PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, smartdisperse, op = fgw_keyword(&argv[1])); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, smartdisperse, op = fgw_keyword(&argv[1])); switch(op) { case -2: @@ -116,12 +116,12 @@ case F_All: all = 1; break; case F_Selected: all = 0; break; default: - PCB_ACT_FAIL(smartdisperse); + RND_ACT_FAIL(smartdisperse); } if (nl->used == 0) { pcb_message(PCB_MSG_ERROR, "Can't use SmartDisperse because no netlist is loaded.\n"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -220,7 +220,7 @@ pcb_hid_redraw(PCB); pcb_board_set_changed_flag(1); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 30899) +++ trunk/src_plugins/stroke/stroke.c (revision 30900) @@ -114,13 +114,13 @@ { const char *cmd, *arg = NULL; - PCB_ACT_CONVARG(1, FGW_STR, stroke, cmd = argv[1].val.str); + RND_PCB_ACT_CONVARG(1, FGW_STR, stroke, cmd = argv[1].val.str); if (strcmp(cmd, "gesture") == 0) { - PCB_ACT_MAY_CONVARG(2, FGW_STR, stroke, arg = argv[2].val.str); + rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, stroke, arg = argv[2].val.str); if (arg == NULL) - PCB_ACT_FAIL(stroke); - pcb_stroke_exec(PCB_ACT_HIDLIB, arg); + RND_ACT_FAIL(stroke); + pcb_stroke_exec(RND_ACT_HIDLIB, arg); } else if (pcb_strcasecmp(cmd, "zoom") == 0) { fgw_arg_t args[5]; @@ -128,11 +128,11 @@ if (f == NULL) { pcb_message(PCB_MSG_ERROR, "zoomto action is not available"); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } - args[0].type = FGW_FUNC; args[0].val.argv0.func = f; args[0].val.argv0.user_call_ctx = PCB_ACT_HIDLIB; + args[0].type = FGW_FUNC; args[0].val.argv0.func = f; args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; args[1].type = FGW_COORD; fgw_coord(&args[1]) = stroke_first_x; args[2].type = FGW_COORD; fgw_coord(&args[2]) = stroke_first_y; args[3].type = FGW_COORD; fgw_coord(&args[3]) = stroke_last_x; @@ -140,11 +140,11 @@ return rnd_actionv_(f, res, 5, args); } else if (pcb_strcasecmp(cmd, "stopline") == 0) - rnd_actionva(PCB_ACT_HIDLIB, "Tool", "Escape", NULL); + rnd_actionva(RND_ACT_HIDLIB, "Tool", "Escape", NULL); else - PCB_ACT_FAIL(stroke); + RND_ACT_FAIL(stroke); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 30899) +++ trunk/src_plugins/teardrops/teardrops.c (revision 30900) @@ -263,7 +263,7 @@ if (new_arcs) pcb_undo_inc_serial(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30899) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30900) @@ -111,7 +111,7 @@ pcb_hid_busy(PCB, 1); apply_vendor_map(); pcb_hid_busy(PCB, 0); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -122,7 +122,7 @@ cached_drill = -1; vendor_free_all(); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -141,7 +141,7 @@ cached_drill = -1; - PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str); + rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str); if (!fname || !*fname) { fname = pcb_gui->fileselect(pcb_gui, "Load Vendor Resource File...", @@ -150,7 +150,7 @@ "particular vendor as well as a list of\n" "predefined drills which are allowed.", default_file, ".res", NULL, "vendor", PCB_HID_FSD_READ, NULL); if (fname == NULL) { - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -169,7 +169,7 @@ doc = pcb_hid_cfg_load_lht(&PCB->hidlib, fname); if (doc == NULL) { pcb_message(PCB_MSG_ERROR, "Could not load vendor resource file \"%s\"\n", fname); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } @@ -276,7 +276,7 @@ if (free_fname) free((char*)fname); lht_dom_uninit(doc); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; }