Index: trunk/src/libcschem/abstract.c =================================================================== --- trunk/src/libcschem/abstract.c (revision 1078) +++ trunk/src/libcschem/abstract.c (revision 1079) @@ -127,7 +127,7 @@ net = calloc(sizeof(csch_anet_t), 1); csch_aobj_init(abs, &net->hdr, CSCH_ATYPE_NET); - net->netname = pcb_strdup(netname); + net->netname = rnd_strdup(netname); htsp_set(&abs->nets, net->netname, net); return net; } @@ -142,7 +142,7 @@ comp = calloc(sizeof(csch_acomp_t), 1); csch_aobj_init(abs, &comp->hdr, CSCH_ATYPE_COMP); - comp->name = pcb_strdup(name); + comp->name = rnd_strdup(name); htsp_set(&abs->comps, comp->name, comp); htsp_init(&comp->ports, strhash, strkeyeq); return comp; @@ -158,7 +158,7 @@ port = calloc(sizeof(csch_aport_t), 1); csch_aobj_init(abs, &port->hdr, CSCH_ATYPE_PORT); - port->name = pcb_strdup(name); + port->name = rnd_strdup(name); htsp_set(&comp->ports, port->name, port); return port; } Index: trunk/src/libcschem/actions_csch.h =================================================================== --- trunk/src/libcschem/actions_csch.h (revision 1078) +++ trunk/src/libcschem/actions_csch.h (revision 1079) @@ -40,7 +40,7 @@ CSCH_HOOK_FAIL(idx, type, aname); \ return FGW_ERR_ARGC; \ } \ - if (fgw_arg_conv(&pcb_fgw, &argv[idx], type) != 0) { \ + if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ CSCH_HOOK_FAIL(idx, type, aname); \ return FGW_ERR_ARG_CONV; \ } \ @@ -51,7 +51,7 @@ #define CSCH_HOOK_MAY_CONVARG(idx, type, aname, stmt) \ do { \ if (argc > idx) { \ - if (fgw_arg_conv(&pcb_fgw, &argv[idx], type) != 0) { \ + if (fgw_arg_conv(&rnd_fgw, &argv[idx], type) != 0) { \ CSCH_HOOK_FAIL(idx, type, aname); \ return FGW_ERR_ARG_CONV; \ } \ Index: trunk/src/libcschem/attrib.c =================================================================== --- trunk/src/libcschem/attrib.c (revision 1078) +++ trunk/src/libcschem/attrib.c (revision 1079) @@ -40,7 +40,7 @@ static csch_attrib_t *attr_alloc(const char *key, int prio) { csch_attrib_t *a = calloc(sizeof(csch_attrib_t), 1); - a->key = pcb_strdup(key); + a->key = rnd_strdup(key); a->prio = prio; return a; } @@ -146,7 +146,7 @@ } attr_free_val(a); } - a->val = pcb_strdup(val); + a->val = rnd_strdup(val); append_src(a, prio, source, 0); if (attr_out != NULL) *attr_out = a; return 0; @@ -176,7 +176,7 @@ } } append_src(a, prio, source, 0); - nval = pcb_strdup(val); + nval = rnd_strdup(val); if (idx < a->arr.used) { free(a->arr.array[idx]); a->arr.array[idx] = nval; @@ -211,7 +211,7 @@ free(a->arr.array[n]); a->arr.used = 0; for(n = 0; n < val->used; n++) - vts0_set(&a->arr, n, pcb_strdup(val->array[n])); + vts0_set(&a->arr, n, rnd_strdup(val->array[n])); if (attr_out != NULL) *attr_out = a; return 0; } @@ -222,9 +222,9 @@ size_t n; csch_attrib_t *dst = calloc(sizeof(csch_attrib_t), 1); - dst->key = pcb_strdup(src->key); + dst->key = rnd_strdup(src->key); if (src->val != NULL) - dst->val = pcb_strdup(src->val); + dst->val = rnd_strdup(src->val); else dst->val = NULL; dst->prio = src->prio; @@ -232,12 +232,12 @@ if (src->arr.used > 0) { vts0_enlarge(&dst->arr, src->arr.used); for(n = 0; n < src->arr.used; n++) - vts0_append(&dst->arr, pcb_strdup(src->arr.array[n])); + vts0_append(&dst->arr, rnd_strdup(src->arr.array[n])); } if (src->source.used > 0) { vts0_enlarge(&dst->source, src->source.used); for(n = 0; n < src->source.used; n++) - vts0_append(&dst->source, pcb_strdup(src->source.array[n])); + vts0_append(&dst->source, rnd_strdup(src->source.array[n])); } return dst; Index: trunk/src/libcschem/engine.c =================================================================== --- trunk/src/libcschem/engine.c (revision 1078) +++ trunk/src/libcschem/engine.c (revision 1079) @@ -173,7 +173,7 @@ ares.val.str = NULL; } else /* need to dup static string */ - sres = pcb_strdup(ares.val.str); + sres = rnd_strdup(ares.val.str); } fgw_arg_free(&view->fgw_ctx, &ares); } Index: trunk/src/libcschem/event.c =================================================================== --- trunk/src/libcschem/event.c (revision 1078) +++ trunk/src/libcschem/event.c (revision 1079) @@ -35,5 +35,5 @@ void csch_event_init_app(void) { - pcb_event_app_reg(CSCH_EVENT_last, csch_evnames, sizeof(csch_evnames)); + rnd_event_app_reg(CSCH_EVENT_last, csch_evnames, sizeof(csch_evnames)); } Index: trunk/src/libcschem/library.c =================================================================== --- trunk/src/libcschem/library.c (revision 1078) +++ trunk/src/libcschem/library.c (revision 1079) @@ -47,13 +47,13 @@ char *p = libs->array[n]; if ((p == NULL) || (*p =='\0')) continue; - if ((p[0] != '~') && (p[0] != '$') && (!pcb_is_path_abs(p))) { + if ((p[0] != '~') && (p[0] != '$') && (!rnd_is_path_abs(p))) { if (p[0] == '.') p++; if (p[0] == '/') p++; - vts0_append(&it->open, pcb_concat(cwd, "/", p, NULL)); + vts0_append(&it->open, rnd_concat(cwd, "/", p, NULL)); } else - vts0_append(&it->open, pcb_strdup(p)); + vts0_append(&it->open, rnd_strdup(p)); } } @@ -70,7 +70,7 @@ free(it->open.array[n]); vts0_uninit(&it->open); if (it->dir != NULL) { - pcb_closedir(it->dir); + rnd_closedir(it->dir); it->dir = NULL; } vts0_uninit(&it->names); @@ -98,7 +98,7 @@ gds_append(&it->path, '/'); it->dirlen = it->path.used; free(dirn); - it->dir = pcb_opendir(it->hidlib, it->path.array); + it->dir = rnd_opendir(it->hidlib, it->path.array); if (it->dir == NULL) goto next_lib; } @@ -107,9 +107,9 @@ struct dirent *de; int cmp, n; - de = pcb_readdir(it->dir); + de = rnd_readdir(it->dir); if (de == NULL) { - pcb_closedir(it->dir); + rnd_closedir(it->dir); it->dir = NULL; goto next_lib; } @@ -138,7 +138,7 @@ gds_truncate(&it->path, it->dirlen); if (it->case_insensitive) - cmp = pcb_strcasecmp(de->d_name, name); + cmp = rnd_strcasecmp(de->d_name, name); else cmp = strcmp(de->d_name, name); if (cmp == 0) { Index: trunk/src/libcschem/message.c =================================================================== --- trunk/src/libcschem/message.c (revision 1078) +++ trunk/src/libcschem/message.c (revision 1079) @@ -45,7 +45,7 @@ return; for(n = 0; n < vtp0_len(&handlers); n++) { - csch_message_handler_t fp = (csch_message_handler_t)pcb_cast_d2f(handlers.array[n]); + csch_message_handler_t fp = (csch_message_handler_t)rnd_cast_d2f(handlers.array[n]); va_start(args, format); handled |= fp(level, format, args); va_end(args); @@ -69,7 +69,7 @@ return; for(n = 0; n < vtp0_len(&handlers); n++) { - csch_message_handler_t fp = (csch_message_handler_t)pcb_cast_d2f(handlers.array[n]); + csch_message_handler_t fp = (csch_message_handler_t)rnd_cast_d2f(handlers.array[n]); va_start(args, format); handled |= fp(CSCH_MSG_ERROR, format, args); va_end(args); @@ -86,7 +86,7 @@ static int find_handler(csch_message_handler_t handler) { int n; - void *f = pcb_cast_f2d((pcb_fptr_t)handler); + void *f = rnd_cast_f2d((rnd_fptr_t)handler); for(n = 0; n < vtp0_len(&handlers); n++) if (handlers.array[n] == f) return n; @@ -95,7 +95,7 @@ void csch_message_reg_handler(csch_message_handler_t handler) { - void *f = pcb_cast_f2d((pcb_fptr_t)handler); + void *f = rnd_cast_f2d((rnd_fptr_t)handler); if (find_handler(handler) >= 0) return; Index: trunk/src/libcschem/operation.c =================================================================== --- trunk/src/libcschem/operation.c (revision 1078) +++ trunk/src/libcschem/operation.c (revision 1079) @@ -68,7 +68,7 @@ { csch_undo_remove_t *u = udata; char *path = "TODO: csch_oidpath_to_str();"; - pcb_snprintf(dst, dst_len, "remove/create: %s", path); + rnd_snprintf(dst, dst_len, "remove/create: %s", path); } Index: trunk/src/libcschem/plug_io.c =================================================================== --- trunk/src/libcschem/plug_io.c (revision 1078) +++ trunk/src/libcschem/plug_io.c (revision 1079) @@ -144,7 +144,7 @@ if (already_in_proj != NULL) *already_in_proj = 0; - real_fn = pcb_lrealpath(load_fn); + real_fn = rnd_lrealpath(load_fn); if (real_fn == NULL) { #warning TODO: error reporting: already loaded return NULL; @@ -189,7 +189,7 @@ free(sheet->filename); sheet->filename = real_fn; free(sheet->loadname); - sheet->loadname = pcb_strdup(load_fn); + sheet->loadname = rnd_strdup(load_fn); sheet->load_pending = 0; sheet->hidlib.filename = sheet->loadname; real_fn = NULL; @@ -222,7 +222,7 @@ if ((fmt != NULL) && (*fmt == '\0')) fmt = NULL; /* reduce the number of cases */ - real_fn = pcb_lrealpath(load_fn); + real_fn = rnd_lrealpath(load_fn); if (real_fn == NULL) { #warning TODO: error reporting return NULL; @@ -249,7 +249,7 @@ proj->filename = real_fn; real_fn = NULL; free(proj->loadname); - proj->loadname = pcb_strdup(load_fn); + proj->loadname = rnd_strdup(load_fn); load_postproc_project(proj); break; } Index: trunk/src/libcschem/plug_io_act.c =================================================================== --- trunk/src/libcschem/plug_io_act.c (revision 1078) +++ trunk/src/libcschem/plug_io_act.c (revision 1079) @@ -43,26 +43,26 @@ { const char *op, *name, *format = NULL; - PCB_ACT_CONVARG(1, FGW_STR, LoadFrom, op = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, LoadFrom, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFrom, format = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, LoadFrom, op = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, LoadFrom, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, LoadFrom, format = argv[3].val.str); - if (pcb_strcasecmp(op, "sheet") == 0) { + if (rnd_strcasecmp(op, "sheet") == 0) { if (csch_io_load_sheet(..., name) != 0) { rnd_message(RND_MSG_ERROR, "Can not load file '%s'\n", name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } rnd_event(&camv.hidlib, CAMV_EVENT_LAYERS_CHANGED, NULL); } - else if (pcb_strcasecmp(op, "project") == 0) { + else if (rnd_strcasecmp(op, "project") == 0) { TODO("the actual project load"); rnd_message(RND_MSG_ERROR, "LoadFrom(project,...) not yet implemented\n"); } else - PCB_ACT_FAIL(LoadFrom); + RND_ACT_FAIL(LoadFrom); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } #endif @@ -74,33 +74,33 @@ const char *op, *name, *format = "lihata"; csch_sheet_t *sheet = CSCH_ACT_SHEET; - PCB_ACT_CONVARG(1, FGW_STR, SaveTo, op = argv[1].val.str); - PCB_ACT_CONVARG(2, FGW_STR, SaveTo, name = argv[2].val.str); - PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveTo, format = argv[3].val.str); + RND_ACT_CONVARG(1, FGW_STR, SaveTo, op = argv[1].val.str); + RND_ACT_CONVARG(2, FGW_STR, SaveTo, name = argv[2].val.str); + RND_ACT_MAY_CONVARG(3, FGW_STR, SaveTo, format = argv[3].val.str); - if (pcb_strcasecmp(op, "sheet") == 0) { + if (rnd_strcasecmp(op, "sheet") == 0) { if (csch_save_sheet(sheet, name, format) != 0) { rnd_message(RND_MSG_ERROR, "Can not save file '%s'\n", name); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } rnd_event(&sheet->hidlib, CSCH_EVENT_LAYERS_CHANGED, NULL); } - else if (pcb_strcasecmp(op, "project") == 0) { + else if (rnd_strcasecmp(op, "project") == 0) { rnd_message(RND_MSG_ERROR, "SaveTo(project,...) not yet implemented\n"); } else - PCB_ACT_FAIL(SaveTo); + RND_ACT_FAIL(SaveTo); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } -static pcb_action_t camv_plug_io_act_list[] = { +static rnd_action_t camv_plug_io_act_list[] = { {"SaveTo", pcb_act_SaveTo, pcb_acth_SaveTo, pcb_acts_SaveTo} }; void csch_plug_io_act_init(void) { - PCB_REGISTER_ACTIONS(camv_plug_io_act_list, plug_io_cookie); + RND_REGISTER_ACTIONS(camv_plug_io_act_list, plug_io_cookie); } Index: trunk/src/libcschem/project.c =================================================================== --- trunk/src/libcschem/project.c (revision 1078) +++ trunk/src/libcschem/project.c (revision 1079) @@ -133,9 +133,9 @@ gds_t tmp; char *realfn; - if (pcb_is_path_abs(sheet->loadname)) { + if (rnd_is_path_abs(sheet->loadname)) { free(sheet->filename); - sheet->filename = pcb_strdup(sheet->loadname); + sheet->filename = rnd_strdup(sheet->loadname); return 0; } @@ -146,7 +146,7 @@ gds_append_str(&tmp, prj->prjdir); gds_append(&tmp, '/'); gds_append_str(&tmp, sheet->loadname); - realfn = pcb_lrealpath(tmp.array); + realfn = rnd_lrealpath(tmp.array); gds_uninit(&tmp); if (realfn == NULL) return -1; @@ -158,7 +158,7 @@ int csch_proj_update_filename(csch_project_t *prj) { - char *end, *real_fn = pcb_lrealpath(prj->loadname); + char *end, *real_fn = rnd_lrealpath(prj->loadname); if (real_fn == NULL) return -1; free(prj->filename); @@ -165,11 +165,11 @@ prj->filename = real_fn; free(prj->prjdir); - prj->prjdir = pcb_strdup(real_fn); + prj->prjdir = rnd_strdup(real_fn); end = strrchr(prj->prjdir, '/'); if (end == NULL) { free(prj->prjdir); - prj->prjdir = pcb_strdup(pcb_get_wd(NULL)); + prj->prjdir = rnd_strdup(rnd_get_wd(NULL)); } else *end = '\0'; Index: trunk/src/plugins/export_tedax/export_tedax.c =================================================================== --- trunk/src/plugins/export_tedax/export_tedax.c (revision 1078) +++ trunk/src/plugins/export_tedax/export_tedax.c (revision 1079) @@ -38,9 +38,9 @@ { if (type != CSCH_IOTYP_NETLIST) return 0; - if ((pcb_strcasecmp(fmt, "tedax") == 0) || (pcb_strcasecmp(fmt, "tdx") == 0)) + if ((rnd_strcasecmp(fmt, "tedax") == 0) || (rnd_strcasecmp(fmt, "tdx") == 0)) return 100; - if (pcb_strcasecmp(fmt, "net") == 0) + if (rnd_strcasecmp(fmt, "net") == 0) return 90; return 0; } Index: trunk/src/plugins/gui/act.c =================================================================== --- trunk/src/plugins/gui/act.c (revision 1078) +++ trunk/src/plugins/gui/act.c (revision 1079) @@ -40,10 +40,10 @@ #define NOGUI() \ do { \ if ((rnd_gui == NULL) || (!rnd_gui->gui)) { \ - PCB_ACT_IRES(1); \ + RND_ACT_IRES(1); \ return 0; \ } \ - PCB_ACT_IRES(0); \ + RND_ACT_IRES(0); \ } while(0) Index: trunk/src/plugins/gui/layersel.c =================================================================== --- trunk/src/plugins/gui/layersel.c (revision 1078) +++ trunk/src/plugins/gui/layersel.c (revision 1079) @@ -54,7 +54,7 @@ struct layersel_ctx_s { - pcb_hid_dad_subdialog_t sub; + rnd_hid_dad_subdialog_t sub; int sub_inited; int lock_vis, lock_sel; int selected; /* layer idx (lid) of the currently selected layer */ @@ -65,12 +65,12 @@ static void lys_update_vis(ls_layer_t *lys) { - pcb_hid_attr_val_t hv; + rnd_hid_attr_val_t hv; hv.lng = !!csch_layer_vis[lys->lid]; rnd_gui->attr_dlg_set_value(lys->ls->sub.dlg_hid_ctx, lys->wvis, &hv); } -static void layer_vis_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) +static void layer_vis_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { ls_layer_t *lys = attr->user_data; if (lys == NULL) @@ -84,25 +84,25 @@ sch_rnd_redraw(NULL); } -static void layer_right_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) +static void layer_right_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr) { TODO("set popup layer to: (ls_layer_t *)attr->user_data"); - pcb_actionl("Popup", "layer", NULL); + rnd_actionl("Popup", "layer", NULL); } static void layersel_create_layer(layersel_ctx_t *ls, ls_layer_t *lys, const char *name) { - PCB_DAD_BEGIN_HBOX(ls->sub.dlg); - PCB_DAD_BOOL(ls->sub.dlg, ""); - lys->wvis = PCB_DAD_CURRENT(ls->sub.dlg); - PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); - PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb); - PCB_DAD_LABEL(ls->sub.dlg, name); - lys->wlab = PCB_DAD_CURRENT(ls->sub.dlg); - PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); - PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb); - PCB_DAD_RIGHT_CB(ls->sub.dlg, layer_right_cb); - PCB_DAD_END(ls->sub.dlg); + RND_DAD_BEGIN_HBOX(ls->sub.dlg); + RND_DAD_BOOL(ls->sub.dlg, ""); + lys->wvis = RND_DAD_CURRENT(ls->sub.dlg); + RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); + RND_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb); + RND_DAD_LABEL(ls->sub.dlg, name); + lys->wlab = RND_DAD_CURRENT(ls->sub.dlg); + RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys); + RND_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb); + RND_DAD_RIGHT_CB(ls->sub.dlg, layer_right_cb); + RND_DAD_END(ls->sub.dlg); } static void layersel_docked_create(layersel_ctx_t *ls) @@ -109,8 +109,8 @@ { int n, i; /* must be signed */ - PCB_DAD_BEGIN_VBOX(ls->sub.dlg); - PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL); + RND_DAD_BEGIN_VBOX(ls->sub.dlg); + RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL); for(i = 0, n = 0; n < CSCH_DSPLY_max; n++) { ls_layer_t *lys = &ls->layers[n]; @@ -119,9 +119,9 @@ layersel_create_layer(ls, lys, csch_dsply_name(n)); i++; } - PCB_DAD_END(ls->sub.dlg); - PCB_DAD_DEFSIZE(ls->sub.dlg, 210, 200); - PCB_DAD_MINSIZE(ls->sub.dlg, 100, 100); + RND_DAD_END(ls->sub.dlg); + RND_DAD_DEFSIZE(ls->sub.dlg, 210, 200); + RND_DAD_MINSIZE(ls->sub.dlg, 100, 100); } static void layersel_update_vis(layersel_ctx_t *ls) @@ -134,13 +134,13 @@ static void layersel_build(void) { layersel_docked_create(&layersel); - if (pcb_hid_dock_enter(&layersel.sub, PCB_HID_DOCK_LEFT, "layersel") == 0) { + if (rnd_hid_dock_enter(&layersel.sub, RND_HID_DOCK_LEFT, "layersel") == 0) { layersel.sub_inited = 1; layersel_update_vis(&layersel); } } -void sch_rnd_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]) +void sch_rnd_layersel_gui_init_ev(rnd_hidlib_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(); @@ -147,7 +147,7 @@ } } -void sch_rnd_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]) +void sch_rnd_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]) { if ((!layersel.sub_inited) || (layersel.lock_vis > 0)) return; @@ -154,10 +154,10 @@ layersel_update_vis(&layersel); } -void sch_rnd_layersel_layer_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]) +void sch_rnd_layersel_layer_chg_ev(rnd_hidlib_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)) { - pcb_hid_dock_leave(&layersel.sub); + rnd_hid_dock_leave(&layersel.sub); layersel.sub_inited = 0; layersel_build(); } Index: trunk/src/plugins/gui/layersel.h =================================================================== --- trunk/src/plugins/gui/layersel.h (revision 1078) +++ trunk/src/plugins/gui/layersel.h (revision 1079) @@ -1,5 +1,5 @@ -void sch_rnd_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); -void sch_rnd_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); -void sch_rnd_layersel_layer_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); +void sch_rnd_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void sch_rnd_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); +void sch_rnd_layersel_layer_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]); Index: trunk/src/plugins/gui/sch_rnd_gui.c =================================================================== --- trunk/src/plugins/gui/sch_rnd_gui.c (revision 1078) +++ trunk/src/plugins/gui/sch_rnd_gui.c (revision 1079) @@ -51,10 +51,10 @@ #define NOGUI() \ do { \ if ((rnd_gui == NULL) || (!rnd_gui->gui)) { \ - PCB_ACT_IRES(1); \ + RND_ACT_IRES(1); \ return 0; \ } \ - PCB_ACT_IRES(0); \ + RND_ACT_IRES(0); \ } while(0) extern csch_chdr_t *csch_obj_clicked; @@ -63,7 +63,7 @@ const char pcb_acth_Popup[] = "Bring up the popup menu specified by MenuName, optionally modified with the object type under the cursor.\n"; fgw_error_t pcb_act_Popup(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib = PCB_ACT_HIDLIB; + rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; csch_sheet_t *sheet = (csch_sheet_t *)hidlib; char name[256], name2[256]; const char *tn = NULL, *a0, *a1 = NULL, *misc = "misc"; @@ -76,10 +76,10 @@ NOGUI(); if (argc != 2 && argc != 3) - PCB_ACT_FAIL(Popup); + RND_ACT_FAIL(Popup); - PCB_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str); - PCB_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str); + RND_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str); + RND_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str); *name = '\0'; *name2 = '\0'; @@ -96,7 +96,7 @@ csch_chdr_t *obj; csch_rtree_box_t q; - pcb_hid_get_coords("context sensitive popup: select object", &x, &y, 0); + rnd_hid_get_coords("context sensitive popup: select object", &x, &y, 0); q.x1 = P2C(x)-1; q.x2 = P2C(x)+1; q.y1 = P2C(y)-1; q.y2 = P2C(y)+1; obj = csch_search_first_gui(sheet, &q); @@ -120,20 +120,20 @@ } } -pcb_trace("name=%s name2=%s\n", name, name2); +rnd_trace("name=%s name2=%s\n", name, name2); if (*name != '\0') r = rnd_gui->open_popup(rnd_gui, name); if ((r != 0) && (*name2 != '\0')) r = rnd_gui->open_popup(rnd_gui, name2); - PCB_ACT_IRES(r); + RND_ACT_IRES(r); return 0; } static char *dup_cwd(void) { - char tmp[PCB_PATH_MAX + 1]; - return pcb_strdup(pcb_get_wd(tmp)); + char tmp[RND_PATH_MAX + 1]; + return rnd_strdup(rnd_get_wd(tmp)); } static const char pcb_acts_Load[] = "Load()\n" "Load(Project|Layer)"; @@ -151,32 +151,32 @@ #if 0 /* Called with both function and file name -> no gui */ if (argc > 2) - return PCB_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv); + return RND_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv); #else if (argc > 2) return -1; #endif - PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str); - if (pcb_strcasecmp(function, "Layer") == 0) - name = rnd_gui->fileselect(rnd_gui, "Load layer", "Import a layer from file", last_layer, NULL, NULL, "layer", PCB_HID_FSD_READ, NULL); - else if (pcb_strcasecmp(function, "Project") == 0) - name = rnd_gui->fileselect(rnd_gui, "Load a project file", "load project (all layers) from file", last_project, ".lht", NULL, "project", PCB_HID_FSD_READ, NULL); + if (rnd_strcasecmp(function, "Layer") == 0) + name = rnd_gui->fileselect(rnd_gui, "Load layer", "Import a layer from file", last_layer, NULL, NULL, "layer", RND_HID_FSD_READ, NULL); + else if (rnd_strcasecmp(function, "Project") == 0) + name = rnd_gui->fileselect(rnd_gui, "Load a project file", "load project (all layers) from file", last_project, ".lht", NULL, "project", RND_HID_FSD_READ, NULL); else { rnd_message(RND_MSG_ERROR, "Invalid subcommand for Load(): '%s'\n", function); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (name != NULL) { - if (pcbhl_conf.rc.verbose) + if (rnd_conf.rc.verbose) fprintf(stderr, "Load: Calling LoadFrom(%s, %s)\n", function, name); - pcb_actionl("LoadFrom", function, name, NULL); + rnd_actionl("LoadFrom", function, name, NULL); free(name); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } @@ -195,45 +195,45 @@ #if 0 /* Called with both function and file name -> no gui */ if (argc > 2) - return PCB_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv); + return RND_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv); #else if (argc > 2) return -1; #endif - PCB_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); + RND_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str); - if (pcb_strcasecmp(function, "Sheet") == 0) + if (rnd_strcasecmp(function, "Sheet") == 0) name = rnd_gui->fileselect(rnd_gui, "Save layer", "Save a sheet to file", last_layer, NULL, NULL, "layer", 0, NULL); - else if (pcb_strcasecmp(function, "Project") == 0) + else if (rnd_strcasecmp(function, "Project") == 0) name = rnd_gui->fileselect(rnd_gui, "Save a project file", "save project (all layers) to file", last_project, ".lht", NULL, "project", 0, NULL); else { rnd_message(RND_MSG_ERROR, "Invalid subcommand for Save(): '%s'\n", function); - PCB_ACT_IRES(1); + RND_ACT_IRES(1); return 0; } if (name != NULL) { - if (pcbhl_conf.rc.verbose) + if (rnd_conf.rc.verbose) fprintf(stderr, "Save: Calling SaveTo(%s, %s)\n", function, name); - pcb_actionl("SaveTo", function, name, NULL); + rnd_actionl("SaveTo", function, name, NULL); free(name); } - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } extern const char pcb_acts_Zoom_default[]; -extern fgw_error_t rnd_gui_act_zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv); +extern fgw_error_t pcb_gui_act_zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv); static const char pcb_acth_Zoom[] = "GUI zoom"; -static pcb_action_t sch_rnd_gui_action_list[] = { +static rnd_action_t sch_rnd_gui_action_list[] = { {"Popup", pcb_act_Popup, pcb_acth_Popup, pcb_acts_Popup}, {"Load", pcb_act_Load, pcb_acth_Load, pcb_acts_Load}, {"Save", pcb_act_Save, pcb_acth_Save, pcb_acts_Save}, - {"Zoom", rnd_gui_act_zoom, pcb_acth_Zoom, pcb_acts_Zoom_default}, - {"ZoomTo", rnd_gui_act_zoom, pcb_acth_Zoom, pcb_acts_Zoom_default}, + {"Zoom", pcb_gui_act_zoom, pcb_acth_Zoom, pcb_acts_Zoom_default}, + {"ZoomTo", pcb_gui_act_zoom, pcb_acth_Zoom, pcb_acts_Zoom_default}, }; TODO("Remove these once librnd separation is finished and plugin headers are accessible") @@ -252,7 +252,7 @@ { rnd_event_bind(RND_EVENT_GUI_INIT, sch_rnd_layersel_gui_init_ev, NULL, layersel_cookie); rnd_event_bind(CSCH_EVENT_LAYERS_CHANGED, sch_rnd_layersel_layer_chg_ev, NULL, layersel_cookie); - PCB_REGISTER_ACTIONS(sch_rnd_gui_action_list, sch_rnd_gui_cookie); + RND_REGISTER_ACTIONS(sch_rnd_gui_action_list, sch_rnd_gui_cookie); rnd_toolbar_init(); return 0; } Index: trunk/src/plugins/io_lihata/read.c =================================================================== --- trunk/src/plugins/io_lihata/read.c (revision 1078) +++ trunk/src/plugins/io_lihata/read.c (revision 1079) @@ -258,7 +258,7 @@ { if ((src == NULL) || (src->type != LHT_TEXT)) return -1; - *dst = pcb_strdup(src->data.text.value); + *dst = rnd_strdup(src->data.text.value); return 0; } @@ -314,7 +314,7 @@ return -1; } l = l << 8; - return pcb_color_load_packed(dst, l); + return rnd_color_load_packed(dst, l); } static int parse_pen_shape(read_ctx_t *ctx, csch_pen_shape_t *dst, const lht_node_t *src) @@ -547,7 +547,7 @@ } sheet = csch_sheet_alloc(ctx->proj, oid++); - sheet->loadname = pcb_strdup(n->data.text.value); + sheet->loadname = rnd_strdup(n->data.text.value); sheet->load_pending = 1; sheet->hidlib.filename = sheet->loadname; csch_proj_sheet_update_filename(ctx->proj, sheet); @@ -657,7 +657,7 @@ return -1; } - vts0_append(&ctx->proj->symlibs, pcb_strdup(n->data.text.value)); + vts0_append(&ctx->proj->symlibs, rnd_strdup(n->data.text.value)); } } @@ -759,7 +759,7 @@ ctx.ver = strtol(ctx.doc->root->name+18, &end, 10); if (*end == '\0') { free(dst->loadname); - dst->loadname = pcb_strdup(fn); + dst->loadname = rnd_strdup(fn); csch_proj_update_filename(dst); res = parse_project(&ctx, ctx.doc->root); } Index: trunk/src/plugins/sch_dialogs/attribute_dialog.c =================================================================== --- trunk/src/plugins/sch_dialogs/attribute_dialog.c (revision 1078) +++ trunk/src/plugins/sch_dialogs/attribute_dialog.c (revision 1079) @@ -43,14 +43,14 @@ #include typedef struct{ - PCB_DAD_DECL_NOINIT(dlg) + RND_DAD_DECL_NOINIT(dlg) csch_oidpath_t coid; } attrdlg_ctx_t; -static void attrdlg_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) +static void attrdlg_close_cb(void *caller_data, rnd_hid_attr_ev_t ev) { attrdlg_ctx_t *ctx = caller_data; - PCB_DAD_FREE(ctx->dlg); + RND_DAD_FREE(ctx->dlg); free(ctx); } @@ -57,81 +57,81 @@ static void attr_dlg(const csch_chdr_t *cobj) { attrdlg_ctx_t *ctx = calloc(sizeof(attrdlg_ctx_t), 1); - pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; + rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}}; const char *hdr[] = {"key", "value", NULL}; if (cobj != NULL) csch_oidpath_from_obj(&ctx->coid, cobj); - PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); - PCB_DAD_BEGIN_HPANE(ctx->dlg); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); - PCB_DAD_BEGIN_VBOX(ctx->dlg); /* top left */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); - PCB_DAD_LABEL(ctx->dlg, "Concrete:"); - PCB_DAD_TREE(ctx->dlg, 2, 0, hdr); + RND_DAD_BEGIN_VBOX(ctx->dlg); + RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); + RND_DAD_BEGIN_HPANE(ctx->dlg); + RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); + RND_DAD_BEGIN_VBOX(ctx->dlg); /* top left */ + RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); + RND_DAD_LABEL(ctx->dlg, "Concrete:"); + RND_DAD_TREE(ctx->dlg, 2, 0, hdr); /* left edit */ - PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_LABEL(ctx->dlg, "Key:"); - PCB_DAD_STRING(ctx->dlg); - PCB_DAD_WIDTH_CHR(ctx->dlg, 32); - PCB_DAD_END(ctx->dlg); - PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_LABEL(ctx->dlg, "Priority:"); - PCB_DAD_INTEGER(ctx->dlg, 0); - PCB_DAD_WIDTH_CHR(ctx->dlg, 5); - PCB_DAD_END(ctx->dlg); + RND_DAD_BEGIN_HBOX(ctx->dlg); + RND_DAD_LABEL(ctx->dlg, "Key:"); + RND_DAD_STRING(ctx->dlg); + RND_DAD_WIDTH_CHR(ctx->dlg, 32); + RND_DAD_END(ctx->dlg); + RND_DAD_BEGIN_HBOX(ctx->dlg); + RND_DAD_LABEL(ctx->dlg, "Priority:"); + RND_DAD_INTEGER(ctx->dlg, 0); + RND_DAD_WIDTH_CHR(ctx->dlg, 5); + RND_DAD_END(ctx->dlg); /* string value */ - PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_LABEL(ctx->dlg, "Val:"); - PCB_DAD_STRING(ctx->dlg); - PCB_DAD_WIDTH_CHR(ctx->dlg, 32); - PCB_DAD_BUTTON(ctx->dlg, "Arr. conv."); - PCB_DAD_END(ctx->dlg); + RND_DAD_BEGIN_HBOX(ctx->dlg); + RND_DAD_LABEL(ctx->dlg, "Val:"); + RND_DAD_STRING(ctx->dlg); + RND_DAD_WIDTH_CHR(ctx->dlg, 32); + RND_DAD_BUTTON(ctx->dlg, "Arr. conv."); + RND_DAD_END(ctx->dlg); /* array value */ - PCB_DAD_BEGIN_VBOX(ctx->dlg); - PCB_DAD_BEGIN_HBOX(ctx->dlg); - PCB_DAD_LABEL(ctx->dlg, "Val:"); - PCB_DAD_BUTTON(ctx->dlg, "Str. conv."); - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_TIGHT); - PCB_DAD_END(ctx->dlg); - PCB_DAD_TREE(ctx->dlg, 1, 0, NULL); - PCB_DAD_BEGIN_HBOX(ctx->dlg); /* array buttons 1 */ - PCB_DAD_BUTTON(ctx->dlg, "Edit..."); - PCB_DAD_BUTTON(ctx->dlg, "Move up"); - PCB_DAD_BUTTON(ctx->dlg, "Move down"); - PCB_DAD_END(ctx->dlg); - PCB_DAD_BEGIN_HBOX(ctx->dlg); /* array buttons 2 */ - PCB_DAD_BUTTON(ctx->dlg, "Delete"); - PCB_DAD_BUTTON(ctx->dlg, "Ins before"); - PCB_DAD_BUTTON(ctx->dlg, "Ins after"); - PCB_DAD_END(ctx->dlg); + RND_DAD_BEGIN_VBOX(ctx->dlg); + RND_DAD_BEGIN_HBOX(ctx->dlg); + RND_DAD_LABEL(ctx->dlg, "Val:"); + RND_DAD_BUTTON(ctx->dlg, "Str. conv."); + RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_TIGHT); + RND_DAD_END(ctx->dlg); + RND_DAD_TREE(ctx->dlg, 1, 0, NULL); + RND_DAD_BEGIN_HBOX(ctx->dlg); /* array buttons 1 */ + RND_DAD_BUTTON(ctx->dlg, "Edit..."); + RND_DAD_BUTTON(ctx->dlg, "Move up"); + RND_DAD_BUTTON(ctx->dlg, "Move down"); + RND_DAD_END(ctx->dlg); + RND_DAD_BEGIN_HBOX(ctx->dlg); /* array buttons 2 */ + RND_DAD_BUTTON(ctx->dlg, "Delete"); + RND_DAD_BUTTON(ctx->dlg, "Ins before"); + RND_DAD_BUTTON(ctx->dlg, "Ins after"); + RND_DAD_END(ctx->dlg); - PCB_DAD_END(ctx->dlg); + RND_DAD_END(ctx->dlg); - PCB_DAD_END(ctx->dlg); + RND_DAD_END(ctx->dlg); - PCB_DAD_BEGIN_VBOX(ctx->dlg); /* top right */ - PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL); - PCB_DAD_LABEL(ctx->dlg, "Abstract:"); - PCB_DAD_TREE(ctx->dlg, 2, 0, hdr); + RND_DAD_BEGIN_VBOX(ctx->dlg); /* top right */ + RND_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL); + RND_DAD_LABEL(ctx->dlg, "Abstract:"); + RND_DAD_TREE(ctx->dlg, 2, 0, hdr); /* right edit */ - PCB_DAD_LABEL(ctx->dlg, "Attribute history:"); - PCB_DAD_TREE(ctx->dlg, 2, 0, NULL); - PCB_DAD_END(ctx->dlg); - PCB_DAD_END(ctx->dlg); + RND_DAD_LABEL(ctx->dlg, "Attribute history:"); + RND_DAD_TREE(ctx->dlg, 2, 0, NULL); + RND_DAD_END(ctx->dlg); + RND_DAD_END(ctx->dlg); - PCB_DAD_BUTTON_CLOSES(ctx->dlg, clbtn); - PCB_DAD_END(ctx->dlg); + RND_DAD_BUTTON_CLOSES(ctx->dlg, clbtn); + RND_DAD_END(ctx->dlg); - PCB_DAD_DEFSIZE(ctx->dlg, 400, 300); - PCB_DAD_NEW("AttributeDialog", ctx->dlg, "Attribute edit", ctx, rnd_false, attrdlg_close_cb); + RND_DAD_DEFSIZE(ctx->dlg, 400, 300); + RND_DAD_NEW("AttributeDialog", ctx->dlg, "Attribute edit", ctx, rnd_false, attrdlg_close_cb); } @@ -141,12 +141,12 @@ const char pcb_acth_AttributeDialog[] = "Bring up the Attribute Editor Dialog for an object.\n"; fgw_error_t pcb_act_AttributeDialog(fgw_arg_t *res, int argc, fgw_arg_t *argv) { - rnd_hidlib_t *hidlib = PCB_ACT_HIDLIB; + rnd_hidlib_t *hidlib = RND_ACT_HIDLIB; csch_sheet_t *sheet = (csch_sheet_t *)hidlib; const char *cmd; csch_chdr_t *obj = NULL; - PCB_ACT_CONVARG(1, FGW_STR, AttributeDialog, cmd = argv[1].val.str); + RND_ACT_CONVARG(1, FGW_STR, AttributeDialog, cmd = argv[1].val.str); if (strcmp(cmd, "last-click") == 0) { obj = csch_obj_clicked; @@ -155,7 +155,7 @@ rnd_coord_t x, y; csch_rtree_box_t q; - pcb_hid_get_coords("context sensitive AttributeDialog: select object", &x, &y, 0); + rnd_hid_get_coords("context sensitive AttributeDialog: select object", &x, &y, 0); q.x1 = P2C(x)-1; q.x2 = P2C(x)+1; q.y1 = P2C(y)-1; q.y2 = P2C(y)+1; obj = csch_search_first_gui(sheet, &q); @@ -166,13 +166,13 @@ if (obj == NULL) { rnd_message(RND_MSG_ERROR, "AttributeDialog: no such object\n"); - PCB_ACT_IRES(-1); + RND_ACT_IRES(-1); return 0; } -pcb_trace("AttributeDialog: edit obj %ld\n", obj->oid); +rnd_trace("AttributeDialog: edit obj %ld\n", obj->oid); - PCB_ACT_IRES(0); + RND_ACT_IRES(0); return 0; } Index: trunk/src/plugins/sch_dialogs/sch_dialogs.c =================================================================== --- trunk/src/plugins/sch_dialogs/sch_dialogs.c (revision 1078) +++ trunk/src/plugins/sch_dialogs/sch_dialogs.c (revision 1079) @@ -41,7 +41,7 @@ static const char *sch_dialogs_cookie = "sch_dialogs"; -static pcb_action_t sch_dialogs_action_list[] = { +static rnd_action_t sch_dialogs_action_list[] = { {"AttributeDialog", pcb_act_AttributeDialog, pcb_acth_AttributeDialog, pcb_acts_AttributeDialog} }; @@ -55,6 +55,6 @@ int pplg_init_sch_dialogs(void) { - PCB_REGISTER_ACTIONS(sch_dialogs_action_list, sch_dialogs_cookie); + RND_REGISTER_ACTIONS(sch_dialogs_action_list, sch_dialogs_cookie); return 0; } Index: trunk/src/plugins/std_devmap/std_devmap.c =================================================================== --- trunk/src/plugins/std_devmap/std_devmap.c (revision 1078) +++ trunk/src/plugins/std_devmap/std_devmap.c (revision 1079) @@ -102,11 +102,11 @@ csch_lib_find_alloc(&it, NULL, &cctx->project->symlibs, cctx->project->prjdir); csch_lib_find_add_name(&it, load_name); if (((len > 7) && (memcmp(load_name + len - 7, ".devmap", 7) != 0)) || (len <= 7)) - csch_lib_find_add_name(&it, dmname = pcb_concat(load_name, ".devmap", NULL)); + csch_lib_find_add_name(&it, dmname = rnd_concat(load_name, ".devmap", NULL)); real_name = csch_lib_find_next(&it); if (real_name != NULL) - real_name = pcb_strdup(real_name); + real_name = rnd_strdup(real_name); csch_lib_find_free(&it); free(dmname); @@ -223,7 +223,7 @@ key = tmp; } else - key = ktmp = pcb_strndup(set, sep - set); + key = ktmp = rnd_strndup(set, sep - set); csch_attrib_set(&port->hdr.attr, cctx->view_eng->eprio + CSCH_PRI_PLUGIN_NORMAL, key, val, pm_src, NULL); free(ktmp); } Index: trunk/src/plugins/std_tools/line_common.c =================================================================== --- trunk/src/plugins/std_tools/line_common.c (revision 1078) +++ trunk/src/plugins/std_tools/line_common.c (revision 1079) @@ -80,10 +80,10 @@ csch_coord_t chx = P2C(csch_crosshair_x), chy = P2C(csch_crosshair_y); if ((csch_tool_line.dir == CSCH_TOOL_LINEDIR_ALL) && rnd_gui->control_is_pressed(rnd_gui)) { double rad = atan2(chy - csch_tool_line.y1, chy - csch_tool_line.x1); - double deg = rad * PCB_RAD_TO_DEG; - double len = pcb_distance(chx, chy, csch_tool_line.x1, csch_tool_line.y1); - deg = pcb_round(deg/15.0) * 15.0; - rad = deg / PCB_RAD_TO_DEG; + double deg = rad * RND_RAD_TO_DEG; + double len = rnd_distance(chx, chy, csch_tool_line.x1, csch_tool_line.y1); + deg = rnd_round(deg/15.0) * 15.0; + rad = deg / RND_RAD_TO_DEG; csch_tool_line.x2 = csch_tool_line.x1 + cos(rad) * len; csch_tool_line.y2 = csch_tool_line.y1 + sin(rad) * len; } Index: trunk/src/plugins/std_tools/std_tools.c =================================================================== --- trunk/src/plugins/std_tools/std_tools.c (revision 1078) +++ trunk/src/plugins/std_tools/std_tools.c (revision 1079) @@ -51,8 +51,8 @@ int pplg_init_std_tools(void) { - pcb_tool_reg(&sch_rnd_tool_arrow, std_tools_cookie); - pcb_tool_reg(&sch_rnd_tool_line, std_tools_cookie); - pcb_tool_reg(&sch_rnd_tool_wirenet, std_tools_cookie); + rnd_tool_reg(&sch_rnd_tool_arrow, std_tools_cookie); + rnd_tool_reg(&sch_rnd_tool_line, std_tools_cookie); + rnd_tool_reg(&sch_rnd_tool_wirenet, std_tools_cookie); return 0; } Index: trunk/src/plugins/std_tools/tool_arrow.c =================================================================== --- trunk/src/plugins/std_tools/tool_arrow.c (revision 1078) +++ trunk/src/plugins/std_tools/tool_arrow.c (revision 1079) @@ -94,8 +94,8 @@ }; -static pcb_tool_t sch_rnd_tool_arrow = { - "arrow", NULL, std_tools_cookie, 50, arrow_icon, PCB_TOOL_CURSOR_NAMED("left_ptr"), 0, +static rnd_tool_t sch_rnd_tool_arrow = { + "arrow", NULL, std_tools_cookie, 50, arrow_icon, RND_TOOL_CURSOR_NAMED("left_ptr"), 0, tool_arrow_init, tool_arrow_uninit, tool_arrow_press, Index: trunk/src/plugins/std_tools/tool_line.c =================================================================== --- trunk/src/plugins/std_tools/tool_line.c (revision 1078) +++ trunk/src/plugins/std_tools/tool_line.c (revision 1079) @@ -115,8 +115,8 @@ }; -static pcb_tool_t sch_rnd_tool_line = { - "line", NULL, std_tools_cookie, 100, line_icon, PCB_TOOL_CURSOR_NAMED("pencil"), 0, +static rnd_tool_t sch_rnd_tool_line = { + "line", NULL, std_tools_cookie, 100, line_icon, RND_TOOL_CURSOR_NAMED("pencil"), 0, tool_line_init, tool_line_uninit, tool_line_press, Index: trunk/src/plugins/std_tools/tool_wirenet.c =================================================================== --- trunk/src/plugins/std_tools/tool_wirenet.c (revision 1078) +++ trunk/src/plugins/std_tools/tool_wirenet.c (revision 1079) @@ -104,8 +104,8 @@ }; -static pcb_tool_t sch_rnd_tool_wirenet = { - "wirenet", NULL, std_tools_cookie, 100, wire_icon, PCB_TOOL_CURSOR_NAMED("pencil"), 0, +static rnd_tool_t sch_rnd_tool_wirenet = { + "wirenet", NULL, std_tools_cookie, 100, wire_icon, RND_TOOL_CURSOR_NAMED("pencil"), 0, tool_wirenet_init, tool_wirenet_uninit, tool_wirenet_press,