Index: buffer.c =================================================================== --- buffer.c (revision 36989) +++ buffer.c (revision 36990) @@ -312,7 +312,7 @@ fn = default_file = nfn; } - pxm = rnd_pixmap_load(RND_ACT_HIDLIB, fn); + pxm = rnd_pixmap_load(RND_ACT_DESIGN, fn); if (pxm == NULL) { rnd_message(RND_MSG_ERROR, "Failed to load pixmap from '%s' - is that file a pixmap in any of the supported formats?\n", fn); RND_ACT_IRES(-1); @@ -506,7 +506,7 @@ RND_ACT_IRES(0); if (angle_s == NULL) - angle_s = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter Rotation (degrees, CCW):", "0", "Rotation angle"); + angle_s = rnd_hid_prompt_for(RND_ACT_DESIGN, "Enter Rotation (degrees, CCW):", "0", "Rotation angle"); if ((angle_s == NULL) || (*angle_s == '\0')) { free(angle_s); @@ -528,9 +528,9 @@ return 0; } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); pcb_buffer_rotate(PCB_PASTEBUFFER, ang); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); return 0; } @@ -637,7 +637,7 @@ y = th = x; } else { - if (pcb_actgui_ScaleBuffer(RND_ACT_HIDLIB, &x, &y, &th, &recurse) != 0) { + if (pcb_actgui_ScaleBuffer(RND_ACT_DESIGN, &x, &y, &th, &recurse) != 0) { RND_ACT_IRES(-1); return 0; } @@ -654,9 +654,9 @@ RND_ACT_IRES(0); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); pcb_buffer_scale(PCB_PASTEBUFFER, x, y, th, recurse); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); return 0; } @@ -1017,7 +1017,7 @@ force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y')); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); switch (op) { /* clear contents of paste buffer */ case F_Clear: @@ -1103,9 +1103,9 @@ { FILE *exist; - if ((!force) && ((exist = rnd_fopen(RND_ACT_HIDLIB, name, "r")))) { + if ((!force) && ((exist = rnd_fopen(RND_ACT_DESIGN, name, "r")))) { fclose(exist); - if (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Buffer: overwrite file", "File exists! Ok to overwrite?", "cancel", 0, "yes", 1, NULL) == 1) + if (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Buffer: overwrite file", "File exists! Ok to overwrite?", "cancel", 0, "yes", 1, NULL) == 1) pcb_save_buffer(name, fmt); } else @@ -1134,18 +1134,18 @@ else name = sbufnum; - if (pcb_load_buffer(RND_ACT_HIDLIB, PCB_PASTEBUFFER, name, NULL) != 0) { + if (pcb_load_buffer(RND_ACT_DESIGN, PCB_PASTEBUFFER, name, NULL) != 0) { rnd_message(RND_MSG_ERROR, "Failed to load buffer from %s\n", name); RND_ACT_IRES(-1); } else - rnd_tool_select_by_name(RND_ACT_HIDLIB, "buffer"); + rnd_tool_select_by_name(RND_ACT_DESIGN, "buffer"); break; case F_Save: name = sbufnum; - rv = rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "PasteBuffer", name, fmt, NULL); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rv = rnd_actionva(RND_ACT_DESIGN, "SaveTo", "PasteBuffer", name, fmt, NULL); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); return rv; case F_ToLayout: @@ -1170,7 +1170,7 @@ } else { - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); RND_ACT_FAIL(PasteBuffer); } @@ -1193,13 +1193,13 @@ number = strtol(sbufnum, &end, 10); if (*end != 0) { rnd_message(RND_MSG_ERROR, "invalid buffer number '%s': should be an integer\n", sbufnum); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); return FGW_ERR_ARG_CONV; } number--; if ((number < 0) || (number >= PCB_MAX_BUFFER)) { rnd_message(RND_MSG_ERROR, "invalid buffer number '%d': out of range 1..%d\n", number+1, PCB_MAX_BUFFER); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); return FGW_ERR_ARG_CONV; } } @@ -1207,7 +1207,7 @@ number = conf_core.editor.buffer_number; res->type = FGW_STR; res->val.str = pcb_buffers[number].source_path; - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); return 0; /* set number */ @@ -1221,12 +1221,12 @@ } } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); RND_ACT_IRES(0); return 0; error:; - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); RND_ACT_IRES(-1); return 0; } Index: change_act.c =================================================================== --- change_act.c (revision 36989) +++ change_act.c (revision 36990) @@ -513,7 +513,7 @@ if (pcb_chg_obj_name_query(ptr2)) { rnd_hid_redraw(PCB); pcb_board_set_changed_flag(pcb, rnd_true); - rnd_actionva(RND_ACT_HIDLIB, "DeleteRats", "AllRats", NULL); + rnd_actionva(RND_ACT_DESIGN, "DeleteRats", "AllRats", NULL); } if (op == F_Object) { pcb_subc_t *subc = pcb_obj_parent_subc(ptr2); @@ -531,7 +531,7 @@ /* change the layout's name */ case F_Layout: - name = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", RND_EMPTY(RND_ACT_HIDLIB->name), "Layout name"); + name = rnd_hid_prompt_for(RND_ACT_DESIGN, "Enter the layout name:", RND_EMPTY(RND_ACT_DESIGN->name), "Layout name"); /* NB: ChangeLayoutName takes ownership of the passed memory */ if (name && pcb_board_change_name(name)) pcb_board_set_changed_flag(pcb, rnd_true); @@ -539,7 +539,7 @@ /* change the name of the active layer */ case F_Layer: - name = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layer name:", RND_EMPTY(PCB_CURRLAYER(PCB_ACT_BOARD)->name), "Layer name"); + name = rnd_hid_prompt_for(RND_ACT_DESIGN, "Enter the layer name:", RND_EMPTY(PCB_CURRLAYER(PCB_ACT_BOARD)->name), "Layer name"); /* NB: pcb_layer_rename_ takes ownership of the passed memory */ if (name && (pcb_layer_rename_(PCB_CURRLAYER(PCB_ACT_BOARD), name, 1) == 0)) pcb_board_set_changed_flag(pcb, rnd_true); @@ -788,7 +788,7 @@ RND_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1])); if (fnc_id == F_Grid) - return rnd_actionv_bin(RND_ACT_HIDLIB, "setgrid", res, argc-1, argv+1); + return rnd_actionv_bin(RND_ACT_DESIGN, "setgrid", res, argc-1, argv+1); RND_ACT_CONVARG(2, FGW_STR, SetValue, val = argv[2].val.str); RND_ACT_MAY_CONVARG(3, FGW_STR, SetValue, units = argv[3].val.str); @@ -803,7 +803,7 @@ rnd_conf_set_design("design/line_thickness", "%$mS", Size); if (conf_core.editor.auto_drc) pcb_crosshair_grid_fit(pcb, pcb_crosshair.X, pcb_crosshair.Y); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); } break; case F_Text: Index: drc.c =================================================================== --- drc.c (revision 36989) +++ drc.c (revision 36990) @@ -75,7 +75,7 @@ if (rnd_strcasecmp(dlg_type, "list") == 0) { if (RND_HAVE_GUI_ATTR_DLG) { args[1].val.str = "list"; - return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args); + return rnd_actionv_bin(RND_ACT_DESIGN, dlgact, res, 2, args); } dlg_type = "print"; } @@ -83,7 +83,7 @@ if (rnd_strcasecmp(dlg_type, "simple") == 0) { if (RND_HAVE_GUI_ATTR_DLG) { args[1].val.str = "simple"; - return rnd_actionv_bin(RND_ACT_HIDLIB, dlgact, res, 2, args); + return rnd_actionv_bin(RND_ACT_DESIGN, dlgact, res, 2, args); } dlg_type = "print"; } Index: file_act.c =================================================================== --- file_act.c (revision 36989) +++ file_act.c (revision 36990) @@ -79,21 +79,21 @@ case F_SubcToBuffer: case F_Subcircuit: case F_Footprint: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, format)) - rnd_tool_select_by_name(RND_ACT_HIDLIB, "buffer"); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_tool_select_by_name(RND_ACT_DESIGN, "buffer"); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_LayoutToBuffer: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); if (pcb_buffer_load_layout(pcb, PCB_PASTEBUFFER, name, format)) - rnd_tool_select_by_name(RND_ACT_HIDLIB, "buffer"); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_tool_select_by_name(RND_ACT_DESIGN, "buffer"); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_Layout: - if (!pcb->Changed || rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "File overwrite", "OK to override layout data?", "cancel", 0, "ok", 1, NULL)) + if (!pcb->Changed || rnd_hid_message_box(RND_ACT_DESIGN, "warning", "File overwrite", "OK to override layout data?", "cancel", 0, "ok", 1, NULL)) pcb_load_pcb(name, format, rnd_true, 0); break; @@ -108,7 +108,7 @@ pcb_netlist_init(&(pcb->netlist[i])); } } - if (!pcb_import_netlist(RND_ACT_HIDLIB, pcb->Netlistname)) + if (!pcb_import_netlist(RND_ACT_DESIGN, pcb->Netlistname)) pcb_netlist_changed(1); else rnd_message(RND_MSG_ERROR, "None of the netlist import plugins could handle that file:\nunknown/broken file format or partial load due to errors in the file\n"); @@ -115,7 +115,7 @@ break; case F_Revert: - if (RND_ACT_HIDLIB->filename && (!pcb->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1))) + if (RND_ACT_DESIGN->filename && (!pcb->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Revert: lose data", "Really revert all modifications?", "no", 0, "yes", 1, NULL) == 1))) pcb_revert_pcb(); break; @@ -140,11 +140,11 @@ RND_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str); - if (!pcb->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) { + if (!pcb->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "New pcb", "OK to clear layout data?", "cancel", 0, "yes", 1, NULL) == 1)) { if (argument_name) name = rnd_strdup(argument_name); else - name = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Enter the layout name:", "", "Layout name"); + name = rnd_hid_prompt_for(RND_ACT_DESIGN, "Enter the layout name:", "", "Layout name"); if (!name) return 1; @@ -152,7 +152,7 @@ /* pcb usage: at the moment, while having only one global pcb, this function legitimately uses that */ - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); /* do emergency saving * clear the old struct and allocate memory for the new one */ @@ -184,7 +184,7 @@ pcb_center_display(pcb, (pcb->hidlib.dwg.X1+pcb->hidlib.dwg.X2) / 2, (pcb->hidlib.dwg.Y1+pcb->hidlib.dwg.Y2) / 2); pcb_board_replaced(0); rnd_hid_redraw(pcb); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); RND_ACT_IRES(0); return 0; } @@ -263,17 +263,17 @@ rnd_message(RND_MSG_ERROR, "SaveTo(Layout) doesn't take file name or format - did you mean SaveTo(LayoutAs)?\n"); return FGW_ERR_ARGC; } - if (pcb_save_pcb(RND_ACT_HIDLIB->filename, NULL) == 0) + if (pcb_save_pcb(RND_ACT_DESIGN->filename, NULL) == 0) pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_false); - rnd_event(RND_ACT_HIDLIB, RND_EVENT_DESIGN_FN_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, RND_EVENT_DESIGN_FN_CHANGED, NULL); return 0; case F_LayoutAs: if (pcb_save_pcb(name, fmt) == 0) { pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_false); - free(RND_ACT_HIDLIB->filename); - RND_ACT_HIDLIB->filename = rnd_strdup(name); - rnd_event(RND_ACT_HIDLIB, RND_EVENT_DESIGN_FN_CHANGED, NULL); + free(RND_ACT_DESIGN->filename); + RND_ACT_DESIGN->filename = rnd_strdup(name); + rnd_event(RND_ACT_DESIGN, RND_EVENT_DESIGN_FN_CHANGED, NULL); } return 0; @@ -294,14 +294,14 @@ /* shorthand kept only for compatibility reasons - do not use */ case F_AllConnections: rnd_message(RND_MSG_WARNING, "Please use action ExportOldConn() instead of SaveTo() for connections.\n"); - return rnd_actionva(RND_ACT_HIDLIB, "ExportOldConn", "AllConnections", name, NULL); + return rnd_actionva(RND_ACT_DESIGN, "ExportOldConn", "AllConnections", name, NULL); case F_AllUnusedPins: rnd_message(RND_MSG_WARNING, "Please use action ExportOldConn() instead of SaveTo() for connections.\n"); - return rnd_actionva(RND_ACT_HIDLIB, "ExportOldConn", "AllUnusedPins", name, NULL); + return rnd_actionva(RND_ACT_DESIGN, "ExportOldConn", "AllUnusedPins", name, NULL); case F_ElementConnections: case F_SubcConnections: rnd_message(RND_MSG_WARNING, "Please use action ExportOldConn() instead of SaveTo() for connections.\n"); - return rnd_actionva(RND_ACT_HIDLIB, "ExportOldConn", "SubcConnections", name, NULL); + return rnd_actionva(RND_ACT_DESIGN, "ExportOldConn", "SubcConnections", name, NULL); } RND_ACT_FAIL(SaveTo); @@ -392,7 +392,7 @@ else name = rnd_strdup(fn); - f = rnd_fopen(RND_ACT_HIDLIB, name, "w"); + f = rnd_fopen(RND_ACT_DESIGN, name, "w"); if (f == NULL) { rnd_message(RND_MSG_ERROR, "Failed to open %s for write\n", name); free(name); @@ -450,7 +450,7 @@ FILE *f; char *fullname = rnd_strdup_printf("%s.%ld%s%s", name, (long)sit.count, sep, ending); - f = rnd_fopen(RND_ACT_HIDLIB, fullname, "w"); + f = rnd_fopen(RND_ACT_DESIGN, fullname, "w"); free(fullname); if (f != NULL) { if (p->write_subcs_head(p, &udata, f, 0, 1) == 0) { @@ -521,7 +521,7 @@ else name = rnd_strdup(fn); - f = rnd_fopen(RND_ACT_HIDLIB, name, "w"); + f = rnd_fopen(RND_ACT_DESIGN, name, "w"); if (f == NULL) { rnd_message(RND_MSG_ERROR, "Failed to open %s for write\n", name); free(name); @@ -548,7 +548,7 @@ if ((force != NULL) && (rnd_strcasecmp(force, "force") == 0)) exit(0); - if (!pcb->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) + if (!pcb->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1)) pcb_quit_app(); RND_ACT_IRES(-1); return 0; @@ -587,12 +587,12 @@ argc-=2; /* call the exporter */ - rnd_event(RND_ACT_HIDLIB, RND_EVENT_EXPORT_SESSION_BEGIN, NULL); + rnd_event(RND_ACT_DESIGN, RND_EVENT_EXPORT_SESSION_BEGIN, NULL); a = args; a++; rnd_exporter->parse_arguments(rnd_exporter, &argc, &a); rnd_exporter->do_export(rnd_exporter, NULL); - rnd_event(RND_ACT_HIDLIB, RND_EVENT_EXPORT_SESSION_END, NULL); + rnd_event(RND_ACT_DESIGN, RND_EVENT_EXPORT_SESSION_END, NULL); rnd_exporter = NULL; RND_ACT_IRES(0); Index: font_act.c =================================================================== --- font_act.c (revision 36989) +++ font_act.c (revision 36990) @@ -94,7 +94,7 @@ } r = pcb_parse_font(fnt, fname); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_FONT_CHANGED, "i", fnt->id); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_FONT_CHANGED, "i", fnt->id); if (r != 0) { rnd_message(RND_MSG_ERROR, "LoadFontFrom(): failed to load font from %s\n", fname); pcb_del_font(&PCB_ACT_BOARD->fontkit, fnt->id); Index: gui_act.c =================================================================== --- gui_act.c (revision 36989) +++ gui_act.c (revision 36990) @@ -130,11 +130,11 @@ /* toggle line-adjust flag */ case F_ToggleAllDirections: rnd_conf_toggle_editor(all_direction_lines); - rnd_tool_adjust_attached(RND_ACT_HIDLIB); + rnd_tool_adjust_attached(RND_ACT_DESIGN); break; case F_CycleClip: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); if (conf_core.editor.all_direction_lines) { rnd_conf_toggle_editor(all_direction_lines); rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",0); @@ -142,8 +142,8 @@ else { rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3); } - rnd_tool_adjust_attached(RND_ACT_HIDLIB); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_tool_adjust_attached(RND_ACT_DESIGN); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_CycleCrosshair: @@ -151,15 +151,15 @@ break; case F_ToggleRubberBandMode: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); rnd_conf_toggle_editor(rubber_band_mode); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_ToggleStartDirection: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); rnd_conf_toggle_editor(swap_start_direction); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_ToggleUniqueNames: @@ -167,21 +167,21 @@ break; case F_ToggleSnapPin: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); rnd_conf_toggle_editor(snap_pin); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_ToggleSnapOffGridLine: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); rnd_conf_toggle_editor(snap_offgrid_line); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_ToggleHighlightOnPoint: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); rnd_conf_toggle_editor(highlight_on_point); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_ToggleLocalRef: @@ -226,7 +226,7 @@ break; case F_ToggleAutoDRC: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); rnd_conf_toggle_editor(auto_drc); if (conf_core.editor.auto_drc && rnd_conf.editor.mode == pcb_crosshair.tool_line) { if (pcb_data_clear_flag(PCB->Data, PCB_FLAG_FOUND, 1, 1) > 0) { @@ -243,7 +243,7 @@ pcb_find_free(&fctx); } } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; case F_ToggleCheckPlanes: @@ -274,7 +274,7 @@ { rnd_coord_t old_grid = rnd_conf.editor.grid, x, y; - rnd_hidlib_set_grid(RND_ACT_HIDLIB, 1, rnd_false, 0, 0); + rnd_hidlib_set_grid(RND_ACT_DESIGN, 1, rnd_false, 0, 0); /* ask for coordinates, but then use the crosshair: with grid 0;0, this means the user can go anywhere, but snapping will apply; if the crosshair is snapped, we are aligning to an object(point), else @@ -281,8 +281,8 @@ we are aligning to whatever fine point the user clicked */ rnd_hid_get_coords("Click to set the grid origin", &x, &y, 0); if (pcb_crosshair_move_absolute(PCB_ACT_BOARD, pcb_crosshair.X, pcb_crosshair.Y)) - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); /* first notify was in MoveCrosshairAbs */ - rnd_hidlib_set_grid(RND_ACT_HIDLIB, old_grid, rnd_true, pcb_crosshair.X, pcb_crosshair.Y); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); /* first notify was in MoveCrosshairAbs */ + rnd_hidlib_set_grid(RND_ACT_DESIGN, old_grid, rnd_true, pcb_crosshair.X, pcb_crosshair.Y); rnd_grid_inval(); } @@ -296,7 +296,7 @@ /* display the pinout of a subcircuit */ case F_Pinout: - return rnd_actionva(RND_ACT_HIDLIB, "pinout", NULL); + return rnd_actionva(RND_ACT_DESIGN, "pinout", NULL); /* toggle displaying of terminal names */ case F_PinOrPadName: @@ -354,8 +354,8 @@ RND_ACT_FAIL(Display); return FGW_ERR_ARG_CONV; } - RND_ACT_HIDLIB->grid_ox = rnd_get_value(argv[2].val.str, NULL, NULL, NULL); - RND_ACT_HIDLIB->grid_oy = rnd_get_value(argv[3].val.str, NULL, NULL, NULL); + RND_ACT_DESIGN->grid_ox = rnd_get_value(argv[2].val.str, NULL, NULL, NULL); + RND_ACT_DESIGN->grid_oy = rnd_get_value(argv[3].val.str, NULL, NULL, NULL); if (rnd_conf.editor.draw_grid) rnd_hid_redraw(PCB); } @@ -380,7 +380,7 @@ #define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (PCB_SLOP * rnd_pixel_slop)) : ((a)-(b) > -(PCB_SLOP * rnd_pixel_slop))) static fgw_error_t pcb_act_CycleDrag(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_design_t *hidlib = RND_ACT_HIDLIB; + rnd_design_t *hidlib = RND_ACT_DESIGN; void *ptr1, *ptr2, *ptr3; int over = 0; @@ -450,8 +450,8 @@ RND_ACT_IRES(-1); return 0; switched:; - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_RESET, NULL); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_RUBBER_RESET, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); return 0; } @@ -694,23 +694,23 @@ /* set layer current and size from line or arc */ switch (type) { case PCB_OBJ_LINE: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); set_same_(((pcb_line_t *)ptr2)->Thickness, -1, -1, -1, ((pcb_line_t *) ptr2)->Clearance / 2, -1, NULL); layer = (pcb_layer_t *) ptr1; if (rnd_conf.editor.mode != pcb_crosshair.tool_line) - rnd_tool_select_by_name(RND_ACT_HIDLIB, "line"); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + rnd_tool_select_by_name(RND_ACT_DESIGN, "line"); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case PCB_OBJ_ARC: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); set_same_(((pcb_arc_t *)ptr2)->Thickness, -1, -1, -1, ((pcb_arc_t *) ptr2)->Clearance / 2, -1, NULL); layer = (pcb_layer_t *) ptr1; if (rnd_conf.editor.mode != pcb_crosshair.tool_arc) - rnd_tool_select_by_name(RND_ACT_HIDLIB, "arc"); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + rnd_tool_select_by_name(RND_ACT_DESIGN, "arc"); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case PCB_OBJ_POLY: @@ -718,23 +718,23 @@ break; case PCB_OBJ_PSTK: - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); set_same_(-1, -1, -1, -1, -1, ((pcb_pstk_t *)ptr2)->proto, NULL); if (rnd_conf.editor.mode != pcb_crosshair.tool_via) - rnd_tool_select_by_name(RND_ACT_HIDLIB, "via"); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + rnd_tool_select_by_name(RND_ACT_DESIGN, "via"); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; case PCB_OBJ_TEXT: { pcb_text_t *text = ptr2; - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); set_same_(-1, text->thickness, text->Scale, text->fid, -1, -1, NULL); if (rnd_conf.editor.mode != pcb_crosshair.tool_text) - rnd_tool_select_by_name(RND_ACT_HIDLIB, "text"); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); + rnd_tool_select_by_name(RND_ACT_DESIGN, "text"); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; } @@ -743,7 +743,7 @@ return 0; } if (layer != PCB_CURRLAYER(PCB_ACT_BOARD)) { - pcb_layervis_change_group_vis(RND_ACT_HIDLIB, pcb_layer_id(PCB_ACT_BOARD->Data, layer), rnd_true, rnd_true); + pcb_layervis_change_group_vis(RND_ACT_DESIGN, pcb_layer_id(PCB_ACT_BOARD->Data, layer), rnd_true, rnd_true); rnd_hid_redraw(PCB); } RND_ACT_IRES(0); @@ -939,12 +939,12 @@ fgw_arg_t args[2]; args[0].type = FGW_FUNC; args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, rnd_aname(fn, "LayerPropGui")); - args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; + args[0].val.argv0.user_call_ctx = RND_ACT_DESIGN; if (args[0].val.func != NULL) { args[1].type = FGW_LONG; args[1].val.nat_long = pcb_layer_id(PCB->Data, ly); ret = rnd_actionv_(args[0].val.func, res, 2, args); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERS_CHANGED, NULL); } else return FGW_ERR_NOT_FOUND; @@ -951,7 +951,7 @@ return ret; } - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERS_CHANGED, NULL); RND_ACT_IRES(0); return ret; } @@ -1049,12 +1049,12 @@ fgw_arg_t args[2]; args[0].type = FGW_FUNC; args[0].val.argv0.func = fgw_func_lookup(&rnd_fgw, rnd_aname(fn, "GroupPropGui")); - args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; + args[0].val.argv0.user_call_ctx = RND_ACT_DESIGN; if (args[0].val.func != NULL) { args[1].type = FGW_LONG; args[1].val.nat_long = pcb_layergrp_id(PCB, g); ret = rnd_actionv_(args[0].val.func, res, 2, args); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERS_CHANGED, NULL); } else return FGW_ERR_NOT_FOUND; @@ -1062,7 +1062,7 @@ } - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERS_CHANGED, NULL); RND_ACT_IRES(0); return ret; } @@ -1241,7 +1241,7 @@ RND_ACT_IRES(-1); pcb_layergrp_inhibit_dec(); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERS_CHANGED, NULL); if ((rnd_gui != NULL) && (rnd_exporter == NULL)) rnd_gui->invalidate_all(rnd_gui); @@ -1297,7 +1297,7 @@ pcb_undo_inc_serial(); pcb_layergrp_inhibit_dec(); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERS_CHANGED, NULL); if ((rnd_gui != NULL) && (rnd_exporter == NULL)) rnd_gui->invalidate_all(rnd_gui); return 0; @@ -1318,7 +1318,7 @@ if (rnd_strcasecmp(name, "silk") == 0) { PCB->RatDraw = 0; if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) { - pcb_layervis_change_group_vis(RND_ACT_HIDLIB, lid, 1, 1); + pcb_layervis_change_group_vis(RND_ACT_DESIGN, lid, 1, 1); } else { rnd_message(RND_MSG_ERROR, "Can't find this-side silk layer\n"); @@ -1337,14 +1337,14 @@ return 0; } *s = *v = 1; - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } PCB->RatDraw = 0; - pcb_layervis_change_group_vis(RND_ACT_HIDLIB, atoi(name)-1, 1, 1); + pcb_layervis_change_group_vis(RND_ACT_DESIGN, atoi(name)-1, 1, 1); rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } @@ -1426,12 +1426,12 @@ RND_ACT_FAIL(toggleview); pcb_layer_vis_change_all(PCB, open, vis); rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } else if (rnd_strcasecmp(name, "silk") == 0) { if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) - pcb_layervis_change_group_vis(RND_ACT_HIDLIB, lid, -1, 0); + pcb_layervis_change_group_vis(RND_ACT_DESIGN, lid, -1, 0); else rnd_message(RND_MSG_ERROR, "Can't find this-side silk layer\n"); } @@ -1438,12 +1438,12 @@ else if ((rnd_strcasecmp(name, "padstacks") == 0) || (rnd_strcasecmp(name, "vias") == 0) || (rnd_strcasecmp(name, "pins") == 0) || (rnd_strcasecmp(name, "pads") == 0)) { PCB->pstk_on = !PCB->pstk_on; rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else if (rnd_strcasecmp(name, "BackSide") == 0) { PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn; rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else if (strncmp(name, "ui:", 3) == 0) { pcb_layer_t *ly = pcb_uilayer_get(atoi(name+3)); @@ -1454,15 +1454,15 @@ } ly->meta.real.vis = !ly->meta.real.vis; rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); } else { char *end; int id = strtol(name, &end, 10) - 1; if (*end == '\0') { /* integer layer */ - pcb_layervis_change_group_vis(RND_ACT_HIDLIB, id, -1, 0); + pcb_layervis_change_group_vis(RND_ACT_DESIGN, id, -1, 0); rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } else { /* virtual menu layer */ @@ -1471,7 +1471,7 @@ rnd_bool *v = (rnd_bool *)((char *)PCB + ml->vis_offs); *v = !(*v); rnd_gui->invalidate_all(rnd_gui); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); return 0; } rnd_message(RND_MSG_ERROR, "Invalid layer id: '%s'\n", name); @@ -1724,9 +1724,9 @@ static const char pcb_acth_LayerVisReset[] = "Reset layer visibility to safe defaults."; static fgw_error_t pcb_act_LayerVisReset(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - pcb_layervis_reset_stack(RND_ACT_HIDLIB); + pcb_layervis_reset_stack(RND_ACT_DESIGN); pcb_layer_vis_historical_hides(PCB_ACT_BOARD); - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); RND_ACT_IRES(0); return 0; } @@ -1739,7 +1739,7 @@ case F_Toggle: ly->meta.real.gui_xform.field = !ly->meta.real.gui_xform.field; break; \ default: return FGW_ERR_ARG_CONV; \ } \ - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_LAYERVIS_CHANGED, NULL); \ + rnd_event(RND_ACT_DESIGN, PCB_EVENT_LAYERVIS_CHANGED, NULL); \ } while(0) static const char pcb_acts_LayerXform[] = "LayerXform(layerid, toggle|set|clear, xformfield, [value])"; Index: main_act.c =================================================================== --- main_act.c (revision 36989) +++ main_act.c (revision 36990) @@ -276,13 +276,13 @@ RND_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str); RND_ACT_IRES(0); - rnd_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_HIDLIB->filename == NULL ? "" : RND_ACT_HIDLIB->filename, 1); + rnd_setenv("PCB_RND_BOARD_FILE_NAME", RND_ACT_DESIGN->filename == NULL ? "" : RND_ACT_DESIGN->filename, 1); rnd_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.X); rnd_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1); rnd_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y); rnd_setenv("PCB_RND_CROSSHAIR_Y_MM", tmp, 1); rnd_setenv("PCB_RND_CURRENT_LAYER_NAME", PCB_CURRLAYER(PCB_ACT_BOARD)->name, 1); - RND_ACT_IRES(rnd_system(RND_ACT_HIDLIB, cmd)); + RND_ACT_IRES(rnd_system(RND_ACT_DESIGN, cmd)); return 0; } @@ -298,7 +298,7 @@ const char *fname; RND_ACT_CONVARG(1, FGW_STR, ExecuteFile, fname = argv[1].val.str); - RND_ACT_IRES(pcb_act_execute_file(RND_ACT_HIDLIB, fname)); + RND_ACT_IRES(pcb_act_execute_file(RND_ACT_DESIGN, fname)); return 0; } Index: netlist_act.c =================================================================== --- netlist_act.c (revision 36989) +++ netlist_act.c (revision 36990) @@ -415,7 +415,7 @@ if (a1 == NULL) RND_ACT_FAIL(Netlist); if (a2 == NULL) { - a2 = a2free = rnd_hid_prompt_for(RND_ACT_HIDLIB, "New name of the network", NULL, "net rename"); + a2 = a2free = rnd_hid_prompt_for(RND_ACT_DESIGN, "New name of the network", NULL, "net rename"); if (a2 == NULL) { RND_ACT_IRES(1); return 0; @@ -428,7 +428,7 @@ if (a1 == NULL) RND_ACT_FAIL(Netlist); if (a2 == NULL) { - a2 = a2free = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Network name to merge into", NULL, "net merge"); + a2 = a2free = rnd_hid_prompt_for(RND_ACT_DESIGN, "Network name to merge into", NULL, "net merge"); if (a2 == NULL) { RND_ACT_IRES(1); return 0; @@ -631,7 +631,7 @@ } if (netname == NULL) { - free_netname = netname = rnd_hid_prompt_for(RND_ACT_HIDLIB, "Name of the new network", NULL, "net name"); + free_netname = netname = rnd_hid_prompt_for(RND_ACT_DESIGN, "Name of the new network", NULL, "net name"); if (netname == NULL) { vtp0_uninit(&termlist); RND_ACT_IRES(1); Index: object_act.c =================================================================== --- object_act.c (revision 36989) +++ object_act.c (revision 36990) @@ -179,7 +179,7 @@ if ((pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) { pcb_subc_t *subc = (pcb_subc_t *)ptrtmp; pcb_undo_freeze_serial(); - pcb_subc_change_side(subc, 2 * pcb_crosshair.Y - RND_ACT_HIDLIB->dwg.Y2); + pcb_subc_change_side(subc, 2 * pcb_crosshair.Y - RND_ACT_DESIGN->dwg.Y2); pcb_undo_unfreeze_serial(); pcb_undo_inc_serial(); pcb_draw(); @@ -230,11 +230,11 @@ if (ny->absolute[0]) ny->c[0] -= pcb_crosshair.Y; - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_RESET, NULL); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_RUBBER_RESET, NULL); if (conf_core.editor.rubber_band_mode) - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); if (type == PCB_OBJ_SUBC) - rnd_event(RND_ACT_HIDLIB, PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); + rnd_event(RND_ACT_DESIGN, PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); pcb_move_obj_and_rubberband(type, ptr1, ptr2, ptr3, nx->c[0], ny->c[0]); pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_true); @@ -577,7 +577,7 @@ args[0].type = FGW_FUNC; args[0].val.argv0.func = NULL; - args[0].val.argv0.user_call_ctx = RND_ACT_HIDLIB; + args[0].val.argv0.user_call_ctx = RND_ACT_DESIGN; args[1] = argv[3]; args[2] = argv[2]; args[3] = argv[4]; @@ -606,7 +606,7 @@ printf(" ... Footprint not on board, need to add it.\n"); #endif /* Not on board, need to add it. */ - if (RND_ACT_CALL_C(RND_ACT_HIDLIB, pcb_act_LoadFootprint, &rs, argc, args) != 0) { + if (RND_ACT_CALL_C(RND_ACT_DESIGN, pcb_act_LoadFootprint, &rs, argc, args) != 0) { number_of_footprints_not_found++; RND_ACT_IRES(1); return 0; @@ -628,7 +628,7 @@ double orig_rot; /* Different footprint, we need to swap them out. */ - if (RND_ACT_CALL_C(RND_ACT_HIDLIB, pcb_act_LoadFootprint, &rs, argc, args) != 0) { + if (RND_ACT_CALL_C(RND_ACT_DESIGN, pcb_act_LoadFootprint, &rs, argc, args) != 0) { number_of_footprints_not_found++; RND_ACT_IRES(1); return 0; @@ -653,7 +653,7 @@ rnd_coord_t pcx = 0, pcy = 0; pcb_subc_get_origin(psc, &pcx, &pcy); if (!orig_on_top) - pcb_subc_change_side(psc, pcy * 2 - RND_ACT_HIDLIB->dwg.Y2); + pcb_subc_change_side(psc, pcy * 2 - RND_ACT_DESIGN->dwg.Y2); if (orig_rot != 0) { double cosa, sina; cosa = cos(orig_rot / RND_RAD_TO_DEG); @@ -1129,7 +1129,7 @@ return 0; } else - gfx_set_resize_gui(RND_ACT_HIDLIB, gfx, 1, 1); + gfx_set_resize_gui(RND_ACT_DESIGN, gfx, 1, 1); break; default: RND_ACT_FAIL(GfxMod); Index: plug_footprint_act.c =================================================================== --- plug_footprint_act.c (revision 36989) +++ plug_footprint_act.c (revision 36990) @@ -43,7 +43,7 @@ RND_ACT_IRES(0); if (name == NULL) { - pcb_fp_rehash(RND_ACT_HIDLIB, NULL); + pcb_fp_rehash(RND_ACT_DESIGN, NULL); return 0; } @@ -66,7 +66,7 @@ return 0; } - if (pcb_fp_rehash(RND_ACT_HIDLIB, l) != 0) { + if (pcb_fp_rehash(RND_ACT_DESIGN, l) != 0) { rnd_message(RND_MSG_ERROR, "Failed to rehash %s\n", name); RND_ACT_IRES(1); return 0; Index: polygon_act.c =================================================================== --- polygon_act.c (revision 36989) +++ polygon_act.c (revision 36990) @@ -99,7 +99,7 @@ RND_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1])); if ((argc > 1) && ((rnd_conf.editor.mode == pcb_crosshair.tool_poly) || (rnd_conf.editor.mode == pcb_crosshair.tool_poly_hole))) { - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); switch(op) { /* close open polygon if possible */ case F_Close: @@ -116,7 +116,7 @@ pcb_polygon_go_to_prev_point(); break; } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); } RND_ACT_IRES(0); return 0; Index: remove_act.c =================================================================== --- remove_act.c (revision 36989) +++ remove_act.c (revision 36990) @@ -79,12 +79,12 @@ pcb_remove_object(obj->type, obj->parent.any, obj, obj); } else { /* interactive remove */ - rnd_design_t *hidlib = RND_ACT_HIDLIB; + rnd_design_t *hidlib = RND_ACT_DESIGN; rnd_hid_get_coords("Click on object to delete", &hidlib->tool_x, &hidlib->tool_y, 0); - rnd_tool_save(RND_ACT_HIDLIB); - rnd_tool_select_by_name(RND_ACT_HIDLIB, "remove"); - rnd_tool_do_press(RND_ACT_HIDLIB); - rnd_tool_restore(RND_ACT_HIDLIB); + rnd_tool_save(RND_ACT_DESIGN); + rnd_tool_select_by_name(RND_ACT_DESIGN, "remove"); + rnd_tool_do_press(RND_ACT_DESIGN); + rnd_tool_restore(RND_ACT_DESIGN); } break; case F_Selected: Index: select_act.c =================================================================== --- select_act.c (revision 36989) +++ select_act.c (revision 36990) @@ -103,13 +103,13 @@ box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X); box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); pcb_tool_notify_block(); if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, rnd_true, rnd_true, rnd_false)) { pcb_board_set_changed_flag(pcb, rnd_true); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); rnd_gui->invalidate_all(rnd_gui); break; } @@ -162,8 +162,8 @@ pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB, PCB_PASTEBUFFER); rnd_hid_get_coords("Select the Subcircuit's Origin (mark) Location", &x, &y, 0); - x = rnd_grid_fit(x, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_ox); - y = rnd_grid_fit(y, RND_ACT_HIDLIB->grid, RND_ACT_HIDLIB->grid_oy); + x = rnd_grid_fit(x, RND_ACT_DESIGN->grid, RND_ACT_DESIGN->grid_ox); + y = rnd_grid_fit(y, RND_ACT_DESIGN->grid, RND_ACT_DESIGN->grid_oy); pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, x, y, rnd_true, rnd_false); pcb_undo_save_serial(); pcb_remove_selected(0); @@ -205,13 +205,13 @@ box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X); box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); pcb_tool_notify_block(); if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, rnd_false, rnd_true, rnd_false)) { pcb_board_set_changed_flag(pcb, rnd_true); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); break; } Index: undo_act.c =================================================================== --- undo_act.c (revision 36989) +++ undo_act.c (revision 36990) @@ -99,13 +99,13 @@ const char *function = NULL; RND_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str); if (!function || !*function) { - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); - if (rnd_tool_undo_act(RND_ACT_HIDLIB)) + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); + if (rnd_tool_undo_act(RND_ACT_DESIGN)) if (pcb_undo(rnd_true) == 0) pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_true); } else if (function) { - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); if (rnd_strcasecmp(function, "ClearList") == 0) pcb_undo_clear_list(rnd_false); else if (rnd_strcasecmp(function, "FreezeSerial") == 0) @@ -135,7 +135,7 @@ } } - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); RND_ACT_IRES(0); return 0; } @@ -146,11 +146,11 @@ /* DOC: redo.html */ fgw_error_t pcb_act_Redo(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false); - if (rnd_tool_redo_act(RND_ACT_HIDLIB)) + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_false); + if (rnd_tool_redo_act(RND_ACT_DESIGN)) if (pcb_redo(rnd_true)) pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_true); - rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_true); + rnd_hid_notify_crosshair_change(RND_ACT_DESIGN, rnd_true); RND_ACT_IRES(0); return 0; }