Index: ar_extern/ar_extern.c =================================================================== --- ar_extern/ar_extern.c (revision 36988) +++ ar_extern/ar_extern.c (revision 36989) @@ -58,8 +58,8 @@ typedef struct { const char *name; int (*route)(pcb_board_t *pcb, ext_route_scope_t scope, const char *method, int argc, fgw_arg_t *argv); - int (*list_methods)(rnd_hidlib_t *hl, vts0_t *dst); - rnd_export_opt_t *(*list_conf)(rnd_hidlib_t *hl, const char *method); + int (*list_methods)(rnd_design_t *hl, vts0_t *dst); + rnd_export_opt_t *(*list_conf)(rnd_design_t *hl, const char *method); } ext_router_t; int pcb_ar_extern_progress(double p_total, double p1, double p2); Index: ar_extern/dlg_extroute.c =================================================================== --- ar_extern/dlg_extroute.c (revision 36988) +++ ar_extern/dlg_extroute.c (revision 36989) @@ -192,7 +192,7 @@ { FILE *f; char *fname; - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); fname = rnd_hid_fileselect(rnd_gui, "Save autoroute settings to...", "Pick a file for saving autoroute settings to.\n", @@ -216,7 +216,7 @@ { FILE *f; char *fname; - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); fname = rnd_hid_fileselect(rnd_gui, "Load autoroute settings from...", "Pick a file for loading autoroute settings from.\n", Index: ar_extern/e_freerouting.c =================================================================== --- ar_extern/e_freerouting.c (revision 36988) +++ ar_extern/e_freerouting.c (revision 36989) @@ -113,7 +113,7 @@ static int freert_route(pcb_board_t *pcb, ext_route_scope_t scope, const char *method, int argc, fgw_arg_t *argv) { char *route_req, *route_res, *end; - rnd_hidlib_t *hl = &pcb->hidlib; + rnd_design_t *hl = &pcb->hidlib; char *cmd; int n, r, rv = 1, ap = 2, pp = 12, fo=0, test = 0, debug, rich; const char *exe, *installation; @@ -250,7 +250,7 @@ return rv; } -static int freert_list_methods(rnd_hidlib_t *hl, vts0_t *dst) +static int freert_list_methods(rnd_design_t *hl, vts0_t *dst) { vts0_append(dst, rnd_strdup("freerouting_cli")); vts0_append(dst, rnd_strdup("Erich's minimized CLI-only fork")); @@ -261,7 +261,7 @@ } -static rnd_export_opt_t *freert_list_conf(rnd_hidlib_t *hl, const char *method) +static rnd_export_opt_t *freert_list_conf(rnd_design_t *hl, const char *method) { rnd_export_opt_t *rv = calloc(sizeof(rnd_export_opt_t), 4+1); Index: ar_extern/e_route-rnd.c =================================================================== --- ar_extern/e_route-rnd.c (revision 36988) +++ ar_extern/e_route-rnd.c (revision 36989) @@ -29,7 +29,7 @@ static int rtrnd_route(pcb_board_t *pcb, ext_route_scope_t scope, const char *method, int argc, fgw_arg_t *argv) { const char *route_req = "rtrnd.1.tdx", *route_res = "rtrnd.2.tdx"; - rnd_hidlib_t *hl = &pcb->hidlib; + rnd_design_t *hl = &pcb->hidlib; char *cmd; int n, r, sargc, rv = 1; fgw_arg_t sres = {0}, *sargv; @@ -84,7 +84,7 @@ return rv; } -static int rtrnd_list_methods(rnd_hidlib_t *hl, vts0_t *dst) +static int rtrnd_list_methods(rnd_design_t *hl, vts0_t *dst) { FILE *f; char *cmd, line[1024]; @@ -116,7 +116,7 @@ } -static rnd_export_opt_t *rtrnd_list_conf(rnd_hidlib_t *hl, const char *method) +static rnd_export_opt_t *rtrnd_list_conf(rnd_design_t *hl, const char *method) { char *cmd; const char *route_lst = "rtrnd.l.tdx"; Index: cam/cam_compile.h =================================================================== --- cam/cam_compile.h (revision 36988) +++ cam/cam_compile.h (revision 36989) @@ -73,7 +73,7 @@ #include typedef struct { - rnd_hidlib_t *hidlib; + rnd_design_t *hidlib; char *prefix; /* strdup'd file name prefix from the last prefix command */ rnd_hid_t *exporter; unsigned partial:1; /* when 1, there are objects marked with the EXPORTSEL flag */ Index: cam/cam_gui.c =================================================================== --- cam/cam_gui.c (revision 36988) +++ cam/cam_gui.c (revision 36989) @@ -257,7 +257,7 @@ RND_DAD_END(ctx->dlg); } -static int cam_gui(rnd_hidlib_t *hidlib, const char *arg) +static int cam_gui(rnd_design_t *hidlib, const char *arg) { cam_dlg_t *ctx = calloc(sizeof(cam_dlg_t), 1); const char *opt_hdr[] = {"key", "option value", NULL}; Index: ch_editpoint/ch_editpoint.c =================================================================== --- ch_editpoint/ch_editpoint.c (revision 36988) +++ ch_editpoint/ch_editpoint.c (revision 36989) @@ -149,7 +149,7 @@ rnd_hid_redraw(PCB); } -static void pcb_ch_editpoint(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_ch_editpoint(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_crosshair_t *ch = argv[1].d.p; if (conf_ch_editpoint.plugins.ch_editpoint.enable) { @@ -159,7 +159,7 @@ } } -static void pcb_editpoint_flush(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_editpoint_flush(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { /* clear all editpoint lists because the old list may hold objects just deleted; the edit will trigger a redraw anyway */ Index: ch_onpoint/ch_onpoint.c =================================================================== --- ch_onpoint/ch_onpoint.c (revision 36988) +++ ch_onpoint/ch_onpoint.c (revision 36989) @@ -192,7 +192,7 @@ rnd_hid_redraw(PCB); } -static void pcb_ch_onpoint(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_ch_onpoint(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_crosshair_t *ch = argv[1].d.p; if (conf_core.editor.highlight_on_point) { Index: ddraft/constraint.c =================================================================== --- ddraft/constraint.c (revision 36988) +++ ddraft/constraint.c (revision 36989) @@ -171,7 +171,7 @@ pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y + dy; } -static void cnst_enforce(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void cnst_enforce(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) || (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_THIRD)) cnst_line2(&cons); Index: ddraft/ddraft.c =================================================================== --- ddraft/ddraft.c (revision 36988) +++ ddraft/ddraft.c (revision 36989) @@ -440,7 +440,7 @@ return 0; } -void ddraft_tool_draw_attached(rnd_hidlib_t *hl) +void ddraft_tool_draw_attached(rnd_design_t *hl) { int n; rnd_render->set_line_cap(pcb_crosshair.GC, rnd_cap_round); Index: diag/diag.c =================================================================== --- diag/diag.c (revision 36988) +++ diag/diag.c (revision 36989) @@ -285,7 +285,7 @@ return 0; } -static void ev_ui_post(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void ev_ui_post(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (conf_diag.plugins.diag.auto_integrity) { Index: dialogs/dlg_fontsel.c =================================================================== --- dialogs/dlg_fontsel.c (revision 36988) +++ dialogs/dlg_fontsel.c (revision 36989) @@ -265,7 +265,7 @@ return 0; } -static void fontsel_mchanged_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void fontsel_mchanged_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { fontsel_ctx_t *c; @@ -276,7 +276,7 @@ fontsel_preview_update(c); } -static void fontsel_bchanged_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void fontsel_bchanged_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { fontsel_ctx_t *c, *next; rnd_dad_retovr_t retovr; @@ -310,7 +310,7 @@ fontsel_timer = rnd_gui->add_timer(rnd_gui, fontsel_timer_cb, 500, fontsel_timer); } -static void fontsel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void fontsel_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { fontsel_timer_cb(fontsel_timer); fontsel_timer_active = 1; Index: dialogs/dlg_library.c =================================================================== --- dialogs/dlg_library.c (revision 36988) +++ dialogs/dlg_library.c (revision 36989) @@ -840,7 +840,7 @@ return 0; } -static void library_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void library_changed_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (library_ctx.active) library_lib2dlg(&library_ctx); Index: dialogs/dlg_netlist.c =================================================================== --- dialogs/dlg_netlist.c (revision 36988) +++ dialogs/dlg_netlist.c (revision 36989) @@ -610,7 +610,7 @@ } /* update the dialog after a netlist change */ -static void pcb_dlg_netlist_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_dlg_netlist_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { netlist_ctx_t *ctx = user_data; if (!ctx->active) Index: dialogs/dlg_pref_board.c =================================================================== --- dialogs/dlg_pref_board.c (revision 36988) +++ dialogs/dlg_pref_board.c (revision 36989) @@ -47,7 +47,7 @@ static void pref_board_brd2dlg(pref_ctx_t *ctx) { TODO("should be coming from arg") - rnd_hidlib_t *hl = &PCB->hidlib; + rnd_design_t *hl = &PCB->hidlib; pcb_board_t *pcb = (pcb_board_t *)hl; DEF_TABDATA; @@ -59,7 +59,7 @@ /* Dialog box to actual board meta */ static void pref_board_dlg2brd(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); pcb_board_t *pcb = (pcb_board_t *)hl; int changed = 0; const char *newname, *oldname; @@ -92,7 +92,7 @@ static void pref_board_edit_attr(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); rnd_actionva(hl, "Propedit", "board", NULL); } @@ -99,7 +99,7 @@ void pcb_dlg_pref_board_create(pref_ctx_t *ctx) { TODO("should be coming from arg") - rnd_hidlib_t *hl = &PCB->hidlib; + rnd_design_t *hl = &PCB->hidlib; pcb_board_t *pcb = (pcb_board_t *)hl; DEF_TABDATA; Index: dialogs/dlg_pref_color.c =================================================================== --- dialogs/dlg_pref_color.c (revision 36988) +++ dialogs/dlg_pref_color.c (revision 36989) @@ -81,7 +81,7 @@ static void pref_color_gen_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); pref_ctx_t *ctx = caller_data; const char *path = attr->user_data; @@ -97,7 +97,7 @@ static void pref_color_layer_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); pref_ctx_t *ctx = caller_data; DEF_TABDATA; int idx = (int *)attr->user_data - tabdata->wlayer; Index: dialogs/dlg_pref_general.c =================================================================== --- dialogs/dlg_pref_general.c (revision 36988) +++ dialogs/dlg_pref_general.c (revision 36989) @@ -47,7 +47,7 @@ static void pref_general_dlg2conf(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); pref_ctx_t *ctx = caller_data; if (rnd_pref_dlg2conf_pre(hl, ctx) == NULL) Index: dialogs/dlg_pref_lib.c =================================================================== --- dialogs/dlg_pref_lib.c (revision 36988) +++ dialogs/dlg_pref_lib.c (revision 36989) @@ -57,7 +57,7 @@ static void libhelp_btn(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr); -static void pref_lib_update_buttons(rnd_hidlib_t *hl) +static void pref_lib_update_buttons(rnd_design_t *hl) { pref_ctx_t *ctx = rnd_pref_get_ctx(hl); DEF_TABDATA; @@ -124,7 +124,7 @@ static void pref_lib_conf2dlg_post(rnd_conf_native_t *cfg, int arr_idx) { pref_ctx_t *ctx = PREFCTX; - rnd_hidlib_t *hl; + rnd_design_t *hl; DEF_TABDATA; rnd_conf_listitem_t *i; int idx; @@ -161,7 +161,7 @@ /* Dialog box to current libraries in config */ static void pref_lib_dlg2conf(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); pref_ctx_t *ctx = caller_data; DEF_TABDATA; rnd_hid_tree_t *tree = attr->wdata; @@ -282,7 +282,7 @@ static void lib_cell_edit_update(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *btn_attr) { - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); cell_edit_ctx_t *ctx = caller_data; char *tmp; Index: dialogs/dlg_undo.c =================================================================== --- dialogs/dlg_undo.c (revision 36988) +++ dialogs/dlg_undo.c (revision 36989) @@ -158,7 +158,7 @@ } /* update the dialog after an undo operation */ -static void pcb_dlg_undo_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_dlg_undo_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { undo_ctx_t *ctx = user_data; if (!ctx->active) @@ -167,7 +167,7 @@ } /* Check if the serial has changed and update the dialog if so */ -static void pcb_dlg_undo_ev_chk(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_dlg_undo_ev_chk(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { undo_ctx_t *ctx = user_data; if (!ctx->active) Index: dialogs/dlg_view.c =================================================================== --- dialogs/dlg_view.c (revision 36988) +++ dialogs/dlg_view.c (revision 36989) @@ -830,7 +830,7 @@ return 0; } -static void view_preview_update_cb(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void view_preview_update_cb(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (drc_gui_ctx.active) view_preview_update(&drc_gui_ctx); Index: dialogs/pcb_export.c =================================================================== --- dialogs/pcb_export.c (revision 36988) +++ dialogs/pcb_export.c (revision 36989) @@ -43,7 +43,7 @@ static int have_gui, currly; static int save_l_ons[PCB_MAX_LAYER], save_g_ons[PCB_MAX_LAYERGRP]; -static void pcb_export_begin_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_export_begin_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { currly = PCB_CURRLID(PCB); have_gui = (rnd_gui != NULL) && rnd_gui->gui; @@ -53,7 +53,7 @@ } } -static void pcb_export_end_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_export_end_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (have_gui) { pcb_hid_restore_layer_ons(save_l_ons); Index: drc_query/dlg.c =================================================================== --- drc_query/dlg.c (revision 36988) +++ drc_query/dlg.c (revision 36989) @@ -209,7 +209,7 @@ } } -static void drcq_open_view_win(rnd_hidlib_t *hidlib, pcb_view_list_t *view) +static void drcq_open_view_win(rnd_design_t *hidlib, pcb_view_list_t *view) { fgw_arg_t args[4], ares; args[1].type = FGW_STR; args[1].val.str = "drc_query: manual run"; @@ -811,7 +811,7 @@ { drc_rlist_ctx_t *ctx = caller_data; rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wdlist])); - rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); + rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx); lht_node_t *nd; char *path; Index: drc_query/drc_lht.c =================================================================== --- drc_query/drc_lht.c (revision 36988) +++ drc_query/drc_lht.c (revision 36989) @@ -28,7 +28,7 @@ * */ -static int drc_query_lht_save_def(rnd_hidlib_t *hl, lht_node_t *ndefs, const char *def_id) +static int drc_query_lht_save_def(rnd_design_t *hl, lht_node_t *ndefs, const char *def_id) { lht_node_t *norig; if (pcb_drc_query_def_by_name(def_id, &norig, 0) != 0) @@ -37,7 +37,7 @@ return 0; } -static int drc_query_lht_save_rule(rnd_hidlib_t *hl, const char *fn, const char *rule_id) +static int drc_query_lht_save_rule(rnd_design_t *hl, const char *fn, const char *rule_id) { htsi_t defs; htsi_entry_t *e; @@ -108,7 +108,7 @@ return res; } -static int drc_query_lht_load_subtree(rnd_hidlib_t *hl, lht_node_t *root) +static int drc_query_lht_load_subtree(rnd_design_t *hl, lht_node_t *root) { lht_node_t *ndefs, *nrules, *nd, *dst; int res = 0; @@ -150,7 +150,7 @@ } -static int drc_query_lht_load_rules(rnd_hidlib_t *hl, const char *fn) +static int drc_query_lht_load_rules(rnd_design_t *hl, const char *fn) { FILE *f; lht_doc_t *doc; Index: drc_query/drc_query.c =================================================================== --- drc_query/drc_query.c (revision 36988) +++ drc_query/drc_query.c (revision 36989) @@ -245,7 +245,7 @@ static int drc_query_progress(pcb_qry_exec_t *ec, long at, long total); -static void pcb_drc_query(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_drc_query(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_board_t *pcb = (pcb_board_t *)hidlib; gdl_iterator_t it; @@ -571,7 +571,7 @@ } -static int pcb_drc_query_clear(rnd_hidlib_t *hidlib, int is_rule, const char *src) +static int pcb_drc_query_clear(rnd_design_t *hidlib, int is_rule, const char *src) { const rnd_conflist_t *l = DRC_QUERY_RULE_OR_DEF(is_rule); gdl_iterator_t it; @@ -599,7 +599,7 @@ return -1; } -static int pcb_drc_query_create(rnd_hidlib_t *hidlib, int is_rule, const char *rule) +static int pcb_drc_query_create(rnd_design_t *hidlib, int is_rule, const char *rule) { lht_node_t *nd; @@ -611,7 +611,7 @@ void d2() {} -static int pcb_drc_query_set(rnd_hidlib_t *hidlib, int is_rule, const char *rule, const char *key, const char *val) +static int pcb_drc_query_set(rnd_design_t *hidlib, int is_rule, const char *rule, const char *key, const char *val) { lht_node_t *nd; @@ -637,7 +637,7 @@ return 0; } -static int pcb_drc_query_remove(rnd_hidlib_t *hidlib, int is_rule, const char *name) +static int pcb_drc_query_remove(rnd_design_t *hidlib, int is_rule, const char *name) { const rnd_conflist_t *l = DRC_QUERY_RULE_OR_DEF(is_rule); gdl_iterator_t it; @@ -655,7 +655,7 @@ return -1; } -static int pcb_drc_query_get(rnd_hidlib_t *hidlib, int is_rule, const char *rule, const char *key, fgw_arg_t *res) +static int pcb_drc_query_get(rnd_design_t *hidlib, int is_rule, const char *rule, const char *key, fgw_arg_t *res) { lht_node_t *nd; @@ -668,7 +668,7 @@ return 0; } -static int pcb_drc_query_get_rule_defs(rnd_hidlib_t *hidlib, const char *rule, fgw_arg_t *res) +static int pcb_drc_query_get_rule_defs(rnd_design_t *hidlib, const char *rule, fgw_arg_t *res) { htsi_t defs; htsi_entry_t *e; @@ -711,7 +711,7 @@ static fgw_error_t pcb_act_DrcQueryRuleMod(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *cmd, *target, *key = NULL, *val=NULL; - rnd_hidlib_t *hl = RND_ACT_HIDLIB; + rnd_design_t *hl = RND_ACT_HIDLIB; int resi = -1; RND_ACT_CONVARG(1, FGW_STR, DrcQueryRuleMod, cmd = argv[1].val.str); @@ -745,7 +745,7 @@ static fgw_error_t pcb_act_DrcQueryDefMod(fgw_arg_t *res, int argc, fgw_arg_t *argv) { const char *cmd, *target, *key = NULL, *val=NULL; - rnd_hidlib_t *hl = RND_ACT_HIDLIB; + rnd_design_t *hl = RND_ACT_HIDLIB; int resi = -1; RND_ACT_CONVARG(1, FGW_STR, DrcQueryDefMod, cmd = argv[1].val.str); @@ -787,7 +787,7 @@ int ires = 0; const char *id, *fn = NULL, *fmt; char *autofree = NULL; - rnd_hidlib_t *hl = RND_ACT_HIDLIB; + rnd_design_t *hl = RND_ACT_HIDLIB; const rnd_hid_fsd_filter_t *flt = init_flt(&fmt); RND_ACT_CONVARG(1, FGW_STR, DrcQueryExport, id = argv[1].val.str); @@ -832,7 +832,7 @@ int ires = 0; const char *fn = NULL, *fmt; char *autofree = NULL; - rnd_hidlib_t *hl = RND_ACT_HIDLIB; + rnd_design_t *hl = RND_ACT_HIDLIB; FILE *f; fgw_arg_t args[2], tpres; const rnd_hid_fsd_filter_t *flt = init_flt(&fmt); @@ -890,12 +890,12 @@ {"DrcQueryImport", pcb_act_DrcQueryImport, pcb_acth_DrcQueryImport, pcb_acts_DrcQueryImport} }; -static int drc_query_anyload_subtree(const rnd_anyload_t *al, rnd_hidlib_t *hl, lht_node_t *root) +static int drc_query_anyload_subtree(const rnd_anyload_t *al, rnd_design_t *hl, lht_node_t *root) { return drc_query_lht_load_subtree(hl, root); } -static int drc_query_anyload_file(const rnd_anyload_t *al, rnd_hidlib_t *hl, const char *filename, const char *type, lht_node_t *nd) +static int drc_query_anyload_file(const rnd_anyload_t *al, rnd_design_t *hl, const char *filename, const char *type, lht_node_t *nd) { if (strncmp(type, "pcb-rnd-drc-query", 17) == 0) return drc_query_lht_load_rules(hl, filename); Index: export_excellon/excellon.c =================================================================== --- export_excellon/excellon.c (revision 36988) +++ export_excellon/excellon.c (revision 36989) @@ -469,7 +469,7 @@ { } -static void exc_session_begin(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void exc_session_begin(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { exc_aperture_cnt = 0; } Index: export_gerber/gerber.c =================================================================== --- export_gerber/gerber.c (revision 36988) +++ export_gerber/gerber.c (revision 36989) @@ -1064,7 +1064,7 @@ { } -static void gerber_session_begin(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void gerber_session_begin(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { gerber_global_aperture_cnt = 0; } Index: export_openems/excitation.c =================================================================== --- export_openems/excitation.c (revision 36988) +++ export_openems/excitation.c (revision 36989) @@ -555,7 +555,7 @@ return excitations[exc_ctx.selected].get(exc_ctx.selected, fmt_matlab); } -static void exc_ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void exc_ev_board_changed(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { load_selector(); if (exc_ctx.active) Index: export_stl/exp_fmt_amf.c =================================================================== --- export_stl/exp_fmt_amf.c (revision 36988) +++ export_stl/exp_fmt_amf.c (revision 36989) @@ -75,7 +75,7 @@ verthash_uninit(&verthash); } -static stl_facet_t *amf_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn); +static stl_facet_t *amf_solid_fload(rnd_design_t *hl, FILE *f, const char *fn); static const stl_fmt_t fmt_amf = { /* output */ Index: export_stl/exp_fmt_stl.c =================================================================== --- export_stl/exp_fmt_stl.c (revision 36988) +++ export_stl/exp_fmt_stl.c (revision 36989) @@ -102,7 +102,7 @@ fprintf(f, "endsolid\n"); } -static stl_facet_t *stl_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn); +static stl_facet_t *stl_solid_fload(rnd_design_t *hl, FILE *f, const char *fn); static const stl_fmt_t fmt_stl = { /* output */ Index: export_stl/export_stl.c =================================================================== --- export_stl/export_stl.c (revision 36988) +++ export_stl/export_stl.c (revision 36989) @@ -360,7 +360,7 @@ const char *attr_model_name; const char *attr_xlate, *attr_xlate_old; const char *attr_rotate, *attr_rotate_old; - stl_facet_t *(*model_load)(rnd_hidlib_t *hl, FILE *f, const char *fn); + stl_facet_t *(*model_load)(rnd_design_t *hl, FILE *f, const char *fn); } stl_fmt_t; static const rnd_export_opt_t *stl_get_export_options_(rnd_hid_t *hid, int *n, const stl_fmt_t *fmt) Index: export_stl/model_load_amf.c =================================================================== --- export_stl/model_load_amf.c (revision 36988) +++ export_stl/model_load_amf.c (revision 36989) @@ -162,7 +162,7 @@ return head; } -static stl_facet_t *amf_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn) +static stl_facet_t *amf_solid_fload(rnd_design_t *hl, FILE *f, const char *fn) { xmlDoc *doc; xmlNode *root, *n, *m; @@ -213,7 +213,7 @@ #else /* Fallback: still provide a dummy if libxml is not available */ -static stl_facet_t *amf_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn) +static stl_facet_t *amf_solid_fload(rnd_design_t *hl, FILE *f, const char *fn) { return &stl_format_not_supported; } Index: export_stl/model_load_stl.c =================================================================== --- export_stl/model_load_stl.c (revision 36988) +++ export_stl/model_load_stl.c (revision 36989) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -static stl_facet_t *stl_solid_fload(rnd_hidlib_t *hl, FILE *f, const char *fn) +static stl_facet_t *stl_solid_fload(rnd_design_t *hl, FILE *f, const char *fn) { stl_facet_t *head = NULL, *tail = NULL, *t; char *cmd, line[512]; Index: export_stl/stl_models.c =================================================================== --- export_stl/stl_models.c (revision 36988) +++ export_stl/stl_models.c (revision 36989) @@ -157,7 +157,7 @@ static stl_facet_t stl_format_not_supported; -static void stl_model_place(rnd_hidlib_t *hl, FILE *outf, htsp_t *models, const char *name, rnd_coord_t ox, rnd_coord_t oy, double rotdeg, int on_bottom, const char *user_xlate, const char *user_rot, double maxy, rnd_coord_t z0, rnd_coord_t z1, const stl_fmt_t *ifmt, const stl_fmt_t *ofmt) +static void stl_model_place(rnd_design_t *hl, FILE *outf, htsp_t *models, const char *name, rnd_coord_t ox, rnd_coord_t oy, double rotdeg, int on_bottom, const char *user_xlate, const char *user_rot, double maxy, rnd_coord_t z0, rnd_coord_t z1, const stl_fmt_t *ifmt, const stl_fmt_t *ofmt) { stl_facet_t *head = NULL; double uxlate[3] = {0,0,0}, xlate[3], urot[3] = {0,0,0}, rot[3]; Index: export_stl/test_load/main.c =================================================================== --- export_stl/test_load/main.c (revision 36988) +++ export_stl/test_load/main.c (revision 36989) @@ -3,7 +3,7 @@ #define STL_TESTER #include "../stl_models.c" -stl_facet_t *stl_solid_load(rnd_hidlib_t *hl, const char *fn) +stl_facet_t *stl_solid_load(rnd_design_t *hl, const char *fn) { FILE *f; stl_facet_t *res; Index: fp_fs/fp_fs.c =================================================================== --- fp_fs/fp_fs.c (revision 36988) +++ fp_fs/fp_fs.c (revision 36989) @@ -77,7 +77,7 @@ htsp_t fp_fs_cache; -pcb_plug_fp_map_t *pcb_io_map_footprint_file_cached(rnd_hidlib_t *hl, htsp_t *cache, struct stat *st, const char *path, const char **fmt) +pcb_plug_fp_map_t *pcb_io_map_footprint_file_cached(rnd_design_t *hl, htsp_t *cache, struct stat *st, const char *path, const char **fmt) { pcb_fp_map_cache_t *c; c = htsp_get(cache, path); @@ -415,7 +415,7 @@ /* refuse entry if it is a directory */ if (found) { - rnd_hidlib_t *hidlib = NULL; + rnd_design_t *hidlib = NULL; char *fullpath = rnd_concat(subdir, RND_DIR_SEPARATOR_S, name, NULL); if (rnd_is_dir(hidlib, fullpath)) found = 0; Index: import_mentor_sch/netlist_helper.c =================================================================== --- import_mentor_sch/netlist_helper.c (revision 36988) +++ import_mentor_sch/netlist_helper.c (revision 36989) @@ -214,7 +214,7 @@ htsp_set(&ectx->attr, rnd_strdup(r->new_key), rnd_strdup(dst)); } -void nethlp_elem_done(rnd_hidlib_t *hl, nethlp_elem_ctx_t *ectx) +void nethlp_elem_done(rnd_design_t *hl, nethlp_elem_ctx_t *ectx) { htsp_entry_t *e; char *refdes, *footprint, *value; @@ -288,7 +288,7 @@ return prealloc; } -void nethlp_net_add_term(rnd_hidlib_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin) +void nethlp_net_add_term(rnd_design_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin) { char *refdes = htsp_get(&nctx->nhctx->id2refdes, part); char term[256]; Index: import_mentor_sch/netlist_helper.h =================================================================== --- import_mentor_sch/netlist_helper.h (revision 36988) +++ import_mentor_sch/netlist_helper.h (revision 36989) @@ -43,9 +43,9 @@ nethlp_elem_ctx_t *nethlp_elem_new(nethlp_ctx_t *nhctx, nethlp_elem_ctx_t *prealloc, const char *id); void nethlp_elem_refdes(nethlp_elem_ctx_t *ectx, const char *refdes); void nethlp_elem_attr(nethlp_elem_ctx_t *ectx, const char *key, const char *val); -void nethlp_elem_done(rnd_hidlib_t *hl, nethlp_elem_ctx_t *ectx); +void nethlp_elem_done(rnd_design_t *hl, nethlp_elem_ctx_t *ectx); nethlp_net_ctx_t *nethlp_net_new(nethlp_ctx_t *nhctx, nethlp_net_ctx_t *prealloc, const char *netname); -void nethlp_net_add_term(rnd_hidlib_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin); +void nethlp_net_add_term(rnd_design_t *hl, nethlp_net_ctx_t *nctx, const char *part, const char *pin); void nethlp_net_destroy(nethlp_net_ctx_t *nctx); Index: io_altium/parser_test/main.c =================================================================== --- io_altium/parser_test/main.c (revision 36988) +++ io_altium/parser_test/main.c (revision 36989) @@ -3,12 +3,12 @@ #include "pcbdoc_ascii.h" #undef fopen -FILE *rnd_fopen(rnd_hidlib_t *hidlib, const char *fn, const char *mode) +FILE *rnd_fopen(rnd_design_t *hidlib, const char *fn, const char *mode) { return fopen(fn, mode); } -long rnd_file_size(rnd_hidlib_t *hidlib, const char *path) +long rnd_file_size(rnd_design_t *hidlib, const char *path) { struct stat st; if (stat(path, &st) != 0) Index: io_altium/pcbdoc_ascii.c =================================================================== --- io_altium/pcbdoc_ascii.c (revision 36988) +++ io_altium/pcbdoc_ascii.c (revision 36989) @@ -253,7 +253,7 @@ return 0; } -int pcbdoc_ascii_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn) +int pcbdoc_ascii_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn) { FILE *f; int res; Index: io_altium/pcbdoc_ascii.h =================================================================== --- io_altium/pcbdoc_ascii.h (revision 36988) +++ io_altium/pcbdoc_ascii.h (revision 36989) @@ -35,7 +35,7 @@ } altium_tree_t; int pcbdoc_ascii_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *file_name, FILE *f); -int pcbdoc_ascii_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn); +int pcbdoc_ascii_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn); #define altium_kw_AUTO (-2) altium_record_t *pcbdoc_ascii_new_rec(altium_tree_t *tree, const char *type_s, int type); Index: io_altium/pcbdoc_bin.c =================================================================== --- io_altium/pcbdoc_bin.c (revision 36988) +++ io_altium/pcbdoc_bin.c (revision 36989) @@ -207,7 +207,7 @@ return make_blk_(tree, str, len, &dummy); } -static int pcbdoc_bin_parse_ascii(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *record, int kw, altium_buf_t *tmp, long len, altium_record_t **rec_out) +static int pcbdoc_bin_parse_ascii(rnd_design_t *hidlib, altium_tree_t *tree, const char *record, int kw, altium_buf_t *tmp, long len, altium_record_t **rec_out) { altium_record_t *rec; char *curr, *end; @@ -240,7 +240,7 @@ return res; } -static int pcbdoc_bin_parse_any_ascii(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp, const char *recname, int kw) +static int pcbdoc_bin_parse_any_ascii(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp, const char *recname, int kw) { for(;;) { long len = read_rec_l4b(fp, tmp); @@ -287,32 +287,32 @@ /*** file/field parsers ***/ -int pcbdoc_bin_parse_board6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_board6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Board", altium_kw_record_board); } -int pcbdoc_bin_parse_polygons6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_polygons6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Polygon", altium_kw_record_polygon); } -int pcbdoc_bin_parse_classes6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_classes6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Class", altium_kw_record_class); } -int pcbdoc_bin_parse_nets6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_nets6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Net", altium_kw_record_net); } -int pcbdoc_bin_parse_components6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_components6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Component", altium_kw_record_component); } -int pcbdoc_bin_parse_rules6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_rules6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { int id; @@ -330,7 +330,7 @@ } -int pcbdoc_bin_parse_tracks6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_tracks6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { unsigned char *d; @@ -375,7 +375,7 @@ } -int pcbdoc_bin_parse_arcs6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_arcs6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { unsigned char *d; @@ -455,7 +455,7 @@ return 0; } -int pcbdoc_bin_parse_texts6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_texts6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { unsigned char *d; @@ -518,7 +518,7 @@ } -int pcbdoc_bin_parse_fills6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_fills6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { unsigned char *d; @@ -559,7 +559,7 @@ } -int pcbdoc_bin_parse_vias6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_vias6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { unsigned char *d; @@ -608,7 +608,7 @@ } /* parse the fields of a pad (the 120 long block of pads6) */ -static int pcbdoc_bin_parse_pads6_fields(rnd_hidlib_t *hidlib, altium_tree_t *tree, altium_buf_t *tmp, const char *name) +static int pcbdoc_bin_parse_pads6_fields(rnd_design_t *hidlib, altium_tree_t *tree, altium_buf_t *tmp, const char *name) { unsigned char *d = tmp->data; altium_record_t *rec; @@ -656,7 +656,7 @@ return 0; } -int pcbdoc_bin_parse_pads6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) +int pcbdoc_bin_parse_pads6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp) { for(;;) { char rtype; @@ -764,7 +764,7 @@ } \ } while(0) -int pcbdoc_bin_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn) +int pcbdoc_bin_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn) { int res; ucdf_ctx_t uctx = {0}; Index: io_altium/pcbdoc_bin.h =================================================================== --- io_altium/pcbdoc_bin.h (revision 36988) +++ io_altium/pcbdoc_bin.h (revision 36989) @@ -4,6 +4,6 @@ } altium_buf_t; int pcbdoc_bin_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *file_name, FILE *f); -int pcbdoc_bin_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn); +int pcbdoc_bin_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn); Index: io_autotrax/read.c =================================================================== --- io_autotrax/read.c (revision 36988) +++ io_autotrax/read.c (revision 36989) @@ -82,7 +82,7 @@ #define null_empty(s) ((s) == NULL ? "" : (s)) -static void sym_flush(rnd_hidlib_t *hl, symattr_t *sattr) +static void sym_flush(rnd_design_t *hl, symattr_t *sattr) { if (sattr->refdes != NULL) { if (sattr->footprint == NULL) Index: io_bxl/read.c =================================================================== --- io_bxl/read.c (revision 36988) +++ io_bxl/read.c (revision 36989) @@ -616,7 +616,7 @@ int io_bxl_parse_footprint(pcb_plug_io_t *ctx, pcb_data_t *data, const char *filename, const char *subfpname) { - rnd_hidlib_t *hl = &PCB->hidlib; + rnd_design_t *hl = &PCB->hidlib; FILE *f; int chr, tok, yres, ret = 0; hdecode_t hctx; @@ -678,7 +678,7 @@ return ret; } -int io_bxl_test_parse2(rnd_hidlib_t *hl, pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *filename, FILE *f_ignore, void *cbctx, void (*pat_cb)(void *cbctx, const char *name)) +int io_bxl_test_parse2(rnd_design_t *hl, pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *filename, FILE *f_ignore, void *cbctx, void (*pat_cb)(void *cbctx, const char *name)) { FILE *f; int chr, tok, found_tok = 0, ret = 0; Index: io_pads/read.c =================================================================== --- io_pads/read.c (revision 36988) +++ io_pads/read.c (revision 36989) @@ -358,7 +358,7 @@ int io_pads_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *filename, rnd_conf_role_t settings_dest) { - rnd_hidlib_t *hl = &PCB->hidlib; + rnd_design_t *hl = &PCB->hidlib; FILE *f; int ret = 0; pads_read_ctx_t rctx = {0}; Index: lib_hid_pcbui/infobar.c =================================================================== --- lib_hid_pcbui/infobar.c (revision 36988) +++ lib_hid_pcbui/infobar.c (revision 36989) @@ -36,7 +36,7 @@ static double last_date = -1; static int infobar_gui_inited = 0; -static void pcb_infobar_brdchg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_infobar_brdchg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL); if ((hidlib != NULL) && (hidlib->filename != NULL)) @@ -79,7 +79,7 @@ } -static void pcb_infobar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_infobar_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { infobar_gui_inited = 1; pcb_infobar_brdchg_ev(hidlib, NULL, 0, NULL); /* this may have happened ebfore plugin init if file was specified on the CLI and is already loaded - pick up file data from memory */ @@ -87,7 +87,7 @@ infobar_tick(infobar_timer); } -static void pcb_infobar_fn_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_infobar_fn_chg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) { last_date = rnd_file_mtime(NULL, PCB->hidlib.filename); Index: lib_hid_pcbui/layer_menu.c =================================================================== --- lib_hid_pcbui/layer_menu.c (revision 36988) +++ lib_hid_pcbui/layer_menu.c (revision 36989) @@ -237,7 +237,7 @@ } static int need_layer_menu_update = 0, need_layer_key_update = 0; -void pcb_layer_menu_batch_timer_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layer_menu_batch_timer_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { int keys_done = 0; @@ -265,13 +265,13 @@ } } -static void layer_install_menu(rnd_hidlib_t *hidlib) +static void layer_install_menu(rnd_design_t *hidlib) { need_layer_menu_update = 1; rnd_hid_gui_batch_timer(hidlib); } -void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layer_menu_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { layer_install_menu(hidlib); if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL)) @@ -278,13 +278,13 @@ rnd_gui->update_menu_checkbox(rnd_gui, NULL); } -void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layer_menu_vis_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((rnd_gui != NULL) && (rnd_gui->update_menu_checkbox != NULL)) rnd_gui->update_menu_checkbox(rnd_gui, NULL); } -void pcb_layer_menu_key_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layer_menu_key_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { need_layer_key_update = 1; rnd_hid_gui_batch_timer(hidlib); Index: lib_hid_pcbui/layer_menu.h =================================================================== --- lib_hid_pcbui/layer_menu.h (revision 36988) +++ lib_hid_pcbui/layer_menu.h (revision 36989) @@ -1,8 +1,8 @@ #include -void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_layer_menu_key_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_layer_menu_batch_timer_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layer_menu_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layer_menu_vis_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layer_menu_key_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layer_menu_batch_timer_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); Index: lib_hid_pcbui/layersel.c =================================================================== --- lib_hid_pcbui/layersel.c (revision 36988) +++ lib_hid_pcbui/layersel.c (revision 36989) @@ -864,13 +864,13 @@ } } -void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layersel_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) layersel_build(); } -void pcb_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layersel_vis_chg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_board_t *pcb = (pcb_board_t *)hidlib; if ((!layersel.sub_inited) || (layersel.lock_vis > 0)) @@ -878,7 +878,7 @@ layersel_update_vis(&layersel, pcb); } -void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_layersel_stack_chg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) { rnd_hid_dock_leave(&layersel.sub); Index: lib_hid_pcbui/layersel.h =================================================================== --- lib_hid_pcbui/layersel.h (revision 36988) +++ lib_hid_pcbui/layersel.h (revision 36989) @@ -1,3 +1,3 @@ -void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layersel_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layersel_vis_chg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_layersel_stack_chg_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); Index: lib_hid_pcbui/rendering.c =================================================================== --- lib_hid_pcbui/rendering.c (revision 36988) +++ lib_hid_pcbui/rendering.c (revision 36989) @@ -90,7 +90,7 @@ return common_set_layer_group(hid, group, purpose, purpi, layer, flags, is_empty, xform); } -static void pcb_rendering_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_rendering_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { /* hook in our dispatcher */ gui_set_layer_group = rnd_gui->set_layer_group; Index: lib_hid_pcbui/routest.c =================================================================== --- lib_hid_pcbui/routest.c (revision 36988) +++ lib_hid_pcbui/routest.c (revision 36989) @@ -122,7 +122,7 @@ static int need_rst_menu = 0; -void pcb_rst_menu_batch_timer_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_rst_menu_batch_timer_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (need_rst_menu) { /* rnd_trace("layer key update timer!\n");*/ @@ -133,7 +133,7 @@ static int rst_lock = 0; -static void rst_update(rnd_hidlib_t *hidlib) +static void rst_update(rnd_design_t *hidlib) { if (rst_lock) return; rst_lock++; @@ -234,12 +234,12 @@ } -void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_rst_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rst_update(hidlib); } -void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_rst_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (RND_HAVE_GUI_ATTR_DLG) { rst_docked_create(); Index: lib_hid_pcbui/routest.h =================================================================== --- lib_hid_pcbui/routest.h (revision 36988) +++ lib_hid_pcbui/routest.h (revision 36989) @@ -2,10 +2,10 @@ #include #include -void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_rst_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_rst_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); void pcb_rst_update_conf(rnd_conf_native_t *cfg, int arr_idx); -void pcb_rst_menu_batch_timer_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_rst_menu_batch_timer_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); extern const char pcb_acts_AdjustStyle[]; Index: lib_hid_pcbui/status.c =================================================================== --- lib_hid_pcbui/status.c (revision 36988) +++ lib_hid_pcbui/status.c (revision 36989) @@ -313,7 +313,7 @@ } -void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_status_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((RND_HAVE_GUI_ATTR_DLG) && (rnd_gui->get_menu_cfg != NULL)) { status_docked_create_st(); @@ -340,12 +340,12 @@ status_rd_pcb2dlg(); } -void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_status_st_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { status_st_pcb2dlg(); } -void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +void pcb_status_rd_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { status_rd_pcb2dlg(); } Index: lib_hid_pcbui/status.h =================================================================== --- lib_hid_pcbui/status.h (revision 36988) +++ lib_hid_pcbui/status.h (revision 36989) @@ -2,11 +2,11 @@ #include #include -void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_status_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); void pcb_status_st_update_conf(rnd_conf_native_t *cfg, int arr_idx); void pcb_status_rd_update_conf(rnd_conf_native_t *cfg, int arr_idx); -void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); -void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_status_st_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void pcb_status_rd_update_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); extern const char pcb_acts_StatusSetText[]; extern const char pcb_acth_StatusSetText[]; Index: lib_hid_pcbui/title.c =================================================================== --- lib_hid_pcbui/title.c (revision 36988) +++ lib_hid_pcbui/title.c (revision 36989) @@ -36,7 +36,7 @@ static gds_t title_buf; static int gui_inited = 0, brd_changed; -static void update_title(rnd_hidlib_t *hl, int changed, int is_footprint) +static void update_title(rnd_design_t *hl, int changed, int is_footprint) { const char *filename, *name; @@ -58,7 +58,7 @@ rnd_gui->set_top_title(rnd_gui, title_buf.array); } -static void pcb_title_board_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_title_board_changed_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_board_t *pcb = (pcb_board_t *)hidlib; brd_changed = 0; @@ -65,7 +65,7 @@ update_title(hidlib, pcb->Changed, pcb->is_footprint); } -static void pcb_title_meta_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_title_meta_changed_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_board_t *pcb = (pcb_board_t *)hidlib; if (brd_changed == pcb->Changed) @@ -74,7 +74,7 @@ update_title(hidlib, pcb->Changed, pcb->is_footprint); } -static void pcb_title_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_title_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_board_t *pcb = (pcb_board_t *)hidlib; gui_inited = 1; Index: mincut/rats_mincut.c =================================================================== --- mincut/rats_mincut.c (revision 36988) +++ mincut/rats_mincut.c (revision 36989) @@ -323,7 +323,7 @@ return bad_gr; } -static void pcb_mincut_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void pcb_mincut_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { int *handled, *cancel; pcb_any_obj_t *term; Index: order_pcbway/pcbway.c =================================================================== --- order_pcbway/pcbway.c (revision 36988) +++ order_pcbway/pcbway.c (revision 36989) @@ -61,7 +61,7 @@ unsigned has_errors:1; } pcbway_form_t; -static int pcbway_cache_update_(rnd_hidlib_t *hidlib, const char *url, const char *path, int update, rnd_wget_opts_t *wopts) +static int pcbway_cache_update_(rnd_design_t *hidlib, const char *url, const char *path, int update, rnd_wget_opts_t *wopts) { double mt, now = rnd_dtime(), timeout; @@ -97,7 +97,7 @@ return 0; } -static int pcbway_cache_update(rnd_hidlib_t *hidlib) +static int pcbway_cache_update(rnd_design_t *hidlib) { char *hdr[5]; rnd_wget_opts_t wopts; @@ -271,7 +271,7 @@ } -static int pcbway_load_fields_(rnd_hidlib_t *hidlib, pcb_order_imp_t *imp, order_ctx_t *octx, xmlNode *root) +static int pcbway_load_fields_(rnd_design_t *hidlib, pcb_order_imp_t *imp, order_ctx_t *octx, xmlNode *root) { xmlNode *n, *v; pcbway_form_t *form = (pcbway_form_t *)octx->odata; @@ -420,7 +420,7 @@ check_constraints(octx); } -static int pcbway_load_constraints_(rnd_hidlib_t *hidlib, pcb_order_imp_t *imp, order_ctx_t *octx, xmlNode *root) +static int pcbway_load_constraints_(rnd_design_t *hidlib, pcb_order_imp_t *imp, order_ctx_t *octx, xmlNode *root) { xmlNode *n, *cd; pcbway_form_t *form = (pcbway_form_t *)octx->odata; @@ -533,7 +533,7 @@ free(form); } -static void rm_files(rnd_hidlib_t *hidlib, const char *dir) +static void rm_files(rnd_design_t *hidlib, const char *dir) { DIR *d = rnd_opendir(hidlib, dir); struct dirent *de; @@ -565,7 +565,7 @@ static void pcbway_order_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { - rnd_hidlib_t *hidlib = &PCB->hidlib; + rnd_design_t *hidlib = &PCB->hidlib; order_ctx_t *octx = caller_data; pcbway_form_t *form = octx->odata; FILE *f, *ft, *fr; Index: propedit/propdlg.c =================================================================== --- propedit/propdlg.c (revision 36988) +++ propedit/propdlg.c (revision 36989) @@ -844,7 +844,7 @@ } } -static void propedit_brd_chg(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void propedit_brd_chg(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { propdlg_t *pd; for(pd = gdl_first(&propdlgs); pd != NULL; pd = gdl_next(&propdlgs, pd)) @@ -852,7 +852,7 @@ prop_refresh(pd); } -static void propedit_brd_unload(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void propedit_brd_unload(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { propdlg_t *pd, *next; Index: rubberband_orig/rubberband.c =================================================================== --- rubberband_orig/rubberband.c (revision 36988) +++ rubberband_orig/rubberband.c (revision 36989) @@ -1042,7 +1042,7 @@ } /*** event handlers ***/ -static void rbe_reset(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_reset(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; rbnd->lines.used = 0; @@ -1049,7 +1049,7 @@ rbnd->arcs.used = 0; } -static void rbe_move(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_move(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; pcb_rb_line_t *ptr = rbnd->lines.array; @@ -1157,7 +1157,7 @@ } } -static void rbe_draw(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_draw(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; pcb_rb_line_t *ptr; @@ -1273,7 +1273,7 @@ } } -static void rbe_rotate90(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_rotate90(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; pcb_rb_line_t *ptr; @@ -1324,12 +1324,12 @@ } } -static void rbe_rotate(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_rotate(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { TODO("TODO") } -static void rbe_lookup_lines(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_lookup_lines(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; int type = argv[1].d.i; @@ -1339,7 +1339,7 @@ pcb_rubber_band_lookup_lines(rbnd, type, ptr1, ptr2, ptr3); } -static void rbe_lookup_rats(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_lookup_rats(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; int type = argv[1].d.i; @@ -1348,7 +1348,7 @@ pcb_rubber_band_lookup_rat_lines(rbnd, type, ptr1, ptr2, ptr3); } -static void rbe_constrain_main_line(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void rbe_constrain_main_line(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { rubber_ctx_t *rbnd = user_data; pcb_line_t *line = argv[1].d.p; Index: serpentine/serpentine.c =================================================================== --- serpentine/serpentine.c (revision 36988) +++ serpentine/serpentine.c (revision 36989) @@ -298,7 +298,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -static void tool_serpentine_notify_mode(rnd_hidlib_t *hl) +static void tool_serpentine_notify_mode(rnd_design_t *hl) { int type; pcb_any_obj_t *term_obj; Index: shape/shape_dialog.c =================================================================== --- shape/shape_dialog.c (revision 36988) +++ shape/shape_dialog.c (revision 36989) @@ -120,7 +120,7 @@ } -static void shape_layer_chg(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void shape_layer_chg(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { void *hid_ctx; int tab; Index: show_netnames/show_netnames.c =================================================================== --- show_netnames/show_netnames.c (revision 36988) +++ show_netnames/show_netnames.c (revision 36989) @@ -140,12 +140,12 @@ pcb_qry_uninit(&shn_qctx); } -static void show_netnames_inv_cache(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void show_netnames_inv_cache(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { shn_cache_uptodate = 0; } -static void show_netnames_brd_chg(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void show_netnames_brd_chg(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if (conf_show_netnames.plugins.show_netnames.enable) show_netnames_invalidate(); @@ -246,7 +246,7 @@ return NULL; } -static void show_netnames_render(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void show_netnames_render(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_board_t *pcb; pcb_draw_info_t *info; Index: sketch_route/sketch_route.c =================================================================== --- sketch_route/sketch_route.c (revision 36988) +++ sketch_route/sketch_route.c (revision 36989) @@ -787,7 +787,7 @@ /*** sketch line tool ***/ -static void tool_skline_adjust_attached_objects(rnd_hidlib_t *hl); +static void tool_skline_adjust_attached_objects(rnd_design_t *hl); struct { pcb_any_obj_t *start_term; @@ -1018,7 +1018,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -static void tool_skline_notify_mode(rnd_hidlib_t *hl) +static void tool_skline_notify_mode(rnd_design_t *hl) { int type; void *ptr1, *ptr2, *ptr3; @@ -1070,7 +1070,7 @@ } } -static void tool_skline_adjust_attached_objects(rnd_hidlib_t *hl) +static void tool_skline_adjust_attached_objects(rnd_design_t *hl) { int last = vtp0_len(&attached_path.lines) - 1; if (last >= 0) { @@ -1079,7 +1079,7 @@ } } -static void tool_skline_draw_attached(rnd_hidlib_t *hl) +static void tool_skline_draw_attached(rnd_design_t *hl) { int i; if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { @@ -1091,7 +1091,7 @@ } } -rnd_bool tool_skline_undo_act(rnd_hidlib_t *hl) +rnd_bool tool_skline_undo_act(rnd_design_t *hl) { /* TODO */ return rnd_false; Index: tool_std/tool_arc.c =================================================================== --- tool_std/tool_arc.c (revision 36988) +++ tool_std/tool_arc.c (revision 36989) @@ -74,7 +74,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_arc_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -132,12 +132,12 @@ } } -void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_arc_adjust_attached_objects(rnd_design_t *hl) { pcb_crosshair.AttachedBox.otherway = rnd_gui->shift_is_pressed(rnd_gui); } -void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_arc_draw_attached(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -171,7 +171,7 @@ } -rnd_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_arc_undo_act(rnd_design_t *hl) { if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) { pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; @@ -193,7 +193,7 @@ return rnd_true; } -void pcb_tool_arc_escape(rnd_hidlib_t *hl) +void pcb_tool_arc_escape(rnd_design_t *hl) { if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST) rnd_tool_select_by_name(hl, "arrow"); Index: tool_std/tool_arc.h =================================================================== --- tool_std/tool_arc.h (revision 36988) +++ tool_std/tool_arc.h (revision 36989) @@ -2,7 +2,7 @@ void pcb_tool_arc_init(void); void pcb_tool_arc_uninit(void); -void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl); -void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl); +void pcb_tool_arc_notify_mode(rnd_design_t *hl); +void pcb_tool_arc_adjust_attached_objects(rnd_design_t *hl); +void pcb_tool_arc_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_arc_undo_act(rnd_design_t *hl); Index: tool_std/tool_arrow.c =================================================================== --- tool_std/tool_arrow.c (revision 36988) +++ tool_std/tool_arrow.c (revision 36989) @@ -65,7 +65,7 @@ at the initial click event) */ static void click_timer_cb(rnd_hidval_t hv) { - rnd_hidlib_t *hl = hv.ptr; + rnd_design_t *hl = hv.ptr; pcb_board_t *pcb = hv.ptr; if (hl->tool_click) { @@ -140,7 +140,7 @@ } } -static int pcb_tool_arrow_notify_mode_(rnd_hidlib_t *hl, int type, void *ptr1, void *ptr2, void *ptr3) +static int pcb_tool_arrow_notify_mode_(rnd_design_t *hl, int type, void *ptr1, void *ptr2, void *ptr3) { int otype = type; @@ -169,7 +169,7 @@ return 0; } -void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_arrow_notify_mode(rnd_design_t *hl) { void *ptr1, *ptr2, *ptr3; int type; @@ -193,7 +193,7 @@ } } -void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl) +void pcb_tool_arrow_release_mode(rnd_design_t *hl) { rnd_box_t box; pcb_board_t *pcb = (pcb_board_t *)hl; @@ -245,7 +245,7 @@ } } -void pcb_tool_arrow_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_arrow_adjust_attached_objects(rnd_design_t *hl) { if (pcb_crosshair.AttachedBox.State) { pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X; Index: tool_std/tool_arrow.h =================================================================== --- tool_std/tool_arrow.h (revision 36988) +++ tool_std/tool_arrow.h (revision 36989) @@ -1,6 +1,6 @@ extern rnd_tool_t pcb_tool_arrow; void pcb_tool_arrow_uninit(void); -void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl); -void pcb_tool_arrow_adjust_attached_objects(rnd_hidlib_t *hl); +void pcb_tool_arrow_notify_mode(rnd_design_t *hl); +void pcb_tool_arrow_release_mode(rnd_design_t *hl); +void pcb_tool_arrow_adjust_attached_objects(rnd_design_t *hl); Index: tool_std/tool_buffer.c =================================================================== --- tool_std/tool_buffer.c (revision 36988) +++ tool_std/tool_buffer.c (revision 36989) @@ -53,7 +53,7 @@ { } -static void pcb_tool_buffer_notify_mode_(rnd_hidlib_t *hl, rnd_bool keep_ids) +static void pcb_tool_buffer_notify_mode_(rnd_design_t *hl, rnd_bool keep_ids) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -68,12 +68,12 @@ } } -void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_buffer_notify_mode(rnd_design_t *hl) { pcb_tool_buffer_notify_mode_(hl, rnd_false); } -void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl) +void pcb_tool_buffer_release_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -93,13 +93,13 @@ } } -void pcb_tool_buffer_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_buffer_adjust_attached_objects(rnd_design_t *hl) { pcb_crosshair.AttachedObject.tx = pcb_crosshair.X; pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y; } -void pcb_tool_buffer_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_buffer_draw_attached(rnd_design_t *hl) { pcb_xordraw_buffer(PCB_PASTEBUFFER); } Index: tool_std/tool_buffer.h =================================================================== --- tool_std/tool_buffer.h (revision 36988) +++ tool_std/tool_buffer.h (revision 36989) @@ -3,6 +3,6 @@ void pcb_tool_buffer_init(void); void pcb_tool_buffer_uninit(void); -void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl); -void pcb_tool_buffer_draw_attached(rnd_hidlib_t *hl); +void pcb_tool_buffer_notify_mode(rnd_design_t *hl); +void pcb_tool_buffer_release_mode(rnd_design_t *hl); +void pcb_tool_buffer_draw_attached(rnd_design_t *hl); Index: tool_std/tool_copy.c =================================================================== --- tool_std/tool_copy.c (revision 36988) +++ tool_std/tool_copy.c (revision 36989) @@ -51,7 +51,7 @@ pcb_crosshair.extobj_edit = NULL; } -void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_copy_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -95,7 +95,7 @@ } } -void pcb_tool_copy_release_mode(rnd_hidlib_t *hl) +void pcb_tool_copy_release_mode(rnd_design_t *hl) { if (hl->tool_hit) { pcb_tool_copy_notify_mode(hl); @@ -103,18 +103,18 @@ } } -void pcb_tool_copy_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_copy_adjust_attached_objects(rnd_design_t *hl) { pcb_crosshair.AttachedObject.tx = pcb_crosshair.X; pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y; } -void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_copy_draw_attached(rnd_design_t *hl) { pcb_xordraw_movecopy(rnd_gui->control_is_pressed(rnd_gui)); } -rnd_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_copy_undo_act(rnd_design_t *hl) { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) Index: tool_std/tool_copy.h =================================================================== --- tool_std/tool_copy.h (revision 36988) +++ tool_std/tool_copy.h (revision 36989) @@ -1,7 +1,7 @@ extern rnd_tool_t pcb_tool_copy; void pcb_tool_copy_uninit(void); -void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_copy_release_mode(rnd_hidlib_t *hl); -void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl); +void pcb_tool_copy_notify_mode(rnd_design_t *hl); +void pcb_tool_copy_release_mode(rnd_design_t *hl); +void pcb_tool_copy_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_copy_undo_act(rnd_design_t *hl); Index: tool_std/tool_insert.c =================================================================== --- tool_std/tool_insert.c (revision 36988) +++ tool_std/tool_insert.c (revision 36989) @@ -62,7 +62,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_insert_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; switch (pcb_crosshair.AttachedObject.State) { @@ -136,7 +136,7 @@ } } -void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_insert_adjust_attached_objects(rnd_design_t *hl) { rnd_point_t *pnt; pnt = pcb_adjust_insert_point(); @@ -144,12 +144,12 @@ InsertedPoint = *pnt; } -void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_insert_draw_attached(rnd_design_t *hl) { pcb_xordraw_insert_pt_obj(); } -rnd_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_insert_undo_act(rnd_design_t *hl) { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) Index: tool_std/tool_insert.h =================================================================== --- tool_std/tool_insert.h (revision 36988) +++ tool_std/tool_insert.h (revision 36989) @@ -1,7 +1,7 @@ extern rnd_tool_t pcb_tool_insert; void pcb_tool_insert_uninit(void); -void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl); -void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl); +void pcb_tool_insert_notify_mode(rnd_design_t *hl); +void pcb_tool_insert_adjust_attached_objects(rnd_design_t *hl); +void pcb_tool_insert_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_insert_undo_act(rnd_design_t *hl); Index: tool_std/tool_line.c =================================================================== --- tool_std/tool_line.c (revision 36988) +++ tool_std/tool_line.c (revision 36989) @@ -93,7 +93,7 @@ } /* creates points of a line (when clicked) */ -static void notify_line(rnd_hidlib_t *hl) +static void notify_line(rnd_design_t *hl) { int type = PCB_OBJ_VOID; void *ptr1, *ptr2, *ptr3; @@ -145,7 +145,7 @@ } } -void pcb_tool_line_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_line_notify_mode(rnd_design_t *hl) { void *ptr1, *ptr2, *ptr3; pcb_board_t *pcb = (pcb_board_t *)hl; @@ -333,7 +333,7 @@ } } -void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_line_adjust_attached_objects(rnd_design_t *hl) { /* don't draw outline when ctrl key is pressed */ if (rnd_gui->control_is_pressed(rnd_gui)) { @@ -345,7 +345,7 @@ } } -void pcb_tool_line_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_line_draw_attached(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -384,7 +384,7 @@ } } -rnd_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_line_undo_act(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -452,7 +452,7 @@ return rnd_true; } -rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_line_redo_act(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -470,7 +470,7 @@ return rnd_false; } -void pcb_tool_line_escape(rnd_hidlib_t *hl) +void pcb_tool_line_escape(rnd_design_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) rnd_tool_select_by_name(hl, "arrow"); Index: tool_std/tool_line.h =================================================================== --- tool_std/tool_line.h (revision 36988) +++ tool_std/tool_line.h (revision 36989) @@ -2,8 +2,8 @@ void pcb_tool_line_init(void); void pcb_tool_line_uninit(void); -void pcb_tool_line_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl); -void pcb_tool_line_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl); -rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl); +void pcb_tool_line_notify_mode(rnd_design_t *hl); +void pcb_tool_line_adjust_attached_objects(rnd_design_t *hl); +void pcb_tool_line_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_line_undo_act(rnd_design_t *hl); +rnd_bool pcb_tool_line_redo_act(rnd_design_t *hl); Index: tool_std/tool_lock.c =================================================================== --- tool_std/tool_lock.c (revision 36988) +++ tool_std/tool_lock.c (revision 36989) @@ -47,7 +47,7 @@ #define PCB_OBJ_CLASS_LOCK (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_LOCKED) -void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_lock_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; void *ptr1, *ptr2, *ptr3; Index: tool_std/tool_lock.h =================================================================== --- tool_std/tool_lock.h (revision 36988) +++ tool_std/tool_lock.h (revision 36989) @@ -1,3 +1,3 @@ extern rnd_tool_t pcb_tool_lock; -void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl); +void pcb_tool_lock_notify_mode(rnd_design_t *hl); Index: tool_std/tool_move.c =================================================================== --- tool_std/tool_move.c (revision 36988) +++ tool_std/tool_move.c (revision 36989) @@ -54,7 +54,7 @@ pcb_crosshair.extobj_edit = NULL; } -void pcb_tool_move_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_move_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; rnd_coord_t dx, dy; @@ -133,7 +133,7 @@ } } -void pcb_tool_move_release_mode(rnd_hidlib_t *hl) +void pcb_tool_move_release_mode(rnd_design_t *hl) { if (hl->tool_hit) { pcb_line_mod_merge_inhibit_inc((pcb_board_t *)hl); @@ -143,18 +143,18 @@ } } -void pcb_tool_move_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_move_adjust_attached_objects(rnd_design_t *hl) { pcb_crosshair.AttachedObject.tx = pcb_crosshair.X; pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y; } -void pcb_tool_move_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_move_draw_attached(rnd_design_t *hl) { pcb_xordraw_movecopy(rnd_gui->control_is_pressed(rnd_gui)); } -rnd_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_move_undo_act(rnd_design_t *hl) { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST) Index: tool_std/tool_move.h =================================================================== --- tool_std/tool_move.h (revision 36988) +++ tool_std/tool_move.h (revision 36989) @@ -1,7 +1,7 @@ extern rnd_tool_t pcb_tool_move; void pcb_tool_move_uninit(void); -void pcb_tool_move_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_move_release_mode(rnd_hidlib_t *hl); -void pcb_tool_move_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl); +void pcb_tool_move_notify_mode(rnd_design_t *hl); +void pcb_tool_move_release_mode(rnd_design_t *hl); +void pcb_tool_move_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_move_undo_act(rnd_design_t *hl); Index: tool_std/tool_poly.c =================================================================== --- tool_std/tool_poly.c (revision 36988) +++ tool_std/tool_poly.c (revision 36989) @@ -50,7 +50,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_poly_notify_mode(rnd_design_t *hl) { rnd_point_t *points = pcb_crosshair.AttachedPolygon.Points; rnd_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN; @@ -95,7 +95,7 @@ } } -void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_poly_adjust_attached_objects(rnd_design_t *hl) { pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; @@ -114,7 +114,7 @@ pcb_line_45(line); } -void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_poly_draw_attached(rnd_design_t *hl) { /* draw only if starting point is set */ if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) @@ -128,7 +128,7 @@ } } -rnd_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_poly_undo_act(rnd_design_t *hl) { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_prev_point(); @@ -137,7 +137,7 @@ return rnd_true; } -rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_poly_redo_act(rnd_design_t *hl) { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_next_point(); @@ -147,7 +147,7 @@ return rnd_true; } -void pcb_tool_poly_escape(rnd_hidlib_t *hl) +void pcb_tool_poly_escape(rnd_design_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) rnd_tool_select_by_name(hl, "arrow"); Index: tool_std/tool_poly.h =================================================================== --- tool_std/tool_poly.h (revision 36988) +++ tool_std/tool_poly.h (revision 36989) @@ -1,8 +1,8 @@ extern rnd_tool_t pcb_tool_poly; void pcb_tool_poly_uninit(void); -void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl); -void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl); -rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl); +void pcb_tool_poly_notify_mode(rnd_design_t *hl); +void pcb_tool_poly_adjust_attached_objects(rnd_design_t *hl); +void pcb_tool_poly_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_poly_undo_act(rnd_design_t *hl); +rnd_bool pcb_tool_poly_redo_act(rnd_design_t *hl); Index: tool_std/tool_polyhole.c =================================================================== --- tool_std/tool_polyhole.c (revision 36988) +++ tool_std/tool_polyhole.c (revision 36989) @@ -51,7 +51,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_polyhole_notify_mode(rnd_design_t *hl) { switch (pcb_crosshair.AttachedObject.State) { /* first notify, lookup object */ @@ -127,7 +127,7 @@ } } -void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_polyhole_adjust_attached_objects(rnd_design_t *hl) { pcb_attached_line_t *line = &pcb_crosshair.AttachedLine; @@ -146,7 +146,7 @@ pcb_line_45(line); } -void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_polyhole_draw_attached(rnd_design_t *hl) { /* draw only if starting point is set */ if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) @@ -160,7 +160,7 @@ } } -rnd_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_polyhole_undo_act(rnd_design_t *hl) { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_prev_point(); @@ -169,7 +169,7 @@ return rnd_true; } -rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_polyhole_redo_act(rnd_design_t *hl) { if (pcb_crosshair.AttachedPolygon.PointN) { pcb_polygon_go_to_next_point(); @@ -179,7 +179,7 @@ return rnd_true; } -void pcb_tool_polyhole_escape(rnd_hidlib_t *hl) +void pcb_tool_polyhole_escape(rnd_design_t *hl) { if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) rnd_tool_select_by_name(hl, "arrow"); Index: tool_std/tool_polyhole.h =================================================================== --- tool_std/tool_polyhole.h (revision 36988) +++ tool_std/tool_polyhole.h (revision 36989) @@ -1,8 +1,8 @@ extern rnd_tool_t pcb_tool_polyhole; void pcb_tool_polyhole_uninit(void); -void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl); -void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl); -rnd_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl); -rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl); +void pcb_tool_polyhole_notify_mode(rnd_design_t *hl); +void pcb_tool_polyhole_adjust_attached_objects(rnd_design_t *hl); +void pcb_tool_polyhole_draw_attached(rnd_design_t *hl); +rnd_bool pcb_tool_polyhole_undo_act(rnd_design_t *hl); +rnd_bool pcb_tool_polyhole_redo_act(rnd_design_t *hl); Index: tool_std/tool_rectangle.c =================================================================== --- tool_std/tool_rectangle.c (revision 36988) +++ tool_std/tool_rectangle.c (revision 36989) @@ -53,7 +53,7 @@ rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true); } -void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_rectangle_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; @@ -94,7 +94,7 @@ } } -void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl) +void pcb_tool_rectangle_adjust_attached_objects(rnd_design_t *hl) { switch (pcb_crosshair.AttachedBox.State) { case PCB_CH_STATE_SECOND: /* one corner is selected */ @@ -107,7 +107,7 @@ } } -rnd_bool pcb_tool_rectangle_anydo_act(rnd_hidlib_t *hl) +rnd_bool pcb_tool_rectangle_anydo_act(rnd_design_t *hl) { /* don't allow undo in the middle of an operation */ if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) @@ -115,7 +115,7 @@ return rnd_true; } -void pcb_tool_rectangle_escape(rnd_hidlib_t *hl) +void pcb_tool_rectangle_escape(rnd_design_t *hl) { if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST) rnd_tool_select_by_name(hl, "arrow"); Index: tool_std/tool_rectangle.h =================================================================== --- tool_std/tool_rectangle.h (revision 36988) +++ tool_std/tool_rectangle.h (revision 36989) @@ -1,6 +1,6 @@ extern rnd_tool_t pcb_tool_rectangle; void pcb_tool_rectangle_uninit(void); -void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl); -rnd_bool pcb_tool_rectangle_undo_act(rnd_hidlib_t *hl); +void pcb_tool_rectangle_notify_mode(rnd_design_t *hl); +void pcb_tool_rectangle_adjust_attached_objects(rnd_design_t *hl); +rnd_bool pcb_tool_rectangle_undo_act(rnd_design_t *hl); Index: tool_std/tool_remove.c =================================================================== --- tool_std/tool_remove.c (revision 36988) +++ tool_std/tool_remove.c (revision 36989) @@ -46,7 +46,7 @@ #include "tool_logic.h" -void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_remove_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; void *ptr1, *ptr2, *ptr3; Index: tool_std/tool_remove.h =================================================================== --- tool_std/tool_remove.h (revision 36988) +++ tool_std/tool_remove.h (revision 36989) @@ -1,3 +1,3 @@ extern rnd_tool_t pcb_tool_remove; -void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl); +void pcb_tool_remove_notify_mode(rnd_design_t *hl); Index: tool_std/tool_rotate.c =================================================================== --- tool_std/tool_rotate.c (revision 36988) +++ tool_std/tool_rotate.c (revision 36989) @@ -43,7 +43,7 @@ #include "tool_logic.h" -void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_rotate_notify_mode(rnd_design_t *hl) { pcb_screen_obj_rotate90((pcb_board_t *)hl, hl->tool_x, hl->tool_y, rnd_gui->shift_is_pressed(rnd_gui) ? (conf_core.editor.show_solder_side ? 1 : 3) : (conf_core.editor.show_solder_side ? 3 : 1)); Index: tool_std/tool_rotate.h =================================================================== --- tool_std/tool_rotate.h (revision 36988) +++ tool_std/tool_rotate.h (revision 36989) @@ -1,3 +1,3 @@ extern rnd_tool_t pcb_tool_rotate; -void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl); +void pcb_tool_rotate_notify_mode(rnd_design_t *hl); Index: tool_std/tool_text.c =================================================================== --- tool_std/tool_text.c (revision 36988) +++ tool_std/tool_text.c (revision 36989) @@ -45,7 +45,7 @@ #include "obj_text_draw.h" -void pcb_tool_text_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_text_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; char *string; @@ -71,7 +71,7 @@ } } -void pcb_tool_text_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_text_draw_attached(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; pcb_text_t text = {0}; Index: tool_std/tool_text.h =================================================================== --- tool_std/tool_text.h (revision 36988) +++ tool_std/tool_text.h (revision 36989) @@ -1,3 +1,3 @@ extern rnd_tool_t pcb_tool_text; -void pcb_tool_text_notify_mode(rnd_hidlib_t *hl); +void pcb_tool_text_notify_mode(rnd_design_t *hl); Index: tool_std/tool_thermal.c =================================================================== --- tool_std/tool_thermal.c (revision 36988) +++ tool_std/tool_thermal.c (revision 36989) @@ -90,7 +90,7 @@ } -void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_thermal_notify_mode(rnd_design_t *hl) { void *ptr1, *ptr2, *ptr3; int type, locked = 0; Index: tool_std/tool_thermal.h =================================================================== --- tool_std/tool_thermal.h (revision 36988) +++ tool_std/tool_thermal.h (revision 36989) @@ -1,6 +1,6 @@ extern rnd_tool_t pcb_tool_thermal; -void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl); +void pcb_tool_thermal_notify_mode(rnd_design_t *hl); /* direct call: cycle through thermal modes on a padstack - provided for tool_via.h */ void pcb_tool_thermal_on_obj(pcb_any_obj_t *ps, unsigned long lid); Index: tool_std/tool_via.c =================================================================== --- tool_std/tool_via.c (revision 36988) +++ tool_std/tool_via.c (revision 36989) @@ -48,7 +48,7 @@ #include "obj_pstk_draw.h" -void pcb_tool_via_notify_mode(rnd_hidlib_t *hl) +void pcb_tool_via_notify_mode(rnd_design_t *hl) { pcb_board_t *pcb = (pcb_board_t *)hl; pcb_pstk_t *ps; @@ -76,7 +76,7 @@ } -void pcb_tool_via_draw_attached(rnd_hidlib_t *hl) +void pcb_tool_via_draw_attached(rnd_design_t *hl) { static pcb_pstk_t ps; /* initialized to all-zero */ Index: tool_std/tool_via.h =================================================================== --- tool_std/tool_via.h (revision 36988) +++ tool_std/tool_via.h (revision 36989) @@ -1,4 +1,4 @@ extern rnd_tool_t pcb_tool_via; -void pcb_tool_via_notify_mode(rnd_hidlib_t *hl); -void pcb_tool_via_draw_attached(rnd_hidlib_t *hl); +void pcb_tool_via_notify_mode(rnd_design_t *hl); +void pcb_tool_via_draw_attached(rnd_design_t *hl); Index: vendordrill/vendor.c =================================================================== --- vendordrill/vendor.c (revision 36988) +++ vendordrill/vendor.c (revision 36989) @@ -664,7 +664,7 @@ } /* Tune newly placed padstacks */ -static void vendor_new_pstk(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) +static void vendor_new_pstk(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { pcb_pstk_t *ps; rnd_cardinal_t dummy; @@ -676,7 +676,7 @@ apply_vendor_pstk1(ps, &dummy); } -static int vendor_anyload_subtree(const rnd_anyload_t *al, rnd_hidlib_t *hl, lht_node_t *root) +static int vendor_anyload_subtree(const rnd_anyload_t *al, rnd_design_t *hl, lht_node_t *root) { return vendor_load_root(root->file_name, root, 0); }