Index: trunk/doc/developer/plugin/template_pup/ext_foo.c =================================================================== --- trunk/doc/developer/plugin/template_pup/ext_foo.c (revision 30897) +++ trunk/doc/developer/plugin/template_pup/ext_foo.c (revision 30898) @@ -41,7 +41,7 @@ return 0; } -static const pcb_action_t ext_foo_action_list[] = { +static const rnd_action_t ext_foo_action_list[] = { {"ExtFoo", pcb_act_ExtFoo, pcb_acth_ExtFoo, pcb_acts_ExtFoo} }; @@ -50,7 +50,7 @@ void pplg_uninit_ext_foo(void) { fprintf(stderr, "EXT FOO uninit\n"); - pcb_remove_actions_by_cookie(ext_foo_cookie); + rnd_remove_actions_by_cookie(ext_foo_cookie); } Index: trunk/src/actions_pcb.c =================================================================== --- trunk/src/actions_pcb.c (revision 30897) +++ trunk/src/actions_pcb.c (revision 30898) @@ -270,18 +270,18 @@ const char *str = arg->val.str; pcb_idpath_t *idp = pcb_str2idpath(PCB, str); if (idp != NULL) { - fgw_ptr_reg(&pcb_fgw, arg, PCB_PTR_DOMAIN_IDPATH, FGW_IDPATH, idp); + fgw_ptr_reg(&rnd_fgw, arg, RND_PTR_DOMAIN_IDPATH, FGW_IDPATH, idp); /*FGW_PTR | FGW_STRUCT*/ return 0; } } - if (FGW_BASE_TYPE(arg->type) == (FGW_PTR | FGW_STRUCT) && fgw_ptr_in_domain(&pcb_fgw, arg, PCB_PTR_DOMAIN_IDPATH)) + if (FGW_BASE_TYPE(arg->type) == (FGW_PTR | FGW_STRUCT) && fgw_ptr_in_domain(&rnd_fgw, arg, RND_PTR_DOMAIN_IDPATH)) return 0; arg->type = FGW_INVALID; return -1; } if (arg->type == FGW_IDPATH) { /* convert from idpath */ - if (fgw_ptr_in_domain(&pcb_fgw, arg, PCB_PTR_DOMAIN_IDPATH)) { + if (fgw_ptr_in_domain(&rnd_fgw, arg, RND_PTR_DOMAIN_IDPATH)) { char *name = pcb_idpath2str(arg->val.ptr_void, 0); if (name != NULL) { arg->val.str = name; @@ -297,27 +297,27 @@ void pcb_actions_init_pcb_only(void) { - if (fgw_reg_custom_type(&pcb_fgw, FGW_LAYERID, "layerid", layerid_arg_conv, NULL) != FGW_LAYERID) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_LAYERID, "layerid", layerid_arg_conv, NULL) != FGW_LAYERID) { fprintf(stderr, "pcb_actions_init: failed to register FGW_LAYERID\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_LAYER, "layer", layer_arg_conv, NULL) != FGW_LAYER) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_LAYER, "layer", layer_arg_conv, NULL) != FGW_LAYER) { fprintf(stderr, "pcb_actions_init: failed to register FGW_LAYER\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_LAYERGRPID, "layergrpid", layergrpid_arg_conv, NULL) != FGW_LAYERGRPID) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_LAYERGRPID, "layergrpid", layergrpid_arg_conv, NULL) != FGW_LAYERGRPID) { fprintf(stderr, "pcb_actions_init: failed to register FGW_LAYERGRPID\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_LAYERGRP, "layergrp", layergrp_arg_conv, NULL) != FGW_LAYERGRP) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_LAYERGRP, "layergrp", layergrp_arg_conv, NULL) != FGW_LAYERGRP) { fprintf(stderr, "pcb_actions_init: failed to register FGW_LAYERGRP\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_DATA, "data", data_arg_conv, NULL) != FGW_DATA) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_DATA, "data", data_arg_conv, NULL) != FGW_DATA) { fprintf(stderr, "pcb_actions_init: failed to register FGW_DATA\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_IDPATH, "idpath", idpath_arg_conv, NULL) != FGW_IDPATH) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_IDPATH, "idpath", idpath_arg_conv, NULL) != FGW_IDPATH) { fprintf(stderr, "pcb_actions_init: failed to register FGW_IDPATH\n"); abort(); } Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 30897) +++ trunk/src/brave.c (revision 30898) @@ -275,7 +275,7 @@ return 0; } -static pcb_action_t brave_action_list[] = { +static rnd_action_t brave_action_list[] = { {"Brave", pcb_act_Brave, pcb_acth_Brave, pcb_acts_Brave} }; Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30897) +++ trunk/src/buffer.c (revision 30898) @@ -1117,7 +1117,7 @@ case F_Save: name = sbufnum; - rv = pcb_actionva(PCB_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL); + rv = rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL); pcb_hid_notify_crosshair_change(PCB_ACT_HIDLIB, pcb_true); return rv; @@ -1206,7 +1206,7 @@ /* --------------------------------------------------------------------------- */ -static pcb_action_t buffer_action_list[] = { +static rnd_action_t buffer_action_list[] = { {"FreeRotateBuffer", pcb_act_FreeRotateBuffer, pcb_acth_FreeRotateBuffer, pcb_acts_FreeRotateBuffer}, {"ScaleBuffer", pcb_act_ScaleBuffer, pcb_acth_ScaleBuffer, pcb_acts_ScaleBuffer}, {"LoadFootprint", pcb_act_LoadFootprint, pcb_acth_LoadFootprint, pcb_acts_LoadFootprint}, Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 30897) +++ trunk/src/change_act.c (revision 30898) @@ -88,7 +88,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) { - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); got_coords = 1; type = pcb_search_screen(x, y, PCB_CHANGECLEARSIZE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -95,7 +95,7 @@ if (strcmp(delta, "style") == 0) { if (!got_coords) { - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); got_coords = 1; } @@ -195,7 +195,7 @@ void *ptr1, *ptr2, *ptr3; pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to change", &x, &y, 0); + rnd_hid_get_coords("Click on object to change", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2; @@ -290,7 +290,7 @@ if (funcid == F_Object) { pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to change size of", &x, &y, 0); + rnd_hid_get_coords("Click on object to change size of", &x, &y, 0); type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -385,7 +385,7 @@ if (funcid == F_Object) { pcb_coord_t x, y; - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -490,7 +490,7 @@ case F_Subc: { pcb_coord_t x, y; - pcb_hid_get_coords("Select a subcircuit", &x, &y, 0); + rnd_hid_get_coords("Select a subcircuit", &x, &y, 0); type = op = PCB_OBJ_SUBC; goto do_chg_name; } @@ -500,7 +500,7 @@ { pcb_coord_t x, y; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); type = op == F_Refdes ? PCB_OBJ_SUBC : PCB_CHANGENAME_TYPES; do_chg_name:; type = pcb_search_screen(x, y, type, &ptr1, &ptr2, &ptr3); @@ -509,7 +509,7 @@ if (pcb_chg_obj_name_query(ptr2)) { pcb_hid_redraw(PCB); pcb_board_set_changed_flag(pcb_true); - pcb_actionva(PCB_ACT_HIDLIB, "DeleteRats", "AllRats", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "DeleteRats", "AllRats", NULL); } if (op == F_Object) { pcb_subc_t *subc = pcb_obj_parent_subc(ptr2); @@ -573,7 +573,7 @@ int type; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) if (pcb_chg_obj_join(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); @@ -621,7 +621,7 @@ pcb_coord_t x, y; int type; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Select an Element", &x, &y, 0); + rnd_hid_get_coords("Select an Element", &x, &y, 0); ptr3 = NULL; type = pcb_search_screen(x, y, PCB_CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); @@ -674,7 +674,7 @@ if (absolute && (kind <= 5)) switch (pcb_funchash_get(function, NULL)) { case F_Object: - pcb_hid_get_coords("Click on object for SetThermal", &gx, &gy, 0); + rnd_hid_get_coords("Click on object for SetThermal", &gx, &gy, 0); if ((type = pcb_search_screen(gx, gy, PCB_CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind, PCB_CURRLID(PCB_ACT_BOARD)); pcb_undo_inc_serial(); @@ -765,7 +765,7 @@ PCB_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1])); if (fnc_id == F_Grid) - return pcb_actionv_bin(PCB_ACT_HIDLIB, "setgrid", res, argc-1, argv+1); + return rnd_actionv_bin(PCB_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); @@ -827,7 +827,7 @@ if (funcid == F_Object) { pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to change angle of", &x, &y, 0); + rnd_hid_get_coords("Click on object to change angle of", &x, &y, 0); type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -905,7 +905,7 @@ if (funcid == F_Object) { pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to change radius of", &x, &y, 0); + rnd_hid_get_coords("Click on object to change radius of", &x, &y, 0); type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -945,7 +945,7 @@ /* --------------------------------------------------------------------------- */ -static pcb_action_t change_action_list[] = { +static rnd_action_t change_action_list[] = { {"ChangeAngle", pcb_act_ChangeAngle, pcb_acth_ChangeAngle, pcb_acts_ChangeAngle}, {"ChangeClearSize", pcb_act_ChangeClearSize, pcb_acth_ChangeClearSize, pcb_acts_ChangeClearSize}, {"ChangeDrillSize", pcb_act_Change2ndSize, pcb_acth_Change2ndSize, pcb_acts_Change2ndSize}, Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 30897) +++ trunk/src/conf_act.c (revision 30898) @@ -81,7 +81,7 @@ return 0; } -static pcb_action_t conf_action_list[] = { +static rnd_action_t conf_action_list[] = { {"GetStyle", pcb_act_GetStyle, pcb_acth_GetStyle, pcb_acts_GetStyle}, {"ChkSubcID", pcb_act_ChkSubcID, pcb_acth_ChkSubcID, pcb_acts_ChkSubcID}, {"ChkTermID", pcb_act_ChkTermID, pcb_acth_ChkTermID, pcb_acts_ChkTermID}, Index: trunk/src/drc.c =================================================================== --- trunk/src/drc.c (revision 30897) +++ trunk/src/drc.c (revision 30898) @@ -73,7 +73,7 @@ if (pcb_strcasecmp(dlg_type, "list") == 0) { if (PCB_HAVE_GUI_ATTR_DLG) { args[1].val.str = "list"; - return pcb_actionv_bin(PCB_ACT_HIDLIB, dlgact, res, 2, args); + return rnd_actionv_bin(PCB_ACT_HIDLIB, dlgact, res, 2, args); } dlg_type = "print"; } @@ -81,7 +81,7 @@ if (pcb_strcasecmp(dlg_type, "simple") == 0) { if (PCB_HAVE_GUI_ATTR_DLG) { args[1].val.str = "simple"; - return pcb_actionv_bin(PCB_ACT_HIDLIB, dlgact, res, 2, args); + return rnd_actionv_bin(PCB_ACT_HIDLIB, dlgact, res, 2, args); } dlg_type = "print"; } @@ -186,7 +186,7 @@ return view_dlg(res, argc, argv, dlg_type, "ioincompatlistdialog", &pcb_drc_lst, pcb_drc_all); } -static pcb_action_t drc_action_list[] = { +static rnd_action_t drc_action_list[] = { {"DRC", pcb_act_DRC, pcb_acth_DRC, pcb_acts_DRC}, {"IOIncompatList", pcb_act_IOIncompatList, pcb_acth_IOIncompatList, pcb_acts_IOIncompatList}, }; Index: trunk/src/extobj_act.c =================================================================== --- trunk/src/extobj_act.c (revision 30897) +++ trunk/src/extobj_act.c (revision 30898) @@ -105,7 +105,7 @@ if (argc > 3) { /* convert by idpath */ pcb_idpath_t *idp; PCB_ACT_CONVARG(3, FGW_IDPATH, ExtobjConvFrom, idp = fgw_idpath(&argv[2])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[3], PCB_PTR_DOMAIN_IDPATH)) + 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); } @@ -112,7 +112,7 @@ else { /* interactive convert */ void *p1, *p3; pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to convert", &x, &y, 0); + rnd_hid_get_coords("Click on object to convert", &x, &y, 0); 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"); @@ -166,7 +166,7 @@ if (argc > 2) { /* convert by idpath */ pcb_idpath_t *idp; PCB_ACT_CONVARG(2, FGW_IDPATH, ExtobjGUIPropEdit, idp = fgw_idpath(&argv[2])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + 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); } @@ -173,7 +173,7 @@ else { /* interactive convert */ void *p1, *p3; pcb_coord_t x, y; - pcb_hid_get_coords("Click on extended object to edit", &x, &y, 0); + rnd_hid_get_coords("Click on extended object to edit", &x, &y, 0); 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"); @@ -214,7 +214,7 @@ return 0; } -static pcb_action_t pcb_extobj_action_list[] = { +static rnd_action_t pcb_extobj_action_list[] = { {"ExtobjConvFrom", pcb_act_ExtobjConvFrom, pcb_acth_ExtobjConvFrom, pcb_acts_ExtobjConvFrom}, {"ExtobjGUIPropEdit", pcb_act_ExtobjGUIPropEdit, pcb_acth_ExtobjGUIPropEdit, pcb_acts_ExtobjGUIPropEdit} }; Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30897) +++ trunk/src/file_act.c (revision 30898) @@ -285,14 +285,14 @@ /* 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 pcb_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "AllConnections", name, NULL); + return rnd_actionva(PCB_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 pcb_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "AllUnusedPins", name, NULL); + return rnd_actionva(PCB_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 pcb_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "SubcConnections", name, NULL); + return rnd_actionva(PCB_ACT_HIDLIB, "ExportOldConn", "SubcConnections", name, NULL); } PCB_ACT_FAIL(SaveTo); @@ -318,7 +318,7 @@ argv[3].type = FGW_STR; argv[3].val.str = "fp"; argv[4].type = FGW_STR; argv[4].val.cstr = descr; argv[5].type = FGW_STR; argv[5].val.cstr = conf_core.rc.save_fp_fmt; - err = pcb_actionv_(f, &res, 5, argv); + err = rnd_actionv_(f, &res, 5, argv); if ((err != 0) || (res.val.str == NULL)) /* cancel */ return -1; if ((res.type & (FGW_STR | FGW_DYN)) != (FGW_STR | FGW_DYN)) { @@ -532,7 +532,7 @@ return 0; } -pcb_action_t file_action_list[] = { +rnd_action_t file_action_list[] = { {"Backup", pcb_act_Backup, pcb_acth_Backup, pcb_acts_Backup}, {"Export", pcb_act_Export, pcb_acth_Export, pcb_acts_Export}, {"LoadFrom", pcb_act_LoadFrom, pcb_acth_LoadFrom, pcb_acts_LoadFrom}, Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 30897) +++ trunk/src/font_act.c (revision 30898) @@ -170,7 +170,7 @@ } -static pcb_action_t font_action_list[] = { +static rnd_action_t font_action_list[] = { {"LoadFontFrom", pcb_act_load_font_from, pcb_acth_load_font_from, pcb_acts_load_font_from}, {"SaveFontTo", pcb_act_save_font_to, pcb_acth_save_font_to, pcb_acts_save_font_to} }; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30897) +++ trunk/src/gui_act.c (revision 30898) @@ -306,7 +306,7 @@ /* display the pinout of a subcircuit */ case F_Pinout: - return pcb_actionva(PCB_ACT_HIDLIB, "pinout", NULL); + return rnd_actionva(PCB_ACT_HIDLIB, "pinout", NULL); /* toggle displaying of terminal names */ case F_PinOrPadName: @@ -314,7 +314,7 @@ int type; void *ptr1, *ptr2, *ptr3; pcb_coord_t x, y; - pcb_hid_get_coords("Click on a subcircuit", &x, &y, 0); + rnd_hid_get_coords("Click on a subcircuit", &x, &y, 0); /* toggle terminal ID print for subcircuit parts */ type = pcb_search_screen(x, y, PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART | PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT, (void **)&ptr1, (void **)&ptr2, (void **)&ptr3); @@ -359,7 +359,7 @@ switch(id) { case F_ToggleGrid: if (argc > 3) { - if (fgw_arg_conv(&pcb_fgw, &argv[3], FGW_KEYWORD) != 0) { + if (fgw_arg_conv(&rnd_fgw, &argv[3], FGW_KEYWORD) != 0) { PCB_ACT_FAIL(Display); return FGW_ERR_ARG_CONV; } @@ -493,7 +493,7 @@ pcb_marked.Y = pcb_crosshair.Y; } else - pcb_hid_get_coords("Click on new mark", &pcb_marked.X, &pcb_marked.Y, 0); + rnd_hid_get_coords("Click on new mark", &pcb_marked.X, &pcb_marked.Y, 0); pcb_notify_mark_change(pcb_true); } } @@ -505,7 +505,7 @@ pcb_marked.Y = pcb_crosshair.Y; } else - pcb_hid_get_coords("Click on new mark", &pcb_marked.X, &pcb_marked.Y, 0); + rnd_hid_get_coords("Click on new mark", &pcb_marked.X, &pcb_marked.Y, 0); pcb_notify_mark_change(pcb_true); pcb_marked.user_placed = 1; } @@ -582,7 +582,7 @@ int type; pcb_layer_t *layer = PCB_CURRLAYER(PCB_ACT_BOARD); - pcb_hid_get_coords("Select item to use properties from", &x, &y, 0); + rnd_hid_get_coords("Select item to use properties from", &x, &y, 0); type = pcb_search_screen(x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3); /* set layer current and size from line or arc */ @@ -698,12 +698,12 @@ char fn[PCB_ACTION_NAME_MAX]; fgw_arg_t args[2]; args[0].type = FGW_FUNC; - args[0].val.argv0.func = fgw_func_lookup(&pcb_fgw, pcb_aname(fn, "LayerPropGui")); + args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, pcb_aname(fn, "LayerPropGui")); args[0].val.argv0.user_call_ctx = PCB_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 = pcb_actionv_(args[0].val.func, res, 2, args); + ret = rnd_actionv_(args[0].val.func, res, 2, args); pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); } else @@ -807,12 +807,12 @@ char fn[PCB_ACTION_NAME_MAX]; fgw_arg_t args[2]; args[0].type = FGW_FUNC; - args[0].val.argv0.func = fgw_func_lookup(&pcb_fgw, pcb_aname(fn, "GroupPropGui")); + args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, pcb_aname(fn, "GroupPropGui")); args[0].val.argv0.user_call_ctx = PCB_ACT_HIDLIB; if (args[0].val.func != NULL) { args[1].type = FGW_LONG; args[1].val.nat_long = pcb_layergrp_id(PCB, g); - ret = pcb_actionv_(args[0].val.func, res, 2, args); + ret = rnd_actionv_(args[0].val.func, res, 2, args); pcb_event(PCB_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); } else @@ -1454,7 +1454,7 @@ return 0; } -static pcb_action_t gui_action_list[] = { +static rnd_action_t gui_action_list[] = { {"Display", pcb_act_Display, pcb_acth_Display, pcb_acts_Display}, {"CycleDrag", pcb_act_CycleDrag, pcb_acth_CycleDrag, pcb_acts_CycleDrag}, {"MarkCrosshair", pcb_act_MarkCrosshair, pcb_acth_MarkCrosshair, pcb_acts_MarkCrosshair}, Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 30897) +++ trunk/src/librnd/core/actions.c (revision 30898) @@ -43,17 +43,17 @@ #include #include -const pcb_action_t *pcb_current_action = NULL; +const rnd_action_t *pcb_current_action = NULL; -const char *PCB_PTR_DOMAIN_IDPATH = "pcb_fgw_ptr_domain_idpath"; -const char *PCB_PTR_DOMAIN_IDPATH_LIST = "pcb_fgw_ptr_domain_idpath_list"; +const char *RND_PTR_DOMAIN_IDPATH = "pcb_fgw_ptr_domain_idpath"; +const char *RND_PTR_DOMAIN_IDPATH_LIST = "pcb_fgw_ptr_domain_idpath_list"; -fgw_ctx_t pcb_fgw; +fgw_ctx_t rnd_fgw; fgw_obj_t *pcb_fgw_obj; typedef struct { const char *cookie; - const pcb_action_t *action; + const rnd_action_t *action; } hid_cookie_action_t; static const char *check_action_name(const char *s) @@ -79,7 +79,7 @@ return out; } -void rnd_register_actions(const pcb_action_t *a, int n, const char *cookie) +void rnd_register_actions(const rnd_action_t *a, int n, const char *cookie) { int i; hid_cookie_action_t *ca; @@ -114,7 +114,7 @@ } } -void rnd_register_action(const pcb_action_t *a, const char *cookie) +void rnd_register_action(const rnd_action_t *a, const char *cookie) { rnd_register_actions(a, 1, cookie); } @@ -129,11 +129,11 @@ fgw_func_t *pcb_act_lookup(const char *aname) { char fn[PCB_ACTION_NAME_MAX]; - fgw_func_t *f = fgw_func_lookup(&pcb_fgw, pcb_aname(fn, aname)); + fgw_func_t *f = fgw_func_lookup(&rnd_fgw, pcb_aname(fn, aname)); return f; } -void pcb_remove_actions(const pcb_action_t *a, int n) +void rnd_remove_actions(const rnd_action_t *a, int n) { int i; @@ -147,12 +147,12 @@ } } -void pcb_remove_actions_by_cookie(const char *cookie) +void rnd_remove_actions_by_cookie(const char *cookie) { htsp_entry_t *e; /* Slow linear search - probably OK, this will run only on uninit */ - for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) { + for (e = htsp_first(&rnd_fgw.func_tbl); e; e = htsp_next(&rnd_fgw.func_tbl, e)) { fgw_func_t *f = e->value; hid_cookie_action_t *ca = f->reg_data; if ((ca != NULL) && (ca->cookie == cookie)) @@ -160,7 +160,7 @@ } } -const pcb_action_t *pcb_find_action(const char *name, fgw_func_t **f_out) +const rnd_action_t *rnd_find_action(const char *name, fgw_func_t **f_out) { fgw_func_t *f; hid_cookie_action_t *ca; @@ -179,12 +179,12 @@ return ca->action; } -void pcb_print_actions() +void rnd_print_actions() { htsp_entry_t *e; fprintf(stderr, "Registered Actions:\n"); - for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) { + for (e = htsp_first(&rnd_fgw.func_tbl); e; e = htsp_next(&rnd_fgw.func_tbl, e)) { fgw_func_t *f = e->value; hid_cookie_action_t *ca = f->reg_data; if (ca->action->description) @@ -224,12 +224,12 @@ putchar('\n'); } -void pcb_dump_actions(void) +void rnd_dump_actions(void) { htsp_entry_t *e; fprintf(stderr, "Registered Actions:\n"); - for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) { + for (e = htsp_first(&rnd_fgw.func_tbl); e; e = htsp_next(&rnd_fgw.func_tbl, e)) { fgw_func_t *f = e->value; hid_cookie_action_t *ca = f->reg_data; const char *desc = ca->action->description; @@ -247,12 +247,12 @@ } } -int pcb_action(pcb_hidlib_t *hl, const char *name) +int rnd_action(pcb_hidlib_t *hl, const char *name) { - return pcb_actionv(hl, name, 0, 0); + return rnd_actionv(hl, name, 0, 0); } -int pcb_actionva(pcb_hidlib_t *hl, const char *name, ...) +int rnd_actionva(pcb_hidlib_t *hl, const char *name, ...) { const char *argv[20]; int argc = 0; @@ -263,10 +263,10 @@ while ((arg = va_arg(ap, char *)) != 0) argv[argc++] = arg; va_end(ap); - return pcb_actionv(hl, name, argc, argv); + return rnd_actionv(hl, name, argc, argv); } -int pcb_actionl(const char *name, ...) +int rnd_actionl(const char *name, ...) { const char *argv[20]; int argc = 0; @@ -277,14 +277,14 @@ while ((arg = va_arg(ap, char *)) != 0) argv[argc++] = arg; va_end(ap); - return pcb_actionv(NULL, name, argc, argv); + return rnd_actionv(NULL, name, argc, argv); } -fgw_error_t pcb_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv) +fgw_error_t rnd_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv) { fgw_error_t ret; int i; - const pcb_action_t *old_action; + const rnd_action_t *old_action; hid_cookie_action_t *ca = f->reg_data; if (pcbhl_conf.rc.verbose) { @@ -306,12 +306,12 @@ ret = f->func(res, argc, argv); } - fgw_argv_free(&pcb_fgw, argc, argv); + fgw_argv_free(&rnd_fgw, argc, argv); return ret; } -fgw_error_t pcb_actionv_bin(pcb_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv) +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); @@ -323,11 +323,11 @@ argv[0].val.argv0.user_call_ctx = hl; res->type = FGW_INVALID; - return pcb_actionv_(f, res, argc, argv); + return rnd_actionv_(f, res, argc, argv); } -int pcb_actionv(pcb_hidlib_t *hl, const char *name, int argc, const char **argsv) +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]; @@ -358,14 +358,14 @@ argv[n+1].val.str = (char *)argsv[n]; } res.type = FGW_INVALID; - if (pcb_actionv_(f, &res, argc+1, argv) != 0) + if (rnd_actionv_(f, &res, argc+1, argv) != 0) return -1; - if (fgw_arg_conv(&pcb_fgw, &res, FGW_INT) != 0) + if (fgw_arg_conv(&rnd_fgw, &res, FGW_INT) != 0) return -1; return res.val.nat_int; } -void pcb_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force) +void rnd_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force) { if (pcb_gui == NULL) { fprintf(stderr, "pcb_hid_get_coords: can not get coordinates (no gui) for '%s'\n", msg); @@ -424,7 +424,7 @@ * with no parameters or event. */ if (*sp == '\0') { - retcode = pcb_actionv(hl, aname, 0, 0); + retcode = rnd_actionv(hl, aname, 0, 0); goto cleanup; } @@ -447,7 +447,7 @@ * "," */ if (!maybe_empty && ((parens && *sp == ')') || (!parens && !*sp))) { - retcode = pcb_actionv(hl, aname, num, list); + retcode = rnd_actionv(hl, aname, num, list); if (retcode) goto cleanup; @@ -523,7 +523,7 @@ return retcode; } -const char *pcb_cli_prompt(const char *suffix) +const char *rnd_cli_prompt(const char *suffix) { const char *base; static char prompt[128]; @@ -568,7 +568,7 @@ return cli_stack.array[--cli_stack.used]; } -int pcb_cli_enter(const char *backend, const char *prompt) +int rnd_cli_enter(const char *backend, const char *prompt) { cli_push(pcbhl_conf.rc.cli_backend); cli_push(pcbhl_conf.rc.cli_prompt); @@ -578,7 +578,7 @@ return pcb_conf_set(CFR_CLI, "rc/cli_prompt", 0, prompt, POL_OVERWRITE); } -int pcb_cli_leave(void) +int rnd_cli_leave(void) { if (vtp0_len(&cli_stack) >= 2) { char *prompt = NULL, *backend = NULL; @@ -598,7 +598,7 @@ static int pcb_cli_common(pcb_hidlib_t *hl, fgw_arg_t *args) { - const pcb_action_t *a; + const rnd_action_t *a; fgw_func_t *f; /* no backend: let the original action work */ @@ -606,7 +606,7 @@ return -1; /* backend: let the backend action handle it */ - a = pcb_find_action(pcbhl_conf.rc.cli_backend, &f); + a = rnd_find_action(pcbhl_conf.rc.cli_backend, &f); if (!a) return -1; @@ -616,7 +616,7 @@ return 0; } -int pcb_cli_tab(pcb_hidlib_t *hl) +int rnd_cli_tab(pcb_hidlib_t *hl) { fgw_arg_t res, args[2]; @@ -626,13 +626,13 @@ args[1].type = FGW_STR; args[1].val.str = "/tab"; - if (pcb_actionv_(args[0].val.func, &res, 2, args) != 0) + if (rnd_actionv_(args[0].val.func, &res, 2, args) != 0) return -1; - fgw_arg_conv(&pcb_fgw, &res, FGW_INT); + fgw_arg_conv(&rnd_fgw, &res, FGW_INT); return res.val.nat_int; } -int pcb_cli_edit(pcb_hidlib_t *hl) +int rnd_cli_edit(pcb_hidlib_t *hl) { fgw_arg_t res, args[2]; @@ -642,13 +642,13 @@ args[1].type = FGW_STR; args[1].val.str = "/edit"; - if (pcb_actionv_(args[0].val.func, &res, 2, args) != 0) + if (rnd_actionv_(args[0].val.func, &res, 2, args) != 0) return -1; - fgw_arg_conv(&pcb_fgw, &res, FGW_INT); + fgw_arg_conv(&rnd_fgw, &res, FGW_INT); return res.val.nat_int; } -int pcb_cli_mouse(pcb_hidlib_t *hl, pcb_bool notify) +int rnd_cli_mouse(pcb_hidlib_t *hl, pcb_bool notify) { fgw_arg_t res, args[3]; @@ -660,24 +660,24 @@ args[2].type = FGW_INT; args[2].val.nat_int = notify; - if (pcb_actionv_(args[0].val.func, &res, 3, args) != 0) + if (rnd_actionv_(args[0].val.func, &res, 3, args) != 0) return -1; - fgw_arg_conv(&pcb_fgw, &res, FGW_INT); + fgw_arg_conv(&rnd_fgw, &res, FGW_INT); return res.val.nat_int; } -void pcb_cli_uninit(void) +void rnd_cli_uninit(void) { while(vtp0_len(&cli_stack) > 0) free(cli_pop()); } -int pcb_parse_command(pcb_hidlib_t *hl, const char *str_, pcb_bool force_action_mode) +int rnd_parse_command(pcb_hidlib_t *hl, const char *str_, pcb_bool force_action_mode) { fgw_arg_t res, args[2]; fgw_func_t *f; - const pcb_action_t *a; + const rnd_action_t *a; const char *end; /* no backend or forced action mode: classic pcb-rnd action parse */ @@ -687,10 +687,10 @@ } /* backend: let the backend action handle it */ - a = pcb_find_action(pcbhl_conf.rc.cli_backend, &f); + a = rnd_find_action(pcbhl_conf.rc.cli_backend, &f); if (!a) { pcb_message(PCB_MSG_ERROR, "cli: no action %s; leaving mode\n", pcbhl_conf.rc.cli_backend); - pcb_cli_leave(); + rnd_cli_leave(); return -1; } @@ -712,13 +712,13 @@ args[1].val.str[end - str_] = '\0'; } - if (pcb_actionv_(f, &res, 2, args) != 0) + if (rnd_actionv_(f, &res, 2, args) != 0) return -1; - fgw_arg_conv(&pcb_fgw, &res, FGW_INT); + fgw_arg_conv(&rnd_fgw, &res, FGW_INT); return res.val.nat_int; } -int pcb_parse_actions(pcb_hidlib_t *hl, const char *str_) +int rnd_parse_actions(pcb_hidlib_t *hl, const char *str_) { return hid_parse_actionstring(hl, str_, pcb_true); } @@ -916,7 +916,7 @@ s++; if ((*s != '\0') && (*s != '#')) - res |= pcb_parse_actions(hidlib, s); + res |= rnd_parse_actions(hidlib, s); } fclose(f); @@ -923,30 +923,30 @@ return res; } -void pcb_actions_init(void) +void rnd_actions_init(void) { - fgw_init(&pcb_fgw, "pcb-rnd"); - pcb_fgw.async_error = pcb_action_err; - pcb_fgw_obj = fgw_obj_reg(&pcb_fgw, "core"); - if (fgw_reg_custom_type(&pcb_fgw, FGW_KEYWORD, "keyword", keyword_arg_conv, NULL) != FGW_KEYWORD) { + fgw_init(&rnd_fgw, "pcb-rnd"); + rnd_fgw.async_error = pcb_action_err; + pcb_fgw_obj = fgw_obj_reg(&rnd_fgw, "core"); + if (fgw_reg_custom_type(&rnd_fgw, FGW_KEYWORD, "keyword", keyword_arg_conv, NULL) != FGW_KEYWORD) { fprintf(stderr, "pcb_actions_init: failed to register FGW_KEYWORD\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_COORD, "coord", coord_arg_conv, NULL) != FGW_COORD) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_COORD, "coord", coord_arg_conv, NULL) != FGW_COORD) { fprintf(stderr, "pcb_actions_init: failed to register FGW_COORD\n"); abort(); } - if (fgw_reg_custom_type(&pcb_fgw, FGW_COORDS, "coords", coords_arg_conv, coords_arg_free) != FGW_COORDS) { + if (fgw_reg_custom_type(&rnd_fgw, FGW_COORDS, "coords", coords_arg_conv, coords_arg_free) != FGW_COORDS) { fprintf(stderr, "pcb_actions_init: failed to register FGW_COORDS\n"); abort(); } } -void pcb_actions_uninit(void) +void rnd_actions_uninit(void) { htsp_entry_t *e; - for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) { + for (e = htsp_first(&rnd_fgw.func_tbl); e; e = htsp_next(&rnd_fgw.func_tbl, e)) { fgw_func_t *f = e->value; hid_cookie_action_t *ca = f->reg_data; if (ca->cookie != NULL) @@ -954,8 +954,8 @@ pcb_remove_action(f); } - fgw_obj_unreg(&pcb_fgw, pcb_fgw_obj); - fgw_uninit(&pcb_fgw); + fgw_obj_unreg(&rnd_fgw, pcb_fgw_obj); + fgw_uninit(&rnd_fgw); fgw_atexit(); } Index: trunk/src/librnd/core/actions.h =================================================================== --- trunk/src/librnd/core/actions.h (revision 30897) +++ trunk/src/librnd/core/actions.h (revision 30898) @@ -7,7 +7,7 @@ #define PCB_ACTION_NAME_MAX 128 -struct pcb_action_s { +struct rnd_action_s { const char *name; /* action command name */ fgw_error_t (*trigger_cb)(fgw_arg_t *ores, int argc, fgw_arg_t *argv); /* Action implementation; if this returns non-zero, no further actions will be invoked for this key/mouse event. */ const char *description;/* Short description (help text) */ @@ -14,7 +14,7 @@ const char *syntax; /* Full allowed syntax; use \n to separate lines. */ }; -extern fgw_ctx_t pcb_fgw; +extern fgw_ctx_t rnd_fgw; typedef struct fgw_coords_s { int len; @@ -54,11 +54,11 @@ #define FGW_LAYERGRPID ((fgw_type_t)FGW_LAYERGRPID_) #define FGW_LAYERGRP ((fgw_type_t)FGW_LAYERGRP_) -extern const char *PCB_PTR_DOMAIN_IDPATH; -extern const char *PCB_PTR_DOMAIN_IDPATH_LIST; +extern const char *RND_PTR_DOMAIN_IDPATH; +extern const char *RND_PTR_DOMAIN_IDPATH_LIST; -void rnd_register_action(const pcb_action_t *a, const char *cookie); -void rnd_register_actions(const pcb_action_t *a, int, const char *cookie); +void rnd_register_action(const rnd_action_t *a, const char *cookie); +void rnd_register_actions(const rnd_action_t *a, int, const char *cookie); /* shorthand for registering all actions from an action table */ #define RND_REGISTER_ACTIONS(a, cookie) \ @@ -65,30 +65,30 @@ rnd_register_actions(a, sizeof(a)/sizeof(a[0]), cookie); /* Inits and uninits the whole action framework */ -void pcb_actions_init(void); -void pcb_actions_uninit(void); +void rnd_actions_init(void); +void rnd_actions_uninit(void); /* These are called from main_act.c */ -void pcb_print_actions(void); -void pcb_dump_actions(void); +void rnd_print_actions(void); +void rnd_dump_actions(void); -const pcb_action_t *pcb_find_action(const char *name, fgw_func_t **f_out); +const rnd_action_t *rnd_find_action(const char *name, fgw_func_t **f_out); -void pcb_remove_actions(const pcb_action_t *a, int n); -void pcb_remove_actions_by_cookie(const char *cookie); +void rnd_remove_actions(const rnd_action_t *a, int n); +void rnd_remove_actions_by_cookie(const char *cookie); -int pcb_action(pcb_hidlib_t *hl, const char *action_); -int pcb_actionva(pcb_hidlib_t *hl, const char *action_, ...); /* NULL terminated */ -int pcb_actionv(pcb_hidlib_t *hl, const char *action_, int argc_, const char **argv_); -fgw_error_t pcb_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv); +int rnd_action(pcb_hidlib_t *hl, const char *action_); +int rnd_actionva(pcb_hidlib_t *hl, const char *action_, ...); /* NULL terminated */ +int rnd_actionv(pcb_hidlib_t *hl, const char *action_, int argc_, const char **argv_); +fgw_error_t rnd_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv); -int pcb_actionl(const char *action_, ...); /* NULL terminated - DEPRECATED, DO NOT USE (does not set user_call_ctx) */ +int rnd_actionl(const char *action_, ...); /* NULL terminated - DEPRECATED, DO NOT USE (does not set user_call_ctx) */ /* Call an action by name, passing arguments and res in fungw binary format; Caller must leave argv[0] empty for the function designator. */ -fgw_error_t pcb_actionv_bin(pcb_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv); +fgw_error_t rnd_actionv_bin(pcb_hidlib_t *hl, const char *name, fgw_arg_t *res, int argc, fgw_arg_t *argv); /* Parse the given command string into action calls, and call @@ -97,38 +97,38 @@ action in the later case. If force_action_mode is true, str is interpreted as pcb-rnd action despite of the cli mode. Returns nonzero if the action handler(s) return nonzero. */ -int pcb_parse_command(pcb_hidlib_t *hl, const char *str_, pcb_bool force_action_mode); +int rnd_parse_command(pcb_hidlib_t *hl, const char *str_, pcb_bool force_action_mode); /* Parse the given string into action calls, and call hid_actionv for each action found. Accepts only "action(arg1, arg2)" */ -int pcb_parse_actions(pcb_hidlib_t *hl, const char *str_); +int rnd_parse_actions(pcb_hidlib_t *hl, const char *str_); /* Return a static buffer with the current prompt plus an optional suffix glued to it. Valid until the next call. */ -const char *pcb_cli_prompt(const char *suffix); +const char *rnd_cli_prompt(const char *suffix); /* Change the cli backend/prompt, entering a new cli mode; the old mode is pushed on a stack */ -int pcb_cli_enter(const char *backend, const char *prompt); +int rnd_cli_enter(const char *backend, const char *prompt); /* Leave the current cli mode, returning to the previous mode (popped from a stack) */ -int pcb_cli_leave(void); +int rnd_cli_leave(void); /* Request for tab completion */ -int pcb_cli_tab(pcb_hidlib_t *hl); +int rnd_cli_tab(pcb_hidlib_t *hl); /* Called on each key press so indication can be updated */ -int pcb_cli_edit(pcb_hidlib_t *hl); +int rnd_cli_edit(pcb_hidlib_t *hl); /* Mouse event while the command line is open; returns zero if normal event processing shall be inhibited; notify is true if called in notify mode, false if called in release mode */ -int pcb_cli_mouse(pcb_hidlib_t *hl, pcb_bool notify); +int rnd_cli_mouse(pcb_hidlib_t *hl, pcb_bool notify); /* Discard the cli mode stack */ -void pcb_cli_uninit(void); +void rnd_cli_uninit(void); /* If the mouse cursor is in the drawin area, set x;y silently and return; else show msg and let the user click in the drawing area. If force is @@ -135,7 +135,7 @@ non-zero and msg is non-NULL, discard the cache and force querying a new coord. This mode must NOT be used unless action arguments explictly requested it. */ -void pcb_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force); +void rnd_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force); #define PCB_ACTION_MAX_ARGS 16 @@ -157,7 +157,7 @@ if (ret != 0) return -1; - if (fgw_arg_conv(&pcb_fgw, res, FGW_INT) != 0) + if (fgw_arg_conv(&rnd_fgw, res, FGW_INT) != 0) return -1; return res->val.nat_int; @@ -178,7 +178,7 @@ PCB_ACT_FAIL(aname); \ return FGW_ERR_ARGC; \ } \ - if (fgw_arg_conv(&pcb_fgw, &argv[idx], type) != 0) { \ + if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ PCB_ACT_FAIL(aname); \ return FGW_ERR_ARG_CONV; \ } \ @@ -189,7 +189,7 @@ #define PCB_ACT_MAY_CONVARG(idx, type, aname, stmt) \ do { \ if (argc > idx) { \ - if (fgw_arg_conv(&pcb_fgw, &argv[idx], type) != 0) { \ + if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ PCB_ACT_FAIL(aname); \ return FGW_ERR_ARG_CONV; \ } \ Index: trunk/src/librnd/core/conf_act.c =================================================================== --- trunk/src/librnd/core/conf_act.c (revision 30897) +++ trunk/src/librnd/core/conf_act.c (revision 30898) @@ -349,7 +349,7 @@ } -static pcb_action_t rnd_conf_action_list[] = { +static rnd_action_t rnd_conf_action_list[] = { {"conf", pcb_act_Conf, pcb_acth_Conf, pcb_acts_Conf}, {"ChkMode", pcb_act_ChkMode, pcb_acth_ChkMode, pcb_acts_ChkMode}, {"ChkGridSize", pcb_act_ChkGridSize, pcb_acth_ChkGridSize, pcb_acts_ChkGridSize}, Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 30897) +++ trunk/src/librnd/core/error.c (revision 30898) @@ -277,7 +277,7 @@ return 0; } -static pcb_action_t log_action_list[] = { +static rnd_action_t log_action_list[] = { {"Log", pcb_act_Log, pcb_acth_Log, pcb_acts_Log}, {"Message", pcb_act_Message, pcb_acth_Message, pcb_acts_Message} }; Index: trunk/src/librnd/core/event.c =================================================================== --- trunk/src/librnd/core/event.c (revision 30897) +++ trunk/src/librnd/core/event.c (revision 30898) @@ -228,7 +228,7 @@ a->d.c = va_arg(ap, pcb_coord_t); fa->type = FGW_LONG; fa->val.nat_long = a->d.c; - fgw_arg_conv(&pcb_fgw, fa, FGW_COORD_); + fgw_arg_conv(&rnd_fgw, fa, FGW_COORD_); break; case 'a': a->type = PCB_EVARG_ANGLE; @@ -249,7 +249,7 @@ for (e = events[ev]; e != NULL; e = e->next) e->handler(hidlib, e->user_data, argc, argv); - fgw_ucall_all(&pcb_fgw, hidlib, pcb_event_name(ev), argc, fargv); + fgw_ucall_all(&rnd_fgw, hidlib, pcb_event_name(ev), argc, fargv); } void pcb_events_init(void) Index: trunk/src/librnd/core/global_typedefs.h =================================================================== --- trunk/src/librnd/core/global_typedefs.h (revision 30897) +++ trunk/src/librnd/core/global_typedefs.h (revision 30898) @@ -56,7 +56,7 @@ typedef struct pcb_clrcache_s pcb_clrcache_t; typedef struct pcb_pixmap_s pcb_pixmap_t; -typedef struct pcb_action_s pcb_action_t; +typedef struct rnd_action_s rnd_action_t; typedef struct pcb_hid_dad_subdialog_s pcb_hid_dad_subdialog_t; Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30897) +++ trunk/src/librnd/core/gui_act.c (revision 30898) @@ -291,7 +291,7 @@ 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); - pcb_hid_get_coords(msg, &x, &y, 0); + rnd_hid_get_coords(msg, &x, &y, 0); PCB_ACT_IRES(0); if (op != NULL) { @@ -332,7 +332,7 @@ static const char pcb_acth_Help[] = "On-line action help"; static fgw_error_t pcb_act_Help(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_print_actions(); + rnd_print_actions(); PCB_ACT_IRES(0); return 0; } @@ -346,7 +346,7 @@ return 0; } -static pcb_action_t rnd_gui_action_list[] = { +static rnd_action_t rnd_gui_action_list[] = { {"FullScreen", pcb_act_FullScreen, pcb_acth_FullScreen, pcb_acts_FullScreen}, {"CreateMenu", pcb_act_CreateMenu, pcb_acth_CreateMenu, pcb_acts_CreateMenu}, {"RemoveMenu", pcb_act_RemoveMenu, pcb_acth_RemoveMenu, pcb_acts_RemoveMenu}, Index: trunk/src/librnd/core/hid.h =================================================================== --- trunk/src/librnd/core/hid.h (revision 30897) +++ trunk/src/librnd/core/hid.h (revision 30898) @@ -583,9 +583,9 @@ do the exporting. The GUI HIDs set and unset this var.*/ extern pcb_hid_t *pcb_exporter; -/* This is either NULL or points to the current pcb_action_t that is being +/* This is either NULL or points to the current rnd_action_t that is being called. The action launcher sets and unsets this variable. */ -extern const pcb_action_t *pcb_current_action; +extern const rnd_action_t *pcb_current_action; /* The GUI may set this to be approximately the PCB size of a pixel, to allow for near-misses in selection and changes in drawing items Index: trunk/src/librnd/core/hid_cfg_action.c =================================================================== --- trunk/src/librnd/core/hid_cfg_action.c (revision 30897) +++ trunk/src/librnd/core/hid_cfg_action.c (revision 30898) @@ -43,11 +43,11 @@ switch(node->type) { case LHT_TEXT: - return pcb_parse_actions(hl, node->data.text.value); + return rnd_parse_actions(hl, node->data.text.value); case LHT_LIST: for(node = node->data.list.first; node != NULL; node = node->next) { if (node->type == LHT_TEXT) { - if (pcb_parse_actions(hl, node->data.text.value) != 0) + if (rnd_parse_actions(hl, node->data.text.value) != 0) return -1; } else if ((node->type == LHT_LIST) || (node->type == LHT_SYMLINK)) { Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 30897) +++ trunk/src/librnd/core/hid_dlg.c (revision 30898) @@ -48,12 +48,12 @@ strcpy(tmp, "gui_"); strncpy(tmp+4, act_name, sizeof(tmp)-5); - if (PCB_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&pcb_fgw, tmp) != NULL)) - return pcb_actionv_bin(PCB_ACT_HIDLIB, tmp, res, argc, argv); + if (PCB_HAVE_GUI_ATTR_DLG && (fgw_func_lookup(&rnd_fgw, tmp) != NULL)) + return rnd_actionv_bin(PCB_ACT_HIDLIB, tmp, res, argc, argv); tmp[0] = 'c'; tmp[1] = 'l'; - if (fgw_func_lookup(&pcb_fgw, tmp) != NULL) - return pcb_actionv_bin(PCB_ACT_HIDLIB, tmp, res, argc, argv); + if (fgw_func_lookup(&rnd_fgw, tmp) != NULL) + return rnd_actionv_bin(PCB_ACT_HIDLIB, tmp, res, argc, argv); return FGW_ERR_NOT_FOUND; } @@ -74,13 +74,13 @@ argv[2].type = FGW_STR; argv[2].val.cstr = default_string; argv[3].type = FGW_STR; argv[3].val.cstr = title; - if (pcb_actionv_bin(hl, "PromptFor", &res, 4, argv) != 0) + if (rnd_actionv_bin(hl, "PromptFor", &res, 4, argv) != 0) return NULL; if (res.type == (FGW_STR | FGW_DYN)) return res.val.str; - fgw_arg_free(&pcb_fgw, &res); + fgw_arg_free(&rnd_fgw, &res); return NULL; } @@ -116,13 +116,13 @@ } va_end(ap); - if (pcb_actionv_bin(hl, "MessageBox", &res, argc, argv) != 0) + if (rnd_actionv_bin(hl, "MessageBox", &res, argc, argv) != 0) return -1; - if (fgw_arg_conv(&pcb_fgw, &res, FGW_INT) == 0) + if (fgw_arg_conv(&rnd_fgw, &res, FGW_INT) == 0) return res.val.nat_int; - fgw_arg_free(&pcb_fgw, &res); + fgw_arg_free(&rnd_fgw, &res); return -1; } @@ -259,14 +259,14 @@ /* DOC: print.html */ 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(&pcb_fgw, "printgui") != NULL)) - return pcb_actionv_bin(PCB_ACT_HIDLIB, "printgui", res, argc, 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); 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; } -static pcb_action_t hid_dlg_action_list[] = { +static rnd_action_t hid_dlg_action_list[] = { {"PromptFor", pcb_act_PromptFor, pcb_acth_PromptFor, pcb_acts_PromptFor}, {"MessageBox", pcb_act_MessageBox, pcb_acth_MessageBox, pcb_acts_MessageBox}, {"Print", pcb_act_Print, pcb_acth_Print, pcb_acts_Print} Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30897) +++ trunk/src/librnd/core/hid_init.c (revision 30898) @@ -328,7 +328,7 @@ void pcb_hidlib_init2(const pup_buildin_t *buildins, const pup_buildin_t *local_buildins) { - pcb_actions_init(); + rnd_actions_init(); /* load custom config files in the order they were specified */ if (hidlib_conffile.used > 0) { @@ -390,7 +390,7 @@ pcb_events_uninit(); pcb_conf_uninit(); pcb_plugin_uninit(); - pcb_actions_uninit(); + rnd_actions_uninit(); pcb_dad_unit_uninit(); } @@ -663,7 +663,7 @@ pcb_conf_update(NULL, -1); if (ga->main_action != NULL) { - int res = pcb_parse_command(NULL, ga->main_action, pcb_true); /* hidlib is NULL because there is no context yet */ + int res = rnd_parse_command(NULL, ga->main_action, pcb_true); /* hidlib is NULL because there is no context yet */ if ((res != 0) && (ga->main_action_hint != NULL)) pcb_message(PCB_MSG_ERROR, "\nHint: %s\n", ga->main_action_hint); pcbhl_log_print_uninit_errs("main_action parse error"); Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 30897) +++ trunk/src/librnd/core/hid_nogui.c (revision 30898) @@ -546,7 +546,7 @@ } -static pcb_action_t cli_dlg_action_list[] = { +static rnd_action_t cli_dlg_action_list[] = { {"cli_PromptFor", pcb_act_cli_PromptFor, pcb_acth_cli, NULL}, {"cli_MessageBox", pcb_act_cli_MessageBox, pcb_acth_cli, NULL} }; Index: trunk/src/librnd/core/hidlib.c =================================================================== --- trunk/src/librnd/core/hidlib.c (revision 30897) +++ trunk/src/librnd/core/hidlib.c (revision 30898) @@ -43,7 +43,7 @@ static void hidlib_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]) { - pcb_tool_gui_init(); + rnd_tool_gui_init(); pcb_gui->set_mouse_cursor(pcb_gui, pcbhl_conf.editor.mode); /* make sure the mouse cursor is set up now that it is registered */ } Index: trunk/src/librnd/core/main_act.c =================================================================== --- trunk/src/librnd/core/main_act.c (revision 30897) +++ trunk/src/librnd/core/main_act.c (revision 30898) @@ -48,7 +48,7 @@ static const char pcb_acth_PrintActions[] = "Print all actions available."; fgw_error_t pcb_act_PrintActions(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_print_actions(); + rnd_print_actions(); PCB_ACT_IRES(0); return 0; } @@ -57,7 +57,7 @@ static const char pcb_acth_DumpActions[] = "Dump all actions available."; fgw_error_t pcb_act_DumpActions(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_dump_actions(); + rnd_dump_actions(); PCB_ACT_IRES(0); return 0; } @@ -120,7 +120,7 @@ return 0; } -static pcb_action_t rnd_main_action_list[] = { +static rnd_action_t rnd_main_action_list[] = { {"PrintActions", pcb_act_PrintActions, pcb_acth_PrintActions, pcb_acts_PrintActions}, {"DumpActions", pcb_act_DumpActions, pcb_acth_DumpActions, pcb_acts_DumpActions}, {"PrintFiles", pcb_act_PrintFiles, pcb_acth_PrintFiles, pcb_acts_PrintFiles}, Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 30897) +++ trunk/src/librnd/core/safe_fs.c (revision 30898) @@ -127,7 +127,7 @@ argv[2].type = FGW_INT; argv[2].val.nat_int = (all != NULL); ares.type = FGW_INVALID; - if ((pcb_actionv_(fun, &ares, 3, argv) != 0) || (fgw_arg_conv(&pcb_fgw, &ares, FGW_INT) != 0)) + if ((rnd_actionv_(fun, &ares, 3, argv) != 0) || (fgw_arg_conv(&rnd_fgw, &ares, FGW_INT) != 0)) res = -1; else res = ares.val.nat_int; Index: trunk/src/librnd/core/tool.c =================================================================== --- trunk/src/librnd/core/tool.c (revision 30897) +++ trunk/src/librnd/core/tool.c (revision 30898) @@ -192,7 +192,7 @@ return pcb_tool_select_by_id(hidlib, save_stack[--save_position]); } -void pcb_tool_gui_init(void) +void rnd_tool_gui_init(void) { pcb_toolid_t n; pcb_tool_t **tool; @@ -262,7 +262,7 @@ static void do_release(pcb_hidlib_t *hidlib) { - if (pcbhl_conf.temp.click_cmd_entry_active && (pcb_cli_mouse(hidlib, 0) == 0)) + if (pcbhl_conf.temp.click_cmd_entry_active && (rnd_cli_mouse(hidlib, 0) == 0)) return; hidlib->tool_grabbed.status = pcb_false; @@ -277,7 +277,7 @@ void pcb_tool_do_press(pcb_hidlib_t *hidlib) { - if (pcbhl_conf.temp.click_cmd_entry_active && (pcb_cli_mouse(hidlib, 1) == 0)) + if (pcbhl_conf.temp.click_cmd_entry_active && (rnd_cli_mouse(hidlib, 1) == 0)) return; hidlib->tool_grabbed.X = hidlib->tool_x; @@ -357,7 +357,7 @@ return 0; } -static pcb_action_t tool_action_list[] = { +static rnd_action_t tool_action_list[] = { {"Tool", pcb_act_Tool, pcb_acth_Tool, pcb_acts_Tool}, {"Mode", pcb_act_Tool, pcb_acth_Tool, pcb_acts_Tool} }; Index: trunk/src/librnd/core/tool.h =================================================================== --- trunk/src/librnd/core/tool.h (revision 30897) +++ trunk/src/librnd/core/tool.h (revision 30898) @@ -102,7 +102,7 @@ int pcb_tool_restore(pcb_hidlib_t *hidlib); /* Called after GUI_INIT; registers all mouse cursors in the GUI */ -void pcb_tool_gui_init(void); +void rnd_tool_gui_init(void); /**** Tool function wrappers; calling these will operate on the current tool Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30897) +++ trunk/src/librnd/pcb_compat.h (revision 30898) @@ -11,3 +11,32 @@ #define pcb_register_action rnd_register_action #define pcb_register_actions rnd_register_actions #define PCB_REGISTER_ACTIONS RND_REGISTER_ACTIONS +#define pcb_tool_gui_init rnd_tool_gui_init +#define pcb_action_s rnd_action_s +#define pcb_action_t rnd_action_t +#define pcb_fgw rnd_fgw +#define PCB_PTR_DOMAIN_IDPATH RND_PTR_DOMAIN_IDPATH +#define PCB_PTR_DOMAIN_IDPATH_LIST RND_PTR_DOMAIN_IDPATH_LIST +#define pcb_actions_init rnd_actions_init +#define pcb_actions_uninit rnd_actions_uninit +#define pcb_print_actions rnd_print_actions +#define pcb_dump_actions rnd_dump_actions +#define pcb_find_action rnd_find_action +#define pcb_remove_actions rnd_remove_actions +#define pcb_remove_actions_by_cookie rnd_remove_actions_by_cookie +#define pcb_action rnd_action +#define pcb_actionva rnd_actionva +#define pcb_actionv rnd_actionv +#define pcb_actionv_ rnd_actionv_ +#define pcb_actionl rnd_actionl +#define pcb_actionv_bin rnd_actionv_bin +#define pcb_parse_command rnd_parse_command +#define pcb_parse_actions rnd_parse_actions +#define pcb_cli_prompt rnd_cli_prompt +#define pcb_cli_enter rnd_cli_enter +#define pcb_cli_leave rnd_cli_leave +#define pcb_cli_tab rnd_cli_tab +#define pcb_cli_edit rnd_cli_edit +#define pcb_cli_mouse rnd_cli_mouse +#define pcb_cli_uninit rnd_cli_uninit +#define pcb_hid_get_coords rnd_hid_get_coords Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 30897) +++ trunk/src/main.c (revision 30898) @@ -350,7 +350,7 @@ pcb_funchash_uninit(); pcb_file_loaded_uninit(); pcb_uilayer_uninit(); - pcb_cli_uninit(); + rnd_cli_uninit(); pcb_dynflag_uninit(); pcb_extobj_uninit(); @@ -538,11 +538,11 @@ if (conf_core.rc.script_filename) { pcb_message(PCB_MSG_INFO, "Executing startup script file %s\n", conf_core.rc.script_filename); - pcb_actionva(&PCB->hidlib, "ExecuteFile", conf_core.rc.script_filename, NULL); + rnd_actionva(&PCB->hidlib, "ExecuteFile", conf_core.rc.script_filename, NULL); } if (conf_core.rc.action_string) { pcb_message(PCB_MSG_INFO, "Executing startup action %s\n", conf_core.rc.action_string); - pcb_parse_actions(&PCB->hidlib, conf_core.rc.action_string); + rnd_parse_actions(&PCB->hidlib, conf_core.rc.action_string); } if (pcbhl_main_exported(&ga, &PCB->hidlib, pcb_data_is_empty(PCB->Data))) { Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 30897) +++ trunk/src/main_act.c (revision 30898) @@ -297,7 +297,7 @@ return 0; } -static pcb_action_t main_action_list[] = { +static rnd_action_t main_action_list[] = { {"PrintUsage", pcb_act_PrintUsage, pcb_acth_PrintUsage, pcb_acts_PrintUsage}, {"PrintVersion", pcb_act_PrintVersion, pcb_acth_PrintVersion, pcb_acts_PrintVersion}, {"DumpVersion", pcb_act_DumpVersion, pcb_acth_DumpVersion, pcb_acts_DumpVersion}, Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 30897) +++ trunk/src/netlist_act.c (revision 30898) @@ -554,7 +554,7 @@ pcb_coord_t x, y; void *r1, *r2, *r3; - pcb_hid_get_coords("Select a an object to claim network from", &x, &y, 0); + rnd_hid_get_coords("Select a an object to claim network from", &x, &y, 0); if (pcb_search_screen(x, y, PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_PSTK, &r1, &r2, &r3) <= 0) return 0; @@ -617,7 +617,7 @@ } -static pcb_action_t netlist_action_list[] = { +static rnd_action_t netlist_action_list[] = { {"net", pcb_act_Netlist, pcb_acth_Netlist, pcb_acts_Netlist}, {"netlist", pcb_act_Netlist, pcb_acth_Netlist, pcb_acts_Netlist}, {"claimnet", pcb_act_ClaimNet, pcb_acth_ClaimNet, pcb_acts_ClaimNet} Index: trunk/src/obj_pstk_act.c =================================================================== --- trunk/src/obj_pstk_act.c (revision 30897) +++ trunk/src/obj_pstk_act.c (revision 30898) @@ -55,7 +55,7 @@ PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3])); } else { - pcb_hid_get_coords("Click at padstack origin", &x, &y, 0); + rnd_hid_get_coords("Click at padstack origin", &x, &y, 0); /* rather use the snapped corsshair coords */ x = pcb_crosshair.X; y = pcb_crosshair.Y; @@ -119,7 +119,7 @@ pcb_objtype_t type; pcb_coord_t x, y; - pcb_hid_get_coords("Select a padstack to break up", &x, &y, 0); + rnd_hid_get_coords("Select a padstack to break up", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_OBJ_PSTK, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_PSTK) { pcb_message(PCB_MSG_ERROR, "Need a padstack under the cursor\n"); break; @@ -178,7 +178,7 @@ PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3])); } else { - pcb_hid_get_coords("Click at padstack origin", &x, &y, 0); + rnd_hid_get_coords("Click at padstack origin", &x, &y, 0); /* rather use the snapped corsshair coords */ x = pcb_crosshair.X; y = pcb_crosshair.Y; @@ -214,7 +214,7 @@ /* --------------------------------------------------------------------------- */ -static pcb_action_t padstack_action_list[] = { +static rnd_action_t padstack_action_list[] = { {"PadstackConvert", pcb_act_padstackconvert, pcb_acth_padstackconvert, pcb_acts_padstackconvert}, {"PadstackBreakup", pcb_act_padstackbreakup, pcb_acth_padstackbreakup, pcb_acts_padstackbreakup}, {"PadstackPlace", pcb_act_padstackplace, pcb_acth_padstackplace, pcb_acts_padstackplace} Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 30897) +++ trunk/src/object_act.c (revision 30898) @@ -128,7 +128,7 @@ if (n_found == 0) { pcb_coord_t x, y; void *ptrtmp; - pcb_hid_get_coords("Click on a subcircuit", &x, &y, 0); + rnd_hid_get_coords("Click on a subcircuit", &x, &y, 0); if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) s = (pcb_subc_t *)ptrtmp; else { @@ -266,7 +266,7 @@ PCB_ACT_CONVARG(1, FGW_KEYWORD, Flip, id = fgw_keyword(&argv[1])); PCB_ACT_IRES(0); - pcb_hid_get_coords("Click on Object or Flip Point", &x, &y, 0); + rnd_hid_get_coords("Click on Object or Flip Point", &x, &y, 0); switch(id) { case F_Object: @@ -311,7 +311,7 @@ fgw_str2coord_unit_restore(saved); - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_MOVE_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_OBJ_VOID) { @@ -354,7 +354,7 @@ int type; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_MOVETOLAYER_TYPES | PCB_LOOSE_SUBC(pcb), &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_layer_t *target = PCB_CURRLAYER(pcb); pcb_any_obj_t *o = ptr2; @@ -575,8 +575,8 @@ fgw_arg_t args[4]; args[1].type = FGW_STR; args[1].val.str = "import_removal"; args[2].type = FGW_STR; args[2].val.str = "import part removal"; - fgw_ptr_reg(&pcb_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, plc->remlst); - pcb_actionv_bin(&plc->pcb->hidlib, "viewlist", &res, 4, args); + fgw_ptr_reg(&rnd_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, plc->remlst); + rnd_actionv_bin(&plc->pcb->hidlib, "viewlist", &res, 4, args); plc->remlst = NULL; } if ((number_of_footprints_not_found > 0) && (!pcbhl_conf.rc.quiet)) @@ -1186,7 +1186,7 @@ PCB_ACT_CONVARG(1, FGW_INT, Rotate90, steps = argv[1].val.nat_int); PCB_ACT_IRES(0); - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); if (conf_core.editor.show_solder_side) steps = -steps; @@ -1200,7 +1200,7 @@ return 0; } -static pcb_action_t object_action_list[] = { +static rnd_action_t object_action_list[] = { {"Attributes", pcb_act_Attributes, pcb_acth_Attributes, pcb_acts_Attributes}, {"DisperseElements", pcb_act_DisperseElements, pcb_acth_DisperseElements, pcb_acts_DisperseElements}, {"Flip", pcb_act_Flip, pcb_acth_Flip, pcb_acts_Flip}, Index: trunk/src/plug_footprint_act.c =================================================================== --- trunk/src/plug_footprint_act.c (revision 30897) +++ trunk/src/plug_footprint_act.c (revision 30898) @@ -76,7 +76,7 @@ } -static pcb_action_t plug_footprint_list[] = { +static rnd_action_t plug_footprint_list[] = { {"fp_rehash", pcb_act_fp_rehash, pcb_acth_fp_rehash, pcb_acts_fp_rehash} }; Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30897) +++ trunk/src/plug_io.c (revision 30898) @@ -714,7 +714,7 @@ long int len = pcb_view_list_length(&pcb_io_incompat_lst); if (len > 0) { pcb_message(PCB_MSG_ERROR, "There were %ld save incompatibility errors.\nData in memory is not affected, but the file created may be slightly broken.\nSee the popup view listing for detauls.\n", len); - pcb_actionva(&PCB->hidlib, "IOincompatList", conf_core.editor.io_incomp_style, "auto", NULL); + rnd_actionva(&PCB->hidlib, "IOincompatList", conf_core.editor.io_incomp_style, "auto", NULL); } } Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 30897) +++ trunk/src/polygon_act.c (revision 30898) @@ -65,7 +65,7 @@ int type; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_OBJ_POLY, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_poly_morph((pcb_layer_t *) ptr1, (pcb_poly_t *) ptr3); pcb_draw(); @@ -123,7 +123,7 @@ } -static pcb_action_t polygon_action_list[] = { +static rnd_action_t polygon_action_list[] = { {"MorphPolygon", pcb_act_MorphPolygon, pcb_acth_MorphPolygon, pcb_acts_MorphPolygon}, {"Polygon", pcb_act_Polygon, pcb_acth_Polygon, pcb_acts_Polygon} }; Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 30897) +++ trunk/src/rats_act.c (revision 30898) @@ -120,7 +120,7 @@ pcb_coord_t x, y; unsigned long res; pcb_find_t fctx; - pcb_hid_get_coords("Click on a connection", &x, &y, 0); + rnd_hid_get_coords("Click on a connection", &x, &y, 0); memset(&fctx, 0, sizeof(fctx)); fctx.flag_set = PCB_FLAG_FOUND; fctx.flag_chg_undoable = 1; @@ -196,7 +196,7 @@ } -static pcb_action_t rats_action_list[] = { +static rnd_action_t rats_action_list[] = { {"AddRats", pcb_act_AddRats, pcb_acth_AddRats, pcb_acts_AddRats}, {"Connection", pcb_act_Connection, pcb_acth_Connection, pcb_acts_Connection}, {"DeleteRats", pcb_act_DeleteRats, pcb_acth_DeleteRats, pcb_acts_DeleteRats} Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 30897) +++ trunk/src/rats_patch.c (revision 30898) @@ -630,7 +630,7 @@ return 0; } -static pcb_action_t rats_patch_action_list[] = { +static rnd_action_t rats_patch_action_list[] = { {"ReplaceFootprint", pcb_act_ReplaceFootprint, pcb_acth_ReplaceFootprint, pcb_acts_ReplaceFootprint}, {"SavePatch", pcb_act_SavePatch, pcb_acth_SavePatch, pcb_acts_SavePatch} }; Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 30897) +++ trunk/src/remove_act.c (revision 30898) @@ -62,7 +62,7 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; PCB_ACT_CONVARG(2, FGW_IDPATH, Delete, idp = fgw_idpath(&argv[2])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + 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)) { @@ -73,7 +73,7 @@ } else { /* interactive remove */ pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB; - pcb_hid_get_coords("Click on object to delete", &hidlib->tool_x, &hidlib->tool_y, 0); + 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); @@ -108,7 +108,7 @@ } -static pcb_action_t remove_action_list[] = { +static rnd_action_t remove_action_list[] = { {"Delete", pcb_act_Delete, pcb_acth_Delete, pcb_acts_Delete}, {"PcbDelete", pcb_act_Delete, NULL, "Alias to Delete()"}, {"RemoveSelected", pcb_act_RemoveSelected, pcb_acth_RemoveSelected, pcb_acts_RemoveSelected} Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 30897) +++ trunk/src/select_act.c (revision 30898) @@ -72,7 +72,7 @@ pcb_idpath_t *idp; pcb_any_obj_t *obj; PCB_ACT_CONVARG(2, FGW_IDPATH, Select, idp = fgw_idpath(&argv[2])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + 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)) { @@ -160,7 +160,7 @@ pcb_crosshair_note.Buffer = conf_core.editor.buffer_number; pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB, PCB_PASTEBUFFER); - pcb_hid_get_coords("Select the Subcircuit's Origin (mark) Location", &x, &y, 0); + 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); pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, x, y, pcb_true, pcb_false); @@ -245,7 +245,7 @@ return 0; } -static pcb_action_t select_action_list[] = { +static rnd_action_t select_action_list[] = { {"Select", pcb_act_Select, pcb_acth_Select, pcb_acts_Select}, {"Unselect", pcb_act_Unselect, pcb_acth_Unselect, pcb_acts_Unselect} }; Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 30897) +++ trunk/src/undo_act.c (revision 30898) @@ -144,7 +144,7 @@ } -static pcb_action_t undo_action_list[] = { +static rnd_action_t undo_action_list[] = { {"Atomic", pcb_act_Atomic, pcb_acth_Atomic, pcb_acts_Atomic}, {"Undo", pcb_act_Undo, pcb_acth_Undo, pcb_acts_Undo}, {"Redo", pcb_act_Redo, pcb_acth_Redo, pcb_acts_Redo} Index: trunk/src/view.c =================================================================== --- trunk/src/view.c (revision 30897) +++ trunk/src/view.c (revision 30898) @@ -114,7 +114,7 @@ argv[2].type = FGW_COORD; fgw_coord(&argv[2]) = item->bbox.Y1; argv[3].type = FGW_COORD; fgw_coord(&argv[3]) = item->bbox.X2; argv[4].type = FGW_COORD; fgw_coord(&argv[4]) = item->bbox.Y2; - pcb_actionv_bin(item->hidlib, "zoom", &res, 5, argv); + rnd_actionv_bin(item->hidlib, "zoom", &res, 5, argv); } } Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 30897) +++ trunk/src_plugins/acompnet/acompnet.c (revision 30898) @@ -209,7 +209,7 @@ return 0; } -pcb_action_t acompnet_action_list[] = { +rnd_action_t acompnet_action_list[] = { {"acompnet", pcb_act_acompnet, pcb_acth_acompnet, pcb_acts_acompnet}, }; @@ -219,7 +219,7 @@ void pplg_uninit_acompnet(void) { - pcb_remove_actions_by_cookie(acompnet_cookie); + rnd_remove_actions_by_cookie(acompnet_cookie); pcb_uilayer_free_all_cookie(acompnet_cookie); } Index: trunk/src_plugins/act_draw/act_draw.c =================================================================== --- trunk/src_plugins/act_draw/act_draw.c (revision 30897) +++ trunk/src_plugins/act_draw/act_draw.c (revision 30898) @@ -59,7 +59,7 @@ do { \ pcb_idpath_t *idp = pcb_obj2idpath((pcb_any_obj_t *)obj); \ res->type = FGW_IDPATH; \ - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); \ + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); \ } while(0) #include "act_pstk_proto.c" @@ -352,7 +352,7 @@ poly = pcb_poly_new(layer, cl*2, flags); if (poly != NULL) - fgw_ptr_reg(&pcb_fgw, res, PTR_DOMAIN_POLY, FGW_PTR, poly); + fgw_ptr_reg(&rnd_fgw, res, PTR_DOMAIN_POLY, FGW_PTR, poly); return 0; } @@ -367,7 +367,7 @@ 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); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[1], PTR_DOMAIN_POLY)) { + 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); return 0; @@ -393,7 +393,7 @@ 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); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[1], PTR_DOMAIN_POLY)) { + 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); return 0; @@ -410,7 +410,7 @@ RET_IDPATH(poly); if (!noundo) pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, poly, poly); - fgw_ptr_unreg(&pcb_fgw, &argv[1], PTR_DOMAIN_POLY); + fgw_ptr_unreg(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY); return 0; } @@ -431,7 +431,7 @@ 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); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3], PCB_PTR_DOMAIN_IDPATH)) { + 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; } @@ -450,7 +450,7 @@ if (dst != NULL) { idp = pcb_obj2idpath(dst); - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); pcb_poly_clear_from_poly(data, dst->type, layer, dst); } @@ -458,7 +458,7 @@ return 0; } -pcb_action_t act_draw_action_list[] = { +rnd_action_t act_draw_action_list[] = { {"LineNew", pcb_act_LineNew, pcb_acth_LineNew, pcb_acts_LineNew}, {"ArcNew", pcb_act_ArcNew, pcb_acth_ArcNew, pcb_acts_ArcNew}, {"TextNew", pcb_act_TextNew, pcb_acth_TextNew, pcb_acts_TextNew}, @@ -479,7 +479,7 @@ void pplg_uninit_act_draw(void) { - pcb_remove_actions_by_cookie(act_draw_cookie); + rnd_remove_actions_by_cookie(act_draw_cookie); } int pplg_init_act_draw(void) Index: trunk/src_plugins/act_draw/act_pstk_proto.c =================================================================== --- trunk/src_plugins/act_draw/act_pstk_proto.c (revision 30897) +++ trunk/src_plugins/act_draw/act_pstk_proto.c (revision 30898) @@ -51,7 +51,7 @@ } PCB_ACT_CONVARG(aidx, FGW_IDPATH, PstkProtoTmp, idp = fgw_idpath(&argv[aidx])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[aidx], PCB_PTR_DOMAIN_IDPATH)) + 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); if ((obj == NULL) || (obj->type != PCB_OBJ_PSTK) || (obj->parent_type != PCB_PARENT_DATA)) @@ -80,7 +80,7 @@ switch(cmdi) { case act_draw_keywords_new: proto = calloc(sizeof(pcb_pstk_proto_t), 1); - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto); + fgw_ptr_reg(&rnd_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto); res->val.ptr_void = proto; pcb_vtpadstack_tshape_init(&proto->tr); pcb_vtpadstack_tshape_alloc_append(&proto->tr, 1); @@ -104,7 +104,7 @@ if (src == NULL) return 0; proto = calloc(sizeof(pcb_pstk_proto_t), 1); - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto); + fgw_ptr_reg(&rnd_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto); pcb_pstk_proto_copy(proto, src); res->val.ptr_void = proto; return 0; @@ -118,7 +118,7 @@ return 0; } PCB_ACT_CONVARG(3+ao, FGW_PTR, PstkProtoTmp, proto = argv[3+ao].val.ptr_void); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) { + 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); return 0; @@ -162,7 +162,7 @@ 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); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[1+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) { + 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); return 0; Index: trunk/src_plugins/act_read/act_geo.c =================================================================== --- trunk/src_plugins/act_read/act_geo.c (revision 30897) +++ trunk/src_plugins/act_read/act_geo.c (revision 30898) @@ -46,7 +46,7 @@ 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])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[4], PCB_PTR_DOMAIN_IDPATH)) + 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); if ((obj == NULL) || (obj->type != PCB_OBJ_LINE)) @@ -69,7 +69,7 @@ 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])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[4], PCB_PTR_DOMAIN_IDPATH)) + 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); if ((obj == NULL) || (obj->type != PCB_OBJ_ARC)) @@ -89,9 +89,9 @@ PCB_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1])); PCB_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2])); - if ((idp1 == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[1], PCB_PTR_DOMAIN_IDPATH)) + 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(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + if ((idp2 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj1 = pcb_idpath2obj(PCB, idp1); obj2 = pcb_idpath2obj(PCB, idp2); Index: trunk/src_plugins/act_read/act_idpath.c =================================================================== --- trunk/src_plugins/act_read/act_idpath.c (revision 30897) +++ trunk/src_plugins/act_read/act_idpath.c (revision 30898) @@ -46,12 +46,12 @@ cmd = act_read_keywords_sphash(cmd_); if (cmd == act_read_keywords_alloc) { list = calloc(sizeof(pcb_idpath_list_t), 1); - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list); + 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])); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH_LIST)) + if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST)) return FGW_ERR_PTR_DOMAIN; switch(cmd) { @@ -65,7 +65,7 @@ return 0; case act_read_keywords_free: - fgw_ptr_unreg(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH_LIST); + fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST); pcb_idpath_list_clear(list); free(list); PCB_ACT_IRES(0); @@ -75,7 +75,7 @@ case act_read_keywords_push: case act_read_keywords_prepend: PCB_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3])); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3], PCB_PTR_DOMAIN_IDPATH)) + if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; if (cmd == act_read_keywords_append) pcb_idpath_list_append(list, idp); @@ -103,7 +103,7 @@ res->val.ptr_struct = NULL; return 0; } - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); return 0; case act_read_keywords_pop: @@ -113,7 +113,7 @@ res->val.ptr_struct = NULL; return 0; } - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); pcb_idpath_list_remove(idp); return 0; @@ -135,7 +135,7 @@ PCB_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str); PCB_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; @@ -142,7 +142,7 @@ switch(act_read_keywords_sphash(cmd)) { case act_read_keywords_free: pcb_idpath_list_remove(idp); - fgw_ptr_unreg(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH); + fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH); free(idp); PCB_ACT_IRES(0); return 0; @@ -151,7 +151,7 @@ obj = pcb_idpath2obj(PCB, idp); idp = pcb_obj2idpath(obj); res->type = FGW_IDPATH; - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); return 0; case act_read_keywords_print: @@ -181,7 +181,7 @@ } PCB_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[iidx], PCB_PTR_DOMAIN_IDPATH)) + if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[iidx], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj_in(root_data, idp); Index: trunk/src_plugins/act_read/act_read.c =================================================================== --- trunk/src_plugins/act_read/act_read.c (revision 30897) +++ trunk/src_plugins/act_read/act_read.c (revision 30898) @@ -100,7 +100,7 @@ } -pcb_action_t act_read_action_list[] = { +rnd_action_t act_read_action_list[] = { {"GetValue", pcb_act_GetValue, pcb_acth_GetValue, pcb_acts_GetValue}, {"IDPList", pcb_act_IDPList, pcb_acth_IDPList, pcb_acts_IDPList}, {"IDP", pcb_act_IDP, pcb_acth_IDP, pcb_acts_IDP}, @@ -121,7 +121,7 @@ void pplg_uninit_act_read(void) { - pcb_remove_actions_by_cookie(act_read_cookie); + rnd_remove_actions_by_cookie(act_read_cookie); } int pplg_init_act_read(void) Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c =================================================================== --- trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 30897) +++ trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 30898) @@ -401,7 +401,7 @@ return 0; } -static pcb_action_t cpcb_action_list[] = { +static rnd_action_t cpcb_action_list[] = { {"ImportcpcbFrom", pcb_act_import_cpcb, pcb_acth_import_cpcb, pcb_acts_import_cpcb}, {"ExportcpcbTo", pcb_act_export_cpcb, pcb_acth_export_cpcb, pcb_acts_export_cpcb}, {"cpcb", pcb_act_cpcb, pcb_acth_cpcb, pcb_acts_cpcb} @@ -411,7 +411,7 @@ void pplg_uninit_ar_cpcb(void) { - pcb_remove_actions_by_cookie(cpcb_cookie); + rnd_remove_actions_by_cookie(cpcb_cookie); } Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30897) +++ trunk/src_plugins/asm/asm.c (revision 30898) @@ -625,7 +625,7 @@ return 0; } -static pcb_action_t asm_action_list[] = { +static rnd_action_t asm_action_list[] = { {"asm", pcb_act_asm, pcb_acth_asm, pcb_acts_asm} }; @@ -633,7 +633,7 @@ void pplg_uninit_asm(void) { - pcb_remove_actions_by_cookie(asm_cookie); + rnd_remove_actions_by_cookie(asm_cookie); pcb_conf_unreg_file(ASM_CONF_FN, asm_conf_internal); pcb_conf_unreg_fields("plugins/asm1/"); } Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 30897) +++ trunk/src_plugins/autocrop/autocrop.c (revision 30898) @@ -72,7 +72,7 @@ return 0; } -static pcb_action_t autocrop_action_list[] = { +static rnd_action_t autocrop_action_list[] = { {"autocrop", pcb_act_autocrop, pcb_acth_autocrop, pcb_acts_autocrop} }; @@ -82,7 +82,7 @@ void pplg_uninit_autocrop(void) { - pcb_remove_actions_by_cookie(autocrop_cookie); + rnd_remove_actions_by_cookie(autocrop_cookie); } int pplg_init_autocrop(void) Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 30897) +++ trunk/src_plugins/autoplace/action.c (revision 30898) @@ -56,7 +56,7 @@ static const char *autoplace_cookie = "autoplace plugin"; -pcb_action_t autoplace_action_list[] = { +rnd_action_t autoplace_action_list[] = { {"AutoPlaceSelected", pcb_act_AutoPlaceSelected, autoplace_help, autoplace_syntax} }; @@ -64,7 +64,7 @@ void pplg_uninit_autoplace(void) { - pcb_remove_actions_by_cookie(autoplace_cookie); + rnd_remove_actions_by_cookie(autoplace_cookie); } int pplg_init_autoplace(void) Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 30897) +++ trunk/src_plugins/autoroute/action.c (revision 30898) @@ -71,7 +71,7 @@ static const char *autoroute_cookie = "autoroute plugin"; -pcb_action_t autoroute_action_list[] = { +rnd_action_t autoroute_action_list[] = { {"AutoRoute", pcb_act_AutoRoute, pcb_acth_AutoRoute, pcb_acts_AutoRoute}, }; @@ -79,7 +79,7 @@ void pplg_uninit_autoroute(void) { - pcb_remove_actions_by_cookie(autoroute_cookie); + rnd_remove_actions_by_cookie(autoroute_cookie); } int pplg_init_autoroute(void) Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30897) +++ trunk/src_plugins/cam/cam.c (revision 30898) @@ -201,7 +201,7 @@ } -static pcb_action_t cam_action_list[] = { +static rnd_action_t cam_action_list[] = { {"cam", pcb_act_cam, pcb_acth_cam, pcb_acts_cam} }; @@ -284,7 +284,7 @@ { pcb_conf_unreg_file(CAM_CONF_FN, cam_conf_internal); pcb_conf_unreg_fields("plugins/cam/"); - pcb_remove_actions_by_cookie(cam_cookie); + rnd_remove_actions_by_cookie(cam_cookie); pcb_export_remove_opts_by_cookie(cam_cookie); } Index: trunk/src_plugins/cam/cam_compile.c =================================================================== --- trunk/src_plugins/cam/cam_compile.c (revision 30897) +++ trunk/src_plugins/cam/cam_compile.c (revision 30898) @@ -81,7 +81,7 @@ case PCB_CAM_PARTIAL: if (code->op.partial.arg != NULL) { ctx->partial = 1; - pcb_actionva(&PCB->hidlib, "query", "setflag:exportsel", code->op.partial.arg, NULL); + rnd_actionva(&PCB->hidlib, "query", "setflag:exportsel", code->op.partial.arg, NULL); } else { if (ctx->partial) { Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30897) +++ trunk/src_plugins/cam/cam_gui.c (revision 30898) @@ -199,7 +199,7 @@ if (row != NULL) { const char *outfile = ctx->dlg[ctx->woutfile].val.str; char *tmp = pcb_strdup_printf("outfile=%s", outfile); - pcb_actionva(ctx->cam.hidlib, "cam", "call", row->cell[0], tmp, NULL); + rnd_actionva(ctx->cam.hidlib, "cam", "call", row->cell[0], tmp, NULL); free(tmp); } } Index: trunk/src_plugins/ddraft/cli.c =================================================================== --- trunk/src_plugins/ddraft/cli.c (revision 30897) +++ trunk/src_plugins/ddraft/cli.c (revision 30898) @@ -504,7 +504,7 @@ int ndlen; if (argc == 1) { - pcb_cli_enter("ddraft", "ddraft"); + rnd_cli_enter("ddraft", "ddraft"); pcb_tool_select_by_id(&PCB->hidlib, pcb_ddraft_tool); PCB_ACT_IRES(0); return 0; @@ -512,7 +512,7 @@ PCB_ACT_CONVARG(1, FGW_STR, ddraft, cmd = argv[1].val.str); if (strcmp(cmd, "/exit") == 0) { - pcb_cli_leave(); + rnd_cli_leave(); PCB_ACT_IRES(0); return 0; } Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 30897) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 30898) @@ -158,18 +158,18 @@ static void set_paral(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "paral", NULL); + rnd_actionva(&PCB->hidlib, "paral", NULL); } static void set_perp(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "perp", NULL); + rnd_actionva(&PCB->hidlib, "perp", NULL); } static void set_tang(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "tang", NULL); + rnd_actionva(&PCB->hidlib, "tang", NULL); } void cons_gui_confchg(conf_native_t *cfg, int arr_idx) Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 30897) +++ trunk/src_plugins/ddraft/ddraft.c (revision 30898) @@ -97,7 +97,7 @@ case F_Object: for(;;) { x = PCB_MAX_COORD; - pcb_hid_get_coords("Select an object to cut or press esc", &x, &y, 1); + rnd_hid_get_coords("Select an object to cut or press esc", &x, &y, 1); if (x == PCB_MAX_COORD) break; @@ -141,7 +141,7 @@ switch(kwcut) { case F_Object: - pcb_hid_get_coords("Select cutting edge object", &x, &y, 0); + rnd_hid_get_coords("Select cutting edge object", &x, &y, 0); type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3); if (type == 0) { pcb_message(PCB_MSG_ERROR, "Invalid cutting edge object\n"); @@ -202,13 +202,13 @@ PCB_ACT_CONVARG(n, FGW_IDPATH, split_idp, idp = fgw_idpath(&argv[n])); if (idp == NULL) goto invptr; - if (fgw_ptr_in_domain(&pcb_fgw, &argv[n], PCB_PTR_DOMAIN_IDPATH)) { + if (fgw_ptr_in_domain(&rnd_fgw, &argv[n], RND_PTR_DOMAIN_IDPATH)) { obj = pcb_idpath2obj(PCB, idp); if ((obj == NULL) || ((obj->type & PCB_OBJ_CLASS_REAL) == 0)) goto invptr; vtp0_append(vect, obj); } - else if (fgw_ptr_in_domain(&pcb_fgw, &argv[n], PCB_PTR_DOMAIN_IDPATH_LIST)) { + else if (fgw_ptr_in_domain(&rnd_fgw, &argv[n], RND_PTR_DOMAIN_IDPATH_LIST)) { idpl = (pcb_idpath_list_t *)idp; pcb_idpath_list_foreach(idpl, &it, idp) { obj = pcb_idpath2obj(PCB, idp); @@ -227,7 +227,7 @@ /* copy over the objects to an idpath_list that is then returned */ idpl = calloc(sizeof(pcb_idpath_list_t), 1); - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, idpl); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, idpl); for(n = 0; n < vtp0_len(&newobjs); n++) { idp = pcb_obj2idpath(newobjs.array[n]); if (idp != NULL) @@ -341,11 +341,11 @@ double dx, dy; pcb_line_t *line; - pcb_hid_get_coords("Select target object", &x, &y, 0); + rnd_hid_get_coords("Select target object", &x, &y, 0); type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3); if (type != PCB_OBJ_LINE) { - pcb_hid_get_coords("Select target object", &x, &y, 1); + rnd_hid_get_coords("Select target object", &x, &y, 1); type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -400,11 +400,11 @@ goto err_nonline; - pcb_hid_get_coords("Select target arc", &x, &y, 0); + rnd_hid_get_coords("Select target arc", &x, &y, 0); type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3); if (type != PCB_OBJ_ARC) { - pcb_hid_get_coords("Select target arc", &x, &y, 1); + rnd_hid_get_coords("Select target arc", &x, &y, 1); type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3); } @@ -462,7 +462,7 @@ #include "cli.c" -static pcb_action_t ddraft_action_list[] = { +static rnd_action_t ddraft_action_list[] = { {"trim", pcb_act_trim_split, pcb_acth_trim_split, pcb_acts_trim_split}, {"split", pcb_act_trim_split, pcb_acth_trim_split, pcb_acts_trim_split}, {"pcbsplit", pcb_act_split_idp, pcb_acth_split_idp, pcb_acts_split_idp}, @@ -524,12 +524,12 @@ if (pcbhl_conf.editor.mode == pcb_ddraft_tool) { if (!ddraft_tool_selected) { ddraft_tool_selected = 1; - pcb_cli_enter("ddraft", "ddraft"); + rnd_cli_enter("ddraft", "ddraft"); pcb_gui->open_command(pcb_gui); } } else if (ddraft_tool_selected) { - pcb_cli_leave(); + rnd_cli_leave(); ddraft_tool_selected = 0; } } @@ -540,7 +540,7 @@ { pcb_conf_hid_unreg(ddraft_cookie); pcb_event_unbind_allcookie(ddraft_cookie); - pcb_remove_actions_by_cookie(ddraft_cookie); + rnd_remove_actions_by_cookie(ddraft_cookie); pcb_tool_unreg_by_cookie(ddraft_cookie); } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 30897) +++ trunk/src_plugins/diag/diag.c (revision 30898) @@ -560,7 +560,7 @@ PCB_ACT_CONVARG(1, FGW_STR, forcecolor, new_color = argv[1].val.str); - pcb_hid_get_coords("Click on object to change", &x, &y, 0); + rnd_hid_get_coords("Click on object to change", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_FORCECOLOR_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID){ TODO("color: figure where to store this"); @@ -571,7 +571,7 @@ return 0; } -pcb_action_t diag_action_list[] = { +rnd_action_t diag_action_list[] = { {"dumpconf", pcb_act_DumpConf, pcb_acth_DumpConf, pcb_acts_DumpConf}, {"dumplayers", pcb_act_DumpLayers, pcb_acth_DumpLayers, pcb_acts_DumpLayers}, {"dumpfonts", pcb_act_DumpFonts, dump_fonts_help, dump_fonts_syntax}, @@ -595,7 +595,7 @@ void pplg_uninit_diag(void) { - pcb_remove_actions_by_cookie(diag_cookie); + rnd_remove_actions_by_cookie(diag_cookie); pcb_conf_unreg_fields("plugins/diag/"); pcb_event_unbind_allcookie(diag_cookie); } Index: trunk/src_plugins/dialogs/dialogs.c =================================================================== --- trunk/src_plugins/dialogs/dialogs.c (revision 30897) +++ trunk/src_plugins/dialogs/dialogs.c (revision 30898) @@ -63,7 +63,7 @@ #include "dlg_pref.h" -pcb_action_t dialogs_action_list[] = { +rnd_action_t dialogs_action_list[] = { {"dlg_test", pcb_act_dlg_test, dlg_test_help, dlg_test_syntax}, {"LayerBinding", pcb_act_LayerBinding, pcb_acth_LayerBinding, pcb_acts_LayerBinding}, {"FlagEdit", pcb_act_FlagEdit, pcb_acth_FlagEdit, pcb_acts_FlagEdit}, @@ -102,7 +102,7 @@ pcb_dlg_undo_uninit(); pcb_dlg_pstklib_uninit(); pcb_dlg_pref_uninit(); - pcb_remove_actions_by_cookie(dialogs_cookie); + rnd_remove_actions_by_cookie(dialogs_cookie); pcb_view_dlg_uninit(); pcb_dlg_fontsel_uninit(); pcb_conf_unreg_fields("plugins/dialogs/"); Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 30898) @@ -97,7 +97,7 @@ if (op == F_Object) { pcb_coord_t x, y; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Click on object to change flags of", &x, &y, 0); + rnd_hid_get_coords("Click on object to change flags of", &x, &y, 0); type = pcb_search_screen(x, y, PCB_FLAGEDIT_TYPES | PCB_LOOSE_SUBC(PCB), &ptr1, &ptr2, &ptr3); ctx.ptr1 = ptr1; ctx.obj = (pcb_any_obj_t *)ptr2; Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 30898) @@ -119,7 +119,7 @@ static void btn_load_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "LoadFontFrom", NULL); /* modal, blocking */ + rnd_actionva(&PCB->hidlib, "LoadFontFrom", NULL); /* modal, blocking */ fontsel_preview_update((fontsel_ctx_t *)caller_data); } @@ -127,7 +127,7 @@ { char file[1] = "", id[5]; pcb_snprintf(id, sizeof(id), "%ld", conf_core.design.text_font_id); - pcb_actionva(&PCB->hidlib, "LoadFontFrom", file, id, NULL); /* modal, blocking */ + rnd_actionva(&PCB->hidlib, "LoadFontFrom", file, id, NULL); /* modal, blocking */ fontsel_preview_update((fontsel_ctx_t *)caller_data); } @@ -215,7 +215,7 @@ pcb_coord_t x, y; int type; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Select an Object", &x, &y, 0); + rnd_hid_get_coords("Select an Object", &x, &y, 0); if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { txt_obj = ptr2; modal = 0; Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 30898) @@ -39,12 +39,12 @@ static void ifb_file_chg_reload_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pcb_revert_pcb(); - pcb_actionva(&PCB->hidlib, "InfoBarFileChanged", "close", NULL); + rnd_actionva(&PCB->hidlib, "InfoBarFileChanged", "close", NULL); } static void ifb_file_chg_close_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "InfoBarFileChanged", "close", NULL); + rnd_actionva(&PCB->hidlib, "InfoBarFileChanged", "close", NULL); } const char pcb_acts_InfoBarFileChanged[] = "InfoBarFileChanged(open|close)\n"; Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 30898) @@ -267,7 +267,7 @@ pcb_coord_t x, y; int type; void *ptr1, *ptr2, *ptr3; - pcb_hid_get_coords("Click on subc to change the layer binding of", &x, &y, 0); + rnd_hid_get_coords("Click on subc to change the layer binding of", &x, &y, 0); type = pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3); if (type != PCB_OBJ_SUBC) { pcb_message(PCB_MSG_ERROR, "No subc under the cursor\n"); Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 30898) @@ -637,7 +637,7 @@ void *r1, *r2, *r3; pcb_subc_t *sc; int type; - pcb_hid_get_coords("Pick a subcircuit for padstack lib editing", &x, &y, 0); + 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); Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 30898) @@ -720,7 +720,7 @@ fgw_error_t pcb_act_LibraryDialog(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) { if (strcmp(pcb_gui->name, "lesstif") == 0) - pcb_actionva(oargv[0].val.argv0.user_call_ctx, "DoWindows", "library"); + rnd_actionva(oargv[0].val.argv0.user_call_ctx, "DoWindows", "library"); else pcb_dlg_library(); return 0; Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30898) @@ -87,7 +87,7 @@ if (name != NULL) { if (pcbhl_conf.rc.verbose) fprintf(stderr, "Load: Calling LoadFrom(%s, %s)\n", function, name); - pcb_actionva(PCB_ACT_HIDLIB, "LoadFrom", function, name, NULL); + rnd_actionva(PCB_ACT_HIDLIB, "LoadFrom", function, name, NULL); free(name); } @@ -414,7 +414,7 @@ if (pcb_strcasecmp(function, "Layout") == 0) if (PCB->hidlib.filename != NULL) - return pcb_actionva(PCB_ACT_HIDLIB, "SaveTo", "Layout", NULL); + return rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", "Layout", NULL); if (is_dialog) { const char *siot, *sext; @@ -593,7 +593,7 @@ const char *sfmt = avail.plug[fmt]->description; if (fmt_param != NULL) sfmt = avail.plug[save.pick]->description; - pcb_actionva(PCB_ACT_HIDLIB, "PasteBuffer", "Save", final_name, sfmt, NULL); + rnd_actionva(PCB_ACT_HIDLIB, "PasteBuffer", "Save", final_name, sfmt, NULL); } else { const char *sfmt = NULL; @@ -606,9 +606,9 @@ * just obtained. */ if (pcb_strcasecmp(function, "Layout") == 0) - pcb_actionva(PCB_ACT_HIDLIB, "SaveTo", "LayoutAs", final_name, sfmt, NULL); + rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", "LayoutAs", final_name, sfmt, NULL); else - pcb_actionva(PCB_ACT_HIDLIB, "SaveTo", function, final_name, sfmt, NULL); + rnd_actionva(PCB_ACT_HIDLIB, "SaveTo", function, final_name, sfmt, NULL); } free(final_name); Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 30898) @@ -202,30 +202,30 @@ name = pcb_strdup(r->cell[0]); if (w == ctx->wsel) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "select", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "select", name, NULL); else if (w == ctx->wunsel) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "unselect", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "unselect", name, NULL); else if (w == ctx->wfind) { - pcb_actionva(&ctx->pcb->hidlib, "connection", "reset", NULL); - pcb_actionva(&ctx->pcb->hidlib, "netlist", "find", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "connection", "reset", NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "find", name, NULL); } else if (w == ctx->wunfind) - pcb_actionva(&ctx->pcb->hidlib, "connection", "reset", NULL); + rnd_actionva(&ctx->pcb->hidlib, "connection", "reset", NULL); else if (w == ctx->wrats) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "rats", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "rats", name, NULL); else if (w == ctx->wnorats) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "norats", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "norats", name, NULL); else if (w == ctx->wripup) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "ripup", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "ripup", name, NULL); else if (w == ctx->waddrats) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "AddRats", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "AddRats", name, NULL); else if (w == ctx->wrename) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "rename", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "rename", name, NULL); else if (w == ctx->wmerge) - pcb_actionva(&ctx->pcb->hidlib, "netlist", "merge", name, NULL); + rnd_actionva(&ctx->pcb->hidlib, "netlist", "merge", name, NULL); else if (w == ctx->wattr) { char *tmp = pcb_concat("net:", name, NULL); - pcb_actionva(&ctx->pcb->hidlib, "propedit", tmp, NULL); + rnd_actionva(&ctx->pcb->hidlib, "propedit", tmp, NULL); free(tmp); } else { @@ -238,19 +238,19 @@ static void netlist_claim_obj_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { netlist_ctx_t *ctx = caller_data; - pcb_actionva(&ctx->pcb->hidlib, "ClaimNet", "object", NULL); + rnd_actionva(&ctx->pcb->hidlib, "ClaimNet", "object", NULL); } static void netlist_claim_sel_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { netlist_ctx_t *ctx = caller_data; - pcb_actionva(&ctx->pcb->hidlib, "ClaimNet", "selected", NULL); + rnd_actionva(&ctx->pcb->hidlib, "ClaimNet", "selected", NULL); } static void netlist_claim_fnd_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { netlist_ctx_t *ctx = caller_data; - pcb_actionva(&ctx->pcb->hidlib, "ClaimNet", "found", NULL); + rnd_actionva(&ctx->pcb->hidlib, "ClaimNet", "found", NULL); } static vtp0_t netlist_color_save; @@ -446,7 +446,7 @@ static fgw_error_t pcb_act_NetlistDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { if (strcmp(pcb_gui->name, "lesstif") == 0) - pcb_actionva(PCB_ACT_HIDLIB, "DoWindows", "netlist"); + rnd_actionva(PCB_ACT_HIDLIB, "DoWindows", "netlist"); else pcb_dlg_netlist(PCB); PCB_ACT_IRES(0); Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 30898) @@ -1016,7 +1016,7 @@ pcb_coord_t x, y; void *ptr1, *ptr2 = NULL, *ptr3; long type; - pcb_hid_get_coords("Click on a padstack to edit", &x, &y, 0); + rnd_hid_get_coords("Click on a padstack to edit", &x, &y, 0); 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"); Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 30898) @@ -179,7 +179,7 @@ pcb_coord_t x, y; pcb_objtype_t type; - pcb_hid_get_coords("Click on a subcircuit", &x, &y, 0); + rnd_hid_get_coords("Click on a subcircuit", &x, &y, 0); type = pcb_search_obj_by_location(PCB_OBJ_SUBC, &r1, &r2, &r3, x, y, 1); if (type == PCB_OBJ_SUBC) { pcb_subc_t *sc = r2; Index: trunk/src_plugins/dialogs/dlg_pref_board.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_board.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_pref_board.c (revision 30898) @@ -70,7 +70,7 @@ static void pref_board_edit_attr(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "Propedit", "board", NULL); + rnd_actionva(&PCB->hidlib, "Propedit", "board", NULL); } Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30898) @@ -240,7 +240,7 @@ static void pref_conf_editval_hlist_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *trigger_attr) { confedit_ctx_t *ctx = caller_data; - pcb_actionva(&PCB->hidlib, ctx->nat->gui_edit_act, + rnd_actionva(&PCB->hidlib, ctx->nat->gui_edit_act, pcb_conf_role_name(ctx->role), ctx->nat->hash_path, trigger_attr->val.str, NULL); } Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30898) @@ -54,7 +54,7 @@ static void drc_rules_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, attr->user_data, NULL); + rnd_actionva(&PCB->hidlib, attr->user_data, NULL); } static pref_confitem_t drc_sizes[] = { Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 30898) @@ -299,7 +299,7 @@ { search_ctx_t *ctx = caller_data; if (ctx->dlg[ctx->wexpr_str].val.str != NULL) - pcb_actionva(&PCB->hidlib, "query", search_acts[ctx->dlg[ctx->wact].val.lng], ctx->dlg[ctx->wexpr_str].val.str, NULL); + rnd_actionva(&PCB->hidlib, "query", search_acts[ctx->dlg[ctx->wact].val.lng], ctx->dlg[ctx->wexpr_str].val.str, NULL); } Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 30897) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 30898) @@ -791,7 +791,7 @@ 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); - if ((lst != NULL) && (!fgw_ptr_in_domain(&pcb_fgw, &argv[3], PCB_PTR_DOMAIN_VIEWLIST))) { + 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); return 0; Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 30897) +++ trunk/src_plugins/distalign/distalign.c (revision 30898) @@ -533,7 +533,7 @@ return 0; } -static pcb_action_t distalign_action_list[] = { +static rnd_action_t distalign_action_list[] = { {"distribute", pcb_act_distribute, "Distribute objects", pcb_acts_distribute}, {"distributetext", pcb_act_distribute, "Distribute objects", pcb_acts_distribute}, {"align", pcb_act_align, "Align objects", pcb_acts_align}, @@ -546,7 +546,7 @@ void pplg_uninit_distalign(void) { - pcb_remove_actions_by_cookie(distalign_cookie); + rnd_remove_actions_by_cookie(distalign_cookie); } int pplg_init_distalign(void) Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 30897) +++ trunk/src_plugins/djopt/djopt.c (revision 30898) @@ -2560,7 +2560,7 @@ return 0; } -pcb_action_t djopt_action_list[] = { +rnd_action_t djopt_action_list[] = { {"djopt", pcb_act_DJopt, pcb_acth_DJopt, pcb_acts_DJopt} }; @@ -2568,7 +2568,7 @@ void pplg_uninit_djopt(void) { - pcb_remove_actions_by_cookie(djopt_cookie); + rnd_remove_actions_by_cookie(djopt_cookie); pcb_conf_unreg_fields("plugins/djopt/"); } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 30897) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 30898) @@ -809,7 +809,7 @@ if (lactive >= 0) { char tmp[32]; sprintf(tmp, "%ld", lactive); - pcb_actionva(&PCB->hidlib, "MoveLayer", tmp, "-1", NULL); + rnd_actionva(&PCB->hidlib, "MoveLayer", tmp, "-1", NULL); } drag_dellayer = 0; lactive = -1; @@ -876,13 +876,13 @@ lid = get_layer_coords(x, y); if (lid >= 0) { pcb_layervis_change_group_vis(&PCB->hidlib, lid, 1, 1); - pcb_actionva(&PCB->hidlib, "Popup", "layer", NULL); + rnd_actionva(&PCB->hidlib, "Popup", "layer", NULL); } else if ((x > 0) && (x < PCB_MM_TO_COORD(GROUP_WIDTH_MM))) { pcb_coord_t tmp; pcb_actd_EditGroup_gid = get_group_coords(y, &tmp, &tmp); if (pcb_actd_EditGroup_gid >= 0) - pcb_actionva(&PCB->hidlib, "Popup", "group", NULL); + rnd_actionva(&PCB->hidlib, "Popup", "group", NULL); } break; @@ -940,7 +940,7 @@ static const char *draw_csect_cookie = "draw_csect"; -pcb_action_t draw_csect_action_list[] = { +rnd_action_t draw_csect_action_list[] = { {"DumpCsect", pcb_act_dump_csect, pcb_acth_dump_csect, pcb_acts_dump_csect} }; @@ -948,7 +948,7 @@ void pplg_uninit_draw_csect(void) { - pcb_remove_actions_by_cookie(draw_csect_cookie); + rnd_remove_actions_by_cookie(draw_csect_cookie); } int pplg_init_draw_csect(void) Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30897) +++ trunk/src_plugins/drc_query/dlg.c (revision 30898) @@ -106,8 +106,8 @@ fgw_arg_t args[4], ares; args[1].type = FGW_STR; args[1].val.str = "drc_query: manual run"; args[2].type = FGW_STR; args[2].val.str = "drc_query_run"; - fgw_ptr_reg(&pcb_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view); - pcb_actionv_bin(hidlib, "viewlist", &ares, 4, args); + fgw_ptr_reg(&rnd_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view); + rnd_actionv_bin(hidlib, "viewlist", &ares, 4, args); } Index: trunk/src_plugins/drc_query/drc_query.c =================================================================== --- trunk/src_plugins/drc_query/drc_query.c (revision 30897) +++ trunk/src_plugins/drc_query/drc_query.c (revision 30898) @@ -349,7 +349,7 @@ static pcb_drc_impl_t drc_query_impl = {"drc_query", "query() based DRC", "drcquerylistrules"}; -static pcb_action_t drc_query_action_list[] = { +static rnd_action_t drc_query_action_list[] = { {"DrcQueryListRules", pcb_act_DrcQueryListRules, pcb_acth_DrcQueryListRules, pcb_acts_DrcQueryListRules}, {"DrcQueryEditRule", pcb_act_DrcQueryEditRule, pcb_acth_DrcQueryEditRule, pcb_acts_DrcQueryEditRule} }; @@ -370,7 +370,7 @@ pcb_conf_unreg_field(free_drc_conf_nodes.array[n]); vtp0_uninit(&free_drc_conf_nodes); - pcb_remove_actions_by_cookie(drc_query_cookie); + rnd_remove_actions_by_cookie(drc_query_cookie); pcb_drcq_stat_uninit(); } Index: trunk/src_plugins/expfeat/expfeat.c =================================================================== --- trunk/src_plugins/expfeat/expfeat.c (revision 30897) +++ trunk/src_plugins/expfeat/expfeat.c (revision 30898) @@ -47,7 +47,7 @@ return 0; } -static const pcb_action_t expfeat_action_list[] = { +static const rnd_action_t expfeat_action_list[] = { {"ExpFeatTmp", pcb_act_ExpFeatTmp, pcb_acth_ExpFeatTmp, pcb_acts_ExpFeatTmp} }; @@ -57,7 +57,7 @@ void pplg_uninit_expfeat(void) { - pcb_remove_actions_by_cookie(expfeat_cookie); + rnd_remove_actions_by_cookie(expfeat_cookie); } int pplg_init_expfeat(void) Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 30897) +++ trunk/src_plugins/export_gerber/gerber.c (revision 30898) @@ -1011,7 +1011,7 @@ { pcb_dad_retovr_t retovr; pcb_hid_dad_close(hid_ctx, &retovr, -1); - pcb_actionva(&PCB->hidlib, "cam", NULL); + rnd_actionva(&PCB->hidlib, "cam", NULL); } Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 30897) +++ trunk/src_plugins/export_lpr/lpr.c (revision 30898) @@ -119,7 +119,7 @@ void pplg_uninit_export_lpr(void) { - pcb_remove_actions_by_cookie(lpr_cookie); + rnd_remove_actions_by_cookie(lpr_cookie); } int pplg_init_export_lpr(void) Index: trunk/src_plugins/export_oldconn/oldconn.c =================================================================== --- trunk/src_plugins/export_oldconn/oldconn.c (revision 30897) +++ trunk/src_plugins/export_oldconn/oldconn.c (revision 30898) @@ -289,7 +289,7 @@ case F_ElementConnections: case F_SubcConnections: - pcb_hid_get_coords("Click on a subc", &x, &y, 0); + rnd_hid_get_coords("Click on a subc", &x, &y, 0); if (pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp) != PCB_OBJ_VOID) { pcb_subc_t *subc = (pcb_subc_t *) ptrtmp; f = pcb_check_and_open_file(name); @@ -303,7 +303,7 @@ PCB_ACT_FAIL(ExportOldConn); } -static pcb_action_t oldconn_action_list[] = { +static rnd_action_t oldconn_action_list[] = { {"ExportOldConn", pcb_act_ExportOldConn, pcb_acth_ExportOldConn, pcb_acts_ExportOldConn} }; @@ -311,7 +311,7 @@ void pplg_uninit_export_oldconn(void) { - pcb_remove_actions_by_cookie(oldconn_cookie); + rnd_remove_actions_by_cookie(oldconn_cookie); } int pplg_init_export_oldconn(void) Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30897) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30898) @@ -824,7 +824,7 @@ return 0; } -static pcb_action_t openems_action_list[] = { +static rnd_action_t openems_action_list[] = { {"mesh", pcb_act_mesh, pcb_acth_mesh, pcb_acts_mesh}, {"OpenemsExcitation", pcb_act_OpenemsExcitation, pcb_acth_OpenemsExcitation, pcb_acts_OpenemsExcitation} }; @@ -834,7 +834,7 @@ void pplg_uninit_export_openems(void) { pcb_openems_excitation_uninit(); - pcb_remove_actions_by_cookie(openems_cookie); + rnd_remove_actions_by_cookie(openems_cookie); pcb_export_remove_opts_by_cookie(openems_cookie); } Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30897) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30898) @@ -653,7 +653,7 @@ } -static pcb_action_t scad_action_list[] = { +static rnd_action_t scad_action_list[] = { {"ExportScadPoly", pcb_act_scad_export_poly, pcb_acth_scad_export_poly, pcb_acts_scad_export_poly} }; @@ -662,7 +662,7 @@ void pplg_uninit_export_openscad(void) { pcb_export_remove_opts_by_cookie(openscad_cookie); - pcb_remove_actions_by_cookie(openscad_cookie); + rnd_remove_actions_by_cookie(openscad_cookie); } int pplg_init_export_openscad(void) Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 30897) +++ trunk/src_plugins/export_ps/ps.c (revision 30898) @@ -1422,7 +1422,7 @@ return 0; } -pcb_action_t hidps_action_list[] = { +rnd_action_t hidps_action_list[] = { {"pscalib", pcb_act_PSCalib, NULL, NULL} }; @@ -1469,7 +1469,7 @@ static void plugin_ps_uninit(void) { - pcb_remove_actions_by_cookie(ps_cookie); + rnd_remove_actions_by_cookie(ps_cookie); pcb_export_remove_opts_by_cookie(ps_cookie); ps_inited = 0; } Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 30897) +++ trunk/src_plugins/export_stl/export_stl.c (revision 30898) @@ -245,7 +245,7 @@ void pplg_uninit_export_stl(void) { - pcb_remove_actions_by_cookie(stl_cookie); + rnd_remove_actions_by_cookie(stl_cookie); } int pplg_init_export_stl(void) Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 30897) +++ trunk/src_plugins/extedit/extedit.c (revision 30898) @@ -186,7 +186,7 @@ /* pick up the object to edit */ if ((cmd == NULL) || (pcb_strcasecmp(cmd, "object") == 0)) { pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to edit", &x, &y, 0); + rnd_hid_get_coords("Click on object to edit", &x, &y, 0); type = pcb_search_screen(x, y, EXTEDIT_TYPES, &ptr1, &ptr2, &ptr3); pcb_buffer_set_number(bn); @@ -336,7 +336,7 @@ return 0; } -static pcb_action_t extedit_action_list[] = { +static rnd_action_t extedit_action_list[] = { {"extedit", pcb_act_extedit, pcb_acts_extedit, pcb_acth_extedit} }; @@ -346,7 +346,7 @@ void pplg_uninit_extedit(void) { - pcb_remove_actions_by_cookie(extedit_cookie); + rnd_remove_actions_by_cookie(extedit_cookie); } int pplg_init_extedit(void) Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 30897) +++ trunk/src_plugins/fontmode/fontmode.c (revision 30898) @@ -112,7 +112,7 @@ return 1; } - if (pcb_actionva(PCB_ACT_HIDLIB, "New", "Font", 0)) + if (rnd_actionva(PCB_ACT_HIDLIB, "New", "Font", 0)) return 1; pcb_conf_set(CFR_DESIGN, "editor/grid_unit", -1, "mil", POL_OVERWRITE); @@ -338,13 +338,13 @@ } pcb_font_set_info(font); - pcb_actionva(PCB_ACT_HIDLIB, "SaveFontTo", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "SaveFontTo", NULL); PCB_ACT_IRES(0); return 0; } -pcb_action_t fontmode_action_list[] = { +rnd_action_t fontmode_action_list[] = { {"FontEdit", pcb_act_FontEdit, pcb_acth_fontedit, pcb_acts_fontedit}, {"FontSave", pcb_act_FontSave, pcb_acth_fontsave, pcb_acts_fontsave} }; @@ -355,7 +355,7 @@ void pplg_uninit_fontmode(void) { - pcb_remove_actions_by_cookie(fontmode_cookie); + rnd_remove_actions_by_cookie(fontmode_cookie); } int pplg_init_fontmode(void) Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 30897) +++ trunk/src_plugins/hid_batch/batch.c (revision 30898) @@ -137,7 +137,7 @@ batch_stay = 1; while (batch_stay) { if ((interactive) && (!pcbhl_conf.rc.quiet)) { - printf("%s:%s> ", prompt, pcb_cli_prompt(NULL)); + printf("%s:%s> ", prompt, rnd_cli_prompt(NULL)); fflush(stdout); } if (fgets(line, sizeof(line) - 1, stdin) == NULL) { @@ -144,7 +144,7 @@ uninit_batch(); goto quit; } - pcb_parse_command(hid->hid_data, line, pcb_false); + rnd_parse_command(hid->hid_data, line, pcb_false); } quit:; Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 30897) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 30898) @@ -856,7 +856,7 @@ lesstif_show_library(); } else if (strcmp(a, "3") == 0 || pcb_strcasecmp(a, "Log") == 0) { - pcb_actionva(ltf_hidlib, "LogDialog", NULL); + rnd_actionva(ltf_hidlib, "LogDialog", NULL); } else if (strcmp(a, "4") == 0 || pcb_strcasecmp(a, "Netlist") == 0) { lesstif_show_netlist(); @@ -1188,7 +1188,7 @@ /* ------------------------------------------------------------ */ -static pcb_action_t ltf_dialog_action_list[] = { +static rnd_action_t ltf_dialog_action_list[] = { {"DoWindows", pcb_act_DoWindows, pcb_acth_DoWindows, pcb_acts_DoWindows}, {"AdjustSizes", pcb_act_AdjustSizes, pcb_acth_AdjustSizes, pcb_acts_AdjustSizes} }; Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30897) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 30898) @@ -257,24 +257,24 @@ argv[0].type = FGW_VOID; argv[1].type = FGW_STR | FGW_DYN; argv[1].val.str = pcb_strdup_printf("#%02x%02x%02x", clr->r, clr->g, clr->b); - rs = pcb_actionv_bin(ltf_hidlib, CPACT, &res, 2, argv); + rs = rnd_actionv_bin(ltf_hidlib, CPACT, &res, 2, argv); if (rs != 0) return; if (!(res.type & FGW_STR)) { pcb_message(PCB_MSG_ERROR, CPACT " returned non-string\n"); - fgw_arg_free(&pcb_fgw, &res); + fgw_arg_free(&rnd_fgw, &res); return; } r = pcb_color_load_str(&nclr, res.val.str); - fgw_arg_free(&pcb_fgw, &res); + fgw_arg_free(&rnd_fgw, &res); if (r != 0) { pcb_message(PCB_MSG_ERROR, CPACT " returned invalid color string\n"); return; } - fgw_arg_free(&pcb_fgw, &res); + fgw_arg_free(&rnd_fgw, &res); pcb_ltf_color_button_recolor(display, w, &nclr); ctx->attrs[widx].val.clr = nclr; valchg(w, dlg_widget_, w); Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 30897) +++ trunk/src_plugins/hid_lesstif/library.c (revision 30898) @@ -184,7 +184,7 @@ } } -static pcb_action_t ltf_library_action_list[] = { +static rnd_action_t ltf_library_action_list[] = { {"LibraryShow", pcb_act_LibraryShow, pcb_acth_LibraryShow, pcb_acts_LibraryShow} }; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30897) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30898) @@ -438,7 +438,7 @@ s = XmTextGetString(w); lesstif_show_crosshair(0); pcb_clihist_append(s, NULL, NULL, NULL); - pcb_parse_command(ltf_hidlib, s, pcb_false); + rnd_parse_command(ltf_hidlib, s, pcb_false); XtFree(s); XmTextSetString(w, XmStrCast("")); @@ -501,7 +501,7 @@ switch (e->type) { case KeyRelease: if (cmd_is_active) - pcb_cli_edit(ltf_hidlib); + rnd_cli_edit(ltf_hidlib); break; case KeyPress: @@ -528,7 +528,7 @@ XmTextSetString(w, XmStrCast("")); break; case XK_Tab: - pcb_cli_tab(ltf_hidlib); + rnd_cli_tab(ltf_hidlib); *cont = False; break; case XK_Escape: @@ -1496,7 +1496,7 @@ stdarg(XmNtopAttachment, XmATTACH_FORM); stdarg(XmNbottomAttachment, XmATTACH_FORM); stdarg(XmNleftAttachment, XmATTACH_FORM); - stdarg(XmNlabelString, XmStringCreatePCB(pcb_cli_prompt(":"))); + stdarg(XmNlabelString, XmStringCreatePCB(rnd_cli_prompt(":"))); m_cmd_label = XmCreateLabel(messages, XmStrCast("command"), stdarg_args, stdarg_n); stdarg_n = 0; @@ -1613,7 +1613,7 @@ static void mainwind_delete_cb() { - pcb_action(ltf_hidlib, "Quit"); + rnd_action(ltf_hidlib, "Quit"); } static void lesstif_listener_cb(XtPointer client_data, int *fid, XtInputId * id) @@ -1626,7 +1626,7 @@ if (nbytes) { buf[nbytes] = '\0'; - pcb_parse_actions(ltf_hidlib, buf); + rnd_parse_actions(ltf_hidlib, buf); } } @@ -2777,7 +2777,7 @@ lesstif_invalidate_all(pcb_gui); if (strncmp(cfg->hash_path, "rc/cli_", 7) == 0) { stdarg_n = 0; - stdarg(XmNlabelString, XmStringCreatePCB(pcb_cli_prompt(":"))); + stdarg(XmNlabelString, XmStringCreatePCB(rnd_cli_prompt(":"))); XtSetValues(m_cmd_label, stdarg_args, stdarg_n); } } @@ -3080,7 +3080,7 @@ static void lesstif_end(void) { - pcb_remove_actions_by_cookie(lesstif_cookie); + rnd_remove_actions_by_cookie(lesstif_cookie); pcb_export_remove_opts_by_cookie(lesstif_cookie); lesstif_active = 0; } Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 30897) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 30898) @@ -123,17 +123,17 @@ static void nbcb_select(pcb_net_t *net, int pos) { - pcb_actionva(ltf_hidlib, "netlist", "select", net->name, NULL); + rnd_actionva(ltf_hidlib, "netlist", "select", net->name, NULL); } static void nbcb_deselect(pcb_net_t *net, int pos) { - pcb_actionva(ltf_hidlib, "netlist", "unselect", net->name, NULL); + rnd_actionva(ltf_hidlib, "netlist", "unselect", net->name, NULL); } static void nbcb_find(pcb_net_t *net, int pos) { - pcb_actionva(ltf_hidlib, "netlist", "find", net->name, NULL); + rnd_actionva(ltf_hidlib, "netlist", "find", net->name, NULL); } static void nbcb_std_callback(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs) @@ -144,7 +144,7 @@ if (XmListGetSelectedPos(netlist_list, &posl, &posc) == False) return; if (v == nbcb_find) - pcb_actionva(ltf_hidlib, "connection", "reset", NULL); + rnd_actionva(ltf_hidlib, "connection", "reset", NULL); for(e = htsp_first(&PCB->netlist[PCB_NETLIST_EDITED]), i = 0; e != NULL; e = htsp_next(&PCB->netlist[PCB_NETLIST_EDITED], e), i++) { pcb_net_t *net = e->value; @@ -439,7 +439,7 @@ XtAddEventHandler(XtParent(netlist_dialog), StructureNotifyMask, False, pcb_ltf_wplc_config_cb, "netlist"); } -static pcb_action_t ltf_netlist_action_list[] = { +static rnd_action_t ltf_netlist_action_list[] = { {"NetlistShow", pcb_act_LesstifNetlistShow, pcb_acth_LesstifNetlistShow, pcb_acts_LesstifNetlistShow} }; Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 30897) +++ trunk/src_plugins/hid_remote/remote.c (revision 30898) @@ -45,7 +45,7 @@ } -/*pcb_action_t remote_action_list[] = { +/*rnd_action_t remote_action_list[] = { }; RND_REGISTER_ACTIONS(remote_action_list, remote_cookie)*/ @@ -384,7 +384,7 @@ void pplg_uninit_hid_remote(void) { -/* pcb_remove_actions_by_cookie(remote_cookie);*/ +/* rnd_remove_actions_by_cookie(remote_cookie);*/ pcb_event_unbind_allcookie(remote_cookie); } Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 30897) +++ trunk/src_plugins/import_calay/calay.c (revision 30898) @@ -66,8 +66,8 @@ char line[512]; char *curr = NULL; - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); while(fgets(line, sizeof(line), fn) != NULL) { char *s, *next, *num; @@ -99,7 +99,7 @@ if (num != NULL) { *num = '-'; if (curr != NULL) - pcb_actionva(&PCB->hidlib, "Netlist", "Add", curr, s, NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", curr, s, NULL); else pcb_message(PCB_MSG_ERROR, "Calay syntax error: %s is after a ;, not in any net\n", s); } @@ -121,8 +121,8 @@ } free(curr); - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); return 0; } @@ -132,7 +132,7 @@ char line[512]; char *val, *refdes, *footprint, *end; int len; - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); while(fgets(line, sizeof(line), f) != NULL) { len = strlen(line); @@ -160,9 +160,9 @@ if (end != NULL) *end = '\0'; - pcb_actionva(&PCB->hidlib, "ElementList", "Need", refdes, footprint, val, NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Need", refdes, footprint, val, NULL); } - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); return 0; } @@ -254,12 +254,12 @@ pcb_message(PCB_MSG_ERROR, "import_calay: requires exactly 1 input file name\n"); return -1; } - return pcb_actionva(&PCB->hidlib, "LoadCalayFrom", fns[0], NULL); + return rnd_actionva(&PCB->hidlib, "LoadCalayFrom", fns[0], NULL); } static pcb_plug_import_t import_calay; -pcb_action_t calay_action_list[] = { +rnd_action_t calay_action_list[] = { {"LoadCalayFrom", pcb_act_LoadCalayFrom, pcb_acth_LoadCalayFrom, pcb_acts_LoadCalayFrom} }; @@ -267,7 +267,7 @@ void pplg_uninit_import_calay(void) { - pcb_remove_actions_by_cookie(calay_cookie); + rnd_remove_actions_by_cookie(calay_cookie); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_calay); } Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 30897) +++ trunk/src_plugins/import_dsn/dsn.c (revision 30898) @@ -335,7 +335,7 @@ return 0; } -pcb_action_t dsn_action_list[] = { +rnd_action_t dsn_action_list[] = { {"LoadDsnFrom", pcb_act_LoadDsnFrom, pcb_acth_LoadDsnFrom, pcb_acts_LoadDsnFrom} }; @@ -343,7 +343,7 @@ void pplg_uninit_import_dsn(void) { - pcb_remove_actions_by_cookie(dsn_cookie); + rnd_remove_actions_by_cookie(dsn_cookie); } Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30897) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 30898) @@ -71,9 +71,9 @@ return -1; } - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); while((line = fgets(buff, sizeof(buff), f)) != NULL) { rtrim(line); @@ -124,7 +124,7 @@ ltrim(fp); } if ((fp != NULL) && (*fp != '\0')) { - pcb_actionva(&PCB->hidlib, "ElementList", "Need", line, fp, "", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Need", line, fp, "", NULL); } else pcb_message(PCB_MSG_ERROR, "No footprint specified for %s\n", line); @@ -146,7 +146,7 @@ continue; } *tn = '-'; - pcb_actionva(&PCB->hidlib, "Netlist", "Add", signame, curr, NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", signame, curr, NULL); } break; default: break; /* ignore line */ @@ -153,9 +153,9 @@ } } - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); fclose(f); return 0; @@ -223,7 +223,7 @@ static pcb_plug_import_t import_fpcb_nl; -pcb_action_t fpcb_nl_action_list[] = { +rnd_action_t fpcb_nl_action_list[] = { {"LoadFpcbnlFrom", pcb_act_LoadFpcbnlFrom, pcb_acth_LoadFpcbnlFrom, pcb_acts_LoadFpcbnlFrom} }; @@ -231,7 +231,7 @@ void pplg_uninit_import_fpcb_nl(void) { - pcb_remove_actions_by_cookie(fpcb_nl_cookie); + rnd_remove_actions_by_cookie(fpcb_nl_cookie); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_fpcb_nl); } Index: trunk/src_plugins/import_gnetlist/import_gnetlist.c =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 30897) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 30898) @@ -122,7 +122,7 @@ if (res == 0) { if (verbose) pcb_message(PCB_MSG_DEBUG, "pcb_gnetlist: about to run pcb_act_ExecuteFile, file = %s\n", tmpfn); - fgw_uvcall(&pcb_fgw, &PCB->hidlib, &rs, "executefile", FGW_STR, tmpfn, 0); + fgw_uvcall(&rnd_fgw, &PCB->hidlib, &rs, "executefile", FGW_STR, tmpfn, 0); } for(n = 0; n < numfns; n++) free(cmd[n+8]); Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 30897) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 30898) @@ -136,7 +136,7 @@ pcb_message(PCB_MSG_ERROR, "Error loading HP-GL: could not load any object from %s\n", fname); return 0; } - pcb_actionva(&PCB->hidlib, "mode", "buffer", NULL); + rnd_actionva(&PCB->hidlib, "mode", "buffer", NULL); return 0; } @@ -171,7 +171,7 @@ return hpgl_load(fname); } -pcb_action_t hpgl_action_list[] = { +rnd_action_t hpgl_action_list[] = { {"LoadHpglFrom", pcb_act_LoadHpglFrom, pcb_acth_LoadHpglFrom, pcb_acts_LoadHpglFrom} }; @@ -179,7 +179,7 @@ void pplg_uninit_import_hpgl(void) { - pcb_remove_actions_by_cookie(hpgl_cookie); + rnd_remove_actions_by_cookie(hpgl_cookie); } int pplg_init_import_hpgl(void) Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30897) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 30898) @@ -339,7 +339,7 @@ if (want_net && (netname_valid(netname))) { char tn[36]; sprintf(tn, "%s-%s", refdes, term); - pcb_actionva(&pcb->hidlib, "Netlist", "Add", netname, tn, NULL); + rnd_actionva(&pcb->hidlib, "Netlist", "Add", netname, tn, NULL); } break; case '9': /* EOF */ @@ -405,15 +405,15 @@ } if (want_net) { - pcb_actionva(PCB_ACT_HIDLIB, "Netlist", "Freeze", NULL); - pcb_actionva(PCB_ACT_HIDLIB, "Netlist", "Clear", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Freeze", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Clear", NULL); } rs = ipc356_parse(PCB, f, fname, scs, want_net, want_pads); if (want_net) { - pcb_actionva(PCB_ACT_HIDLIB, "Netlist", "Sort", NULL); - pcb_actionva(PCB_ACT_HIDLIB, "Netlist", "Thaw", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Sort", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "Netlist", "Thaw", NULL); } fclose(f); @@ -435,7 +435,7 @@ return 0; } -pcb_action_t import_ipcd356_action_list[] = { +rnd_action_t import_ipcd356_action_list[] = { {"LoadIpc356From", pcb_act_LoadIpc356From, pcb_acth_LoadIpc356From, pcb_acts_LoadIpc356From} }; @@ -479,7 +479,7 @@ pcb_message(PCB_MSG_ERROR, "import_ipcd356: requires exactly 1 input file name\n"); return -1; } - return pcb_actionva(&PCB->hidlib, "LoadIpc356From", fns[0], NULL); + return rnd_actionva(&PCB->hidlib, "LoadIpc356From", fns[0], NULL); } static pcb_plug_import_t import_ipcd356; @@ -489,7 +489,7 @@ void pplg_uninit_import_ipcd356(void) { - pcb_remove_actions_by_cookie(ipcd356_cookie); + rnd_remove_actions_by_cookie(ipcd356_cookie); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_ipcd356); } Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 30897) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 30898) @@ -86,7 +86,7 @@ if (sattr->footprint == NULL) pcb_message(PCB_MSG_ERROR, "ltspice: not importing refdes=%s: no footprint specified\n", sattr->refdes); else - pcb_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); } free(sattr->refdes); sattr->refdes = NULL; free(sattr->value); sattr->value = NULL; @@ -100,7 +100,7 @@ memset(&sattr, 0, sizeof(sattr)); - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); while(fgets(line, sizeof(line), fa) != NULL) { char *s; @@ -194,7 +194,7 @@ } } sym_flush(&sattr); - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); return 0; } @@ -202,8 +202,8 @@ { char line[1024]; - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); while(fgets(line, sizeof(line), fn) != NULL) { int argc; @@ -217,13 +217,13 @@ int n; for(n = 2; n < argc; n++) { /* pcb_trace("net-add '%s' '%s'\n", argv[1], argv[n]);*/ - pcb_actionva(&PCB->hidlib, "Netlist", "Add", argv[1], argv[n], NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", argv[1], argv[n], NULL); } } } - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); return 0; } @@ -369,12 +369,12 @@ pcb_message(PCB_MSG_ERROR, "import_ltspice: requires exactly 1 input file name\n"); return -1; } - return pcb_actionva(&PCB->hidlib, "LoadLtspiceFrom", fns[0], NULL); + return rnd_actionva(&PCB->hidlib, "LoadLtspiceFrom", fns[0], NULL); } static pcb_plug_import_t import_ltspice; -pcb_action_t ltspice_action_list[] = { +rnd_action_t ltspice_action_list[] = { {"LoadLtspiceFrom", pcb_act_LoadLtspiceFrom, pcb_acth_LoadLtspiceFrom, pcb_acts_LoadLtspiceFrom} }; @@ -382,7 +382,7 @@ void pplg_uninit_import_ltspice(void) { - pcb_remove_actions_by_cookie(ltspice_cookie); + rnd_remove_actions_by_cookie(ltspice_cookie); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_ltspice); } Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30897) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30898) @@ -96,7 +96,7 @@ } nethlp_elem_done(&PCB->hidlib, &ectx); -/* pcb_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);*/ +/* rnd_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);*/ return 0; } @@ -177,9 +177,9 @@ return -1; } - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); for(library = dom->root->children; library != NULL; library = library->next) { if (strcmp(library->str, "library") == 0) { @@ -199,9 +199,9 @@ } } - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); /* for(n = library->children; n != NULL; n = n->next) { printf("n=%s\n", n->str); @@ -300,7 +300,7 @@ static pcb_plug_import_t import_mentor_sch; -pcb_action_t mentor_sch_action_list[] = { +rnd_action_t mentor_sch_action_list[] = { {"LoadMentorFrom", pcb_act_LoadMentorFrom, pcb_acth_Loadmentor_schFrom, pcb_acts_Loadmentor_schFrom} }; @@ -308,7 +308,7 @@ void pplg_uninit_import_mentor_sch(void) { - pcb_remove_actions_by_cookie(mentor_sch_cookie); + rnd_remove_actions_by_cookie(mentor_sch_cookie); pcb_conf_unreg_fields("plugins/import_mentor_sch/"); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_mentor_sch); } Index: trunk/src_plugins/import_mentor_sch/netlist_helper.c =================================================================== --- trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 30897) +++ trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 30898) @@ -256,7 +256,7 @@ if (value == NULL) value = ""; /* create elemet */ - pcb_actionva(hl, "ElementList", "Need", refdes, footprint, value, NULL); + rnd_actionva(hl, "ElementList", "Need", refdes, footprint, value, NULL); /* printf("Elem '%s' -> %s:%s:%s\n", ectx->id, refdes, footprint, value);*/ } else @@ -296,7 +296,7 @@ pcb_message(PCB_MSG_ERROR, "nethelper: can't resolve refdes of part %s\n", part); } pcb_snprintf(term, sizeof(term), "%s-%s", refdes, pin); - pcb_actionva(hl, "Netlist", "Add", nctx->netname, term, NULL); + rnd_actionva(hl, "Netlist", "Add", nctx->netname, term, NULL); } void nethlp_net_destroy(nethlp_net_ctx_t *nctx) Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 30897) +++ trunk/src_plugins/import_mucs/mucs.c (revision 30898) @@ -154,7 +154,7 @@ return 0; } -pcb_action_t mucs_action_list[] = { +rnd_action_t mucs_action_list[] = { {"LoadMucsFrom", pcb_act_LoadMucsFrom, pcb_acth_LoadMucsFrom, pcb_acts_LoadMucsFrom} }; @@ -162,7 +162,7 @@ void pplg_uninit_import_mucs(void) { - pcb_remove_actions_by_cookie(mucs_cookie); + rnd_remove_actions_by_cookie(mucs_cookie); } int pplg_init_import_mucs(void) Index: trunk/src_plugins/import_sch2/import_sch.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch.c (revision 30897) +++ trunk/src_plugins/import_sch2/import_sch.c (revision 30898) @@ -158,7 +158,7 @@ } for(n = 0; n < argc; n++) { - if (fgw_arg_conv(&pcb_fgw, &argv[n], FGW_STR) != 0) { + if (fgw_arg_conv(&rnd_fgw, &argv[n], FGW_STR) != 0) { pcb_message(PCB_MSG_ERROR, "ImportSch: failed to convert argument %d to string\n", n+1); return -1; } @@ -218,7 +218,7 @@ } -static pcb_action_t import_sch_action_list[] = { +static rnd_action_t import_sch_action_list[] = { {"ImportSch", pcb_act_ImportSch, pcb_acth_ImportSch, pcb_acts_ImportSch} }; @@ -226,7 +226,7 @@ void pplg_uninit_import_sch2(void) { - pcb_remove_actions_by_cookie(import_sch_cookie); + rnd_remove_actions_by_cookie(import_sch_cookie); pcb_conf_unreg_fields("plugins/import_sch/"); isch_dlg_uninit(); } Index: trunk/src_plugins/import_sch2/import_sch_dlg.c =================================================================== --- trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30897) +++ trunk/src_plugins/import_sch2/import_sch_dlg.c (revision 30898) @@ -246,7 +246,7 @@ static void isch_plc_cfg_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { - pcb_actionva(&PCB->hidlib, "preferences", "config", "footprint_", NULL); + rnd_actionva(&PCB->hidlib, "preferences", "config", "footprint_", NULL); } Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 30897) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 30898) @@ -74,7 +74,7 @@ if (sattr->footprint == NULL) pcb_message(PCB_MSG_ERROR, "tinycad: not importing refdes=%s: no footprint specified\n", sattr->refdes); else - pcb_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); } free(sattr->refdes); sattr->refdes = NULL; free(sattr->value); sattr->value = NULL; @@ -89,9 +89,9 @@ memset(&sattr, 0, sizeof(sattr)); - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); while(fgets(line, sizeof(line), fn) != NULL) { int argc; @@ -120,7 +120,7 @@ if (sep != NULL) { *sep = '-'; /* pcb_trace("net-add '%s' '%s'\n", argv[2], curr);*/ - pcb_actionva(&PCB->hidlib, "Netlist", "Add", argv[2], curr, NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", argv[2], curr, NULL); } } } @@ -146,9 +146,9 @@ sym_flush(&sattr); - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); return 0; } @@ -243,7 +243,7 @@ static pcb_plug_import_t import_tinycad; -pcb_action_t tinycad_action_list[] = { +rnd_action_t tinycad_action_list[] = { {"LoadTinycadFrom", pcb_act_LoadtinycadFrom, pcb_acth_LoadtinycadFrom, pcb_acts_LoadtinycadFrom} }; @@ -251,7 +251,7 @@ void pplg_uninit_import_tinycad(void) { - pcb_remove_actions_by_cookie(tinycad_cookie); + rnd_remove_actions_by_cookie(tinycad_cookie); PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_tinycad); } Index: trunk/src_plugins/import_ttf/ttf.c =================================================================== --- trunk/src_plugins/import_ttf/ttf.c (revision 30897) +++ trunk/src_plugins/import_ttf/ttf.c (revision 30898) @@ -50,7 +50,7 @@ return 0; } -pcb_action_t ttf_action_list[] = { +rnd_action_t ttf_action_list[] = { {"LoadTtfGlyphs", pcb_act_LoadTtfGlyphs, pcb_acth_LoadTtfGlyphs, pcb_acts_LoadTtfGlyphs} }; @@ -58,7 +58,7 @@ void pplg_uninit_import_ttf(void) { - pcb_remove_actions_by_cookie(ttf_cookie); + rnd_remove_actions_by_cookie(ttf_cookie); } int pplg_init_import_ttf(void) Index: trunk/src_plugins/io_autotrax/io_autotrax.c =================================================================== --- trunk/src_plugins/io_autotrax/io_autotrax.c (revision 30897) +++ trunk/src_plugins/io_autotrax/io_autotrax.c (revision 30898) @@ -67,7 +67,7 @@ void pplg_uninit_io_autotrax(void) { - pcb_remove_actions_by_cookie(autotrax_cookie); + rnd_remove_actions_by_cookie(autotrax_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_autotrax); } Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 30897) +++ trunk/src_plugins/io_autotrax/read.c (revision 30898) @@ -88,7 +88,7 @@ if (sattr->footprint == NULL) pcb_message(PCB_MSG_ERROR, "protel autotrax: not importing refdes=%s: no footprint specified\n", sattr->refdes); else - pcb_actionva(hl, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); + rnd_actionva(hl, "ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL); } free(sattr->refdes); sattr->refdes = NULL; @@ -928,7 +928,7 @@ s = line; rtrim(s); if ((*line != '\0') && (netname != NULL)) { - pcb_actionva(&st->pcb->hidlib, "Netlist", "Add", netname, line, NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Add", netname, line, NULL); } } } @@ -1124,9 +1124,9 @@ } else if (strncmp(s, "NETDEF", 6) == 0) { if (netdefs == 0) { - pcb_actionva(&Ptr->hidlib, "ElementList", "start", NULL); - pcb_actionva(&Ptr->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&Ptr->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&Ptr->hidlib, "ElementList", "start", NULL); + rnd_actionva(&Ptr->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&Ptr->hidlib, "Netlist", "Clear", NULL); } netdefs |= 1; rdax_net(&st, FP); @@ -1147,9 +1147,9 @@ } } if (netdefs) { - pcb_actionva(&Ptr->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&Ptr->hidlib, "Netlist", "Thaw", NULL); - pcb_actionva(&Ptr->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&Ptr->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&Ptr->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&Ptr->hidlib, "ElementList", "Done", NULL); } fclose(FP); box = pcb_data_bbox(&board_size, Ptr->Data, pcb_false); Index: trunk/src_plugins/io_bxl/io_bxl.c =================================================================== --- trunk/src_plugins/io_bxl/io_bxl.c (revision 30897) +++ trunk/src_plugins/io_bxl/io_bxl.c (revision 30898) @@ -59,7 +59,7 @@ void pplg_uninit_io_bxl(void) { - pcb_remove_actions_by_cookie(bxl_cookie); + rnd_remove_actions_by_cookie(bxl_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_bxl); } Index: trunk/src_plugins/io_dsn/read.c =================================================================== --- trunk/src_plugins/io_dsn/read.c (revision 30897) +++ trunk/src_plugins/io_dsn/read.c (revision 30898) @@ -1639,7 +1639,7 @@ if (pcb_strcasecmp(nwr->str, "pins") == 0) { gsxl_node_t *n; for(n = nwr->children; n != NULL; n = n->next) - pcb_actionva(&ctx->pcb->hidlib, "Netlist", "Add", netname, n->str, NULL); + rnd_actionva(&ctx->pcb->hidlib, "Netlist", "Add", netname, n->str, NULL); } else if (pcb_strcasecmp(nwr->str, "property") == 0) { parse_attribute(ctx, &net->Attributes, nwr->children); @@ -1651,8 +1651,8 @@ static int dsn_parse_network(dsn_read_t *ctx, gsxl_node_t *nwr) { - pcb_actionva(&ctx->pcb->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&ctx->pcb->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&ctx->pcb->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&ctx->pcb->hidlib, "Netlist", "Clear", NULL); for(nwr = nwr->children; nwr != NULL; nwr = nwr->next) { if (nwr->str == NULL) @@ -1663,8 +1663,8 @@ } } - pcb_actionva(&ctx->pcb->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&ctx->pcb->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&ctx->pcb->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&ctx->pcb->hidlib, "Netlist", "Thaw", NULL); return 0; } Index: trunk/src_plugins/io_eagle/io_eagle.c =================================================================== --- trunk/src_plugins/io_eagle/io_eagle.c (revision 30897) +++ trunk/src_plugins/io_eagle/io_eagle.c (revision 30898) @@ -58,7 +58,7 @@ void pplg_uninit_io_eagle(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ - pcb_remove_actions_by_cookie(eagle_cookie); + rnd_remove_actions_by_cookie(eagle_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_xml); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_bin); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_dru); Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 30897) +++ trunk/src_plugins/io_eagle/read.c (revision 30898) @@ -1305,10 +1305,10 @@ net = eagle_get_attrs(st, PARENT(subtree), "name", NULL); if (net != NULL && net[0] == '-' && net[1] == '\0') { /* pcb-rnd doesn't like it when Eagle uses '-' for GND*/ - pcb_actionva(&st->pcb->hidlib, "Netlist", "Add", "GND", conn, NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Add", "GND", conn, NULL); pcb_message(PCB_MSG_WARNING, "Substituted contactref net \"GND\" instead of original invalid '-'\n"); } else { - pcb_actionva(&st->pcb->hidlib, "Netlist", "Add", net, conn, NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Add", net, conn, NULL); } return 0; } @@ -1327,8 +1327,8 @@ {NULL, NULL} }; - pcb_actionva(&st->pcb->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&st->pcb->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Clear", NULL); for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) { if (STRCMP(NODENAME(n), "signal") == 0) { @@ -1341,8 +1341,8 @@ } } - pcb_actionva(&st->pcb->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&st->pcb->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&st->pcb->hidlib, "Netlist", "Thaw", NULL); return 0; } Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 30897) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 30898) @@ -118,7 +118,7 @@ return 0; } -pcb_action_t hyp_action_list[] = { +rnd_action_t hyp_action_list[] = { {"LoadhypFrom", pcb_act_LoadhypFrom, pcb_acth_LoadhypFrom, pcb_acts_LoadhypFrom} }; @@ -160,7 +160,7 @@ void pplg_uninit_io_hyp(void) { - pcb_remove_actions_by_cookie(hyp_cookie); + rnd_remove_actions_by_cookie(hyp_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_hyp); } Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 30897) +++ trunk/src_plugins/io_hyp/parser.c (revision 30898) @@ -386,8 +386,8 @@ void hyp_netlist_begin() { /* clear netlist */ - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); return; } @@ -401,7 +401,7 @@ if ((net_name != NULL) && (device_name != NULL) && (pin_name != NULL)) { pcb_snprintf(conn, sizeof(conn), "%s-%s", device_name, pin_name); - pcb_actionva(&PCB->hidlib, "Netlist", "Add", net_name, conn, NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", net_name, conn, NULL); } return; } @@ -409,8 +409,8 @@ void hyp_netlist_end() { /* sort netlist */ - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); return; } Index: trunk/src_plugins/io_kicad/io_kicad.c =================================================================== --- trunk/src_plugins/io_kicad/io_kicad.c (revision 30897) +++ trunk/src_plugins/io_kicad/io_kicad.c (revision 30898) @@ -50,7 +50,7 @@ return 100; } -pcb_action_t eeschema_action_list[] = { +rnd_action_t eeschema_action_list[] = { {"LoadEeschemaFrom", pcb_act_LoadeeschemaFrom, pcb_acth_LoadeeschemaFrom, pcb_acts_LoadeeschemaFrom} }; @@ -59,7 +59,7 @@ void pplg_uninit_io_kicad(void) { /* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */ - pcb_remove_actions_by_cookie(kicad_cookie); + rnd_remove_actions_by_cookie(kicad_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad); pcb_eeschema_uninit(); } Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 30897) +++ trunk/src_plugins/io_kicad/read_net.c (revision 30898) @@ -98,7 +98,7 @@ } /* Load the elements */ - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); for(c = components->children; c != NULL; c = c->next) { const char *ref = NULL, *value = NULL, *footprint = NULL; @@ -117,15 +117,15 @@ pcb_message(PCB_MSG_WARNING, "eeschema: ignoring component %s with no footprint\n", ref); continue; } - pcb_actionva(&PCB->hidlib, "ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL); } - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); /* Load the netlist */ - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); for(net = nets->children; net != NULL; net = net->next) { const char *netname = NULL, *code = NULL, *name = NULL; @@ -164,13 +164,13 @@ continue; } pcb_snprintf(refpin, sizeof(refpin), "%s-%s", ref, pin); - pcb_actionva(&PCB->hidlib, "Netlist", "Add", netname, refpin, NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", netname, refpin, NULL); } } } - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); return 0; } Index: trunk/src_plugins/io_mentor_cell/io_mentor_cell.c =================================================================== --- trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 30897) +++ trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 30898) @@ -55,7 +55,7 @@ void pplg_uninit_io_mentor_cell(void) { - pcb_remove_actions_by_cookie(mentor_cell_cookie); + rnd_remove_actions_by_cookie(mentor_cell_cookie); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_mentor_cell); } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 30897) +++ trunk/src_plugins/io_pcb/file.c (revision 30898) @@ -1008,7 +1008,7 @@ pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); } -/* pcb_action(&pcb->hidlib, "dumplayers");*/ +/* rnd_action(&pcb->hidlib, "dumplayers");*/ return 0; } Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 30897) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 30898) @@ -177,7 +177,7 @@ PCB_ACT_FAIL(LoadtedaxFrom); } -pcb_action_t tedax_action_list[] = { +rnd_action_t tedax_action_list[] = { {"LoadTedaxFrom", pcb_act_LoadtedaxFrom, pcb_acth_LoadtedaxFrom, pcb_acts_LoadtedaxFrom}, {"SaveTedax", pcb_act_Savetedax, pcb_acth_Savetedax, pcb_acts_Savetedax} }; @@ -247,7 +247,7 @@ void pplg_uninit_io_tedax(void) { - pcb_remove_actions_by_cookie(tedax_cookie); + rnd_remove_actions_by_cookie(tedax_cookie); tedax_etest_uninit(); PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_tedax); pcb_tedax_net_uninit(); Index: trunk/src_plugins/io_tedax/tnetlist.c =================================================================== --- trunk/src_plugins/io_tedax/tnetlist.c (revision 30897) +++ trunk/src_plugins/io_tedax/tnetlist.c (revision 30898) @@ -79,8 +79,8 @@ htsp_init(&fps, strhash, strkeyeq); htsp_init(&pinnames, strhash, strkeyeq); - pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL); while((argc = tedax_getline(fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) >= 0) { if ((argc == 3) && (strcmp(argv[0], "footprint") == 0)) { @@ -94,7 +94,7 @@ else if ((argc == 4) && (strcmp(argv[0], "conn") == 0)) { char id[512]; sprintf(id, "%s-%s", argv[2], argv[3]); - pcb_actionva(&PCB->hidlib, "Netlist", "Add", argv[1], id, NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Add", argv[1], id, NULL); } else if ((argc == 4) && (strcmp(argv[0], "pinname") == 0)) { char id[512]; @@ -110,11 +110,11 @@ break; } - pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); - pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL); + rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL); if (import_fp) { - pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL); for (e = htsp_first(&fps); e; e = htsp_next(&fps, e)) { fp_t *fp = e->value; @@ -122,7 +122,7 @@ if (fp->footprint == NULL) pcb_message(PCB_MSG_ERROR, "tedax: not importing refdes=%s: no footprint specified\n", e->key); else - pcb_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(e->key), null_empty(fp->footprint), null_empty(fp->value), NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Need", null_empty(e->key), null_empty(fp->footprint), null_empty(fp->value), NULL); free(e->key); free(fp->value); @@ -129,7 +129,7 @@ free(fp->footprint); free(fp); } - pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL); + rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL); } for (e = htsp_first(&pinnames); e; e = htsp_next(&pinnames, e)) { @@ -138,7 +138,7 @@ if (pin != NULL) { *pin = '\0'; pin++; - pcb_actionva(&PCB->hidlib, "ChangePinName", refdes, pin, name, NULL); + rnd_actionva(&PCB->hidlib, "ChangePinName", refdes, pin, name, NULL); } free(e->key); free(e->value); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 30897) +++ trunk/src_plugins/jostle/jostle.c (revision 30898) @@ -509,7 +509,7 @@ return 0; } -static pcb_action_t jostle_action_list[] = { +static rnd_action_t jostle_action_list[] = { {"jostle", pcb_act_jostle, pcb_acth_jostle, pcb_acts_jostle} }; @@ -519,7 +519,7 @@ void pplg_uninit_jostle(void) { - pcb_remove_actions_by_cookie(jostle_cookie); + rnd_remove_actions_by_cookie(jostle_cookie); } int pplg_init_jostle(void) Index: trunk/src_plugins/lib_gtk_common/bu_command.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_command.c (revision 30897) +++ trunk/src_plugins/lib_gtk_common/bu_command.c (revision 30898) @@ -105,7 +105,7 @@ gint ksym = kev->keyval; if (ksym == PCB_GTK_KEY(Tab)) { - pcb_cli_tab(ghidgui->hidlib); + rnd_cli_tab(ghidgui->hidlib); return TRUE; } @@ -121,7 +121,7 @@ static pcb_bool command_keyrelease_cb(GtkWidget *widget, GdkEventKey *kev, pcb_gtk_command_t *ctx) { if (ctx->command_entry_status_line_active) - pcb_cli_edit(ghidgui->hidlib); + rnd_cli_edit(ghidgui->hidlib); return TRUE; } @@ -170,7 +170,7 @@ void ghid_command_update_prompt(pcb_gtk_command_t *ctx) { if (ctx->prompt_label != NULL) - gtk_label_set_text(GTK_LABEL(ctx->prompt_label), pcb_cli_prompt(":")); + gtk_label_set_text(GTK_LABEL(ctx->prompt_label), rnd_cli_prompt(":")); } @@ -235,10 +235,10 @@ { char *command; - command = ghid_command_entry_get(ctx, pcb_cli_prompt(":"), (gchar *)""); + command = ghid_command_entry_get(ctx, rnd_cli_prompt(":"), (gchar *)""); if (command != NULL) { /* copy new command line to save buffer */ - pcb_parse_command(hl, command, pcb_false); + rnd_parse_command(hl, command, pcb_false); g_free(command); } } Index: trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 30897) +++ trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 30898) @@ -54,7 +54,7 @@ argv[2].type = FGW_COORD_; fgw_coord(&argv[2]) = crosshairy; - if (pcb_actionv_bin(hl, "DescribeLocation", &res, 3, argv) != 0) + if (rnd_actionv_bin(hl, "DescribeLocation", &res, 3, argv) != 0) return FALSE; description = res.val.cstr; Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30897) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30898) @@ -200,7 +200,7 @@ { pcb_gtk_t *gctx = data; - pcb_action(gctx->hidlib, "Quit"); + rnd_action(gctx->hidlib, "Quit"); /* Return TRUE to keep our app running. A FALSE here would let the delete signal continue on and kill our program. */ Index: trunk/src_plugins/lib_gtk_common/in_mouse.c =================================================================== --- trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 30897) +++ trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 30898) @@ -173,7 +173,7 @@ return pcb_false; getting_loc = 1; - pcb_actionva(ctx->hidlib, "StatusSetText", message, NULL); + rnd_actionva(ctx->hidlib, "StatusSetText", message, NULL); chst = pcb_hidlib_crosshair_suspend(ctx->hidlib); @@ -209,7 +209,7 @@ pcb_hidlib_crosshair_restore(ctx->hidlib, chst); ghid_restore_cursor(ctx); - pcb_actionva(ctx->hidlib, "StatusSetText", NULL); + rnd_actionva(ctx->hidlib, "StatusSetText", NULL); getting_loc = 0; return lctx.got_location; } Index: trunk/src_plugins/lib_gtk_common/util_listener.c =================================================================== --- trunk/src_plugins/lib_gtk_common/util_listener.c (revision 30897) +++ trunk/src_plugins/lib_gtk_common/util_listener.c (revision 30898) @@ -58,7 +58,7 @@ status = g_io_channel_read_line(source, &str, &len, &term, &err); switch (status) { case G_IO_STATUS_NORMAL: - pcb_parse_actions(gctx->hidlib, str); + rnd_parse_actions(gctx->hidlib, str); g_free(str); break; Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 30897) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 30898) @@ -115,7 +115,7 @@ int idx = attr - dad->dlg; char **act = vts0_get(&dad->change_cb, idx, 0); if ((act != NULL) && (*act != NULL)) - pcb_parse_command(dad->hidlib, *act, 1); + rnd_parse_command(dad->hidlib, *act, 1); } static void dad_row_free_cb(pcb_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row) @@ -125,7 +125,7 @@ fgw_arg_t res; res.type = FGW_PTR | FGW_VOID; res.val.ptr_void = row; - fgw_ptr_unreg(&pcb_fgw, &res, dad->row_domain); + fgw_ptr_unreg(&rnd_fgw, &res, dad->row_domain); } static char *tmp_str_dup(dad_t *dad, const char *txt) @@ -357,7 +357,7 @@ PCB_ACT_CONVARG(4, FGW_STR, dad, txt = argv[4].val.str); if (row != NULL) { - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3], dad->row_domain)) { + 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); return 0; @@ -374,7 +374,7 @@ } else nrow = NULL; - fgw_ptr_reg(&pcb_fgw, res, dad->row_domain, FGW_PTR, nrow); + fgw_ptr_reg(&rnd_fgw, res, dad->row_domain, FGW_PTR, nrow); return 0; } else if (pcb_strcasecmp(cmd, "begin_hbox") == 0) { Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30897) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 30898) @@ -112,13 +112,13 @@ static void btn_clear_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { log_ctx_t *ctx = caller_data; - pcb_actionva(ctx->hidlib, "log", "clear", NULL); + rnd_actionva(ctx->hidlib, "log", "clear", NULL); } static void btn_export_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { log_ctx_t *ctx = caller_data; - pcb_actionva(ctx->hidlib, "log", "export", NULL); + rnd_actionva(ctx->hidlib, "log", "export", NULL); } static void maybe_scroll_to_bottom() Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30897) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30898) @@ -72,7 +72,7 @@ static const char pcb_acth_gui[] = "Intenal: GUI frontend action. Do not use directly."; -pcb_action_t hid_common_action_list[] = { +rnd_action_t hid_common_action_list[] = { {"dad", pcb_act_dad, pcb_acth_dad, pcb_acts_dad}, {"Pan", pcb_act_Pan, pcb_acth_Pan, pcb_acts_Pan}, {"Center", pcb_act_Center, pcb_acth_Center, pcb_acts_Center}, @@ -101,7 +101,7 @@ pcb_event_unbind_allcookie(wplc_cookie); pcb_conf_hid_unreg(grid_cookie); pcb_dialog_place_uninit(); - pcb_remove_actions_by_cookie(hid_common_cookie); + rnd_remove_actions_by_cookie(hid_common_cookie); pcb_act_dad_uninit(); pcb_conf_unreg_fields("plugins/lib_hid_common/"); pcb_dlg_log_uninit(); Index: trunk/src_plugins/lib_hid_common/menu_helper.c =================================================================== --- trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30897) +++ trunk/src_plugins/lib_hid_common/menu_helper.c (revision 30898) @@ -61,7 +61,7 @@ const char *end, *s; fgw_arg_t res, argv[2]; if (cp != NULL) { - const pcb_action_t *a; + const rnd_action_t *a; fgw_func_t *f; char buff[256]; int len, multiarg; @@ -72,7 +72,7 @@ } memcpy(buff, name, len); buff[len] = '\0'; - a = pcb_find_action(buff, &f); + a = rnd_find_action(buff, &f); if (!a) { pcb_message(PCB_MSG_ERROR, "hid_get_flag: no action %s\n", name); return -1; @@ -104,14 +104,14 @@ argv[1].type = FGW_STR; argv[1].val.str = buff; res.type = FGW_INVALID; - if (pcb_actionv_(f, &res, (len > 0) ? 2 : 1, argv) != 0) + if (rnd_actionv_(f, &res, (len > 0) ? 2 : 1, argv) != 0) return -1; - fgw_arg_conv(&pcb_fgw, &res, FGW_INT); + fgw_arg_conv(&rnd_fgw, &res, FGW_INT); return res.val.nat_int; } else { /* slower but more generic way */ - return pcb_parse_command(hidlib, name, pcb_true); + return rnd_parse_command(hidlib, name, pcb_true); } } else { Index: trunk/src_plugins/lib_hid_common/zoompan.c =================================================================== --- trunk/src_plugins/lib_hid_common/zoompan.c (revision 30897) +++ trunk/src_plugins/lib_hid_common/zoompan.c (revision 30898) @@ -84,7 +84,7 @@ if (v <= 0) return FGW_ERR_ARG_CONV; - pcb_hid_get_coords("Select zoom center", &x, &y, 0); + rnd_hid_get_coords("Select zoom center", &x, &y, 0); switch (ovp[0]) { case '-': pcb_gui->zoom(pcb_gui, x, y, 1 / v, 1); @@ -112,7 +112,7 @@ PCB_GUI_NOGUI(); - pcb_hid_get_coords("Click on a place to pan", &x, &y, 0); + 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); pcb_gui->pan_mode(pcb_gui, x, y, mode); @@ -129,7 +129,7 @@ pcb_coord_t x, y; PCB_GUI_NOGUI(); - pcb_hid_get_coords("Click to center", &x, &y, 0); + rnd_hid_get_coords("Click to center", &x, &y, 0); if (argc != 1) PCB_ACT_FAIL(Center); Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 30897) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 30898) @@ -95,7 +95,7 @@ PCB_GUI_NOGUI(); - pcb_hid_get_coords("Click to center of flip", &x, &y, 0); + rnd_hid_get_coords("Click to center of flip", &x, &y, 0); x = pcb_crosshair.X; y = pcb_crosshair.Y; @@ -221,7 +221,7 @@ void *o1, *o2, *o3; pcb_any_obj_t *o; - pcb_hid_get_coords("context sensitive popup: select object", &x, &y, 0); + rnd_hid_get_coords("context sensitive popup: select object", &x, &y, 0); type = pcb_search_screen(x, y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &o1, &o2, &o3); o = o2; if ((type == 0) || ((o != NULL) && (pcb_gobj_parent_subc(o->parent_type, &o->parent) == NULL))) { @@ -295,16 +295,16 @@ 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 = pcb_actionv_bin(PCB_ACT_HIDLIB, "promptfor", &r, 4, args); + er = rnd_actionv_bin(PCB_ACT_HIDLIB, "promptfor", &r, 4, args); if ((er != 0) || ((r.type & FGW_STR) != FGW_STR)) { - fgw_arg_free(&pcb_fgw, &r); + fgw_arg_free(&rnd_fgw, &r); PCB_ACT_IRES(1); return 0; } pcb_attribute_put(&ly->Attributes, key, r.val.str); - fgw_arg_free(&pcb_fgw, &r); + fgw_arg_free(&rnd_fgw, &r); PCB_ACT_IRES(0); return 0; Index: trunk/src_plugins/lib_hid_pcbui/infobar.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 30897) +++ trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 30898) @@ -38,7 +38,7 @@ static void pcb_infobar_brdchg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]) { - pcb_actionva(hidlib, "InfoBarFileChanged", "close", NULL); + rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL); if ((hidlib != NULL) && (hidlib->filename != NULL)) last_date = pcb_file_mtime(NULL, PCB->hidlib.filename); else @@ -61,7 +61,7 @@ double last_chg = pcb_file_mtime(NULL, PCB->hidlib.filename); if (last_chg > last_date) { last_date = last_chg; - pcb_actionva(&PCB->hidlib, "InfoBarFileChanged", "open", NULL); + rnd_actionva(&PCB->hidlib, "InfoBarFileChanged", "open", NULL); } } } @@ -91,7 +91,7 @@ { if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) { last_date = pcb_file_mtime(NULL, PCB->hidlib.filename); - pcb_actionva(hidlib, "InfoBarFileChanged", "close", NULL); + rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL); } } Index: trunk/src_plugins/lib_hid_pcbui/layersel.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30897) +++ trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 30898) @@ -274,7 +274,7 @@ else if (lys->ml != NULL) { vis = (pcb_bool *)((char *)PCB + lys->ml->vis_offs); *vis = 1; - pcb_actionva(&PCB->hidlib, "SelectLayer", lys->ml->select_name, NULL); + rnd_actionva(&PCB->hidlib, "SelectLayer", lys->ml->select_name, NULL); } else return; @@ -430,7 +430,7 @@ return; layer_select(lys); - pcb_actionva(&PCB->hidlib, "Popup", "layer", NULL); + rnd_actionva(&PCB->hidlib, "Popup", "layer", NULL); } extern pcb_layergrp_id_t pcb_actd_EditGroup_gid; @@ -440,7 +440,7 @@ if (grp->gid < 0) return; pcb_actd_EditGroup_gid = grp->gid; - pcb_actionva(&PCB->hidlib, "Popup", "group", NULL); + rnd_actionva(&PCB->hidlib, "Popup", "group", NULL); } Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 30897) +++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 30898) @@ -54,16 +54,16 @@ static const char *title_cookie = "lib_hid_pcbui/title"; static const char *layersel_cookie = "lib_hid_pcbui/layersel"; -static pcb_action_t rst_action_list[] = { +static rnd_action_t rst_action_list[] = { {"AdjustStyle", pcb_act_AdjustStyle, pcb_acth_AdjustStyle, pcb_acts_AdjustStyle} }; -static pcb_action_t status_action_list[] = { +static rnd_action_t status_action_list[] = { {"StatusSetText", pcb_act_StatusSetText, pcb_acth_StatusSetText, pcb_acts_StatusSetText}, {"DescribeLocation", pcb_act_DescribeLocation, pcb_acth_DescribeLocation, pcb_acts_DescribeLocation} }; -static pcb_action_t act_action_list[] = { +static rnd_action_t act_action_list[] = { {"Zoom", pcb_act_Zoom, pcb_acth_Zoom, pcb_acts_Zoom_}, {"ZoomTo", pcb_act_Zoom, pcb_acth_Zoom, pcb_acts_Zoom_}, {"SwapSides", pcb_act_SwapSides, pcb_acth_SwapSides, pcb_acts_SwapSides}, @@ -76,9 +76,9 @@ void pplg_uninit_lib_hid_pcbui(void) { - pcb_remove_actions_by_cookie(rst_cookie); - pcb_remove_actions_by_cookie(status_cookie); - pcb_remove_actions_by_cookie(act_cookie); + rnd_remove_actions_by_cookie(rst_cookie); + rnd_remove_actions_by_cookie(status_cookie); + rnd_remove_actions_by_cookie(act_cookie); pcb_event_unbind_allcookie(layer_cookie); pcb_event_unbind_allcookie(rst_cookie); pcb_event_unbind_allcookie(status_cookie); Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 30897) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 30898) @@ -242,9 +242,9 @@ static void unit_change_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { if (pcbhl_conf.editor.grid_unit == get_unit_struct("mm")) - pcb_actionva(&PCB->hidlib, "SetUnits", "mil", NULL); + rnd_actionva(&PCB->hidlib, "SetUnits", "mil", NULL); else - pcb_actionva(&PCB->hidlib, "SetUnits", "mm", NULL); + rnd_actionva(&PCB->hidlib, "SetUnits", "mm", NULL); status_rd_pcb2dlg(); } Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 30897) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 30898) @@ -526,7 +526,7 @@ } -static pcb_action_t polyhelp_action_list[] = { +static rnd_action_t polyhelp_action_list[] = { {"PolyHatch", pcb_act_PolyHatch, pcb_acth_PolyHatch, pcb_acts_PolyHatch}, {"PolyOffs", pcb_act_PolyOffs, pcb_acth_PolyOffs, pcb_acts_PolyOffs}, {"ToPoly", pcb_act_topoly, pcb_acth_topoly, pcb_acts_topoly} @@ -536,7 +536,7 @@ void pplg_uninit_lib_polyhelp(void) { - pcb_remove_actions_by_cookie(polyhelp_cookie); + rnd_remove_actions_by_cookie(polyhelp_cookie); } int pplg_init_lib_polyhelp(void) Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 30897) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 30898) @@ -346,7 +346,7 @@ if (op == NULL) { pcb_coord_t x, y; - pcb_hid_get_coords("Click on a line or arc of the contour loop", &x, &y, 0); + 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); Index: trunk/src_plugins/millpath/millpath.c =================================================================== --- trunk/src_plugins/millpath/millpath.c (revision 30897) +++ trunk/src_plugins/millpath/millpath.c (revision 30898) @@ -62,7 +62,7 @@ } -pcb_action_t millpath_action_list[] = { +rnd_action_t millpath_action_list[] = { {"mill", pcb_act_mill, pcb_acth_mill, pcb_acts_mill} }; @@ -70,7 +70,7 @@ void pplg_uninit_millpath(void) { - pcb_remove_actions_by_cookie(pcb_millpath_cookie); + rnd_remove_actions_by_cookie(pcb_millpath_cookie); } Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 30897) +++ trunk/src_plugins/oldactions/oldactions.c (revision 30898) @@ -150,7 +150,7 @@ PCB_ACT_CONVARG(i, FGW_STR, debugxy, s = argv[i].val.str); printf(" [%d] `%s'", i, s); } - pcb_hid_get_coords("Click X,Y for Debug", &x, &y, 0); + rnd_hid_get_coords("Click X,Y for Debug", &x, &y, 0); pcb_printf(" x,y %$mD\n", x, y); PCB_ACT_IRES(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(pcb_actionva(PCB_ACT_HIDLIB, "ImportSch", NULL)); + PCB_ACT_IRES(rnd_actionva(PCB_ACT_HIDLIB, "ImportSch", NULL)); return 0; } @@ -371,7 +371,7 @@ return 1; } -pcb_action_t oldactions_action_list[] = { +rnd_action_t oldactions_action_list[] = { {"DumpLibrary", pcb_act_DumpLibrary, pcb_acth_DumpLibrary, pcb_acts_DumpLibrary}, {"Bell", pcb_act_Bell, pcb_acth_Bell, pcb_acts_Bell}, {"Debug", pcb_act_Debug, pcb_acth_debug, pcb_acts_debug}, @@ -407,7 +407,7 @@ void pplg_uninit_oldactions(void) { - pcb_remove_actions_by_cookie(oldactions_cookie); + rnd_remove_actions_by_cookie(oldactions_cookie); } int pplg_init_oldactions(void) Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30897) +++ trunk/src_plugins/order/order.c (revision 30898) @@ -77,7 +77,7 @@ return 0; } -static pcb_action_t order_action_list[] = { +static rnd_action_t order_action_list[] = { {"OrderPCB", pcb_act_OrderPCB, pcb_acth_OrderPCB, pcb_acts_OrderPCB} }; @@ -202,7 +202,7 @@ void pplg_uninit_order(void) { - pcb_remove_actions_by_cookie(order_cookie); + rnd_remove_actions_by_cookie(order_cookie); pcb_event_unbind_allcookie(order_cookie); pcb_conf_unreg_file(ORDER_CONF_FN, order_conf_internal); pcb_conf_unreg_fields("plugins/order/"); Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 30897) +++ trunk/src_plugins/polycombine/polycombine.c (revision 30898) @@ -332,7 +332,7 @@ return 0; } -static pcb_action_t polycombine_action_list[] = { +static rnd_action_t polycombine_action_list[] = { {"PolyCombine", pcb_act_polycombine, NULL, NULL} }; @@ -342,7 +342,7 @@ void pplg_uninit_polycombine(void) { - pcb_remove_actions_by_cookie(polycombine_cookie); + rnd_remove_actions_by_cookie(polycombine_cookie); } int pplg_init_polycombine(void) Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 30897) +++ trunk/src_plugins/polystitch/polystitch.c (revision 30898) @@ -86,7 +86,7 @@ pcb_coord_t x, y; pcb_poly_t *inner_poly, *outer_poly; - pcb_hid_get_coords("Select a corner on the inner polygon", &x, &y, 0); + rnd_hid_get_coords("Select a corner on the inner polygon", &x, &y, 0); inner_poly = find_crosshair_poly(x, y); if (inner_poly) { @@ -114,7 +114,7 @@ return 0; } -static pcb_action_t polystitch_action_list[] = { +static rnd_action_t polystitch_action_list[] = { {"PolyStitch", pcb_act_polystitch, NULL, NULL} }; @@ -124,7 +124,7 @@ void pplg_uninit_polystitch(void) { - pcb_remove_actions_by_cookie(polystitch_cookie); + rnd_remove_actions_by_cookie(polystitch_cookie); } int pplg_init_polystitch(void) Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 30897) +++ trunk/src_plugins/propedit/propedit.c (revision 30898) @@ -142,7 +142,7 @@ else { char *end; pcb_idpath_t *idp = (void *)strtol(cmd, &end, 0); - if ((*end == '\0') && (idp != NULL) && (htpp_get(&pcb_fgw.ptr_tbl, idp) == PCB_PTR_DOMAIN_IDPATH)) { + if ((*end == '\0') && (idp != NULL) && (htpp_get(&rnd_fgw.ptr_tbl, idp) == RND_PTR_DOMAIN_IDPATH)) { pcb_idpath_list_append(&pe->objs, idp); return 0; } @@ -335,7 +335,7 @@ static const char *propedit_cookie = "propedit"; -pcb_action_t propedit_action_list[] = { +rnd_action_t propedit_action_list[] = { {"propedit", pcb_act_propedit, pcb_acth_propedit, pcb_acts_propedit}, {"propprint", pcb_act_propprint, pcb_acth_propprint, pcb_acts_propprint}, {"propset", pcb_act_propset, pcb_acth_propset, pcb_acts_propset}, @@ -347,7 +347,7 @@ void pplg_uninit_propedit(void) { pcb_propdlg_uninit(); - pcb_remove_actions_by_cookie(propedit_cookie); + rnd_remove_actions_by_cookie(propedit_cookie); } int pplg_init_propedit(void) Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 30897) +++ trunk/src_plugins/puller/puller.c (revision 30898) @@ -349,7 +349,7 @@ double tangent; int new_delta_angle; - pcb_hid_get_coords("Click on a line-arc intersection or line segment", &Ux, &Uy, 0); + rnd_hid_get_coords("Click on a line-arc intersection or line segment", &Ux, &Uy, 0); if (!find_pair(pcb_crosshair.X, pcb_crosshair.Y)) { if (!find_pair(Ux, Uy)) { @@ -2090,7 +2090,7 @@ } /* This canonicalizes all the lines, and cleans up near-misses. */ - /* pcb_actionva(&PCB->hidlib, "djopt", "puller", 0); */ + /* rnd_actionva(&PCB->hidlib, "djopt", "puller", 0); */ cflg = pcb_layergrp_flags(PCB, pcb_layer_get_group_(PCB_CURRLAYER(PCB))); current_is_solder = (cflg & PCB_LYT_BOTTOM); @@ -2189,7 +2189,7 @@ /* */ /*****************************************************************************/ -pcb_action_t puller_action_list[] = { +rnd_action_t puller_action_list[] = { {"Puller", pcb_act_Puller, pcb_acth_Puller, pcb_acts_Puller}, {"GlobalPuller", pcb_act_GlobalPuller, pcb_acth_GlobalPuller, pcb_acts_GlobalPuller} }; @@ -2200,7 +2200,7 @@ void pplg_uninit_puller(void) { - pcb_remove_actions_by_cookie(puller_cookie); + rnd_remove_actions_by_cookie(puller_cookie); } int pplg_init_puller(void) Index: trunk/src_plugins/query/fnc_glue.c =================================================================== --- trunk/src_plugins/query/fnc_glue.c (revision 30897) +++ trunk/src_plugins/query/fnc_glue.c (revision 30898) @@ -50,14 +50,14 @@ long i; pcb_idpath_list_t *list = calloc(sizeof(pcb_idpath_list_t), 1); for(i = 0; i < argv[n].data.lst.used; i++) { - fgw_ptr_reg(&pcb_fgw, &tmp, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, pcb_obj2idpath(argv[n].data.lst.array[i])); + fgw_ptr_reg(&rnd_fgw, &tmp, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, pcb_obj2idpath(argv[n].data.lst.array[i])); pcb_idpath_list_append(list, fgw_idpath(&tmp)); } - fgw_ptr_reg(&pcb_fgw, &(arga[n]), PCB_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list); + fgw_ptr_reg(&rnd_fgw, &(arga[n]), RND_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list); } break; case PCBQ_VT_OBJ: - fgw_ptr_reg(&pcb_fgw, &(arga[n]), PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, pcb_obj2idpath(argv[n].data.obj)); + fgw_ptr_reg(&rnd_fgw, &(arga[n]), RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, pcb_obj2idpath(argv[n].data.obj)); break; case PCBQ_VT_COORD: arga[n].type = FGW_COORD; @@ -78,7 +78,7 @@ } } - if (pcb_actionv_bin(&ectx->pcb->hidlib, argv[0].data.str, &resa, argc, arga) != 0) { + if (rnd_actionv_bin(&ectx->pcb->hidlib, argv[0].data.str, &resa, argc, arga) != 0) { retv = -1; goto fin; } @@ -95,16 +95,16 @@ res->type = PCBQ_VT_VOID; \ goto fin; \ } \ - else if (fgw_ptr_in_domain(&pcb_fgw, val, PCB_PTR_DOMAIN_IDPATH)) { \ + else if (fgw_ptr_in_domain(&rnd_fgw, val, RND_PTR_DOMAIN_IDPATH)) { \ pcb_idpath_t *idp = val; \ res->type = PCBQ_VT_OBJ; \ res->data.obj = pcb_idpath2obj(ectx->pcb, idp); \ pcb_idpath_list_remove(idp); \ - fgw_ptr_unreg(&pcb_fgw, &resa, PCB_PTR_DOMAIN_IDPATH); \ + fgw_ptr_unreg(&rnd_fgw, &resa, RND_PTR_DOMAIN_IDPATH); \ free(idp); \ goto fin; \ } \ - else if (fgw_ptr_in_domain(&pcb_fgw, val, PCB_PTR_DOMAIN_IDPATH_LIST)) { \ + else if (fgw_ptr_in_domain(&rnd_fgw, val, RND_PTR_DOMAIN_IDPATH_LIST)) { \ pcb_message(PCB_MSG_ERROR, "query action(): can not convert object list yet\n"); \ res->type = PCBQ_VT_VOID; \ goto fin; \ @@ -117,7 +117,7 @@ arg = &resa; if (FGW_IS_TYPE_CUSTOM(resa.type)) - fgw_arg_conv(&pcb_fgw, &resa, FGW_AUTO); + fgw_arg_conv(&rnd_fgw, &resa, FGW_AUTO); switch(FGW_BASE_TYPE(resa.type)) { ARG_CONV_CASE_LONG(lst, FGW_TO_QRY_NUM); @@ -151,7 +151,7 @@ } } - fgw_arg_free(&pcb_fgw, &resa); + fgw_arg_free(&rnd_fgw, &resa); return retv; } Index: trunk/src_plugins/query/query.c =================================================================== --- trunk/src_plugins/query/query.c (revision 30897) +++ trunk/src_plugins/query/query.c (revision 30898) @@ -401,7 +401,7 @@ void pplg_uninit_query(void) { - pcb_remove_actions_by_cookie(query_cookie); + rnd_remove_actions_by_cookie(query_cookie); pcb_qry_fnc_destroy(); qry_lex_destroy(); } Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 30897) +++ trunk/src_plugins/query/query_act.c (revision 30898) @@ -318,7 +318,7 @@ 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); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH_LIST)) + 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) @@ -335,8 +335,8 @@ 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(&pcb_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view); - pcb_actionv_bin(PCB_ACT_HIDLIB, "viewlist", &ares, 4, args); + 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); } else { @@ -475,11 +475,11 @@ else if ((argv[2].type & FGW_PTR) == FGW_PTR) { id:; PCB_ACT_CONVARG(2, FGW_PTR, QueryObj, fld = argv[2].val.ptr_void); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[2], PTR_DOMAIN_PCFIELD)) + if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], PTR_DOMAIN_PCFIELD)) return FGW_ERR_PTR_DOMAIN; } - if ((fld == NULL) || (!fgw_ptr_in_domain(&pcb_fgw, &argv[1], PCB_PTR_DOMAIN_IDPATH))) { + if ((fld == NULL) || (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], RND_PTR_DOMAIN_IDPATH))) { if (free_fld) field_free(fld); return FGW_ERR_PTR_DOMAIN; @@ -530,13 +530,13 @@ case 'c': /* compile */ PCB_ACT_CONVARG(2, FGW_STR, QueryCompileField, fname = argv[2].val.str); fld = field_comp(fname); - fgw_ptr_reg(&pcb_fgw, res, PTR_DOMAIN_PCFIELD, FGW_PTR | FGW_STRUCT, fld); + fgw_ptr_reg(&rnd_fgw, res, PTR_DOMAIN_PCFIELD, FGW_PTR | FGW_STRUCT, fld); return 0; case 'f': /* free */ - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[2], PTR_DOMAIN_PCFIELD)) + 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); - fgw_ptr_unreg(&pcb_fgw, &argv[2], PTR_DOMAIN_PCFIELD); + fgw_ptr_unreg(&rnd_fgw, &argv[2], PTR_DOMAIN_PCFIELD); field_free(fld); break; default: @@ -547,7 +547,7 @@ return 0; } -pcb_action_t query_action_list[] = { +rnd_action_t query_action_list[] = { {"query", pcb_act_query, pcb_acth_query, pcb_acts_query}, {"QueryObj", pcb_act_QueryObj, pcb_acth_QueryObj, pcb_acts_QueryObj}, {"QueryCompileField", pcb_act_QueryCompileField, pcb_acth_QueryCompileField, pcb_acts_QueryCompileField} Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 30897) +++ trunk/src_plugins/renumber/renumber.c (revision 30898) @@ -354,7 +354,7 @@ static const char *renumber_cookie = "renumber plugin"; -pcb_action_t renumber_action_list[] = { +rnd_action_t renumber_action_list[] = { {"Renumber", pcb_act_Renumber, pcb_acth_Renumber, pcb_acts_Renumber}, {"RenumberBlock", pcb_act_RenumberBlock, pcb_acth_RenumberBlock, pcb_acts_RenumberBlock}, {"RenumberBuffer", pcb_act_RenumberBuffer, pcb_acth_RenumberBuffer, pcb_acts_RenumberBuffer} @@ -364,7 +364,7 @@ void pplg_uninit_renumber(void) { - pcb_remove_actions_by_cookie(renumber_cookie); + rnd_remove_actions_by_cookie(renumber_cookie); } int pplg_init_renumber(void) Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 30897) +++ trunk/src_plugins/report/report.c (revision 30898) @@ -367,7 +367,7 @@ char *op = NULL, *how = NULL; pcb_subc_t *subc; pcb_coord_t x, y; - pcb_hid_get_coords("Click on object to report on", &x, &y, 0); + 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); @@ -640,7 +640,7 @@ int type; pcb_coord_t ox, oy, x, y; - pcb_hid_get_coords("Click on a copper line", &x, &y, 0); + rnd_hid_get_coords("Click on a copper line", &x, &y, 0); type = pcb_search_screen(x, y, PCB_OBJ_LINE, &r1, &r2, &r3); if (type != PCB_OBJ_LINE) { @@ -685,7 +685,7 @@ } else { pcb_coord_t x, y; - pcb_hid_get_coords("Click on a network", &x, &y, 0); + rnd_hid_get_coords("Click on a network", &x, &y, 0); return report_net_length_(res, argc, argv, x, y); } } @@ -770,15 +770,15 @@ PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str); if (pcb_strcasecmp(cmd, "Object") == 0) { - pcb_hid_get_coords("Click on an object", &x, &y, 0); + rnd_hid_get_coords("Click on an object", &x, &y, 0); return pcb_act_report_dialog(res, argc, argv); } else if (pcb_strncasecmp(cmd, "Subc", 4) == 0) { - pcb_hid_get_coords("Click on a subcircuit", &x, &y, 0); + rnd_hid_get_coords("Click on a subcircuit", &x, &y, 0); return pcb_act_report_dialog(res, argc, argv); } - pcb_hid_get_coords("Click on object to report on", &x, &y, 0); + rnd_hid_get_coords("Click on object to report on", &x, &y, 0); if (pcb_strcasecmp(cmd, "DrillReport") == 0) return report_drills(res, argc, argv); @@ -818,7 +818,7 @@ return 0; } -pcb_action_t report_action_list[] = { +rnd_action_t report_action_list[] = { {"ReportObject", pcb_act_report_dialog, pcb_acth_reportdialog, pcb_acts_reportdialog}, {"Report", pcb_act_Report, pcb_acth_Report, pcb_acts_Report}, {"Info", pcb_act_info} @@ -830,7 +830,7 @@ void pplg_uninit_report(void) { - pcb_remove_actions_by_cookie(report_cookie); + rnd_remove_actions_by_cookie(report_cookie); pcb_conf_unreg_fields("plugins/report/"); } Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30897) +++ trunk/src_plugins/script/live_script.c (revision 30898) @@ -193,7 +193,7 @@ return; } - pcb_actionva(lvs->hidlib, "livescript", arg, lvs->name, NULL); + rnd_actionva(lvs->hidlib, "livescript", arg, lvs->name, NULL); } static live_script_t *pcb_dlg_live_script(pcb_hidlib_t *hidlib, const char *name) Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 30897) +++ trunk/src_plugins/script/script.c (revision 30898) @@ -133,10 +133,10 @@ argv[1].val.cstr = preunload; res.type = FGW_INVALID; if (f->func(&res, 2, argv) == 0) { - if ((fgw_arg_conv(&pcb_fgw, &res, FGW_STR) == 0) && (res.val.str != NULL) && (*res.val.str != '\0')) + if ((fgw_arg_conv(&rnd_fgw, &res, FGW_STR) == 0) && (res.val.str != NULL) && (*res.val.str != '\0')) script_save_preunload(s, res.val.str); } - fgw_arg_free(&pcb_fgw, &res); + fgw_arg_free(&rnd_fgw, &res); } } @@ -144,7 +144,7 @@ script_unreg(cookie); if (s->obj != NULL) - fgw_obj_unreg(&pcb_fgw, s->obj); + fgw_obj_unreg(&rnd_fgw, s->obj); #ifdef PCB_HAVE_SYS_FUNGW if (s->pup != NULL) pup_unload(&script_pup, s->pup, NULL); @@ -305,7 +305,7 @@ old_id = script_persistency_id; script_persistency_id = id; - s->obj = fgw_obj_new(&pcb_fgw, s->id, s->lang, s->fn, NULL); + s->obj = fgw_obj_new(&rnd_fgw, s->id, s->lang, s->fn, NULL); script_persistency_id = old_id; if (s->obj == NULL) { @@ -428,7 +428,7 @@ htsp_entry_t *e; pcb_live_script_uninit(); - pcb_remove_actions_by_cookie(script_cookie); + rnd_remove_actions_by_cookie(script_cookie); for(e = htsp_first(&scripts); e; e = htsp_next(&scripts, e)) { script_t *script = e->value; char *cookie = script_gen_cookie(script->id); Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30897) +++ trunk/src_plugins/script/script_act.c (revision 30898) @@ -406,7 +406,7 @@ PCB_ACT_CONVARG(2, FGW_STR, Oneliner, scr = argv[2].val.str); } else if (strcmp(lang, "/exit") == 0) { - PCB_ACT_IRES(pcb_cli_leave()); + PCB_ACT_IRES(rnd_cli_leave()); return 0; } else { @@ -418,7 +418,7 @@ if (first != NULL) { if (*first == '/') { if (pcb_strcasecmp(scr, "/exit") == 0) { - PCB_ACT_IRES(pcb_cli_leave()); + PCB_ACT_IRES(rnd_cli_leave()); return 0; } PCB_ACT_IRES(-1); /* ignore /click, /tab and others for now */ @@ -429,12 +429,12 @@ lang = guess_lang(lang); if (scr == NULL) { - PCB_ACT_IRES(pcb_cli_enter(lang, lang)); + PCB_ACT_IRES(rnd_cli_enter(lang, lang)); return 0; } if (pcb_strcasecmp(scr, "/exit") == 0) { - PCB_ACT_IRES(pcb_cli_leave()); + PCB_ACT_IRES(rnd_cli_leave()); return 0; } @@ -488,7 +488,7 @@ } -static pcb_action_t script_action_list[] = { +static rnd_action_t script_action_list[] = { {"LoadScript", pcb_act_LoadScript, pcb_acth_LoadScript, pcb_acts_LoadScript}, {"UnloadScript", pcb_act_UnloadScript, pcb_acth_UnloadScript, pcb_acts_UnloadScript}, {"ReloadScript", pcb_act_ReloadScript, pcb_acth_ReloadScript, pcb_acts_ReloadScript}, Index: trunk/src_plugins/script/timer.c =================================================================== --- trunk/src_plugins/script/timer.c (revision 30897) +++ trunk/src_plugins/script/timer.c (revision 30898) @@ -66,7 +66,7 @@ if (t->next <= now) { t->next += t->period; - f = fgw_func_lookup(&pcb_fgw, t->aname); + f = fgw_func_lookup(&rnd_fgw, t->aname); if (f == NULL) goto remove; argv[0].type = FGW_FUNC; @@ -86,9 +86,9 @@ } res.type = FGW_INVALID; - if (pcb_actionv_(f, &res, 4, argv) != 0) + if (rnd_actionv_(f, &res, 4, argv) != 0) goto remove; - fgw_arg_conv(&pcb_fgw, &res, FGW_INT); + fgw_arg_conv(&rnd_fgw, &res, FGW_INT); if ((res.type != FGW_INT) || (res.val.nat_int != 0)) /* action requested timer removal */ goto remove; Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 30897) +++ trunk/src_plugins/serpentine/serpentine.c (revision 30898) @@ -436,7 +436,7 @@ } -pcb_action_t serpentine_action_list[] = { +rnd_action_t serpentine_action_list[] = { {"Serpentine", pcb_act_serpentine, pcb_acth_serpentine, pcb_acts_serpentine} }; @@ -444,7 +444,7 @@ void pplg_uninit_serpentine(void) { - pcb_remove_actions_by_cookie(serpentine_cookie); + rnd_remove_actions_by_cookie(serpentine_cookie); pcb_tool_unreg_by_cookie(serpentine_cookie); pcb_conf_unreg_fields("plugins/serpentine/"); } Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 30897) +++ trunk/src_plugins/shand_cmd/command.c (revision 30898) @@ -197,7 +197,7 @@ return 0; } -pcb_action_t shand_cmd_action_list[] = { +rnd_action_t shand_cmd_action_list[] = { {"h", pcb_act_Help, pcb_acth_Help, pcb_acts_Help}, {"l", pcb_act_LoadLayout, pcb_acth_LoadLayout, pcb_acts_LoadLayout}, {"le", pcb_act_LoadElementToBuffer, pcb_acth_LoadElementToBuffer, pcb_acts_LoadElementToBuffer}, @@ -216,7 +216,7 @@ void pplg_uninit_shand_cmd(void) { - pcb_remove_actions_by_cookie(shand_cmd_cookie); + rnd_remove_actions_by_cookie(shand_cmd_cookie); } int pplg_init_shand_cmd(void) Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 30897) +++ trunk/src_plugins/shape/shape.c (revision 30898) @@ -435,7 +435,7 @@ } if ((data == PCB->Data) && (!have_coords)) - pcb_hid_get_coords("Click on the center of the polygon", &x, &y, 0); + rnd_hid_get_coords("Click on the center of the polygon", &x, &y, 0); 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"); @@ -484,7 +484,7 @@ a = 0; data = PCB->Data; have_coords = 1; - pcb_hid_get_coords("Click on the center of the rectangle", &x, &y, 0); + rnd_hid_get_coords("Click on the center of the rectangle", &x, &y, 0); } /* convert width;height */ @@ -551,7 +551,7 @@ } if ((data == PCB->Data) && (!have_coords)) - pcb_hid_get_coords("Click on the center of the polygon", &x, &y, 0); + rnd_hid_get_coords("Click on the center of the polygon", &x, &y, 0); 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"); @@ -605,7 +605,7 @@ } if ((data == PCB->Data) && (!have_coords)) - pcb_hid_get_coords("Click on the center of the circle", &x, &y, 0); + rnd_hid_get_coords("Click on the center of the circle", &x, &y, 0); if (circle_place(PCB->Data, PCB_CURRLAYER(PCB), dia, x, y) == NULL) pcb_message(PCB_MSG_ERROR, "circle(): failed to create the polygon\n"); @@ -616,7 +616,7 @@ #include "shape_dialog.c" -pcb_action_t shape_action_list[] = { +rnd_action_t shape_action_list[] = { {"regpoly", pcb_act_regpoly, pcb_acth_regpoly, pcb_acts_regpoly}, {"roundrect", pcb_act_roundrect, pcb_acth_roundrect, pcb_acts_roundrect}, {"circle", pcb_act_circle, pcb_acth_circle, pcb_acts_circle}, @@ -628,7 +628,7 @@ void pplg_uninit_shape(void) { pcb_event_unbind_allcookie(pcb_shape_cookie); - pcb_remove_actions_by_cookie(pcb_shape_cookie); + rnd_remove_actions_by_cookie(pcb_shape_cookie); } int pplg_init_shape(void) Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 30897) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 30898) @@ -1170,7 +1170,7 @@ return 0; } -pcb_action_t sketch_route_action_list[] = { +rnd_action_t sketch_route_action_list[] = { {"skretriangulate", pcb_act_skretriangulate, pcb_acth_skretriangulate, pcb_acts_skretriangulate}, {"skline", pcb_act_skline, pcb_acth_skline, pcb_acts_skline}, {"sktransform", pcb_act_sktransform, pcb_acth_sktransform, pcb_acts_sktransform} @@ -1180,7 +1180,7 @@ void pplg_uninit_sketch_route(void) { - pcb_remove_actions_by_cookie(pcb_sketch_route_cookie); + rnd_remove_actions_by_cookie(pcb_sketch_route_cookie); pcb_tool_unreg_by_cookie(pcb_sketch_route_cookie); /* should be done before pcb_tool_uninit, somehow */ sketches_uninit(); } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 30897) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 30898) @@ -224,7 +224,7 @@ return 0; } -static pcb_action_t smartdisperse_action_list[] = { +static rnd_action_t smartdisperse_action_list[] = { {"smartdisperse", pcb_act_smartdisperse, pcb_acth_smartdisperse, pcb_acts_smartdisperse} }; @@ -234,7 +234,7 @@ void pplg_uninit_smartdisperse(void) { - pcb_remove_actions_by_cookie(smartdisperse_cookie); + rnd_remove_actions_by_cookie(smartdisperse_cookie); } int pplg_init_smartdisperse(void) Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 30897) +++ trunk/src_plugins/stroke/stroke.c (revision 30898) @@ -62,7 +62,7 @@ int idx; conf_loop_list(&conf_stroke.plugins.stroke.gestures, item, idx) { - if ((strcmp(seq, item->name) == 0) && (pcb_parse_actions(hl, item->val.string[0]) == 0)) + if ((strcmp(seq, item->name) == 0) && (rnd_parse_actions(hl, item->val.string[0]) == 0)) return 1; } if (conf_stroke.plugins.stroke.warn4unknown) @@ -124,7 +124,7 @@ } else if (pcb_strcasecmp(cmd, "zoom") == 0) { fgw_arg_t args[5]; - fgw_func_t *f = fgw_func_lookup(&pcb_fgw, "zoomto"); + fgw_func_t *f = fgw_func_lookup(&rnd_fgw, "zoomto"); if (f == NULL) { pcb_message(PCB_MSG_ERROR, "zoomto action is not available"); @@ -137,10 +137,10 @@ args[2].type = FGW_COORD; fgw_coord(&args[2]) = stroke_first_y; args[3].type = FGW_COORD; fgw_coord(&args[3]) = stroke_last_x; args[4].type = FGW_COORD; fgw_coord(&args[4]) = stroke_last_y; - return pcb_actionv_(f, res, 5, args); + return rnd_actionv_(f, res, 5, args); } else if (pcb_strcasecmp(cmd, "stopline") == 0) - pcb_actionva(PCB_ACT_HIDLIB, "Tool", "Escape", NULL); + rnd_actionva(PCB_ACT_HIDLIB, "Tool", "Escape", NULL); else PCB_ACT_FAIL(stroke); @@ -150,7 +150,7 @@ /*** administration ***/ -pcb_action_t stroke_action_list[] = { +rnd_action_t stroke_action_list[] = { {"stroke", pcb_act_stroke, pcb_acth_stroke, pcb_acts_stroke} }; @@ -160,7 +160,7 @@ { pcb_conf_unreg_file(STROKE_CONF_FN, stroke_conf_internal); pcb_conf_unreg_fields("plugins/stroke/"); - pcb_remove_actions_by_cookie(pcb_stroke_cookie); + rnd_remove_actions_by_cookie(pcb_stroke_cookie); pcb_event_unbind_allcookie(pcb_stroke_cookie); return 0; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 30897) +++ trunk/src_plugins/teardrops/teardrops.c (revision 30898) @@ -267,7 +267,7 @@ return 0; } -static pcb_action_t teardrops_action_list[] = { +static rnd_action_t teardrops_action_list[] = { {"Teardrops", pcb_act_teardrops, NULL, NULL} }; @@ -277,7 +277,7 @@ void pplg_uninit_teardrops(void) { - pcb_remove_actions_by_cookie(teardrops_cookie); + rnd_remove_actions_by_cookie(teardrops_cookie); } int pplg_init_teardrops(void) Index: trunk/src_plugins/tool_std/tool_buffer.c =================================================================== --- trunk/src_plugins/tool_std/tool_buffer.c (revision 30897) +++ trunk/src_plugins/tool_std/tool_buffer.c (revision 30898) @@ -58,7 +58,7 @@ pcb_board_t *pcb = (pcb_board_t *)hl; if (pcb_gui->shift_is_pressed(pcb_gui)) { - pcb_actionva(hl, "ReplaceFootprint", "object", "@buffer", "dumb", NULL); + rnd_actionva(hl, "ReplaceFootprint", "object", "@buffer", "dumb", NULL); return; } Index: trunk/src_plugins/tool_std/tool_lock.c =================================================================== --- trunk/src_plugins/tool_std/tool_lock.c (revision 30897) +++ trunk/src_plugins/tool_std/tool_lock.c (revision 30898) @@ -60,7 +60,7 @@ DrawSubc(subc); pcb_draw(); - pcb_actionva(hl, "Report", "Subc", "log", NULL); + rnd_actionva(hl, "Report", "Subc", "log", NULL); } else if (type != PCB_OBJ_VOID) { pcb_text_t *thing = (pcb_text_t *) ptr3; @@ -72,7 +72,7 @@ pcb_draw_obj((pcb_any_obj_t *)ptr2); pcb_draw(); } - pcb_actionva(hl, "Report", "Object", "log", NULL); + rnd_actionva(hl, "Report", "Object", "log", NULL); } } Index: trunk/src_plugins/tool_std/tool_poly.c =================================================================== --- trunk/src_plugins/tool_std/tool_poly.c (revision 30897) +++ trunk/src_plugins/tool_std/tool_poly.c (revision 30898) @@ -68,13 +68,13 @@ /* check if this is the last point of a polygon */ if (n >= 3 && points[0].X == pcb_crosshair.AttachedLine.Point2.X && points[0].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_actionva(hl, "Polygon", "Close", NULL); + rnd_actionva(hl, "Polygon", "Close", NULL); return; } /* Someone clicking twice on the same point ('doubleclick'): close polygon */ if (n >= 3 && points[n - 1].X == pcb_crosshair.AttachedLine.Point2.X && points[n - 1].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_actionva(hl, "Polygon", "Close", NULL); + rnd_actionva(hl, "Polygon", "Close", NULL); return; } Index: trunk/src_plugins/tool_std/tool_polyhole.c =================================================================== --- trunk/src_plugins/tool_std/tool_polyhole.c (revision 30897) +++ trunk/src_plugins/tool_std/tool_polyhole.c (revision 30898) @@ -101,13 +101,13 @@ /* check if this is the last point of a polygon */ if (n >= 3 && points[0].X == pcb_crosshair.AttachedLine.Point2.X && points[0].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_actionva(hl, "Polygon", "CloseHole", NULL); + rnd_actionva(hl, "Polygon", "CloseHole", NULL); break; } /* Someone clicking twice on the same point ('doubleclick'): close polygon hole */ if (n >= 3 && points[n - 1].X == pcb_crosshair.AttachedLine.Point2.X && points[n - 1].Y == pcb_crosshair.AttachedLine.Point2.Y) { - pcb_actionva(hl, "Polygon", "CloseHole", NULL); + rnd_actionva(hl, "Polygon", "CloseHole", NULL); break; } Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30897) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30898) @@ -607,7 +607,7 @@ static const char *vendor_cookie = "vendor drill mapping"; -pcb_action_t vendor_action_list[] = { +rnd_action_t vendor_action_list[] = { {"ApplyVendor", pcb_act_ApplyVendor, apply_vendor_help, apply_vendor_syntax}, {"UnloadVendor", pcb_act_UnloadVendor, unload_vendor_help, unload_vendor_syntax}, {"LoadVendorFrom", pcb_act_LoadVendorFrom, pcb_acth_LoadVendorFrom, pcb_acts_LoadVendorFrom} @@ -657,7 +657,7 @@ void pplg_uninit_vendordrill(void) { pcb_event_unbind_allcookie(vendor_cookie); - pcb_remove_actions_by_cookie(vendor_cookie); + rnd_remove_actions_by_cookie(vendor_cookie); vendor_free_all(); pcb_conf_unreg_fields("plugins/vendor/"); }