Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 30950) +++ trunk/src/board.c (revision 30951) @@ -115,7 +115,7 @@ dpcb = -1; pcb_io_err_inhibit_inc(); - conf_list_foreach_path_first(NULL, dpcb, &conf_core.rc.default_pcb_file, pcb_load_pcb(__path__, NULL, pcb_false, 1 | 0x10 | inh)); + rnd_conf_list_foreach_path_first(NULL, dpcb, &conf_core.rc.default_pcb_file, pcb_load_pcb(__path__, NULL, pcb_false, 1 | 0x10 | inh)); pcb_io_err_inhibit_dec(); if (dpcb != 0) { /* no default PCB in file, use embedded version */ @@ -329,7 +329,7 @@ void pcb_board_set_line_width(rnd_coord_t Size) { if (Size >= PCB_MIN_THICKNESS && Size <= PCB_MAX_THICKNESS) { - conf_set_design("design/line_thickness", "%$mS", Size); + rnd_conf_set_design("design/line_thickness", "%$mS", Size); if (conf_core.editor.auto_drc) pcb_crosshair_grid_fit(pcb_crosshair.X, pcb_crosshair.Y); } @@ -339,7 +339,7 @@ void pcb_board_set_via_size(rnd_coord_t Size, rnd_bool Force) { if (Force || (Size <= PCB_MAX_PINORVIASIZE && Size >= PCB_MIN_PINORVIASIZE && Size >= conf_core.design.via_drilling_hole + PCB_MIN_PINORVIACOPPER)) { - conf_set_design("design/via_thickness", "%$mS", Size); + rnd_conf_set_design("design/via_thickness", "%$mS", Size); } } @@ -347,7 +347,7 @@ void pcb_board_set_via_drilling_hole(rnd_coord_t Size, rnd_bool Force) { if (Force || (Size <= PCB_MAX_PINORVIASIZE && Size >= PCB_MIN_PINORVIAHOLE && Size <= conf_core.design.via_thickness - PCB_MIN_PINORVIACOPPER)) { - conf_set_design("design/via_drilling_hole", "%$mS", Size); + rnd_conf_set_design("design/via_drilling_hole", "%$mS", Size); } } @@ -355,7 +355,7 @@ void pcb_board_set_clearance(rnd_coord_t Width) { if (Width <= PCB_MAX_THICKNESS) { - conf_set_design("design/clearance", "%$mS", Width); + rnd_conf_set_design("design/clearance", "%$mS", Width); } } @@ -363,7 +363,7 @@ void pcb_board_set_text_scale(int Scale) { if (Scale <= PCB_MAX_TEXTSCALE && Scale >= PCB_MIN_TEXTSCALE) { - conf_set_design("design/text_scale", "%d", Scale); + rnd_conf_set_design("design/text_scale", "%d", Scale); } } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 30950) +++ trunk/src/buffer.c (revision 30951) @@ -920,7 +920,7 @@ void pcb_buffer_set_number(int Number) { if (Number >= 0 && Number < PCB_MAX_BUFFER) - conf_set_design("editor/buffer_number", "%d", Number); + rnd_conf_set_design("editor/buffer_number", "%d", Number); } /* loads footprint data from file/library into buffer (as subcircuit) Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 30950) +++ trunk/src/conf_core.c (revision 30951) @@ -64,13 +64,13 @@ htpp_entry_t *e; conf_clamp_to(RND_CFT_COORD, conf_core.design.line_thickness, PCB_MIN_THICKNESS, PCB_MAX_THICKNESS, PCB_MIL_TO_COORD(10)); - conf_force_set_bool(conf_core.rc.have_regex, 1); + rnd_conf_force_set_bool(conf_core.rc.have_regex, 1); rnd_conf_ro("rc/have_regex"); - conf_force_set_str(conf_core.rc.path.prefix, PCB_PREFIX); rnd_conf_ro("rc/path/prefix"); - conf_force_set_str(conf_core.rc.path.lib, PCBLIBDIR); rnd_conf_ro("rc/path/lib"); - conf_force_set_str(conf_core.rc.path.bin, BINDIR); rnd_conf_ro("rc/path/bin"); - conf_force_set_str(conf_core.rc.path.share, PCBSHAREDIR); rnd_conf_ro("rc/path/share"); + rnd_conf_force_set_str(conf_core.rc.path.prefix, PCB_PREFIX); rnd_conf_ro("rc/path/prefix"); + rnd_conf_force_set_str(conf_core.rc.path.lib, PCBLIBDIR); rnd_conf_ro("rc/path/lib"); + rnd_conf_force_set_str(conf_core.rc.path.bin, BINDIR); rnd_conf_ro("rc/path/bin"); + rnd_conf_force_set_str(conf_core.rc.path.share, PCBSHAREDIR); rnd_conf_ro("rc/path/share"); for(e = htpp_first(&legacy_new2old); e != NULL; e = htpp_next(&legacy_new2old, e)) { rnd_conf_native_t *nlegacy = e->value, *ndst = e->key; Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 30950) +++ trunk/src/font.c (revision 30951) @@ -100,13 +100,13 @@ { int res = -1; pcb_io_err_inhibit_inc(); - conf_list_foreach_path_first(&pcb->hidlib, res, &conf_core.rc.default_font_file, pcb_parse_font_default(&pcb->fontkit.dflt, __path__)); + rnd_conf_list_foreach_path_first(&pcb->hidlib, res, &conf_core.rc.default_font_file, pcb_parse_font_default(&pcb->fontkit.dflt, __path__)); pcb_io_err_inhibit_dec(); if (res != 0) { const char *s; gds_t buff; - s = pcb_conf_concat_strlist(&conf_core.rc.default_font_file, &buff, NULL, ':'); + s = rnd_conf_concat_strlist(&conf_core.rc.default_font_file, &buff, NULL, ':'); rnd_message(PCB_MSG_WARNING, "Can't find font-symbol-file. Searched: '%s'; falling back to the embedded default font\n", s); pcb_font_load_internal(&pcb->fontkit.dflt); pcb_file_loaded_set_at("font", "default", "", "original default font"); Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 30950) +++ trunk/src/gui_act.c (revision 30951) @@ -143,7 +143,7 @@ /* toggle line-adjust flag */ case F_ToggleAllDirections: - conf_toggle_editor(all_direction_lines); + rnd_conf_toggle_editor(all_direction_lines); pcb_tool_adjust_attached(RND_ACT_HIDLIB); break; @@ -150,11 +150,11 @@ case F_CycleClip: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); if (conf_core.editor.all_direction_lines) { - conf_toggle_editor(all_direction_lines); - pcb_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",0); + rnd_conf_toggle_editor(all_direction_lines); + rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",0); } else { - pcb_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3); + rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3); } pcb_tool_adjust_attached(RND_ACT_HIDLIB); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); @@ -162,7 +162,7 @@ case F_CycleCrosshair: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - pcb_conf_setf(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "%d", CrosshairShapeIncrement(pcbhl_conf.editor.crosshair_shape_idx)); + rnd_conf_setf(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "%d", CrosshairShapeIncrement(pcbhl_conf.editor.crosshair_shape_idx)); if (pcb_ch_shape_NUM == pcbhl_conf.editor.crosshair_shape_idx) rnd_conf_set(RND_CFR_CLI, "editor/crosshair_shape_idx", 0, "0", RND_POL_OVERWRITE); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); @@ -170,13 +170,13 @@ case F_ToggleRubberBandMode: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - conf_toggle_editor(rubber_band_mode); + rnd_conf_toggle_editor(rubber_band_mode); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleStartDirection: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - conf_toggle_editor(swap_start_direction); + rnd_conf_toggle_editor(swap_start_direction); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; @@ -186,66 +186,66 @@ case F_ToggleSnapPin: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - conf_toggle_editor(snap_pin); + rnd_conf_toggle_editor(snap_pin); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleSnapOffGridLine: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - conf_toggle_editor(snap_offgrid_line); + rnd_conf_toggle_editor(snap_offgrid_line); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleHighlightOnPoint: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - conf_toggle_editor(highlight_on_point); + rnd_conf_toggle_editor(highlight_on_point); pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_true); break; case F_ToggleLocalRef: - conf_toggle_editor(local_ref); + rnd_conf_toggle_editor(local_ref); break; case F_ToggleThindraw: - conf_toggle_editor(thin_draw); + rnd_conf_toggle_editor(thin_draw); pcb_hid_redraw(PCB); break; case F_ToggleThindrawPoly: - conf_toggle_editor(thin_draw_poly); + rnd_conf_toggle_editor(thin_draw_poly); pcb_hid_redraw(PCB); break; case F_ToggleLockNames: - conf_toggle_editor(lock_names); - conf_set_editor(only_names, 0); + rnd_conf_toggle_editor(lock_names); + rnd_conf_set_editor(only_names, 0); break; case F_ToggleOnlyNames: - conf_toggle_editor(only_names); - conf_set_editor(lock_names, 0); + rnd_conf_toggle_editor(only_names); + rnd_conf_set_editor(lock_names, 0); break; case F_ToggleHideNames: - conf_toggle_editor(hide_names); + rnd_conf_toggle_editor(hide_names); pcb_hid_redraw(PCB); break; case F_ToggleStroke: - conf_toggle_heditor(enable_stroke); + rnd_conf_toggle_heditor(enable_stroke); break; case F_ToggleShowDRC: - conf_toggle_editor(show_drc); + rnd_conf_toggle_editor(show_drc); break; case F_ToggleLiveRoute: - conf_toggle_editor(live_routing); + rnd_conf_toggle_editor(live_routing); break; case F_ToggleAutoDRC: pcb_hid_notify_crosshair_change(RND_ACT_HIDLIB, pcb_false); - conf_toggle_editor(auto_drc); + rnd_conf_toggle_editor(auto_drc); if (conf_core.editor.auto_drc && pcbhl_conf.editor.mode == pcb_crosshair.tool_line) { if (pcb_data_clear_flag(PCB->Data, PCB_FLAG_FOUND, 1, 1) > 0) { pcb_undo_inc_serial(); @@ -264,25 +264,25 @@ break; case F_ToggleCheckPlanes: - conf_toggle_editor(check_planes); + rnd_conf_toggle_editor(check_planes); pcb_hid_redraw(PCB); break; case F_ToggleOrthoMove: - conf_toggle_editor(orthogonal_moves); + rnd_conf_toggle_editor(orthogonal_moves); break; case F_ToggleName: - conf_toggle_editor(show_number); + rnd_conf_toggle_editor(show_number); pcb_hid_redraw(PCB); break; case F_ToggleClearLine: - conf_toggle_editor(clear_line); + rnd_conf_toggle_editor(clear_line); break; case F_ToggleFullPoly: - conf_toggle_editor(full_poly); + rnd_conf_toggle_editor(full_poly); break; /* shift grid alignment */ @@ -300,7 +300,7 @@ /* toggle displaying of the grid */ case F_Grid: - conf_toggle_heditor(draw_grid); + rnd_conf_toggle_heditor(draw_grid); pcb_hid_redraw(PCB); break; @@ -565,10 +565,10 @@ known = pcb_route_style_lookup(&PCB->RouteStyle, Thick, Diameter, Hole, Clearance, Name); if (known < 0) { /* unknown style, set properties */ - if (Thick != -1) { pcb_custom_route_style.Thick = Thick; conf_set_design("design/line_thickness", "%$mS", Thick); } - if (Clearance != -1) { pcb_custom_route_style.Clearance = Clearance; conf_set_design("design/clearance", "%$mS", Clearance); } - if (Diameter != -1) { pcb_custom_route_style.Diameter = Diameter; conf_set_design("design/via_thickness", "%$mS", Diameter); } - if (Hole != -1) { pcb_custom_route_style.Hole = Hole; conf_set_design("design/via_drilling_hole", "%$mS", Hole); } + if (Thick != -1) { pcb_custom_route_style.Thick = Thick; rnd_conf_set_design("design/line_thickness", "%$mS", Thick); } + if (Clearance != -1) { pcb_custom_route_style.Clearance = Clearance; rnd_conf_set_design("design/clearance", "%$mS", Clearance); } + if (Diameter != -1) { pcb_custom_route_style.Diameter = Diameter; rnd_conf_set_design("design/via_thickness", "%$mS", Diameter); } + if (Hole != -1) { pcb_custom_route_style.Hole = Hole; rnd_conf_set_design("design/via_drilling_hole", "%$mS", Hole); } PCB->pen_attr = NULL; } else Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 30950) +++ trunk/src/librnd/core/conf.c (revision 30951) @@ -438,7 +438,7 @@ } -int pcb_conf_get_policy_prio(lht_node_t *node, rnd_conf_policy_t *gpolicy, long *gprio) +int rnd_conf_get_policy_prio(lht_node_t *node, rnd_conf_policy_t *gpolicy, long *gprio) { for(;;node = node->parent) { if (node->parent == node->doc->root) { @@ -450,12 +450,12 @@ } } -const char *pcb_conf_get_user_conf_name() +const char *rnd_conf_get_user_conf_name() { return pcphl_conf_user_path; } -const char *pcb_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **try) +const char *rnd_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **try) { static char res[PCB_PATH_MAX+1]; static const char *project_name = "project.lht"; @@ -503,7 +503,7 @@ return NULL; } -int pcb_conf_parse_text(rnd_confitem_t *dst, int idx, rnd_conf_native_type_t type, const char *text, lht_node_t *err_node) +int rnd_conf_parse_text(rnd_confitem_t *dst, int idx, rnd_conf_native_type_t type, const char *text, lht_node_t *err_node) { const char *strue[] = {"true", "yes", "on", "1", NULL}; const char *sfalse[] = {"false", "no", "off", "0", NULL}; @@ -592,7 +592,7 @@ return 0; } - if (pcb_conf_parse_text(&dest->val, 0, dest->type, src->data.text.value, src) == 0) { + if (rnd_conf_parse_text(&dest->val, 0, dest->type, src->data.text.value, src) == 0) { dest->prop[0].prio = prio; dest->prop[0].src = src; dest->used = 1; @@ -667,7 +667,7 @@ break; } - if ((s->data.text.value != NULL) && (pcb_conf_parse_text(&dest->val, didx, dest->type, s->data.text.value, s) == 0)) { + if ((s->data.text.value != NULL) && (rnd_conf_parse_text(&dest->val, didx, dest->type, s->data.text.value, s) == 0)) { dest->prop[didx].prio = prio; dest->prop[didx].src = s; if (didx >= dest->used) @@ -711,7 +711,7 @@ } if (s->type == LHT_TEXT) { - if (pcb_conf_parse_text(&i->val, 0, RND_CFN_STRING, s->data.text.value, s) != 0) { + if (rnd_conf_parse_text(&i->val, 0, RND_CFN_STRING, s->data.text.value, s) != 0) { free(i); continue; } @@ -750,7 +750,7 @@ i->prop.src = s; } if (s->type == LHT_TEXT) { - if (pcb_conf_parse_text(&i->val, 0, RND_CFN_STRING, s->data.text.value, s) != 0) { + if (rnd_conf_parse_text(&i->val, 0, RND_CFN_STRING, s->data.text.value, s) != 0) { free(i); continue; } @@ -1069,7 +1069,7 @@ /* clear memory-bin data first */ if (path == NULL) { htsp_entry_t *e; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { conf_hid_global_cb((rnd_conf_native_t *)e->value, -1, val_change_pre); conf_hid_local_cb((rnd_conf_native_t *)e->value, -1, val_change_pre); conf_field_clear(e->value); @@ -1109,7 +1109,7 @@ if (path == NULL) { htsp_entry_t *e; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { conf_hid_local_cb((rnd_conf_native_t *)e->value, -1, val_change_post); conf_hid_global_cb((rnd_conf_native_t *)e->value, -1, val_change_post); } @@ -1156,7 +1156,7 @@ return ov; } -lht_node_t *pcb_conf_lht_get_first(rnd_conf_role_t target, int create) +lht_node_t *rnd_conf_lht_get_first(rnd_conf_role_t target, int create) { assert(target != RND_CFR_invalid); assert(target >= 0); @@ -1176,7 +1176,7 @@ return conf_lht_get_first_(pcb_conf_plug_root[target]->root, POL_ANY, create); } -lht_node_t *pcb_conf_lht_get_first_pol(rnd_conf_role_t target, rnd_conf_policy_t pol, int create) +lht_node_t *rnd_conf_lht_get_first_pol(rnd_conf_role_t target, rnd_conf_policy_t pol, int create) { assert(target != RND_CFR_invalid); assert(target >= 0); @@ -1190,7 +1190,7 @@ { lht_node_t *n, *r = NULL; - n = pcb_conf_lht_get_first(target, create); + n = rnd_conf_lht_get_first(target, create); if (n == NULL) return NULL; @@ -1211,7 +1211,7 @@ return r; } -lht_node_t *pcb_conf_lht_get_at_mainplug(rnd_conf_role_t target, const char *path, int allow_plug, int create) +lht_node_t *rnd_conf_lht_get_at_mainplug(rnd_conf_role_t target, const char *path, int allow_plug, int create) { lht_node_t *r; char *pc, *end; @@ -1237,9 +1237,9 @@ return r; } -lht_node_t *pcb_conf_lht_get_at(rnd_conf_role_t target, const char *path, int create) +lht_node_t *rnd_conf_lht_get_at(rnd_conf_role_t target, const char *path, int create) { - return pcb_conf_lht_get_at_mainplug(target, path, 0, create); + return rnd_conf_lht_get_at_mainplug(target, path, 0, create); } @@ -1254,7 +1254,7 @@ /* load config files */ rnd_conf_load_as(RND_CFR_SYSTEM, pcbhl_conf_sys_path, 0); rnd_conf_load_as(RND_CFR_USER, pcphl_conf_user_path, 0); - pc = pcb_conf_get_project_conf_name(project_fn, pcb_fn, &try); + pc = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try); if (pc != NULL) rnd_conf_load_as(RND_CFR_PROJECT, pc, 0); pcb_conf_merge_all(NULL); @@ -1285,7 +1285,7 @@ assert((project_fn != NULL) || (pcb_fn != NULL)); - pc = pcb_conf_get_project_conf_name(project_fn, pcb_fn, &try); + pc = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try); if (pc != NULL) if (rnd_conf_load_as(RND_CFR_PROJECT, pc, 0) != 0) pc = NULL; @@ -1375,7 +1375,7 @@ assert(prefix[len-1] == '/'); - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { if (strncmp(e->key, prefix, len) == 0) { pcb_conf_free_native(e->value); htsp_delentry(rnd_conf_fields, e); @@ -1408,7 +1408,7 @@ return -1; if (mkdirp) - pcb_conf_lht_get_first_pol(target, pol, 1); + rnd_conf_lht_get_first_pol(target, pol, 1); path = rnd_strdup(path_); sidx = strrchr(path, '['); @@ -1449,7 +1449,7 @@ return -1; } - cwd = pcb_conf_lht_get_first_pol(target, pol, 0); + cwd = rnd_conf_lht_get_first_pol(target, pol, 0); if (cwd == NULL) { free(path); return -1; @@ -1723,7 +1723,7 @@ } /* now that we have a clean path (arg) and a value, try to set the config */ - pcb_conf_lht_get_first_pol(RND_CFR_CLI, pol, 1); /* make sure the root for the given policy is created */ + rnd_conf_lht_get_first_pol(RND_CFR_CLI, pol, 1); /* make sure the root for the given policy is created */ ret = rnd_conf_set(RND_CFR_CLI, arg, -1, val, pol); if (ret != 0) *why = "invalid config path"; @@ -1759,12 +1759,12 @@ return 0; } -void pcb_conf_usage(const char *prefix, void (*print)(const char *name, const char *help)) +void rnd_conf_usage(const char *prefix, void (*print)(const char *name, const char *help)) { htsp_entry_t *e; int pl = (prefix == NULL ? 0 : strlen(prefix)); - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { if ((prefix == NULL) || (strncmp(prefix, e->key, pl) == 0)) { rnd_conf_native_t *n = e->value; if (n->flags & RND_CFF_USAGE) { @@ -1797,7 +1797,7 @@ int rnd_conf_replace_subtree(rnd_conf_role_t dst_role, const char *dst_path, rnd_conf_role_t src_role, const char *src_path) { - lht_node_t *dst = pcb_conf_lht_get_at(dst_role, dst_path, 1); + lht_node_t *dst = rnd_conf_lht_get_at(dst_role, dst_path, 1); lht_node_t *src, *new_src = NULL; if (src_role == RND_CFR_binary) { @@ -1845,7 +1845,7 @@ src = ch; } else - src = pcb_conf_lht_get_at(src_role, src_path, 0); + src = rnd_conf_lht_get_at(src_role, src_path, 0); if ((src == NULL) && (dst != NULL)) { lht_tree_del(dst); @@ -1881,7 +1881,7 @@ int rnd_conf_save_file(rnd_hidlib_t *hidlib, const char *project_fn, const char *pcb_fn, rnd_conf_role_t role, const char *fn) { int fail = 1; - lht_node_t *r = pcb_conf_lht_get_first(role, 0); + lht_node_t *r = rnd_conf_lht_get_first(role, 0); const char *try; char *efn; @@ -1895,7 +1895,7 @@ fn = pcphl_conf_user_path; break; case RND_CFR_PROJECT: - fn = pcb_conf_get_project_conf_name(project_fn, pcb_fn, &try); + fn = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try); if (fn == NULL) { rnd_message(PCB_MSG_ERROR, "Error: can not save config to project file: %s does not exist - please create an empty file there first\n", try); return -1; @@ -1953,9 +1953,9 @@ return fail; } -int pcb_conf_export_to_file(rnd_hidlib_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path) +int rnd_conf_export_to_file(rnd_hidlib_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path) { - lht_node_t *at = pcb_conf_lht_get_at(role, conf_path, 0); + lht_node_t *at = rnd_conf_lht_get_at(role, conf_path, 0); lht_err_t r; FILE *f; @@ -1972,7 +1972,7 @@ } -pcb_conf_listitem_t *pcb_conf_list_first_str(pcb_conflist_t *list, const char **item_str, int *idx) +pcb_conf_listitem_t *rnd_conf_list_first_str(pcb_conflist_t *list, const char **item_str, int *idx) { pcb_conf_listitem_t *item_li; item_li = pcb_conflist_first(list); @@ -1982,10 +1982,10 @@ *item_str = item_li->val.string[0]; return item_li; } - return pcb_conf_list_next_str(item_li, item_str, idx); + return rnd_conf_list_next_str(item_li, item_str, idx); } -pcb_conf_listitem_t *pcb_conf_list_next_str(pcb_conf_listitem_t *item_li, const char **item_str, int *idx) +pcb_conf_listitem_t *rnd_conf_list_next_str(pcb_conf_listitem_t *item_li, const char **item_str, int *idx) { while((item_li = pcb_conflist_next(item_li)) != NULL) { (*idx)++; @@ -2001,7 +2001,7 @@ return item_li; } -const char *pcb_conf_concat_strlist(const pcb_conflist_t *lst, gds_t *buff, int *inited, char sep) +const char *rnd_conf_concat_strlist(const pcb_conflist_t *lst, gds_t *buff, int *inited, char sep) { int n; pcb_conf_listitem_t *ci; @@ -2049,7 +2049,7 @@ { pcb_conf_lht_dirty[target]++; } -rnd_conf_role_t pcb_conf_lookup_role(const lht_node_t *nd) +rnd_conf_role_t rnd_conf_lookup_role(const lht_node_t *nd) { rnd_conf_role_t r; for(r = 0; r < RND_CFR_max_real; r++) @@ -2199,7 +2199,7 @@ int n; htsp_entry_t *e; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { if (strncmp(e->key, "plugins/", 8) == 0) fprintf(stderr, "pcb-rnd conf ERROR: conf node '%s' is not unregistered\n", e->key); } @@ -2213,7 +2213,7 @@ lht_dom_uninit(pcb_conf_plug_root[n]); } - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { pcb_conf_free_native(e->value); htsp_delentry(rnd_conf_fields, e); } @@ -2220,10 +2220,10 @@ htsp_free(rnd_conf_fields); vmst_uninit(&merge_subtree); - pcb_conf_files_uninit(); + rnd_conf_files_uninit(); } -void pcb_conf_setf(rnd_conf_role_t role, const char *path, int idx, const char *fmt, ...) +void rnd_conf_setf(rnd_conf_role_t role, const char *path, int idx, const char *fmt, ...) { char *tmp; va_list ap; Index: trunk/src/librnd/core/conf.h =================================================================== --- trunk/src/librnd/core/conf.h (revision 30950) +++ trunk/src/librnd/core/conf.h (revision 30951) @@ -303,9 +303,9 @@ #define rnd_conf_is_read_only(role) \ (((role) == RND_CFR_INTERNAL) || ((role) == RND_CFR_SYSTEM) || ((role) == RND_CFR_DEFAULTPCB)) -void pcb_conf_setf(rnd_conf_role_t role, const char *path, int idx, const char *fmt, ...); +void rnd_conf_setf(rnd_conf_role_t role, const char *path, int idx, const char *fmt, ...); -#define conf_list_foreach_path_first(hidlib, res, conf_list, call) \ +#define rnd_conf_list_foreach_path_first(hidlib, res, conf_list, call) \ do { \ pcb_conf_listitem_t *__n__; \ const pcb_conflist_t *__lst1__ = (conf_list); \ @@ -328,98 +328,98 @@ /* printf("conf_list_foreach_path_first: %s using %s\n", # call, # conf_list); \*/ /* htsp_entry_t *e; */ -#define conf_fields_foreach(e) \ +#define rnd_conf_fields_foreach(e) \ for (e = htsp_first(rnd_conf_fields); e; e = htsp_next(rnd_conf_fields, e)) /* helpers to make the code shorter */ -#define conf_set_design(path, fmt, new_val) \ - pcb_conf_setf(RND_CFR_DESIGN, path, -1, fmt, new_val) +#define rnd_conf_set_design(path, fmt, new_val) \ + rnd_conf_setf(RND_CFR_DESIGN, path, -1, fmt, new_val) -#define conf_set_editor(field, val) \ +#define rnd_conf_set_editor(field, val) \ rnd_conf_set(RND_CFR_DESIGN, "editor/" #field, -1, val ? "1" : "0", RND_POL_OVERWRITE) -#define conf_set_editor_(sfield, val) \ +#define rnd_conf_set_editor_(sfield, val) \ rnd_conf_set(RND_CFR_DESIGN, sfield, -1, val ? "1" : "0", RND_POL_OVERWRITE) -#define conf_toggle_editor(field) \ - conf_set_editor(field, !conf_core.editor.field) +#define rnd_conf_toggle_editor(field) \ + rnd_conf_set_editor(field, !conf_core.editor.field) -#define conf_toggle_heditor(field) \ - conf_set_editor(field, !pcbhl_conf.editor.field) +#define rnd_conf_toggle_heditor(field) \ + rnd_conf_set_editor(field, !pcbhl_conf.editor.field) -#define conf_toggle_editor_(sfield, field) \ - conf_set_editor_("editor/" sfield, !conf_core.editor.field) +#define rnd_conf_toggle_editor_(sfield, field) \ + rnd_conf_set_editor_("editor/" sfield, !conf_core.editor.field) -#define conf_toggle_heditor_(sfield, field) \ - conf_set_editor_("editor/" sfield, !pcbhl_conf.editor.field) +#define rnd_conf_toggle_heditor_(sfield, field) \ + rnd_conf_set_editor_("editor/" sfield, !pcbhl_conf.editor.field) /* For temporary modification/restoration of variables (hack) */ -#define conf_force_set_bool(var, val) *((RND_CFT_BOOLEAN *)(&var)) = val -#define conf_force_set_str(var, val) *((RND_CFT_STRING *)(&var)) = val +#define rnd_conf_force_set_bool(var, val) *((RND_CFT_BOOLEAN *)(&var)) = val +#define rnd_conf_force_set_str(var, val) *((RND_CFT_STRING *)(&var)) = val /* get the first config subtree node (it's a hash and its children are "design", "rc", ...); if create is 1, and the subtree doesn't exist, create an "overwrite". */ -lht_node_t *pcb_conf_lht_get_first(rnd_conf_role_t target, int create); +lht_node_t *rnd_conf_lht_get_first(rnd_conf_role_t target, int create); /* loop helper */ -pcb_conf_listitem_t *pcb_conf_list_first_str(pcb_conflist_t *list, const char **item_str, int *idx); -pcb_conf_listitem_t *pcb_conf_list_next_str(pcb_conf_listitem_t *item_li, const char **item_str, int *idx); +pcb_conf_listitem_t *rnd_conf_list_first_str(pcb_conflist_t *list, const char **item_str, int *idx); +pcb_conf_listitem_t *rnd_conf_list_next_str(pcb_conf_listitem_t *item_li, const char **item_str, int *idx); /*pcb_conf_listitem_t *item;*/ -#define conf_loop_list(list, item, idx) \ +#define rnd_conf_loop_list(list, item, idx) \ for (idx = 0, item = pcb_conflist_first((pcb_conflist_t *)list); item != NULL; item = pcb_conflist_next(item), idx++) /*pcb_conf_listitem_t *item; const char *item_str; */ -#define conf_loop_list_str(list, item_li, item_str, idx) \ - for (idx = 0, item_li = pcb_conf_list_first_str((pcb_conflist_t *)list, &item_str, &idx); \ +#define rnd_conf_loop_list_str(list, item_li, item_str, idx) \ + for (idx = 0, item_li = rnd_conf_list_first_str((pcb_conflist_t *)list, &item_str, &idx); \ item_li != NULL;\ - item_li = pcb_conf_list_next_str(item_li, &item_str, &idx)) + item_li = rnd_conf_list_next_str(item_li, &item_str, &idx)) -const char *pcb_conf_concat_strlist(const pcb_conflist_t *lst, gds_t *buff, int *inited, char sep); +const char *rnd_conf_concat_strlist(const pcb_conflist_t *lst, gds_t *buff, int *inited, char sep); /* Print usage help for all nodes that have the RND_CFF_USAGE flag and whose path starts with prefix (if prefix != NULL) */ -void pcb_conf_usage(const char *prefix, void (*print)(const char *name, const char *help)); +void rnd_conf_usage(const char *prefix, void (*print)(const char *name, const char *help)); /* Determine under which role a node is */ -rnd_conf_role_t pcb_conf_lookup_role(const lht_node_t *nd); +rnd_conf_role_t rnd_conf_lookup_role(const lht_node_t *nd); /* Return the lihata node of a path in target, optionally creating it with the right type; if allow_plug is 1, fall back returning node from plugin conf */ -lht_node_t *pcb_conf_lht_get_at(rnd_conf_role_t target, const char *path, int create); -lht_node_t *pcb_conf_lht_get_at_mainplug(rnd_conf_role_t target, const char *path, int allow_plug, int create); +lht_node_t *rnd_conf_lht_get_at(rnd_conf_role_t target, const char *path, int create); +lht_node_t *rnd_conf_lht_get_at_mainplug(rnd_conf_role_t target, const char *path, int allow_plug, int create); /* Write an existing conf subtree to a file */ -int pcb_conf_export_to_file(rnd_hidlib_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path); +int rnd_conf_export_to_file(rnd_hidlib_t *hidlib, const char *fn, rnd_conf_role_t role, const char *conf_path); /* Determine the policy and priority of a config lihata node; returns 0 on success but may not fill in both values, caller is responsible for initializing them before the call. */ -int pcb_conf_get_policy_prio(lht_node_t *node, rnd_conf_policy_t *gpolicy, long *gprio); +int rnd_conf_get_policy_prio(lht_node_t *node, rnd_conf_policy_t *gpolicy, long *gprio); /* Parse text and convert the value into native form and store in one of dst fields depending on type */ -int pcb_conf_parse_text(rnd_confitem_t *dst, int idx, rnd_conf_native_type_t type, const char *text, lht_node_t *err_node); +int rnd_conf_parse_text(rnd_confitem_t *dst, int idx, rnd_conf_native_type_t type, const char *text, lht_node_t *err_node); /* Returns the user configuration file name */ -const char *pcb_conf_get_user_conf_name(); +const char *rnd_conf_get_user_conf_name(); /* Determine the file name of the project file - project_fn and pcb_fn can be NULL */ -const char *pcb_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **out_project_fn); +const char *rnd_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **out_project_fn); /* Get the first subtree that matches pol within target; allocate new subtree if needed */ -lht_node_t *pcb_conf_lht_get_first_pol(rnd_conf_role_t target, rnd_conf_policy_t pol, int create); +lht_node_t *rnd_conf_lht_get_first_pol(rnd_conf_role_t target, rnd_conf_policy_t pol, int create); /* (un)register a custom config file name (not path, just file name); if intern is not NULL, it is the internal (executable-embedded) version; it's not strdup'd, the caller needs to keep the string available - until pcb_conf_unreg_file(). path is strdup'd */ -void pcb_conf_reg_file(const char *path, const char *intern); -void pcb_conf_unreg_file(const char *path, const char *intern); + until rnd_conf_unreg_file(). path is strdup'd */ +void rnd_conf_reg_file(const char *path, const char *intern); +void rnd_conf_unreg_file(const char *path, const char *intern); -void pcb_conf_files_uninit(void); +void rnd_conf_files_uninit(void); extern void (*pcb_conf_core_postproc)(void); /* if not NULL, called after conf updates to give conf_core a chance to update dynamic entries */ Index: trunk/src/librnd/core/conf_hid.c =================================================================== --- trunk/src/librnd/core/conf_hid.c (revision 30950) +++ trunk/src/librnd/core/conf_hid.c (revision 30951) @@ -85,7 +85,7 @@ return; /* remove local callbacks */ - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { int len; rnd_conf_native_t *cfg = e->value; len = vtp0_len(&cfg->hid_callbacks); @@ -105,7 +105,7 @@ } if ((h->cb != NULL) && (h->cb->unreg_item != NULL)) { - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { rnd_conf_native_t *cfg = e->value; h->cb->unreg_item(cfg, -1); } Index: trunk/src/librnd/core/conf_regfile.c =================================================================== --- trunk/src/librnd/core/conf_regfile.c (revision 30950) +++ trunk/src/librnd/core/conf_regfile.c (revision 30951) @@ -36,7 +36,7 @@ conf_files_inited = 1; } -void pcb_conf_files_uninit(void) +void rnd_conf_files_uninit(void) { htsi_entry_t *e; for (e = htsi_first(&conf_files); e; e = htsi_next(&conf_files, e)) @@ -46,7 +46,7 @@ conf_files_inited = 0; } -void pcb_conf_reg_file(const char *path, const char *intern) +void rnd_conf_reg_file(const char *path, const char *intern) { htsi_entry_t *e; if (!conf_files_inited) conf_files_init(); @@ -83,7 +83,7 @@ } } -void pcb_conf_unreg_file(const char *path, const char *intern) +void rnd_conf_unreg_file(const char *path, const char *intern) { assert(conf_files_inited); if (!conf_files_inited) return; Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 30950) +++ trunk/src/librnd/core/grid.c (revision 30951) @@ -191,7 +191,7 @@ if (dst < 0) return pcb_false; - pcb_conf_setf(RND_CFR_DESIGN, "editor/grids_idx", -1, "%d", dst); + rnd_conf_setf(RND_CFR_DESIGN, "editor/grids_idx", -1, "%d", dst); li = pcb_conflist_nth((pcb_conflist_t *)&pcbhl_conf.editor.grids, dst); /* clamp */ @@ -217,6 +217,6 @@ void pcb_grid_inval(void) { if (pcbhl_conf.editor.grids_idx > 0) - pcb_conf_setf(RND_CFR_DESIGN, "editor/grids_idx", -1, "%d", -1 - pcbhl_conf.editor.grids_idx); + rnd_conf_setf(RND_CFR_DESIGN, "editor/grids_idx", -1, "%d", -1 - pcbhl_conf.editor.grids_idx); } Index: trunk/src/librnd/core/gui_act.c =================================================================== --- trunk/src/librnd/core/gui_act.c (revision 30950) +++ trunk/src/librnd/core/gui_act.c (revision 30951) @@ -115,7 +115,7 @@ rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, FullScreen, cmd = argv[1].val.str); if ((cmd == NULL) || (rnd_strcasecmp(cmd, "Toggle") == 0)) - pcb_conf_setf(RND_CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, RND_POL_OVERWRITE); + rnd_conf_setf(RND_CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, RND_POL_OVERWRITE); else if (rnd_strcasecmp(cmd, "On") == 0) rnd_conf_set(RND_CFR_DESIGN, "editor/fullscreen", -1, "1", RND_POL_OVERWRITE); else if (rnd_strcasecmp(cmd, "Off") == 0) Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30950) +++ trunk/src/librnd/core/hid_init.c (revision 30951) @@ -299,7 +299,7 @@ void pcbhl_conf_postproc(void) { - conf_force_set_str(pcbhl_conf.rc.path.home, get_homedir()); rnd_conf_ro("rc/path/home"); + rnd_conf_force_set_str(pcbhl_conf.rc.path.home, get_homedir()); rnd_conf_ro("rc/path/home"); } void pcb_hidlib_init1(void (*conf_core_init)(void)) @@ -403,7 +403,7 @@ int n; const char *g; - conf_loop_list_str(&pcbhl_conf.rc.preferred_gui, apg, g, n) { + rnd_conf_loop_list_str(&pcbhl_conf.rc.preferred_gui, apg, g, n) { if (n == autopick_gui) break; } @@ -436,7 +436,7 @@ int n; const char *g; - apg = pcb_conf_list_next_str(apg, &g, &n); + apg = rnd_conf_list_next_str(apg, &g, &n); if (apg == NULL) goto ran_out_of_hids; pcb_render = pcb_gui = pcb_hid_find_gui(g); @@ -633,7 +633,7 @@ pcb_conf_listitem_t *i; pcb_render = pcb_gui = NULL; - conf_loop_list_str(&pcbhl_conf.rc.preferred_gui, i, g, ga->autopick_gui) { + rnd_conf_loop_list_str(&pcbhl_conf.rc.preferred_gui, i, g, ga->autopick_gui) { pcb_render = pcb_gui = pcb_hid_find_gui(g); if (pcb_gui != NULL) break; Index: trunk/src/librnd/core/hidlib_conf.c =================================================================== --- trunk/src/librnd/core/hidlib_conf.c (revision 30950) +++ trunk/src/librnd/core/hidlib_conf.c (revision 30951) @@ -58,7 +58,7 @@ hidlib->grid_oy = oy % Grid; } hidlib->grid = Grid; - conf_set_design("editor/grid", "%$mS", Grid); + rnd_conf_set_design("editor/grid", "%$mS", Grid); if (pcbhl_conf.editor.draw_grid) pcb_gui->invalidate_all(pcb_gui); } Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30950) +++ trunk/src/librnd/pcb_compat.h (revision 30951) @@ -306,3 +306,34 @@ #define pcb_conf_update rnd_conf_update #define pcb_conf_fields rnd_conf_fields #define conf_pfn rnd_conf_pfn +#define pcb_conf_setf rnd_conf_setf +#define conf_list_foreach_path_first rnd_conf_list_foreach_path_first +#define conf_fields_foreach rnd_conf_fields_foreach +#define conf_set_design rnd_conf_set_design +#define conf_set_editor rnd_conf_set_editor +#define conf_set_editor_ rnd_conf_set_editor_ +#define conf_toggle_editor rnd_conf_toggle_editor +#define conf_toggle_heditor rnd_conf_toggle_heditor +#define conf_toggle_editor_ rnd_conf_toggle_editor_ +#define conf_toggle_heditor_ rnd_conf_toggle_heditor_ +#define conf_force_set_bool rnd_conf_force_set_bool +#define conf_force_set_str rnd_conf_force_set_str +#define pcb_conf_lht_get_first rnd_conf_lht_get_first +#define pcb_conf_list_first_str rnd_conf_list_first_str +#define pcb_conf_list_next_str rnd_conf_list_next_str +#define conf_loop_list rnd_conf_loop_list +#define conf_loop_list_str rnd_conf_loop_list_str +#define pcb_conf_concat_strlist rnd_conf_concat_strlist +#define pcb_conf_usage rnd_conf_usage +#define pcb_conf_lookup_role rnd_conf_lookup_role +#define pcb_conf_lht_get_at rnd_conf_lht_get_at +#define pcb_conf_lht_get_at_mainplug rnd_conf_lht_get_at_mainplug +#define pcb_conf_export_to_file rnd_conf_export_to_file +#define pcb_conf_get_policy_prio rnd_conf_get_policy_prio +#define pcb_conf_parse_text rnd_conf_parse_text +#define pcb_conf_get_user_conf_name rnd_conf_get_user_conf_name +#define pcb_conf_get_project_conf_name rnd_conf_get_project_conf_name +#define pcb_conf_lht_get_first_pol rnd_conf_lht_get_first_pol +#define pcb_conf_reg_file rnd_conf_reg_file +#define pcb_conf_unreg_file rnd_conf_unreg_file +#define pcb_conf_files_uninit rnd_conf_files_uninit Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 30950) +++ trunk/src/main_act.c (revision 30951) @@ -222,7 +222,7 @@ const char *p; printf(" "); - conf_loop_list_str(cl, ci, p, n) { + rnd_conf_loop_list_str(cl, ci, p, n) { printf("%c%s", (n == 0) ? '"' : ':', p); } printf("\"\n"); @@ -230,7 +230,7 @@ fgw_error_t pcb_act_PrintPaths(fgw_arg_t *res, int argc, fgw_arg_t *argv) { htsp_entry_t *e; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { rnd_conf_native_t *n = e->value; if ((strncmp(n->hash_path, "rc/path/", 8) == 0) && (n->type == RND_CFN_STRING) && (n->used == 1)) printf("%-32s = %s\n", n->hash_path, n->val.string[0]); Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 30950) +++ trunk/src/obj_line_drcenf.c (revision 30951) @@ -498,11 +498,11 @@ if (conf_core.editor.line_refraction != 0) { if (shift) { if (conf_core.editor.line_refraction !=2) - pcb_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 2); + rnd_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 2); } else{ if (conf_core.editor.line_refraction != 1) - pcb_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 1); + rnd_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 1); } } pcb->hidlib.ch_x = pcb_crosshair.X = rs.X; @@ -512,11 +512,11 @@ if (conf_core.editor.line_refraction !=0) { if (shift) { if (conf_core.editor.line_refraction != 1) - pcb_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 1); + rnd_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 1); } else { if (conf_core.editor.line_refraction != 2) - pcb_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 2); + rnd_conf_setf(RND_CFR_DESIGN, "editor/line_refraction", -1, "%d", 2); } } pcb->hidlib.ch_x = pcb_crosshair.X = r45.X; Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 30950) +++ trunk/src/obj_rat.c (revision 30951) @@ -409,7 +409,7 @@ newone = pcb_line_new(ctx->move.dst_layer, Rat->Point1.X, Rat->Point1.Y, Rat->Point2.X, Rat->Point2.Y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags); if (conf_core.editor.clear_line) - conf_set_editor(clear_line, 1); + rnd_conf_set_editor(clear_line, 1); if (!newone) return NULL; pcb_undo_add_obj_to_create(PCB_OBJ_LINE, ctx->move.dst_layer, newone, newone); Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 30950) +++ trunk/src/object_act.c (revision 30951) @@ -646,9 +646,9 @@ fx = pcbhl_conf.editor.view.flip_x; fy = pcbhl_conf.editor.view.flip_y; fs = conf_core.editor.show_solder_side; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); - conf_force_set_bool(conf_core.editor.show_solder_side, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); #ifdef DEBUG printf(" ... footprint = %s\n", footprint); @@ -753,9 +753,9 @@ printf(" ... Leaving pcb_act_ElementList.\n"); #endif - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, fx); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, fy); - conf_force_set_bool(conf_core.editor.show_solder_side, fs); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, fx); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, fy); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, fs); RND_ACT_IRES(0); return 0; Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30950) +++ trunk/src/plug_io.c (revision 30951) @@ -122,7 +122,7 @@ if (last_design_dir == NULL) { last_design_dir = rnd_strdup(""); - conf_force_set_str(conf_core.rc.path.design, last_design_dir); + rnd_conf_force_set_str(conf_core.rc.path.design, last_design_dir); rnd_conf_ro("rc/path/design"); return; } @@ -131,7 +131,7 @@ if (end != NULL) *end = '\0'; - conf_force_set_str(conf_core.rc.path.design, last_design_dir); + rnd_conf_force_set_str(conf_core.rc.path.design, last_design_dir); rnd_conf_ro("rc/path/design"); } @@ -577,7 +577,7 @@ /* geda/pcb compatibility: use attribute PCB::grid::unit as unit, if present */ unit_suffix = rnd_attrib_get(PCB, "PCB::grid::unit"); if (unit_suffix && *unit_suffix) { - lht_node_t *nat = pcb_conf_lht_get_at(RND_CFR_DESIGN, "editor/grid_unit", 0); + lht_node_t *nat = rnd_conf_lht_get_at(RND_CFR_DESIGN, "editor/grid_unit", 0); if (nat == NULL) { const pcb_unit_t *new_unit = get_unit_struct(unit_suffix); if (new_unit) Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 30950) +++ trunk/src/route_style.c (revision 30951) @@ -162,12 +162,12 @@ void pcb_use_route_style(pcb_route_style_t * rst) { - conf_set_design("design/line_thickness", "%$mS", rst->Thick); - conf_set_design("design/text_scale", "%d", rst->texts <= 0 ? 100 : rst->texts); - conf_set_design("design/text_thickness", "%$mS", rst->textt); - conf_set_design("design/via_thickness", "%$mS", rst->Diameter); - conf_set_design("design/via_drilling_hole", "%$mS", rst->Hole); - conf_set_design("design/clearance", "%$mS", rst->Clearance); + rnd_conf_set_design("design/line_thickness", "%$mS", rst->Thick); + rnd_conf_set_design("design/text_scale", "%d", rst->texts <= 0 ? 100 : rst->texts); + rnd_conf_set_design("design/text_thickness", "%$mS", rst->textt); + rnd_conf_set_design("design/via_thickness", "%$mS", rst->Diameter); + rnd_conf_set_design("design/via_drilling_hole", "%$mS", rst->Hole); + rnd_conf_set_design("design/clearance", "%$mS", rst->Clearance); PCB->pen_attr = &rst->attr; } Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 30950) +++ trunk/src_plugins/asm/asm.c (revision 30951) @@ -634,7 +634,7 @@ void pplg_uninit_asm(void) { rnd_remove_actions_by_cookie(asm_cookie); - pcb_conf_unreg_file(ASM_CONF_FN, asm_conf_internal); + rnd_conf_unreg_file(ASM_CONF_FN, asm_conf_internal); rnd_conf_unreg_fields("plugins/asm1/"); } @@ -641,7 +641,7 @@ int pplg_init_asm(void) { PCB_API_CHK_VER; - pcb_conf_reg_file(ASM_CONF_FN, asm_conf_internal); + rnd_conf_reg_file(ASM_CONF_FN, asm_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_asm, field,isarray,type_name,cpath,cname,desc,flags); #include "asm_conf_fields.h" Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30950) +++ trunk/src_plugins/cam/cam.c (revision 30951) @@ -88,7 +88,7 @@ pcb_conf_listitem_t *j; int idx; - conf_loop_list(&conf_cam.plugins.cam.jobs, j, idx) + rnd_conf_loop_list(&conf_cam.plugins.cam.jobs, j, idx) if (strcmp(j->name, job) == 0) return j->payload; @@ -282,7 +282,7 @@ void pplg_uninit_cam(void) { - pcb_conf_unreg_file(CAM_CONF_FN, cam_conf_internal); + rnd_conf_unreg_file(CAM_CONF_FN, cam_conf_internal); rnd_conf_unreg_fields("plugins/cam/"); rnd_remove_actions_by_cookie(cam_cookie); pcb_export_remove_opts_by_cookie(cam_cookie); @@ -293,7 +293,7 @@ int pplg_init_cam(void) { PCB_API_CHK_VER; - pcb_conf_reg_file(CAM_CONF_FN, cam_conf_internal); + rnd_conf_reg_file(CAM_CONF_FN, cam_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_cam, field,isarray,type_name,cpath,cname,desc,flags); #include "cam_conf_fields.h" Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 30950) +++ trunk/src_plugins/cam/cam_gui.c (revision 30951) @@ -65,7 +65,7 @@ int idx; cell[1] = NULL; - conf_loop_list(cn->val.list, item, idx) { + rnd_conf_loop_list(cn->val.list, item, idx) { cell[0] = rnd_strdup(item->name); pcb_dad_tree_append(attr, NULL, cell); } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 30950) +++ trunk/src_plugins/diag/diag.c (revision 30951) @@ -132,13 +132,13 @@ for(role = 0; role < RND_CFR_max_real; role++) { lht_node_t *n; printf(" Role: %s\n", rnd_conf_role_name(role)); - n = pcb_conf_lht_get_at(role, path, 0); + n = rnd_conf_lht_get_at(role, path, 0); if (n != NULL) { rnd_conf_policy_t pol = -1; long prio = rnd_conf_default_prio[role]; - if (pcb_conf_get_policy_prio(n, &pol, &prio) == 0) + if (rnd_conf_get_policy_prio(n, &pol, &prio) == 0) printf(" * policy=%s\n * prio=%ld\n", rnd_conf_policy_name(pol), prio); if (n->file_name != NULL) Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 30951) @@ -90,16 +90,16 @@ switch(cn->type) { case RND_CFN_COORD: if (cn->val.coord[0] != attr->val.crd) - pcb_conf_setf(ctx->role, item->confpath, -1, "%.8$mm", attr->val.crd); + rnd_conf_setf(ctx->role, item->confpath, -1, "%.8$mm", attr->val.crd); break; case RND_CFN_BOOLEAN: case RND_CFN_INTEGER: if (cn->val.integer[0] != attr->val.lng) - pcb_conf_setf(ctx->role, item->confpath, -1, "%d", attr->val.lng); + rnd_conf_setf(ctx->role, item->confpath, -1, "%d", attr->val.lng); break; case RND_CFN_REAL: if (cn->val.real[0] != attr->val.dbl) - pcb_conf_setf(ctx->role, item->confpath, -1, "%f", attr->val.dbl); + rnd_conf_setf(ctx->role, item->confpath, -1, "%f", attr->val.dbl); break; case RND_CFN_STRING: if (strcmp(cn->val.string[0], attr->val.str) != 0) Index: trunk/src_plugins/dialogs/dlg_pref_color.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref_color.c (revision 30951) @@ -73,7 +73,7 @@ { pref_ctx_t *ctx = caller_data; const char *path = attr->user_data; - pcb_conf_setf(ctx->role, path, -1, "%s", attr->val.clr.str); + rnd_conf_setf(ctx->role, path, -1, "%s", attr->val.clr.str); pcb_gui->invalidate_all(pcb_gui); } @@ -81,7 +81,7 @@ { pref_ctx_t *ctx = caller_data; int idx = (int *)attr->user_data - ctx->color.wlayer; - pcb_conf_setf(ctx->role, "appearance/color/layer", idx, "%s", attr->val.clr.str); + rnd_conf_setf(ctx->role, "appearance/color/layer", idx, "%s", attr->val.clr.str); } @@ -103,7 +103,7 @@ pl = strlen(path_prefix); ctx->color.ngen = 0; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { nat = e->value; if ((strncmp(e->key, path_prefix, pl) == 0) && (nat->type == RND_CFN_COLOR) && (nat->array_size == 1)) ctx->color.ngen++; @@ -111,7 +111,7 @@ ctx->color.wgen = calloc(sizeof(int), ctx->color.ngen); n = 0; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { nat = e->value; if ((strncmp(e->key, path_prefix, pl) == 0) && (nat->type == RND_CFN_COLOR) && (nat->array_size == 1)) { PCB_DAD_BEGIN_HBOX(ctx->dlg); Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 30951) @@ -153,9 +153,9 @@ long prio = rnd_conf_default_prio[n]; rnd_conf_policy_t pol = RND_POL_OVERWRITE; - nd = pcb_conf_lht_get_at_mainplug(n, nat->hash_path, 1, 0); + nd = rnd_conf_lht_get_at_mainplug(n, nat->hash_path, 1, 0); if (nd != NULL) { /* role, prio, policy, value */ - pcb_conf_get_policy_prio(nd, &pol, &prio); + rnd_conf_get_policy_prio(nd, &pol, &prio); cell[1] = pcb_strdup_printf("%ld", prio); cell[2] = rnd_strdup(rnd_conf_policy_name(pol)); cell[3] = rnd_strdup(pref_conf_get_val(nd, nat, idx)); @@ -240,7 +240,7 @@ pcb_dad_tree_clear(tree); for (n = pcb_conflist_first(&nat->val.list[idx]); n != NULL; n = pcb_conflist_next(n)) { const char *strval; - rolename = rnd_conf_role_name(pcb_conf_lookup_role(n->prop.src)); + rolename = rnd_conf_role_name(rnd_conf_lookup_role(n->prop.src)); if (nat->type == RND_CFN_HLIST) strval = n->name; else @@ -261,7 +261,7 @@ src = nat->prop[idx].src; if (src != NULL) { - rolename = rnd_conf_role_name(pcb_conf_lookup_role(nat->prop[idx].src)); + rolename = rnd_conf_role_name(rnd_conf_lookup_role(nat->prop[idx].src)); hv.str = tmp = pcb_strdup_printf("prio: %d role: %s\nsource: %s:%d.%d", nat->prop[idx].prio, rolename, src->file_name, src->line, src->col); } else Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 30951) @@ -50,7 +50,7 @@ static void confedit_brd2dlg(confedit_ctx_t *ctx) { pcb_hid_attr_val_t hv; - lht_node_t *nl, *nd = pcb_conf_lht_get_at(ctx->role, ctx->nat->hash_path, 1); + lht_node_t *nl, *nd = rnd_conf_lht_get_at(ctx->role, ctx->nat->hash_path, 1); const char *val; if (ctx->idx >= ctx->nat->array_size) @@ -146,7 +146,7 @@ pcb_hid_attribute_t *attr = &ctx->dlg[ctx->wnewval]; pcb_hid_tree_t *tree = attr->wdata; pcb_hid_row_t *r; - lht_node_t *nd = pcb_conf_lht_get_at(ctx->role, ctx->nat->hash_path, 0); + lht_node_t *nd = rnd_conf_lht_get_at(ctx->role, ctx->nat->hash_path, 0); if (nd == NULL) { rnd_message(PCB_MSG_ERROR, "Internal error: can't copy back to non-existing list!\n"); Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 30951) @@ -91,7 +91,7 @@ { if (nd->file_name != NULL) return nd->file_name; - return rnd_conf_role_name(pcb_conf_lookup_role(nd)); + return rnd_conf_role_name(rnd_conf_lookup_role(nd)); } /* Current libraries from config to dialog box: after the change, fill @@ -111,7 +111,7 @@ attr = &pref_ctx.dlg[pref_ctx.lib.wlist]; /* copy everything from the config tree to the dialog */ - conf_loop_list_str(&conf_core.rc.library_search_paths, i, s, idx) { + rnd_conf_loop_list_str(&conf_core.rc.library_search_paths, i, s, idx) { char *tmp; cell[0] = rnd_strdup(i->payload); pcb_path_resolve(&PCB->hidlib, cell[0], &tmp, 0, pcb_false); @@ -158,7 +158,7 @@ ctx->lib.lock++; /* get the list and clean it */ - m = pcb_conf_lht_get_first(ctx->role, 0); + m = rnd_conf_lht_get_first(ctx->role, 0); lst = lht_tree_path_(m->doc, m, "rc/library_search_paths", 1, 0, NULL); if (lst == NULL) rnd_conf_set(ctx->role, "rc/library_search_paths", 0, "", RND_POL_OVERWRITE); @@ -405,7 +405,7 @@ PCB_DAD_LABEL(ctx->dlg, "The following $(variables) can be used in the path:"); PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { rnd_conf_native_t *nat = e->value; char tmp[256]; Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 30951) @@ -86,7 +86,7 @@ double v = ctx->dlg[ctx->sizes.wisle].val.dbl * 1000000.0; ctx->sizes.lock++; - pcb_conf_setf(ctx->role, "design/poly_isle_area", -1, "%f", v); + rnd_conf_setf(ctx->role, "design/poly_isle_area", -1, "%f", v); ctx->sizes.lock--; } Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30950) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 30951) @@ -56,7 +56,7 @@ static void pref_win_master_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - pcb_conf_setf(ctx->role, "editor/auto_place", -1, "%d", attr->val.lng); + rnd_conf_setf(ctx->role, "editor/auto_place", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } @@ -63,7 +63,7 @@ static void pref_win_board_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - pcb_conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_design", -1, "%d", attr->val.lng); + rnd_conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_design", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } @@ -70,7 +70,7 @@ static void pref_win_project_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - pcb_conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_project", -1, "%d", attr->val.lng); + rnd_conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_project", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } @@ -77,7 +77,7 @@ static void pref_win_user_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pref_ctx_t *ctx = caller_data; - pcb_conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_user", -1, "%d", attr->val.lng); + rnd_conf_setf(ctx->role, "plugins/dialogs/auto_save_window_geometry/to_user", -1, "%d", attr->val.lng); pref_win_brd2dlg(ctx); } Index: trunk/src_plugins/drc_orig/drc_orig.c =================================================================== --- trunk/src_plugins/drc_orig/drc_orig.c (revision 30950) +++ trunk/src_plugins/drc_orig/drc_orig.c (revision 30951) @@ -390,7 +390,7 @@ void pplg_uninit_drc_orig(void) { pcb_event_unbind_allcookie(drc_orig_cookie); - pcb_conf_unreg_file(DRC_ORIG_CONF_FN, drc_orig_conf_internal); + rnd_conf_unreg_file(DRC_ORIG_CONF_FN, drc_orig_conf_internal); rnd_conf_unreg_fields("plugins/drc_orig/"); } @@ -399,7 +399,7 @@ PCB_API_CHK_VER; pcb_event_bind(PCB_EVENT_DRC_RUN, pcb_drc_orig, NULL, drc_orig_cookie); - pcb_conf_reg_file(DRC_ORIG_CONF_FN, drc_orig_conf_internal); + rnd_conf_reg_file(DRC_ORIG_CONF_FN, drc_orig_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_drc_orig, field,isarray,type_name,cpath,cname,desc,flags); #include "drc_orig_conf_fields.h" Index: trunk/src_plugins/drc_query/dlg.c =================================================================== --- trunk/src_plugins/drc_query/dlg.c (revision 30950) +++ trunk/src_plugins/drc_query/dlg.c (revision 30951) @@ -78,7 +78,7 @@ static void drc_rule_pcb2dlg(rule_edit_ctx_t *ctx) { pcb_dad_retovr_t retovr; - lht_node_t *nd = pcb_conf_lht_get_at_mainplug(ctx->role, ctx->path, 1, 0); + lht_node_t *nd = rnd_conf_lht_get_at_mainplug(ctx->role, ctx->path, 1, 0); if (nd != NULL) { pcb_hid_attribute_t *atxt = &ctx->dlg[ctx->wquery]; pcb_hid_text_t *txt = atxt->wdata; @@ -183,9 +183,9 @@ } role = save_rolee[ri]; - nd = pcb_conf_lht_get_at_mainplug(role, ctx->path, 1, 0); + nd = rnd_conf_lht_get_at_mainplug(role, ctx->path, 1, 0); if (nd == NULL) { - nd = pcb_conf_lht_get_first(role, 1); + nd = rnd_conf_lht_get_first(role, 1); if (nd == NULL) { rnd_message(PCB_MSG_ERROR, "Internal error: failed to create role root, rule is NOT saved\n"); return; @@ -236,7 +236,7 @@ } path = pcb_concat(DRC_CONF_PATH_RULES, rule, ":0", NULL); - nd = pcb_conf_lht_get_at_mainplug(role, path, 1, 0); + nd = rnd_conf_lht_get_at_mainplug(role, path, 1, 0); if (nd == NULL) { rnd_message(PCB_MSG_ERROR, "Rule %s not found on this role.\n", rule); return -1; @@ -401,7 +401,7 @@ if (dis == NULL) dis = &dis_; - role = pcb_conf_lookup_role(rule); + role = rnd_conf_lookup_role(rule); cell[0] = rule->name; cell[1] = rnd_strdup(rnd_conf_role_name(role)); cell[2] = *dis ? "YES" : "no"; @@ -461,7 +461,7 @@ #define rlist_fetch_nd() \ do { \ char *path = pcb_concat(DRC_CONF_PATH_RULES, row->cell[0], ":0", NULL); \ - nd = pcb_conf_lht_get_at_mainplug(role, path, 1, 0); \ + nd = rnd_conf_lht_get_at_mainplug(role, path, 1, 0); \ if (nd == NULL) { \ rnd_message(PCB_MSG_ERROR, "internal error: rule not found at %s\n", path); \ return; \ Index: trunk/src_plugins/drc_query/drc_query.c =================================================================== --- trunk/src_plugins/drc_query/drc_query.c (revision 30950) +++ trunk/src_plugins/drc_query/drc_query.c (revision 30951) @@ -362,7 +362,7 @@ pcb_drc_impl_unreg(&drc_query_impl); pcb_event_unbind_allcookie(drc_query_cookie); - pcb_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); + rnd_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN); pcb_conf_hid_unreg(drc_query_cookie); @@ -388,7 +388,7 @@ cbs.new_hlist_item_post = drc_query_newconf; pcb_conf_hid_reg(drc_query_cookie, &cbs); - pcb_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); + rnd_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags); #include "drc_query_conf_fields.h" Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 30950) +++ trunk/src_plugins/export_dxf/dxf.c (revision 30951) @@ -222,7 +222,7 @@ memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); - conf_force_set_bool(conf_core.editor.show_solder_side, 0); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); dxf_ctx.enable_force_thin = options[HA_thin].lng; dxf_ctx.poly_fill = options[HA_poly_fill].lng; Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 30950) +++ trunk/src_plugins/export_openems/export_openems.c (revision 30951) @@ -609,7 +609,7 @@ f = the_file; - conf_force_set_bool(conf_core.editor.show_solder_side, 0); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); find_origin(&wctx); openems_write_sim(&wctx); Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 30950) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 30951) @@ -155,7 +155,7 @@ memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); - conf_force_set_bool(conf_core.editor.show_solder_side, 0); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); pcbhl_expose_main(&openscad_hid, &ctx, NULL); Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30950) +++ trunk/src_plugins/export_png/png.c (revision 30951) @@ -548,7 +548,7 @@ if (options[HA_as_shown].lng) pcb_draw_setup_default_gui_xform(xform); if (!options[HA_as_shown].lng) { - conf_force_set_bool(conf_core.editor.show_solder_side, 0); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); qsort(pcb_layer_stack, pcb_max_layer(PCB), sizeof(pcb_layer_stack[0]), layer_sort); Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 30950) +++ trunk/src_plugins/export_svg/svg.c (revision 30951) @@ -222,7 +222,7 @@ memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); { - conf_force_set_bool(conf_core.editor.show_solder_side, 0); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 0); if (options[HA_photo_mode].lng) { photo_mode = 1; @@ -232,7 +232,7 @@ if (options[HA_flip].lng) { flip = 1; - conf_force_set_bool(conf_core.editor.show_solder_side, 1); + rnd_conf_force_set_bool(conf_core.editor.show_solder_side, 1); } else flip = 0; Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 30950) +++ trunk/src_plugins/export_xy/xy.c (revision 30951) @@ -108,7 +108,7 @@ fmt_ids.used = 0; free_fmts(); - conf_loop_list(&conf_xy.plugins.export_xy.templates, li, idx) { + rnd_conf_loop_list(&conf_xy.plugins.export_xy.templates, li, idx) { char id[MAX_TEMP_NAME_LEN]; const char *sep = strchr(li->name, '.'); int len; @@ -755,7 +755,7 @@ pcb_conf_listitem_t *i; int n; - conf_loop_list(&conf_xy.plugins.export_xy.templates, i, n) { + rnd_conf_loop_list(&conf_xy.plugins.export_xy.templates, i, n) { char buff[256], *id, *sect; int nl = strlen(i->name); if (nl > sizeof(buff)-1) { @@ -781,7 +781,7 @@ int idx; sprintf(path, "%s.%s", tid, type); /* safe: tid's length is checked before it was put in the vector, type is hardwired in code and is never longer than a few chars */ - conf_loop_list(&conf_xy.plugins.export_xy.templates, li, idx) + rnd_conf_loop_list(&conf_xy.plugins.export_xy.templates, li, idx) if (strcmp(li->name, path) == 0) return li->payload; return NULL; @@ -851,7 +851,7 @@ void pplg_uninit_export_xy(void) { pcb_export_remove_opts_by_cookie(xy_cookie); - pcb_conf_unreg_file(CONF_FN, export_xy_conf_internal); + rnd_conf_unreg_file(CONF_FN, export_xy_conf_internal); rnd_conf_unreg_fields("plugins/export_xy/"); free_fmts(); vts0_uninit(&fmt_names); @@ -863,7 +863,7 @@ { PCB_API_CHK_VER; - pcb_conf_reg_file(CONF_FN, export_xy_conf_internal); + rnd_conf_reg_file(CONF_FN, export_xy_conf_internal); memset(&xy_hid, 0, sizeof(pcb_hid_t)); Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 30950) +++ trunk/src_plugins/fontmode/fontmode.c (revision 30951) @@ -116,9 +116,9 @@ return 1; rnd_conf_set(RND_CFR_DESIGN, "editor/grid_unit", -1, "mil", RND_POL_OVERWRITE); - conf_set_design("design/min_wid", "%s", "1"); - conf_set_design("design/min_slk", "%s", "1"); - conf_set_design("design/text_font_id", "%s", "0"); + rnd_conf_set_design("design/min_wid", "%s", "1"); + rnd_conf_set_design("design/min_slk", "%s", "1"); + rnd_conf_set_design("design/text_font_id", "%s", "0"); PCB->hidlib.size_x = CELL_SIZE * 18; Index: trunk/src_plugins/fp_wget/fp_wget.c =================================================================== --- trunk/src_plugins/fp_wget/fp_wget.c (revision 30950) +++ trunk/src_plugins/fp_wget/fp_wget.c (revision 30951) @@ -14,7 +14,7 @@ void pplg_uninit_fp_wget(void) { - pcb_conf_unreg_file(FP_WGET_CONF_FN, fp_wget_conf_internal); + rnd_conf_unreg_file(FP_WGET_CONF_FN, fp_wget_conf_internal); fp_gedasymbols_uninit(); fp_edakrill_uninit(); rnd_conf_unreg_fields("plugins/fp_wget/"); @@ -28,7 +28,7 @@ rnd_conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags); #include "fp_wget_conf_fields.h" - pcb_conf_reg_file(FP_WGET_CONF_FN, fp_wget_conf_internal); + rnd_conf_reg_file(FP_WGET_CONF_FN, fp_wget_conf_internal); fp_gedasymbols_init(); fp_edakrill_init(); Index: trunk/src_plugins/hid_lesstif/wt_preview.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_preview.c (revision 30950) +++ trunk/src_plugins/hid_lesstif/wt_preview.c (revision 30951) @@ -125,8 +125,8 @@ view_zoom = pd->zoom; view_width = pd->x2; view_height = pd->y2; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); XFillRectangle(display, pixmap, bg_gc, 0, 0, pd->v_width, pd->v_height); @@ -154,8 +154,8 @@ mask_bitmap = save_mask_bm; pixmap = save_px; pcb_gui->coord_per_pix = save_cpp; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); pd->expose_lock = 0; } Index: trunk/src_plugins/import_gnetlist/import_gnetlist.c =================================================================== --- trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 30950) +++ trunk/src_plugins/import_gnetlist/import_gnetlist.c (revision 30951) @@ -136,7 +136,7 @@ void pplg_uninit_import_gnetlist(void) { PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); - pcb_conf_unreg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); + rnd_conf_unreg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); rnd_conf_unreg_fields("plugins/import_gnetlist/"); } @@ -158,7 +158,7 @@ PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); - pcb_conf_reg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); + rnd_conf_reg_file(IMPORT_GNETLIST_CONF_FN, import_gnetlist_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags); Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30950) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 30951) @@ -140,7 +140,7 @@ nethlp_new(&nhctx); - conf_loop_list_str(&conf_mentor.plugins.import_mentor_sch.map_search_paths, item, item_str, idx) { + rnd_conf_loop_list_str(&conf_mentor.plugins.import_mentor_sch.map_search_paths, item, item_str, idx) { char *p; pcb_path_resolve(&PCB->hidlib, item_str, &p, 0, pcb_false); if (p != NULL) { Index: trunk/src_plugins/io_dsn/read.c =================================================================== --- trunk/src_plugins/io_dsn/read.c (revision 30950) +++ trunk/src_plugins/io_dsn/read.c (revision 30951) @@ -231,7 +231,7 @@ if ((rule == NULL) || (rule->str == NULL)) return 0; if (rnd_strcasecmp(rule->str, "width") == 0) - conf_set_design("design/min_wid", "%$mS", COORD(ctx, rule->children)); + rnd_conf_set_design("design/min_wid", "%$mS", COORD(ctx, rule->children)); /* the rest of the rules do not have a direct mapping in the current DRC code */ return 0; } Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 30950) +++ trunk/src_plugins/io_lihata/write.c (revision 30951) @@ -1791,13 +1791,13 @@ int omit_styles = !!sub->dlg[save->womit_styles].val.lng; if (omit_font != !!conf_io_lihata.plugins.io_lihata.omit_font) - pcb_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_font", 0, "%d", omit_font); + rnd_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_font", 0, "%d", omit_font); if (omit_config != !!conf_io_lihata.plugins.io_lihata.omit_config) - pcb_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_config", 0, "%d", omit_config); + rnd_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_config", 0, "%d", omit_config); if (omit_styles != !!conf_io_lihata.plugins.io_lihata.omit_styles) - pcb_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_styles", 0, "%d", omit_styles); + rnd_conf_setf(RND_CFR_CLI, "plugins/io_lihata/omit_styles", 0, "%d", omit_styles); } free(save); Index: trunk/src_plugins/io_pcb/attribs.c =================================================================== --- trunk/src_plugins/io_pcb/attribs.c (revision 30950) +++ trunk/src_plugins/io_pcb/attribs.c (revision 30951) @@ -100,7 +100,7 @@ void io_pcb_attrib_c2a(pcb_board_t *pcb) { - lht_node_t *nmain = pcb_conf_lht_get_first(RND_CFR_DESIGN, 0); + lht_node_t *nmain = rnd_conf_lht_get_first(RND_CFR_DESIGN, 0); c2a(pcb, nmain, ""); } Index: trunk/src_plugins/io_tedax/tdrc.c =================================================================== --- trunk/src_plugins/io_tedax/tdrc.c (revision 30950) +++ trunk/src_plugins/io_tedax/tdrc.c (revision 30951) @@ -124,7 +124,7 @@ } for(n = 0, r = rules; n < NUM_RULES; r++,n++) - pcb_conf_setf(RND_CFR_DESIGN, r->conf, -1, "%$mm", val[n]); + rnd_conf_setf(RND_CFR_DESIGN, r->conf, -1, "%$mm", val[n]); return 0; } Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30950) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 30951) @@ -252,7 +252,7 @@ static void fullscreen_cb(GtkButton *btn, void *data) { - pcb_conf_setf(RND_CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, RND_POL_OVERWRITE); + rnd_conf_setf(RND_CFR_DESIGN, "editor/fullscreen", -1, "%d", !pcbhl_conf.editor.fullscreen, RND_POL_OVERWRITE); } /* XPM */ Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30950) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 30951) @@ -350,7 +350,7 @@ static int ghid_usage(pcb_hid_t *hid, const char *topic) { fprintf(stderr, "\nGTK GUI command line arguments:\n\n"); - pcb_conf_usage("plugins/hid_gtk", pcb_hid_usage_option); + rnd_conf_usage("plugins/hid_gtk", pcb_hid_usage_option); fprintf(stderr, "\nInvocation:\n"); fprintf(stderr, " pcb-rnd --gui gtk2_gdk [options]\n"); fprintf(stderr, " pcb-rnd --gui gtk2_gl [options]\n"); Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30950) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 30951) @@ -124,8 +124,8 @@ *end = '\0'; if (rnd_conf_get_field(p[1]) == NULL) rnd_conf_reg_field_(&dummy_gtk_conf_init, 1, RND_CFN_INTEGER, p[1], "", 0); - r = pcb_conf_lookup_role(nat->prop->src); - pcb_conf_setf(r, p[1], -1, "%d", nat->val.integer[0]); + r = rnd_conf_lookup_role(nat->prop->src); + rnd_conf_setf(r, p[1], -1, "%d", nat->val.integer[0]); dirty[r] = 1; } for(r = 0; r < RND_CFR_max_real; r++) Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 30950) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 30951) @@ -232,13 +232,13 @@ preview->expose_data.view.Y2 = preview->y_max; save_fx = pcbhl_conf.editor.view.flip_x; save_fy = pcbhl_conf.editor.view.flip_y; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); res = preview->expose(widget, ev, pcbhl_expose_preview, &preview->expose_data); - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); return res; } @@ -361,13 +361,13 @@ save_fx = pcbhl_conf.editor.view.flip_x; save_fy = pcbhl_conf.editor.view.flip_y; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); r = button_press_(w, btn); - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); return r; } @@ -399,8 +399,8 @@ save_fx = pcbhl_conf.editor.view.flip_x; save_fy = pcbhl_conf.editor.view.flip_y; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); draw_data = preview->expose_data.draw_data; @@ -424,8 +424,8 @@ default:; } - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); return FALSE; } @@ -440,8 +440,8 @@ save_fx = pcbhl_conf.editor.view.flip_x; save_fy = pcbhl_conf.editor.view.flip_y; - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, 0); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, 0); draw_data = preview->expose_data.draw_data; @@ -459,8 +459,8 @@ gtk_widget_queue_draw(w); } - conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); - conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_x, save_fx); + rnd_conf_force_set_bool(pcbhl_conf.editor.view.flip_y, save_fy); return FALSE; } Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30950) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 30951) @@ -93,7 +93,7 @@ void pplg_uninit_lib_hid_common(void) { - pcb_conf_unreg_file(DIALOGS_CONF_FN, dialogs_conf_internal); + rnd_conf_unreg_file(DIALOGS_CONF_FN, dialogs_conf_internal); pcb_clihist_save(); pcb_clihist_uninit(); pcb_event_unbind_allcookie(grid_cookie); @@ -122,7 +122,7 @@ RND_REGISTER_ACTIONS(hid_common_action_list, hid_common_cookie) pcb_act_dad_init(); - pcb_conf_reg_file(DIALOGS_CONF_FN, dialogs_conf_internal); + rnd_conf_reg_file(DIALOGS_CONF_FN, dialogs_conf_internal); pcb_dialog_place_init(); Index: trunk/src_plugins/lib_hid_common/place.c =================================================================== --- trunk/src_plugins/lib_hid_common/place.c (revision 30950) +++ trunk/src_plugins/lib_hid_common/place.c (revision 30951) @@ -123,7 +123,7 @@ if (rnd_conf_get_field(path) == NULL) rnd_conf_reg_field_(&dummy, 1, RND_CFN_INTEGER, str_cleanup_later(path), "", 0); - pcb_conf_setf(role, path, -1, "%d", val); + rnd_conf_setf(role, path, -1, "%d", val); } static void place_conf_load(rnd_conf_role_t role, const char *path, int *val) @@ -148,7 +148,7 @@ role matches the role that's being loaded. Else the currently loading role is lower prio and didn't contribute to the final values and should be ignored. */ - crole = pcb_conf_lookup_role(nat->prop->src); + crole = rnd_conf_lookup_role(nat->prop->src); if (crole != role) return; @@ -169,7 +169,7 @@ strcpy(path, BASEPATH); end = path + strlen(BASEPATH); - root = pcb_conf_lht_get_at(role, path, 0); + root = rnd_conf_lht_get_at(role, path, 0); if (root == NULL) return; Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 30950) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 30951) @@ -123,7 +123,7 @@ rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str); switch (a[0]) { case 'h': case 'H': - conf_toggle_heditor_("view/flip_x", view.flip_x); + rnd_conf_toggle_heditor_("view/flip_x", view.flip_x); xoffs = 0; break; case 'v': case 'V': @@ -131,7 +131,7 @@ yoffs = -yoffs; else yoffs = 0; - conf_toggle_heditor_("view/flip_y", view.flip_y); + rnd_conf_toggle_heditor_("view/flip_y", view.flip_y); break; case 'r': case 'R': xoffs = 0; @@ -140,9 +140,9 @@ else yoffs = 0; - conf_toggle_heditor_("view/flip_x", view.flip_x); - conf_toggle_heditor_("view/flip_y", view.flip_y); - conf_toggle_editor(show_solder_side); /* Swapped back below */ + rnd_conf_toggle_heditor_("view/flip_x", view.flip_x); + rnd_conf_toggle_heditor_("view/flip_y", view.flip_y); + rnd_conf_toggle_editor(show_solder_side); /* Swapped back below */ break; default: @@ -161,7 +161,7 @@ } } - conf_toggle_editor(show_solder_side); + rnd_conf_toggle_editor(show_solder_side); if ((active_group == comp_group && comp_on && !solder_on) || (active_group == solder_group && solder_on && !comp_on)) { rnd_bool new_solder_vis = conf_core.editor.show_solder_side; Index: trunk/src_plugins/lib_vfs/lib_vfs.c =================================================================== --- trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30950) +++ trunk/src_plugins/lib_vfs/lib_vfs.c (revision 30951) @@ -484,7 +484,7 @@ gds_append_str(&path, "conf/"); ou = path.used; SEE; - conf_fields_foreach(e) { + rnd_conf_fields_foreach(e) { path.used = ou; cb_mkdirp(cb, ctx, &path, e->key, &seen); gds_append_str(&path, e->key); Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 30950) +++ trunk/src_plugins/order/order.c (revision 30951) @@ -204,7 +204,7 @@ { rnd_remove_actions_by_cookie(order_cookie); pcb_event_unbind_allcookie(order_cookie); - pcb_conf_unreg_file(ORDER_CONF_FN, order_conf_internal); + rnd_conf_unreg_file(ORDER_CONF_FN, order_conf_internal); rnd_conf_unreg_fields("plugins/order/"); } @@ -212,7 +212,7 @@ { PCB_API_CHK_VER; - pcb_conf_reg_file(ORDER_CONF_FN, order_conf_internal); + rnd_conf_reg_file(ORDER_CONF_FN, order_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_order, field,isarray,type_name,cpath,cname,desc,flags); #include "order_conf_fields.h" Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 30950) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 30951) @@ -570,7 +570,7 @@ void pplg_uninit_order_pcbway(void) { - pcb_conf_unreg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal); + rnd_conf_unreg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal); rnd_conf_unreg_fields("plugins/order_pcbway/"); } @@ -578,7 +578,7 @@ { PCB_API_CHK_VER; - pcb_conf_reg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal); + rnd_conf_reg_file(ORDER_PCBWAY_CONF_FN, order_pcbway_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_order_pcbway, field,isarray,type_name,cpath,cname,desc,flags); #include "order_pcbway_conf_fields.h" Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 30950) +++ trunk/src_plugins/renumber/renumberblock.c (revision 30951) @@ -36,7 +36,7 @@ RND_PCB_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int); RND_PCB_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int); - conf_set_editor(name_on_pcb, 1); + rnd_conf_set_editor(name_on_pcb, 1); PCB_SUBC_LOOP(PCB->Data); { @@ -81,7 +81,7 @@ RND_PCB_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int); RND_PCB_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int); - conf_set_editor(name_on_pcb, 1); + rnd_conf_set_editor(name_on_pcb, 1); PCB_SUBC_LOOP(PCB_PASTEBUFFER->Data); { Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 30950) +++ trunk/src_plugins/stroke/stroke.c (revision 30951) @@ -61,7 +61,7 @@ pcb_conf_listitem_t *item; int idx; - conf_loop_list(&conf_stroke.plugins.stroke.gestures, item, idx) { + rnd_conf_loop_list(&conf_stroke.plugins.stroke.gestures, item, idx) { if ((strcmp(seq, item->name) == 0) && (rnd_parse_actions(hl, item->val.string[0]) == 0)) return 1; } @@ -158,7 +158,7 @@ int pplg_uninit_stroke(void) { - pcb_conf_unreg_file(STROKE_CONF_FN, stroke_conf_internal); + rnd_conf_unreg_file(STROKE_CONF_FN, stroke_conf_internal); rnd_conf_unreg_fields("plugins/stroke/"); rnd_remove_actions_by_cookie(pcb_stroke_cookie); pcb_event_unbind_allcookie(pcb_stroke_cookie); @@ -169,7 +169,7 @@ { PCB_API_CHK_VER; stroke_init(); - pcb_conf_reg_file(STROKE_CONF_FN, stroke_conf_internal); + rnd_conf_reg_file(STROKE_CONF_FN, stroke_conf_internal); #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ rnd_conf_reg_field(conf_stroke, field,isarray,type_name,cpath,cname,desc,flags); Index: trunk/src_plugins/tool_std/tool_line.c =================================================================== --- trunk/src_plugins/tool_std/tool_line.c (revision 30950) +++ trunk/src_plugins/tool_std/tool_line.c (revision 30951) @@ -214,7 +214,7 @@ /* automatic swap of line refraction after each click - should work only if refraction is in effect (no ortho, no alldir) */ if (conf_core.editor.swap_start_direction && (conf_core.editor.line_refraction != 0) && !conf_core.editor.all_direction_lines) - pcb_conf_setf(RND_CFR_DESIGN,"editor/line_refraction", -1, "%d",conf_core.editor.line_refraction ^ 3); + rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction", -1, "%d",conf_core.editor.line_refraction ^ 3); if (conf_core.editor.orthogonal_moves) { /* set the mark to the new starting point so ortho works as expected and we can draw a perpendicular line from here */ @@ -325,7 +325,7 @@ if (conf_core.editor.swap_start_direction) { - pcb_conf_setf(RND_CFR_DESIGN,"editor/line_refraction", -1, "%d",conf_core.editor.line_refraction ^ 3); + rnd_conf_setf(RND_CFR_DESIGN,"editor/line_refraction", -1, "%d",conf_core.editor.line_refraction ^ 3); } pcb_subc_as_board_update(PCB); } Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 30950) +++ trunk/src_plugins/vendordrill/vendor.c (revision 30951) @@ -325,7 +325,7 @@ state = conf_vendor.plugins.vendor.enable; /* enable mapping */ - conf_force_set_bool(conf_vendor.plugins.vendor.enable, 1); + rnd_conf_force_set_bool(conf_vendor.plugins.vendor.enable, 1); /* If we have loaded vendor drills, then apply them to the design */ if (n_vendor_drills > 0) { @@ -345,7 +345,7 @@ /* Update the current Via */ if (conf_core.design.via_drilling_hole != vendorDrillMap(conf_core.design.via_drilling_hole)) { changed++; - pcb_conf_setf(RND_CFR_DESIGN, "design/via_drilling_hole", -1, "%$mm", vendorDrillMap(conf_core.design.via_drilling_hole)); + rnd_conf_setf(RND_CFR_DESIGN, "design/via_drilling_hole", -1, "%$mm", vendorDrillMap(conf_core.design.via_drilling_hole)); rnd_message(PCB_MSG_INFO, "Adjusted active via hole size to be %ml mils\n", conf_core.design.via_drilling_hole); } @@ -378,7 +378,7 @@ } /* restore mapping on/off */ - conf_force_set_bool(conf_vendor.plugins.vendor.enable, state); + rnd_conf_force_set_bool(conf_vendor.plugins.vendor.enable, state); } /* for a given drill size, find the closest vendor drill size */ Index: trunk/tests/conf/conftest.c =================================================================== --- trunk/tests/conf/conftest.c (revision 30950) +++ trunk/tests/conf/conftest.c (revision 30951) @@ -189,7 +189,7 @@ rnd_message(PCB_MSG_ERROR, "Invalid integer prio: '%s'", arg); return; } - first = pcb_conf_lht_get_first(current_role, 0); + first = rnd_conf_lht_get_first(current_role, 0); if (first != NULL) { char tmp[128]; char *end; @@ -218,7 +218,7 @@ return; } - first = pcb_conf_lht_get_first(current_role, 0); + first = rnd_conf_lht_get_first(current_role, 0); if (first != NULL) { char tmp[128]; char *end;