Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 31039) +++ trunk/src/board.c (revision 31040) @@ -189,7 +189,7 @@ TODO("padstack: move this to obj_pstk.c after pinvia removal") #include "obj_pstk_inlines.h" -static pcb_r_dir_t hole_counting_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t hole_counting_callback(const rnd_rnd_box_t * b, void *cl) { pcb_pstk_t *ps = (pcb_pstk_t *)b; pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); @@ -201,10 +201,10 @@ else hcs->nunplated++; } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t slot_counting_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t slot_counting_callback(const rnd_rnd_box_t *b, void *cl) { pcb_pstk_t *ps = (pcb_pstk_t *)b; pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); @@ -216,7 +216,7 @@ else hcs->nunplated++; } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } void pcb_board_count_holes(pcb_board_t *pcb, int *plated, int *unplated, const rnd_rnd_box_t *within_area) @@ -223,7 +223,7 @@ { HoleCountStruct hcs = { 0, 0 }; - pcb_r_search(pcb->Data->padstack_tree, within_area, NULL, hole_counting_callback, &hcs, NULL); + rnd_r_search(pcb->Data->padstack_tree, within_area, NULL, hole_counting_callback, &hcs, NULL); if (plated != NULL) *plated = hcs.nplated; @@ -235,7 +235,7 @@ { HoleCountStruct hcs = { 0, 0 }; - pcb_r_search(pcb->Data->padstack_tree, within_area, NULL, slot_counting_callback, &hcs, NULL); + rnd_r_search(pcb->Data->padstack_tree, within_area, NULL, slot_counting_callback, &hcs, NULL); if (plated != NULL) *plated = hcs.nplated; Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 31039) +++ trunk/src/buffer.c (revision 31040) @@ -345,37 +345,37 @@ PCB_LINE_ALL_LOOP(Buffer->Data); { if (layer->line_tree != NULL) - pcb_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line); + rnd_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line); pcb_line_rotate90(line, Buffer->X, Buffer->Y, Number); if (layer->line_tree != NULL) - pcb_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line); + rnd_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line); } PCB_ENDALL_LOOP; PCB_ARC_ALL_LOOP(Buffer->Data); { if (layer->arc_tree != NULL) - pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); pcb_arc_rotate90(arc, Buffer->X, Buffer->Y, Number); if (layer->arc_tree != NULL) - pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); } PCB_ENDALL_LOOP; PCB_TEXT_ALL_LOOP(Buffer->Data); { if (layer->text_tree != NULL) - pcb_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); pcb_text_rotate90(text, Buffer->X, Buffer->Y, Number); if (layer->text_tree != NULL) - pcb_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); } PCB_ENDALL_LOOP; PCB_POLY_ALL_LOOP(Buffer->Data); { if (layer->polygon_tree != NULL) - pcb_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); pcb_poly_rotate90(polygon, Buffer->X, Buffer->Y, Number); if (layer->polygon_tree != NULL) - pcb_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); } PCB_ENDALL_LOOP; Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 31039) +++ trunk/src/crosshair.c (revision 31040) @@ -572,7 +572,7 @@ rnd_coord_t Y; }; -static pcb_r_dir_t onpoint_line_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t onpoint_line_callback(const rnd_rnd_box_t * box, void *cl) { struct onpoint_search_info *info = (struct onpoint_search_info *) cl; pcb_crosshair_t *crosshair = info->crosshair; @@ -589,16 +589,16 @@ vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line); pcb_line_invalidate_draw(NULL, line); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } else { - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } } #define close_enough(v1, v2) (coord_abs((v1)-(v2)) < 10) -static pcb_r_dir_t onpoint_arc_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t onpoint_arc_callback(const rnd_rnd_box_t * box, void *cl) { struct onpoint_search_info *info = (struct onpoint_search_info *) cl; pcb_crosshair_t *crosshair = info->crosshair; @@ -619,10 +619,10 @@ vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) arc); pcb_arc_invalidate_draw(NULL, arc); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } else { - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } } @@ -692,8 +692,8 @@ /* Only find points of arcs and lines on currently visible layers. */ if (!layer->meta.real.vis) continue; - pcb_r_search(layer->line_tree, &SearchBox, NULL, onpoint_line_callback, &info, NULL); - pcb_r_search(layer->arc_tree, &SearchBox, NULL, onpoint_arc_callback, &info, NULL); + rnd_r_search(layer->line_tree, &SearchBox, NULL, onpoint_line_callback, &info, NULL); + rnd_r_search(layer->arc_tree, &SearchBox, NULL, onpoint_arc_callback, &info, NULL); } /* Undraw the old objects */ Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 31039) +++ trunk/src/data.c (revision 31040) @@ -188,11 +188,11 @@ if (!is_subc) { if (data->subc_tree) - pcb_r_destroy_tree(&data->subc_tree); + rnd_r_destroy_tree(&data->subc_tree); if (data->padstack_tree) - pcb_r_destroy_tree(&data->padstack_tree); + rnd_r_destroy_tree(&data->padstack_tree); if (data->rat_tree) - pcb_r_destroy_tree(&data->rat_tree); + rnd_r_destroy_tree(&data->rat_tree); } for (layer = data->Layer, i = 0; i < PCB_MAX_LAYER; layer++, i++) @@ -677,18 +677,18 @@ #define rsearch(tree) \ do { \ - pcb_r_dir_t tmp = pcb_r_search(tree, starting_region, region_in_search, rectangle_in_region, closure, num_found); \ - if (tmp == PCB_R_DIR_CANCEL) return tmp; \ + rnd_r_dir_t tmp = rnd_r_search(tree, starting_region, region_in_search, rectangle_in_region, closure, num_found); \ + if (tmp == RND_R_DIR_CANCEL) return tmp; \ res |= tmp; \ } while(0); -pcb_r_dir_t pcb_data_r_search(pcb_data_t *data, pcb_objtype_t types, const rnd_rnd_box_t *starting_region, - pcb_r_dir_t (*region_in_search) (const rnd_rnd_box_t *region, void *cl), - pcb_r_dir_t (*rectangle_in_region) (const rnd_rnd_box_t *box, void *cl), +rnd_r_dir_t pcb_data_r_search(pcb_data_t *data, pcb_objtype_t types, const rnd_rnd_box_t *starting_region, + rnd_r_dir_t (*region_in_search) (const rnd_rnd_box_t *region, void *cl), + rnd_r_dir_t (*rectangle_in_region) (const rnd_rnd_box_t *box, void *cl), void *closure, int *num_found, rnd_bool vis_only) { rnd_layer_id_t lid; - pcb_r_dir_t res = 0; + rnd_r_dir_t res = 0; if (!vis_only || PCB->RatOn) if (types & PCB_OBJ_RAT) rsearch(data->rat_tree); @@ -869,21 +869,21 @@ conf_core.temp.rat_warn = rnd_false; if (tmask & PCB_OBJ_PSTK) { - for(n = pcb_r_first(data->padstack_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(data->padstack_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if (tmask & PCB_OBJ_RAT) { - for(n = pcb_r_first(data->rat_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(data->rat_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if (tmask & PCB_OBJ_SUBC) { - for(n = pcb_r_first(data->subc_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(data->subc_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if ((tmask & (PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT | PCB_OBJ_GFX)) == 0) @@ -891,33 +891,33 @@ for(li = 0, l = data->Layer; li < data->LayerN; li++,l++) { if (tmask & PCB_OBJ_LINE) { - for(n = pcb_r_first(l->line_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->line_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if (tmask & PCB_OBJ_ARC) { - for(n = pcb_r_first(l->arc_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->arc_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if (tmask & PCB_OBJ_POLY) { - for(n = pcb_r_first(l->polygon_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->polygon_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if (tmask & PCB_OBJ_TEXT) { - for(n = pcb_r_first(l->text_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->text_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } if (tmask & PCB_OBJ_GFX) { - for(n = pcb_r_first(l->gfx_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->gfx_tree, &it); n != NULL; n = rnd_r_next(&it)) CHK_CLEAR(n); - pcb_r_end(&it); + rnd_r_end(&it); } } return cnt; @@ -937,40 +937,40 @@ int li; pcb_layer_t *l; - for(n = pcb_r_first(data->padstack_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(data->padstack_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); - for(n = pcb_r_first(data->subc_tree, &it); n != NULL; n = pcb_r_next(&it)) { + for(n = rnd_r_first(data->subc_tree, &it); n != NULL; n = rnd_r_next(&it)) { PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); pcb_data_dynflag_clear(((pcb_subc_t *)n)->data, dynf); } - pcb_r_end(&it); + rnd_r_end(&it); - for(n = pcb_r_first(data->rat_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(data->rat_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); for(li = 0, l = data->Layer; li < data->LayerN; li++,l++) { - for(n = pcb_r_first(l->line_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->line_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); - for(n = pcb_r_first(l->arc_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->arc_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); - for(n = pcb_r_first(l->polygon_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->polygon_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); - for(n = pcb_r_first(l->text_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->text_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); - for(n = pcb_r_first(l->gfx_tree, &it); n != NULL; n = pcb_r_next(&it)) + for(n = rnd_r_first(l->gfx_tree, &it); n != NULL; n = rnd_r_next(&it)) PCB_DFLAG_CLR(&((pcb_any_obj_t *)n)->Flags, dynf); - pcb_r_end(&it); + rnd_r_end(&it); } } Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 31039) +++ trunk/src/data.h (revision 31040) @@ -184,9 +184,9 @@ /* rsearch on all trees matching types of data */ -pcb_r_dir_t pcb_data_r_search(pcb_data_t *data, pcb_objtype_t types, const rnd_rnd_box_t *starting_region, - pcb_r_dir_t (*region_in_search) (const rnd_rnd_box_t *region, void *cl), - pcb_r_dir_t (*rectangle_in_region) (const rnd_rnd_box_t *box, void *cl), +rnd_r_dir_t pcb_data_r_search(pcb_data_t *data, pcb_objtype_t types, const rnd_rnd_box_t *starting_region, + rnd_r_dir_t (*region_in_search) (const rnd_rnd_box_t *region, void *cl), + rnd_r_dir_t (*rectangle_in_region) (const rnd_rnd_box_t *box, void *cl), void *closure, int *num_found, rnd_bool vis_only); /* Either pcb->data or the subcircuit's data if PCB is a subc (footprint edit mode) */ Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 31039) +++ trunk/src/draw.c (revision 31040) @@ -278,7 +278,7 @@ if (PCB->SubcOn) { info->objcb.subc.per_side = per_side; - pcb_r_search(PCB->Data->subc_tree, info->drawn_area, NULL, draw_subc_mark_callback, info, NULL); + rnd_r_search(PCB->Data->subc_tree, info->drawn_area, NULL, draw_subc_mark_callback, info, NULL); } rnd_hid_set_line_width(pcb_draw_out.fgGC, 0); @@ -316,7 +316,7 @@ rnd_hid_set_line_width(pcb_draw_out.fgGC, 0); if (PCB->SubcOn) { info->objcb.subc.per_side = per_side; - pcb_r_search(PCB->Data->subc_tree, info->drawn_area, NULL, draw_subc_label_callback, info, NULL); + rnd_r_search(PCB->Data->subc_tree, info->drawn_area, NULL, draw_subc_label_callback, info, NULL); } if (PCB->padstack_mark_on) { rnd_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick); @@ -563,7 +563,7 @@ info->objcb.pstk.layer1 = NULL; if (!info->xform->check_planes) - pcb_r_search(info->pcb->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_callback, info, NULL); + rnd_r_search(info->pcb->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_callback, info, NULL); info->xform = NULL; info->layer = NULL; } @@ -570,12 +570,12 @@ static void pcb_draw_pstk_marks(pcb_draw_info_t *info) { - pcb_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_mark_callback, info, NULL); + rnd_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_mark_callback, info, NULL); } static void pcb_draw_pstk_labels(pcb_draw_info_t *info) { - pcb_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_label_callback, info, NULL); + rnd_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_label_callback, info, NULL); } static void pcb_draw_pstk_holes(pcb_draw_info_t *info, rnd_layergrp_id_t group, pcb_pstk_draw_hole_t holetype) @@ -589,7 +589,7 @@ xform_setup(info, &tmp, NULL); info->objcb.pstk.gid = group; info->objcb.pstk.holetype = holetype; - pcb_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_hole_callback, info, NULL); + rnd_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_hole_callback, info, NULL); info->xform = NULL; info->layer = NULL; } @@ -603,7 +603,7 @@ xform_setup(info, &tmp, NULL); info->objcb.pstk.gid = group; info->objcb.pstk.holetype = holetype; - pcb_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_slot_callback, info, NULL); + rnd_r_search(PCB->Data->padstack_tree, info->drawn_area, NULL, pcb_pstk_draw_slot_callback, info, NULL); info->xform = NULL; info->layer = NULL; } @@ -744,12 +744,12 @@ delayed_terms_enabled = rnd_true; rnd_hid_set_line_width(pcb_draw_out.fgGC, 1); rnd_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_square); - pcb_r_search(Layer->polygon_tree, info->drawn_area, NULL, pcb_poly_draw_term_callback, info, NULL); + rnd_r_search(Layer->polygon_tree, info->drawn_area, NULL, pcb_poly_draw_term_callback, info, NULL); delayed_terms_enabled = rnd_false; may_have_delayed = 1; } else { - pcb_r_search(Layer->polygon_tree, info->drawn_area, NULL, pcb_poly_draw_callback, info, NULL); + rnd_r_search(Layer->polygon_tree, info->drawn_area, NULL, pcb_poly_draw_callback, info, NULL); } if (info->xform->check_planes) @@ -758,18 +758,18 @@ /* draw all visible layer objects (with terminal gfx on copper) */ if (lflg & PCB_LYT_COPPER) { delayed_terms_enabled = rnd_true; - pcb_r_search(Layer->line_tree, info->drawn_area, NULL, pcb_line_draw_term_callback, info, NULL); - pcb_r_search(Layer->arc_tree, info->drawn_area, NULL, pcb_arc_draw_term_callback, info, NULL); - pcb_r_search(Layer->text_tree, info->drawn_area, NULL, pcb_text_draw_term_callback, info, NULL); - pcb_r_search(Layer->gfx_tree, info->drawn_area, NULL, pcb_gfx_draw_callback, info, NULL); + rnd_r_search(Layer->line_tree, info->drawn_area, NULL, pcb_line_draw_term_callback, info, NULL); + rnd_r_search(Layer->arc_tree, info->drawn_area, NULL, pcb_arc_draw_term_callback, info, NULL); + rnd_r_search(Layer->text_tree, info->drawn_area, NULL, pcb_text_draw_term_callback, info, NULL); + rnd_r_search(Layer->gfx_tree, info->drawn_area, NULL, pcb_gfx_draw_callback, info, NULL); delayed_terms_enabled = rnd_false; may_have_delayed = 1; } else { - pcb_r_search(Layer->line_tree, info->drawn_area, NULL, pcb_line_draw_callback, info, NULL); - pcb_r_search(Layer->arc_tree, info->drawn_area, NULL, pcb_arc_draw_callback, info, NULL); - pcb_r_search(Layer->text_tree, info->drawn_area, NULL, pcb_text_draw_callback, info, NULL); - pcb_r_search(Layer->gfx_tree, info->drawn_area, NULL, pcb_gfx_draw_callback, info, NULL); + rnd_r_search(Layer->line_tree, info->drawn_area, NULL, pcb_line_draw_callback, info, NULL); + rnd_r_search(Layer->arc_tree, info->drawn_area, NULL, pcb_arc_draw_callback, info, NULL); + rnd_r_search(Layer->text_tree, info->drawn_area, NULL, pcb_text_draw_callback, info, NULL); + rnd_r_search(Layer->gfx_tree, info->drawn_area, NULL, pcb_gfx_draw_callback, info, NULL); } if (may_have_delayed) Index: trunk/src/draw_ly_spec.c =================================================================== --- trunk/src/draw_ly_spec.c (revision 31039) +++ trunk/src/draw_ly_spec.c (revision 31040) @@ -332,7 +332,7 @@ { rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area); - pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, info, NULL); + rnd_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, info, NULL); rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area); } Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 31039) +++ trunk/src/extobj_helper.h (revision 31040) @@ -78,7 +78,7 @@ { pcb_data_t *data = subc->parent.data; if (data->subc_tree != NULL) - pcb_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); pcb_undo_freeze_add(); } @@ -89,7 +89,7 @@ pcb_undo_unfreeze_add(); pcb_subc_bbox(subc); if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); return 0; } @@ -119,8 +119,8 @@ pcb_subc_rebind(pcb, subc); pcb_subc_bind_globals(pcb, subc); if (!dst->subc_tree) - dst->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dst->subc_tree, (rnd_rnd_box_t *)subc); + dst->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dst->subc_tree, (rnd_rnd_box_t *)subc); } pcb_undo_add_obj_to_create(PCB_OBJ_SUBC, subc, subc, subc); Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 31039) +++ trunk/src/find.c (revision 31040) @@ -188,25 +188,25 @@ if (l->line_tree != NULL) { for(n = rnd_rtree_first(&it, l->line_tree, sb); n != NULL; n = rnd_rtree_next(&it)) PCB_FIND_CHECK(ctx, curr, n, ctype, return); - pcb_r_end(&it); + rnd_r_end(&it); } if (l->arc_tree != NULL) { for(n = rnd_rtree_first(&it, l->arc_tree, sb); n != NULL; n = rnd_rtree_next(&it)) PCB_FIND_CHECK(ctx, curr, n, ctype, return); - pcb_r_end(&it); + rnd_r_end(&it); } if (l->polygon_tree != NULL) { for(n = rnd_rtree_first(&it, l->polygon_tree, sb); n != NULL; n = rnd_rtree_next(&it)) PCB_FIND_CHECK(ctx, curr, n, ctype, return); - pcb_r_end(&it); + rnd_r_end(&it); } if (l->text_tree != NULL) { for(n = rnd_rtree_first(&it, l->text_tree, sb); n != NULL; n = rnd_rtree_next(&it)) PCB_FIND_CHECK(ctx, curr, n, ctype, return); - pcb_r_end(&it); + rnd_r_end(&it); } } @@ -262,7 +262,7 @@ if (PCB->Data->padstack_tree != NULL) { for(n = rnd_rtree_first(&it, PCB->Data->padstack_tree, sb); n != NULL; n = rnd_rtree_next(&it)) PCB_FIND_CHECK(ctx, curr, n, ctype, return ctx->nfound); - pcb_r_end(&it); + rnd_r_end(&it); } if ((ctx->consider_rats || ctx->only_mark_rats) && (PCB->Data->rat_tree != NULL)) { @@ -269,7 +269,7 @@ if (PCB->Data->padstack_tree != NULL) { for(n = rnd_rtree_first(&it, PCB->Data->rat_tree, sb); n != NULL; n = rnd_rtree_next(&it)) PCB_FIND_CHECK_RAT(ctx, curr, n, PCB_FCT_RAT, return ctx->nfound); - pcb_r_end(&it); + rnd_r_end(&it); } } Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 31039) +++ trunk/src/layer.c (revision 31040) @@ -153,15 +153,15 @@ list_map0(&layer->Polygon, pcb_poly_t, undoable ? UFC(obj_free_undoable) : UFC(pcb_poly_free)); if (!layer->is_bound) { if (layer->line_tree) - pcb_r_destroy_tree(&layer->line_tree); + rnd_r_destroy_tree(&layer->line_tree); if (layer->arc_tree) - pcb_r_destroy_tree(&layer->arc_tree); + rnd_r_destroy_tree(&layer->arc_tree); if (layer->text_tree) - pcb_r_destroy_tree(&layer->text_tree); + rnd_r_destroy_tree(&layer->text_tree); if (layer->polygon_tree) - pcb_r_destroy_tree(&layer->polygon_tree); + rnd_r_destroy_tree(&layer->polygon_tree); if (layer->gfx_tree) - pcb_r_destroy_tree(&layer->gfx_tree); + rnd_r_destroy_tree(&layer->gfx_tree); } free((char *)layer->name); memset(layer, 0, sizeof(pcb_layer_t)); @@ -179,11 +179,11 @@ /* if the layer is locally empty, it might be a board layer that has objects from subcircuits so also check the rtrees */ return - PCB_RTREE_EMPTY(layer->line_tree) && - PCB_RTREE_EMPTY(layer->arc_tree) && - PCB_RTREE_EMPTY(layer->gfx_tree) && - PCB_RTREE_EMPTY(layer->polygon_tree) && - PCB_RTREE_EMPTY(layer->text_tree); + RND_RTREE_EMPTY(layer->line_tree) && + RND_RTREE_EMPTY(layer->arc_tree) && + RND_RTREE_EMPTY(layer->gfx_tree) && + RND_RTREE_EMPTY(layer->polygon_tree) && + RND_RTREE_EMPTY(layer->text_tree); } static rnd_bool pcb_layer_is_empty_glob(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_t *layer) @@ -1118,11 +1118,11 @@ void pcb_layer_link_trees(pcb_layer_t *dst, pcb_layer_t *src) { /* we can't link non-existing trees - make sure src does have the trees initialized */ - if (src->line_tree == NULL) src->line_tree = pcb_r_create_tree(); - if (src->arc_tree == NULL) src->arc_tree = pcb_r_create_tree(); - if (src->text_tree == NULL) src->text_tree = pcb_r_create_tree(); - if (src->polygon_tree == NULL) src->polygon_tree = pcb_r_create_tree(); - if (src->gfx_tree == NULL) src->gfx_tree = pcb_r_create_tree(); + if (src->line_tree == NULL) src->line_tree = rnd_r_create_tree(); + if (src->arc_tree == NULL) src->arc_tree = rnd_r_create_tree(); + if (src->text_tree == NULL) src->text_tree = rnd_r_create_tree(); + if (src->polygon_tree == NULL) src->polygon_tree = rnd_r_create_tree(); + if (src->gfx_tree == NULL) src->gfx_tree = rnd_r_create_tree(); dst->line_tree = src->line_tree; dst->arc_tree = src->arc_tree; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 31039) +++ trunk/src/librnd/pcb_compat.h (revision 31040) @@ -1301,3 +1301,22 @@ #define pcb_pline_is_selfint rnd_pline_is_selfint #define pcb_pline_split_selfint rnd_pline_split_selfint #define pcb_polyarea_split_selfint rnd_polyarea_split_selfint +#define PCB_R_DIR_NOT_FOUND RND_R_DIR_NOT_FOUND +#define PCB_R_DIR_FOUND_CONTINUE RND_R_DIR_FOUND_CONTINUE +#define PCB_R_DIR_CANCEL RND_R_DIR_CANCEL +#define pcb_r_dir_e rnd_r_dir_e +#define pcb_r_dir_t rnd_r_dir_t +#define pcb_r_create_tree rnd_r_create_tree +#define pcb_r_destroy_tree rnd_r_destroy_tree +#define pcb_r_free_tree_data rnd_r_free_tree_data +#define pcb_r_insert_entry rnd_r_insert_entry +#define pcb_r_insert_array rnd_r_insert_array +#define pcb_r_delete_entry rnd_r_delete_entry +#define pcb_r_delete_entry_free_data rnd_r_delete_entry_free_data +#define pcb_r_search rnd_r_search +#define pcb_r_region_is_empty rnd_r_region_is_empty +#define pcb_r_dump_tree rnd_r_dump_tree +#define PCB_RTREE_EMPTY RND_RTREE_EMPTY +#define pcb_r_first rnd_r_first +#define pcb_r_next rnd_r_next +#define pcb_r_end rnd_r_end Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 31039) +++ trunk/src/librnd/poly/polyarea.c (revision 31040) @@ -520,7 +520,7 @@ q->box.X2 = max(q->v->point[0], q->v->next->point[0]) + 1; q->box.Y1 = min(q->v->point[1], q->v->next->point[1]); q->box.Y2 = max(q->v->point[1], q->v->next->point[1]) + 1; - pcb_r_insert_entry(tree, (const rnd_rnd_box_t *) q); + rnd_r_insert_entry(tree, (const rnd_rnd_box_t *) q); q = (seg *) malloc(sizeof(struct seg)); if (!q) return 1; @@ -531,8 +531,8 @@ q->box.X2 = max(q->v->point[0], q->v->next->point[0]) + 1; q->box.Y1 = min(q->v->point[1], q->v->next->point[1]); q->box.Y2 = max(q->v->point[1], q->v->next->point[1]) + 1; - pcb_r_insert_entry(tree, (const rnd_rnd_box_t *) q); - pcb_r_delete_entry(tree, (const rnd_rnd_box_t *) s); + rnd_r_insert_entry(tree, (const rnd_rnd_box_t *) q); + rnd_r_delete_entry(tree, (const rnd_rnd_box_t *) s); free(s); return 0; } @@ -542,20 +542,20 @@ * (C) 2006, harry eaton * This prunes the search for boxes that don't intersect the segment. */ -static pcb_r_dir_t seg_in_region(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t seg_in_region(const rnd_rnd_box_t * b, void *cl) { struct info *i = (struct info *) cl; double y1, y2; /* for zero slope the search is aligned on the axis so it is already pruned */ if (i->m == 0.) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; y1 = i->m * b->X1 + i->b; y2 = i->m * b->X2 + i->b; if (min(y1, y2) >= b->Y2) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (max(y1, y2) < b->Y1) - return PCB_R_DIR_NOT_FOUND; - return PCB_R_DIR_FOUND_CONTINUE; /* might intersect */ + return RND_R_DIR_NOT_FOUND; + return RND_R_DIR_FOUND_CONTINUE; /* might intersect */ } /* Prepend a deferred node-insertion task to a list */ @@ -579,7 +579,7 @@ * problem. There are efficient algorithms for finding intersections with snap * rounding, but I don't have time to implement them right now. */ -static pcb_r_dir_t seg_in_seg(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t seg_in_seg(const rnd_rnd_box_t * b, void *cl) { struct info *i = (struct info *) cl; struct seg *s = (struct seg *) b; @@ -592,11 +592,11 @@ * already been intersected this pass, skip it until the next pass. */ if (s->intersected || i->s->intersected) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; cnt = rnd_vect_inters2(s->v->point, s->v->next->point, i->v->point, i->v->next->point, s1, s2); if (!cnt) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (i->touch) /* if checking touches one find and we're done */ longjmp(*i->touch, TOUCHES); i->s->p->Flags.status = ISECTED; @@ -619,7 +619,7 @@ #endif i->node_insert_list = prepend_insert_node_task(i->node_insert_list, s, new_node); s->intersected = 1; - return PCB_R_DIR_NOT_FOUND; /* Keep looking for intersections with segment "i" */ + return RND_R_DIR_NOT_FOUND; /* Keep looking for intersections with segment "i" */ } /* Skip any remaining r_search hits against segment i, as any further * intersections will be rejected until the next pass anyway. @@ -627,7 +627,7 @@ if (done_insert_on_i) longjmp(*i->env, 1); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } void *rnd_poly_make_edge_tree(rnd_pline_t *pb) @@ -634,7 +634,7 @@ { struct seg *s; rnd_vnode_t *bv; - rnd_rtree_t *ans = pcb_r_create_tree(); + rnd_rtree_t *ans = rnd_r_create_tree(); bv = pb->head; do { s = (seg *) malloc(sizeof(struct seg)); @@ -657,21 +657,21 @@ } s->v = bv; s->p = pb; - pcb_r_insert_entry(ans, (const rnd_rnd_box_t *) s); + rnd_r_insert_entry(ans, (const rnd_rnd_box_t *) s); } while ((bv = bv->next) != pb->head); return (void *) ans; } -static pcb_r_dir_t get_seg(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t get_seg(const rnd_rnd_box_t * b, void *cl) { struct info *i = (struct info *) cl; struct seg *s = (struct seg *) b; if (i->v == s->v) { i->s = s; - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } /* @@ -692,7 +692,7 @@ * */ -static pcb_r_dir_t contour_bounds_touch(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t contour_bounds_touch(const rnd_rnd_box_t * b, void *cl) { contour_info *c_info = (contour_info *) cl; rnd_pline_t *pa = c_info->pa; @@ -725,7 +725,7 @@ av = looping_over->head; do { /* Loop over the nodes in the smaller contour */ - pcb_r_dir_t rres; + rnd_r_dir_t rres; /* check this edge for any insertions */ double dx; info.v = av; @@ -741,8 +741,8 @@ box.Y2 = (box.Y1 = av->point[1]) + 1; /* fill in the segment in info corresponding to this node */ - rres = pcb_r_search(looping_over->tree, &box, NULL, get_seg, &info, NULL); - assert(rres == PCB_R_DIR_CANCEL); + rres = rnd_r_search(looping_over->tree, &box, NULL, get_seg, &info, NULL); + assert(rres == RND_R_DIR_CANCEL); /* If we're going to have another pass anyway, skip this */ if (info.s->intersected && info.node_insert_list != NULL) @@ -755,7 +755,7 @@ info.tree = rtree_over->tree; if (info.tree) { int seen; - pcb_r_search(info.tree, &info.s->box, seg_in_region, seg_in_seg, &info, &seen); + rnd_r_search(info.tree, &info.s->box, seg_in_region, seg_in_seg, &info, &seen); if (RND_UNLIKELY(seen)) assert(0); /* XXX: Memory allocation failure */ } @@ -765,7 +765,7 @@ c_info->node_insert_list = info.node_insert_list; if (info.need_restart) c_info->need_restart = 1; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static int intersect_impl(jmp_buf * jb, rnd_polyarea_t * b, rnd_polyarea_t * a, int add) @@ -810,7 +810,7 @@ sb.X2 = pa->xmax + 1; sb.Y2 = pa->ymax + 1; - pcb_r_search(b->contour_tree, &sb, NULL, contour_bounds_touch, &c_info, NULL); + rnd_r_search(b->contour_tree, &sb, NULL, contour_bounds_touch, &c_info, NULL); if (c_info.need_restart) need_restart = 1; } @@ -894,14 +894,14 @@ /*****************************************************************/ /* Routines for making labels */ -static pcb_r_dir_t count_contours_i_am_inside(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t count_contours_i_am_inside(const rnd_rnd_box_t * b, void *cl) { rnd_pline_t *me = (rnd_pline_t *) cl; rnd_pline_t *check = (rnd_pline_t *) b; if (rnd_poly_contour_in_contour(check, me)) - return PCB_R_DIR_FOUND_CONTINUE; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_NOT_FOUND; } /* cntr_in_M_pcb_polyarea_t @@ -931,7 +931,7 @@ break; outer = (rnd_polyarea_t *) rnd_heap_remove_smallest(heap); - pcb_r_search(outer->contour_tree, (rnd_rnd_box_t *) poly, NULL, count_contours_i_am_inside, poly, &cnt); + rnd_r_search(outer->contour_tree, (rnd_rnd_box_t *) poly, NULL, count_contours_i_am_inside, poly, &cnt); switch (cnt) { case 0: /* Didn't find anything in this piece, Keep looking */ break; @@ -1090,8 +1090,8 @@ newp->f->b = newp->b->f = newp; } newp->contours = c; - newp->contour_tree = pcb_r_create_tree(); - pcb_r_insert_entry(newp->contour_tree, (rnd_rnd_box_t *) c); + newp->contour_tree = rnd_r_create_tree(); + rnd_r_insert_entry(newp->contour_tree, (rnd_rnd_box_t *) c); c->next = NULL; } /* InsCntr */ @@ -1105,7 +1105,7 @@ if (cntr->Flags.orient == RND_PLF_DIR) { if (owner != NULL) - pcb_r_delete_entry(owner->contour_tree, (rnd_rnd_box_t *) cntr); + rnd_r_delete_entry(owner->contour_tree, (rnd_rnd_box_t *) cntr); InsCntr(e, cntr, contours); } /* put hole into temporary list */ @@ -1116,8 +1116,8 @@ parent_contour->next = cntr; if (owner != parent) { if (owner != NULL) - pcb_r_delete_entry(owner->contour_tree, (rnd_rnd_box_t *) cntr); - pcb_r_insert_entry(parent->contour_tree, (rnd_rnd_box_t *) cntr); + rnd_r_delete_entry(owner->contour_tree, (rnd_rnd_box_t *) cntr); + rnd_r_insert_entry(parent->contour_tree, (rnd_rnd_box_t *) cntr); } } else { @@ -1126,7 +1126,7 @@ /* We don't insert the holes into an r-tree, * they just form a linked list */ if (owner != NULL) - pcb_r_delete_entry(owner->contour_tree, (rnd_rnd_box_t *) cntr); + rnd_r_delete_entry(owner->contour_tree, (rnd_rnd_box_t *) cntr); } } } /* PutContour */ @@ -1143,7 +1143,7 @@ contour->next = NULL; if (remove_rtree_entry) - pcb_r_delete_entry(piece->contour_tree, (rnd_rnd_box_t *) contour); + rnd_r_delete_entry(piece->contour_tree, (rnd_rnd_box_t *) contour); } struct polyarea_info { @@ -1151,15 +1151,15 @@ rnd_polyarea_t *pa; }; -static pcb_r_dir_t heap_it(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t heap_it(const rnd_rnd_box_t * b, void *cl) { rnd_heap_t *heap = (rnd_heap_t *) cl; struct polyarea_info *pa_info = (struct polyarea_info *) b; rnd_pline_t *p = pa_info->pa->contours; if (p->Count == 0) - return PCB_R_DIR_NOT_FOUND; /* how did this happen? */ + return RND_R_DIR_NOT_FOUND; /* how did this happen? */ rnd_heap_insert(heap, p->area, pa_info); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } struct find_inside_info { @@ -1168,7 +1168,7 @@ rnd_pline_t *result; }; -static pcb_r_dir_t find_inside(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t find_inside(const rnd_rnd_box_t * b, void *cl) { struct find_inside_info *info = (struct find_inside_info *) cl; rnd_pline_t *check = (rnd_pline_t *) b; @@ -1175,13 +1175,13 @@ /* Do test on check to see if it inside info->want_inside */ /* If it is: */ if (check->Flags.orient == RND_PLF_DIR) { - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } if (rnd_poly_contour_in_contour(info->want_inside, check)) { info->result = check; longjmp(info->jb, 1); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } void pcb_poly_insert_holes(jmp_buf * e, rnd_polyarea_t * dest, rnd_pline_t ** src) @@ -1209,7 +1209,7 @@ /* make a polyarea info table */ /* make an rtree of polyarea info table */ all_pa_info = (struct polyarea_info *) malloc(sizeof(struct polyarea_info) * num_polyareas); - tree = pcb_r_create_tree(); + tree = rnd_r_create_tree(); i = 0; curc = dest; do { @@ -1218,7 +1218,7 @@ all_pa_info[i].BoundingBox.X2 = curc->contours->xmax; all_pa_info[i].BoundingBox.Y2 = curc->contours->ymax; all_pa_info[i].pa = curc; - pcb_r_insert_entry(tree, (const rnd_rnd_box_t *) &all_pa_info[i]); + rnd_r_insert_entry(tree, (const rnd_rnd_box_t *) &all_pa_info[i]); i++; } while ((curc = curc->f) != dest); @@ -1230,7 +1230,7 @@ container = NULL; /* build a heap of all of the polys that the hole is inside its bounding box */ heap = rnd_heap_create(); - pcb_r_search(tree, (rnd_rnd_box_t *) curh, NULL, heap_it, heap, NULL); + rnd_r_search(tree, (rnd_rnd_box_t *) curh, NULL, heap_it, heap, NULL); if (rnd_heap_is_empty(heap)) { #ifndef NDEBUG #ifdef DEBUG @@ -1289,7 +1289,7 @@ info.result = NULL; /* Rtree search, calling back a routine to longjmp back with data about any hole inside the added one */ /* Be sure not to bother jumping back to report the main contour! */ - pcb_r_search(pa_info->pa->contour_tree, (rnd_rnd_box_t *) curh, NULL, find_inside, &info, NULL); + rnd_r_search(pa_info->pa->contour_tree, (rnd_rnd_box_t *) curh, NULL, find_inside, &info, NULL); /* Nothing found? */ break; @@ -1313,11 +1313,11 @@ /* link at front of hole list */ curh->next = container->next; container->next = curh; - pcb_r_insert_entry(pa_info->pa->contour_tree, (rnd_rnd_box_t *) curh); + rnd_r_insert_entry(pa_info->pa->contour_tree, (rnd_rnd_box_t *) curh); } } - pcb_r_destroy_tree(&tree); + rnd_r_destroy_tree(&tree); free(all_pa_info); } /* pcb_poly_insert_holes */ @@ -1763,21 +1763,21 @@ rnd_pline_t *result; }; -static pcb_r_dir_t find_inside_m_pa(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t find_inside_m_pa(const rnd_rnd_box_t * b, void *cl) { struct find_inside_m_pa_info *info = (struct find_inside_m_pa_info *) cl; rnd_pline_t *check = (rnd_pline_t *) b; /* Don't report for the main contour */ if (check->Flags.orient == RND_PLF_DIR) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* Don't look at contours marked as being intersected */ if (check->Flags.status == ISECTED) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (cntr_in_M_pcb_polyarea_t(check, info->want_inside, rnd_false)) { info->result = check; longjmp(info->jb, 1); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } @@ -1880,7 +1880,7 @@ * data about any hole inside the B polygon. * NB: Does not jump back to report the main contour! */ - pcb_r_search(a->contour_tree, &box, NULL, find_inside_m_pa, &info, NULL); + rnd_r_search(a->contour_tree, &box, NULL, find_inside_m_pa, &info, NULL); /* Nothing found? */ break; @@ -2322,8 +2322,8 @@ /* FIXME -- strict aliasing violation. */ if ((*c)->tree) { rnd_rtree_t *r = (*c)->tree; - pcb_r_free_tree_data(r, free); - pcb_r_destroy_tree(&r); + rnd_r_free_tree_data(r, free); + rnd_r_destroy_tree(&r); } free((*c)->head); free(*c), *c = NULL; @@ -2375,11 +2375,11 @@ C->tree = (rnd_rtree_t *) rnd_poly_make_edge_tree(C); } /* poly_PreContour */ -static pcb_r_dir_t flip_cb(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t flip_cb(const rnd_rnd_box_t * b, void *cl) { struct seg *s = (struct seg *) b; s->v = s->v->prev; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } void rnd_poly_contour_inv(rnd_pline_t * c) @@ -2398,7 +2398,7 @@ while ((cur = next) != c->head); c->Flags.orient ^= 1; if (c->tree) { - pcb_r_search(c->tree, NULL, NULL, flip_cb, NULL, &r); + rnd_r_search(c->tree, NULL, NULL, flip_cb, NULL, &r); assert(r == c->Count); } } @@ -2495,7 +2495,7 @@ *dst = (rnd_polyarea_t *) calloc(1, sizeof(rnd_polyarea_t)); if (*dst == NULL) return rnd_false; - (*dst)->contour_tree = pcb_r_create_tree(); + (*dst)->contour_tree = rnd_r_create_tree(); return rnd_polyarea_copy1(*dst, src); } @@ -2510,7 +2510,7 @@ for (cur = src->contours; cur != NULL; cur = cur->next) { if (!rnd_poly_contour_copy(last, cur)) return rnd_false; - pcb_r_insert_entry(dst->contour_tree, (rnd_rnd_box_t *) * last); + rnd_r_insert_entry(dst->contour_tree, (rnd_rnd_box_t *) * last); last = &(*last)->next; } return rnd_true; @@ -2563,7 +2563,7 @@ p->contours->next = c; c->next = tmp; } - pcb_r_insert_entry(p->contour_tree, (rnd_rnd_box_t *) c); + rnd_r_insert_entry(p->contour_tree, (rnd_rnd_box_t *) c); return rnd_true; } @@ -2574,7 +2574,7 @@ } pip; -static pcb_r_dir_t crossing(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t crossing(const rnd_rnd_box_t * b, void *cl) { struct seg *s = (struct seg *) b; struct pip *p = (struct pip *) cl; @@ -2609,7 +2609,7 @@ p->f -= 1; } } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } int rnd_poly_contour_inside(const rnd_pline_t *c, rnd_vector_t p) @@ -2625,7 +2625,7 @@ ray.X2 = RND_COORD_MAX; ray.Y2 = p[1] + 1; if (setjmp(info.env) == 0) - pcb_r_search(c->tree, &ray, NULL, crossing, &info, NULL); + rnd_r_search(c->tree, &ray, NULL, crossing, &info, NULL); return info.f; } @@ -2822,7 +2822,7 @@ { p->f = p->b = p; p->contours = NULL; - p->contour_tree = pcb_r_create_tree(); + p->contour_tree = rnd_r_create_tree(); } rnd_polyarea_t *rnd_polyarea_create(void) @@ -2852,13 +2852,13 @@ return; for (cur = (*p)->f; cur != *p; cur = (*p)->f) { rnd_poly_contours_free(&cur->contours); - pcb_r_destroy_tree(&cur->contour_tree); + rnd_r_destroy_tree(&cur->contour_tree); cur->f->b = cur->b; cur->b->f = cur->f; free(cur); } rnd_poly_contours_free(&cur->contours); - pcb_r_destroy_tree(&cur->contour_tree); + rnd_r_destroy_tree(&cur->contour_tree); free(*p), *p = NULL; } @@ -3363,7 +3363,7 @@ rnd_coord_t cx, cy; } pline_isect_line_t; -static pcb_r_dir_t pline_isect_line_cb(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t pline_isect_line_cb(const rnd_rnd_box_t * b, void *cl) { pline_isect_line_t *ctx = (pline_isect_line_t *)cl; struct seg *s = (struct seg *)b; @@ -3372,10 +3372,10 @@ if (rnd_vect_inters2(s->v->point, s->v->next->point, ctx->l1, ctx->l2, S1, S2)) { ctx->cx = S1[0]; ctx->cy = S1[1]; - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } rnd_bool pcb_pline_isect_line(rnd_pline_t *pl, rnd_coord_t lx1, rnd_coord_t ly1, rnd_coord_t lx2, rnd_coord_t ly2, rnd_coord_t *cx, rnd_coord_t *cy) @@ -3392,7 +3392,7 @@ if (pl->tree == NULL) pl->tree = (rnd_rtree_t *) rnd_poly_make_edge_tree(pl); - if (pcb_r_search(pl->tree, &lbx, NULL, pline_isect_line_cb, &ctx, NULL) == PCB_R_DIR_CANCEL) { + if (rnd_r_search(pl->tree, &lbx, NULL, pline_isect_line_cb, &ctx, NULL) == RND_R_DIR_CANCEL) { if (cx != NULL) *cx = ctx.cx; if (cy != NULL) *cy = ctx.cy; return rnd_true; @@ -3410,7 +3410,7 @@ double r2; } pline_isect_circ_t; -static pcb_r_dir_t pline_isect_circ_cb(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t pline_isect_circ_cb(const rnd_rnd_box_t * b, void *cl) { pline_isect_circ_t *ctx = (pline_isect_circ_t *)cl; struct seg *s = (struct seg *)b; @@ -3420,9 +3420,9 @@ /* Cheap: if either line endpoint is within the circle, we sure have an intersection */ if ((RND_SQUARE(s->v->point[0] - ctx->cx) + RND_SQUARE(s->v->point[1] - ctx->cy)) <= ctx->r2) - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ if ((RND_SQUARE(s->v->next->point[0] - ctx->cx) + RND_SQUARE(s->v->next->point[1] - ctx->cy)) <= ctx->r2) - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ dx = s->v->point[0] - s->v->next->point[0]; dy = s->v->point[1] - s->v->next->point[1]; @@ -3434,9 +3434,9 @@ ray2[0] = ctx->cx + ox; ray2[1] = ctx->cy + oy; if (rnd_vect_inters2(s->v->point, s->v->next->point, ray1, ray2, S1, S2)) - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } rnd_bool pcb_pline_isect_circ(rnd_pline_t *pl, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t r) @@ -3451,7 +3451,7 @@ if (pl->tree == NULL) pl->tree = (rnd_rtree_t *) rnd_poly_make_edge_tree(pl); - return pcb_r_search(pl->tree, &cbx, NULL, pline_isect_circ_cb, &ctx, NULL) == PCB_R_DIR_CANCEL; + return rnd_r_search(pl->tree, &cbx, NULL, pline_isect_circ_cb, &ctx, NULL) == RND_R_DIR_CANCEL; } @@ -3464,11 +3464,11 @@ * (or intersecting). * (C) 2017 Tibor 'Igor2' Palinkas */ -static pcb_r_dir_t pline_embraces_circ_cb(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t pline_embraces_circ_cb(const rnd_rnd_box_t * b, void *cl) { int *cnt = (int *)cl; (*cnt)++; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } rnd_bool pcb_pline_embraces_circ(rnd_pline_t *pl, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t r) @@ -3484,7 +3484,7 @@ bx.X1 = cx + r; bx.X2 = RND_COORD_MAX; cnt = 0; - pcb_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL); + rnd_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL); if ((cnt % 2) == 0) return rnd_false; @@ -3492,7 +3492,7 @@ bx.X1 = -RND_COORD_MAX; bx.X2 = cx - r; cnt = 0; - pcb_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL); + rnd_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL); if ((cnt % 2) == 0) return rnd_false; @@ -3552,8 +3552,8 @@ break; } if (pa->contour_tree != NULL) - pcb_r_destroy_tree(&pa->contour_tree); - pa->contour_tree = pcb_r_create_tree(); + rnd_r_destroy_tree(&pa->contour_tree); + pa->contour_tree = rnd_r_create_tree(); for(pl = pa->contours; pl != NULL; pl = pl->next) { rnd_vnode_t *v; int cnt2 = 0; @@ -3571,12 +3571,12 @@ pl->xmax += dx; pl->ymax += dy; if (pl->tree != NULL) { - pcb_r_free_tree_data(pl->tree, free); - pcb_r_destroy_tree(&pl->tree); + rnd_r_free_tree_data(pl->tree, free); + rnd_r_destroy_tree(&pl->tree); } pl->tree = (rnd_rtree_t *)rnd_poly_make_edge_tree(pl); - pcb_r_insert_entry(pa->contour_tree, (rnd_rnd_box_t *)pl); + rnd_r_insert_entry(pa->contour_tree, (rnd_rnd_box_t *)pl); } } } Index: trunk/src/librnd/poly/rtree.c =================================================================== --- trunk/src/librnd/poly/rtree.c (revision 31039) +++ trunk/src/librnd/poly/rtree.c (revision 31040) @@ -40,7 +40,7 @@ #include /* Temporary compatibility layer for the transition */ -rnd_rtree_t *pcb_r_create_tree(void) +rnd_rtree_t *rnd_r_create_tree(void) { rnd_rtree_t *root = malloc(sizeof(rnd_rtree_t)); rnd_rtree_init(root); @@ -47,7 +47,7 @@ return root; } -void pcb_r_destroy_tree(rnd_rtree_t **tree) +void rnd_r_destroy_tree(rnd_rtree_t **tree) { rnd_rtree_uninit(*tree); free(*tree); @@ -54,13 +54,13 @@ *tree = NULL; } -void pcb_r_insert_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which) +void rnd_r_insert_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which) { assert(which != NULL); rnd_rtree_insert(rtree, (void *)which, (rnd_rtree_box_t *)which); /* assumes first field is the bounding box */ } -void pcb_r_insert_array(rnd_rtree_t *rtree, const rnd_rnd_box_t *boxlist[], rnd_cardinal_t len) +void rnd_r_insert_array(rnd_rtree_t *rtree, const rnd_rnd_box_t *boxlist[], rnd_cardinal_t len) { rnd_cardinal_t n; @@ -70,16 +70,16 @@ assert(boxlist != 0); for(n = 0; n < len; n++) - pcb_r_insert_entry(rtree, boxlist[n]); + rnd_r_insert_entry(rtree, boxlist[n]); } -rnd_bool pcb_r_delete_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which) +rnd_bool rnd_r_delete_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which) { assert(which != NULL); return rnd_rtree_delete(rtree, (void *)which, (rnd_rtree_box_t *)which) == 0; /* assumes first field is the bounding box */ } -rnd_bool pcb_r_delete_entry_free_data(rnd_rtree_t *rtree, rnd_rnd_box_t *box, void (*free_data)(void *d)) +rnd_bool rnd_r_delete_entry_free_data(rnd_rtree_t *rtree, rnd_rnd_box_t *box, void (*free_data)(void *d)) { void *obj = box; /* assumes first field is the bounding box */ assert(obj != NULL); @@ -90,8 +90,8 @@ } typedef struct { - pcb_r_dir_t (*region_in_search)(const rnd_rnd_box_t *region, void *closure); - pcb_r_dir_t (*rectangle_in_region)(const rnd_rnd_box_t *box, void *closure); + rnd_r_dir_t (*region_in_search)(const rnd_rnd_box_t *region, void *closure); + rnd_r_dir_t (*rectangle_in_region)(const rnd_rnd_box_t *box, void *closure); void *clo; } r_cb_t; @@ -108,12 +108,12 @@ } -pcb_r_dir_t pcb_r_search(rnd_rtree_t *rtree, const rnd_rnd_box_t *query, - pcb_r_dir_t (*region_in_search)(const rnd_rnd_box_t *region, void *closure), - pcb_r_dir_t (*rectangle_in_region)(const rnd_rnd_box_t *box, void *closure), +rnd_r_dir_t rnd_r_search(rnd_rtree_t *rtree, const rnd_rnd_box_t *query, + rnd_r_dir_t (*region_in_search)(const rnd_rnd_box_t *region, void *closure), + rnd_r_dir_t (*rectangle_in_region)(const rnd_rnd_box_t *box, void *closure), void *closure, int *num_found) { - pcb_r_dir_t res; + rnd_r_dir_t res; rnd_rtree_cardinal_t out_cnt; r_cb_t ctx; ctx.region_in_search = region_in_search; @@ -131,7 +131,7 @@ return res; } -int pcb_r_region_is_empty(rnd_rtree_t *rtree, const rnd_rnd_box_t *region) +int rnd_r_region_is_empty(rnd_rtree_t *rtree, const rnd_rnd_box_t *region) { return rnd_rtree_is_box_empty(rtree, (const rnd_rtree_box_t *)region); } @@ -141,12 +141,12 @@ fprintf(f, "\n", obj); } -void pcb_r_dump_tree(rnd_rtree_t *root, int unused) +void rnd_r_dump_tree(rnd_rtree_t *root, int unused) { rnd_rtree_dump_text(stdout, root, r_print_obj); } -void pcb_r_free_tree_data(rnd_rtree_t *rtree, void (*free)(void *ptr)) +void rnd_r_free_tree_data(rnd_rtree_t *rtree, void (*free)(void *ptr)) { rnd_rtree_it_t it; void *o; @@ -155,7 +155,7 @@ free(o); } -rnd_rnd_box_t *pcb_r_first(rnd_rtree_t *tree, rnd_rtree_it_t *it) +rnd_rnd_box_t *rnd_r_first(rnd_rtree_t *tree, rnd_rtree_it_t *it) { if (tree == NULL) return NULL; @@ -162,11 +162,11 @@ return (rnd_rnd_box_t *)rnd_rtree_all_first(it, tree); } -rnd_rnd_box_t *pcb_r_next(rnd_rtree_it_t *it) +rnd_rnd_box_t *rnd_r_next(rnd_rtree_it_t *it) { return (rnd_rnd_box_t *)rnd_rtree_all_next(it); } -void pcb_r_end(rnd_rtree_it_t *it) +void rnd_r_end(rnd_rtree_it_t *it) { } Index: trunk/src/librnd/poly/rtree2_compat.h =================================================================== --- trunk/src/librnd/poly/rtree2_compat.h (revision 31039) +++ trunk/src/librnd/poly/rtree2_compat.h (revision 31040) @@ -38,27 +38,27 @@ /* Compatibility layer between the new rtree and the old rtree for the period of transition */ -#ifndef PCB_RTREE2_COMPAT_H -#define PCB_RTREE2_COMPAT_H +#ifndef RND_RTREE2_COMPAT_H +#define RND_RTREE2_COMPAT_H #include /* callback direction to the search engine */ -typedef enum pcb_r_dir_e { - PCB_R_DIR_NOT_FOUND = 0, /* object not found or not accepted */ - PCB_R_DIR_FOUND_CONTINUE = 1, /* object found or accepted, go on searching */ - PCB_R_DIR_CANCEL = 2 /* cancel the search and return immediately */ -} pcb_r_dir_t; +typedef enum rnd_r_dir_e { + RND_R_DIR_NOT_FOUND = 0, /* object not found or not accepted */ + RND_R_DIR_FOUND_CONTINUE = 1, /* object found or accepted, go on searching */ + RND_R_DIR_CANCEL = 2 /* cancel the search and return immediately */ +} rnd_r_dir_t; -rnd_rtree_t *pcb_r_create_tree(void); -void pcb_r_destroy_tree(rnd_rtree_t **tree); -void pcb_r_free_tree_data(rnd_rtree_t *rtree, void (*free)(void *ptr)); +rnd_rtree_t *rnd_r_create_tree(void); +void rnd_r_destroy_tree(rnd_rtree_t **tree); +void rnd_r_free_tree_data(rnd_rtree_t *rtree, void (*free)(void *ptr)); -void pcb_r_insert_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which); -void pcb_r_insert_array(rnd_rtree_t *rtree, const rnd_rnd_box_t *boxlist[], rnd_cardinal_t len); +void rnd_r_insert_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which); +void rnd_r_insert_array(rnd_rtree_t *rtree, const rnd_rnd_box_t *boxlist[], rnd_cardinal_t len); -rnd_bool pcb_r_delete_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which); -rnd_bool pcb_r_delete_entry_free_data(rnd_rtree_t *rtree, rnd_rnd_box_t *box, void (*free_data)(void *d)); +rnd_bool rnd_r_delete_entry(rnd_rtree_t *rtree, const rnd_rnd_box_t *which); +rnd_bool rnd_r_delete_entry_free_data(rnd_rtree_t *rtree, rnd_rnd_box_t *box, void (*free_data)(void *d)); /* generic search routine */ /* region_in_search should return rnd_true if "what you're looking for" is @@ -72,27 +72,27 @@ * Look at the implementation of r_region_is_empty for how to * abort the search if that is the desired behavior. */ -pcb_r_dir_t pcb_r_search(rnd_rtree_t *rtree, const rnd_rnd_box_t *query, - pcb_r_dir_t (*region_in_search)(const rnd_rnd_box_t *region, void *closure), - pcb_r_dir_t (*rectangle_in_region)(const rnd_rnd_box_t *box, void *closure), +rnd_r_dir_t rnd_r_search(rnd_rtree_t *rtree, const rnd_rnd_box_t *query, + rnd_r_dir_t (*region_in_search)(const rnd_rnd_box_t *region, void *closure), + rnd_r_dir_t (*rectangle_in_region)(const rnd_rnd_box_t *box, void *closure), void *closure, int *num_found); /* return 0 if there are any rectangles in the given region. */ -int pcb_r_region_is_empty(rnd_rtree_t *rtree, const rnd_rnd_box_t *region); +int rnd_r_region_is_empty(rnd_rtree_t *rtree, const rnd_rnd_box_t *region); -void pcb_r_dump_tree(rnd_rtree_t *root, int unused); +void rnd_r_dump_tree(rnd_rtree_t *root, int unused); -#define PCB_RTREE_EMPTY(rt) (((rt) == NULL) || ((rt)->size == 0)) +#define RND_RTREE_EMPTY(rt) (((rt) == NULL) || ((rt)->size == 0)) /* -- Iterate through an rtree; DO NOT modify the tree while iterating -- */ /* Get the first item, get fields of iterator set up; return can be casted to an object; returns NULL if rtree is empty */ -rnd_rnd_box_t *pcb_r_first(rnd_rtree_t *tree, rnd_rtree_it_t *it); +rnd_rnd_box_t *rnd_r_first(rnd_rtree_t *tree, rnd_rtree_it_t *it); /* Get the next item, return can be casted to an object; returns NULL if no more items */ -rnd_rnd_box_t *pcb_r_next(rnd_rtree_it_t *it); +rnd_rnd_box_t *rnd_r_next(rnd_rtree_it_t *it); /* Free fields of the iterator - not needed anymore, will be removed */ -void pcb_r_end(rnd_rtree_it_t *it); +void rnd_r_end(rnd_rtree_it_t *it); #endif Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 31039) +++ trunk/src/obj_arc.c (revision 31040) @@ -189,12 +189,12 @@ new_sa = 0; } pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, a, a, a); a->StartAngle = new_sa; a->Delta = new_da; pcb_arc_bbox(a); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); } @@ -202,12 +202,12 @@ void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, rnd_coord_t new_width, rnd_coord_t new_height) { pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, a, a, a); a->Width = new_width; a->Height = new_height; pcb_arc_bbox(a); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); } @@ -280,8 +280,8 @@ { pcb_arc_bbox(Arc); if (!Layer->arc_tree) - Layer->arc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + Layer->arc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); Arc->type = PCB_OBJ_ARC; PCB_SET_PARENT(Arc, layer, Layer); } @@ -291,7 +291,7 @@ void pcb_arc_free(pcb_arc_t *arc) { if ((arc->parent.layer != NULL) && (arc->parent.layer->arc_tree != NULL)) - pcb_r_delete_entry(arc->parent.layer->arc_tree, (rnd_rnd_box_t *)arc); + rnd_r_delete_entry(arc->parent.layer->arc_tree, (rnd_rnd_box_t *)arc); rnd_attribute_free(&arc->Attributes); pcb_arc_unreg(arc); pcb_obj_common_free((pcb_any_obj_t *)arc); @@ -362,7 +362,7 @@ if (ly == NULL) return; if (ly->arc_tree != NULL) - pcb_r_delete_entry(ly->arc_tree, (rnd_rnd_box_t *)arc); + rnd_r_delete_entry(ly->arc_tree, (rnd_rnd_box_t *)arc); pcb_poly_restore_to_poly(ly->parent.data, PCB_OBJ_ARC, ly, arc); } @@ -372,7 +372,7 @@ if (ly == NULL) return; if (ly->arc_tree != NULL) - pcb_r_insert_entry(ly->arc_tree, (rnd_rnd_box_t *)arc); + rnd_r_insert_entry(ly->arc_tree, (rnd_rnd_box_t *)arc); pcb_poly_clear_from_poly(ly->parent.data, PCB_OBJ_ARC, ly, arc); } @@ -396,7 +396,7 @@ pcb_layer_t *layer = g->arc->parent.layer; if (layer->arc_tree != NULL) - pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *)g->arc); + rnd_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *)g->arc); pcb_poly_restore_to_poly(layer->parent.data, PCB_OBJ_ARC, layer, g->arc); rnd_swap(rnd_coord_t, g->Thickness, g->arc->Thickness); @@ -410,7 +410,7 @@ pcb_arc_bbox(g->arc); if (layer->arc_tree != NULL) - pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *)g->arc); + rnd_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *)g->arc); pcb_poly_clear_from_poly(layer->parent.data, PCB_OBJ_ARC, layer, g->arc); return 0; @@ -466,7 +466,7 @@ } pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_ARC, srcly, arc); - pcb_r_delete_entry(srcly->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_delete_entry(srcly->arc_tree, (rnd_rnd_box_t *) arc); pcb_arc_unreg(arc); pcb_arc_reg(dstly, arc); @@ -474,8 +474,8 @@ PCB_FLAG_CLEAR(PCB_FLAG_FOUND, arc); if (!dstly->arc_tree) - dstly->arc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dstly->arc_tree, (rnd_rnd_box_t *) arc); + dstly->arc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dstly->arc_tree, (rnd_rnd_box_t *) arc); pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_ARC, dstly, arc); return arc; @@ -491,11 +491,11 @@ if (value <= PCB_MAX_THICKNESS && value >= PCB_MIN_THICKNESS && value != Arc->Thickness) { pcb_undo_add_obj_to_size(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); Arc->Thickness = value; pcb_arc_bbox(Arc); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; @@ -518,11 +518,11 @@ if (value != Arc->Clearance) { pcb_undo_add_obj_to_clear_size(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); Arc->Clearance = value; pcb_arc_bbox(Arc); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; @@ -555,11 +555,11 @@ if (value != *dst) { pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); *dst = value; pcb_arc_bbox(Arc); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; @@ -594,11 +594,11 @@ if (value != *dst) { pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); *dst = value; pcb_arc_bbox(Arc); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; @@ -677,10 +677,10 @@ void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arcop_move_noclip(ctx, Layer, Arc); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); return Arc; } @@ -688,11 +688,11 @@ void *pcb_arcop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (ctx->clip.restore) { - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); } if (ctx->clip.clear) { - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); } return Arc; @@ -701,14 +701,14 @@ /* moves an arc between layers; lowlevel routines */ void *pcb_arcop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination) { - pcb_r_delete_entry(Source->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_delete_entry(Source->arc_tree, (rnd_rnd_box_t *) arc); pcb_arc_unreg(arc); pcb_arc_reg(Destination, arc); if (!Destination->arc_tree) - Destination->arc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Destination->arc_tree, (rnd_rnd_box_t *) arc); + Destination->arc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Destination->arc_tree, (rnd_rnd_box_t *) arc); return arc; } @@ -741,7 +741,7 @@ /* destroys an arc from a layer */ void *pcb_arcop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_arc_free(Arc); return NULL; @@ -798,11 +798,11 @@ void pcb_arc_rotate(pcb_layer_t *layer, pcb_arc_t *arc, rnd_coord_t X, rnd_coord_t Y, double cosa, double sina, rnd_angle_t angle) { if (layer->arc_tree != NULL) - pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); rnd_rotate(&arc->X, &arc->Y, X, Y, cosa, sina); arc->StartAngle = rnd_normalize_angle(arc->StartAngle + angle); if (layer->arc_tree != NULL) - pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); } void pcb_arc_mirror(pcb_arc_t *arc, rnd_coord_t y_offs, rnd_bool undoable) @@ -827,13 +827,13 @@ void pcb_arc_flip_side(pcb_layer_t *layer, pcb_arc_t *arc) { - pcb_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_delete_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); arc->X = PCB_SWAP_X(arc->X); arc->Y = PCB_SWAP_Y(arc->Y); arc->StartAngle = RND_SWAP_ANGLE(arc->StartAngle); arc->Delta = RND_SWAP_DELTA(arc->Delta); pcb_arc_bbox(arc); - pcb_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); + rnd_r_insert_entry(layer->arc_tree, (rnd_rnd_box_t *) arc); } void pcb_arc_scale(pcb_arc_t *arc, double sx, double sy, double sth) @@ -867,10 +867,10 @@ pcb_arc_invalidate_erase(Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); if (Layer->arc_tree != NULL) - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_arc_rotate90(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); if (Layer->arc_tree != NULL) - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) Arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; @@ -1132,34 +1132,34 @@ pcb_arc_draw_(info, arc, allow_term_gfx); } -pcb_r_dir_t pcb_arc_draw_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_arc_draw_callback(const rnd_rnd_box_t * b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *)b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(arc->parent_type, &arc->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_arc_draw(info, arc, 0); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_arc_draw_term_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_arc_draw_term_callback(const rnd_rnd_box_t * b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *)b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(arc->parent_type, &arc->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_arc_draw(info, arc, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* erases an arc on a layer */ Index: trunk/src/obj_arc_draw.h =================================================================== --- trunk/src/obj_arc_draw.h (revision 31039) +++ trunk/src/obj_arc_draw.h (revision 31040) @@ -32,8 +32,8 @@ /* Include rtree.h for this */ #ifdef RND_RTREE_H -pcb_r_dir_t pcb_arc_draw_callback(const rnd_rnd_box_t * b, void *cl); -pcb_r_dir_t pcb_arc_draw_term_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_arc_draw_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_arc_draw_term_callback(const rnd_rnd_box_t * b, void *cl); #endif void pcb_arc_draw_(pcb_draw_info_t *info, pcb_arc_t *arc, int allow_term_gfx); Index: trunk/src/obj_gfx.c =================================================================== --- trunk/src/obj_gfx.c (revision 31039) +++ trunk/src/obj_gfx.c (revision 31040) @@ -184,8 +184,8 @@ { pcb_gfx_bbox(gfx); if (!Layer->gfx_tree) - Layer->gfx_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->gfx_tree, (rnd_rnd_box_t *)gfx); + Layer->gfx_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->gfx_tree, (rnd_rnd_box_t *)gfx); gfx->type = PCB_OBJ_GFX; PCB_SET_PARENT(gfx, layer, Layer); } @@ -195,7 +195,7 @@ void pcb_gfx_free(pcb_gfx_t *gfx) { if ((gfx->parent.layer != NULL) && (gfx->parent.layer->gfx_tree != NULL)) - pcb_r_delete_entry(gfx->parent.layer->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_delete_entry(gfx->parent.layer->gfx_tree, (rnd_rnd_box_t *)gfx); rnd_attribute_free(&gfx->Attributes); pcb_gfx_unreg(gfx); pcb_obj_common_free((pcb_any_obj_t *)gfx); @@ -239,7 +239,7 @@ if (ly == NULL) return; if (ly->gfx_tree != NULL) - pcb_r_delete_entry(ly->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_delete_entry(ly->gfx_tree, (rnd_rnd_box_t *)gfx); } void pcb_gfx_post(pcb_gfx_t *gfx) @@ -249,7 +249,7 @@ if (ly == NULL) return; if (ly->gfx_tree != NULL) - pcb_r_insert_entry(ly->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_insert_entry(ly->gfx_tree, (rnd_rnd_box_t *)gfx); } /***** operations *****/ @@ -268,7 +268,7 @@ pcb_layer_t *layer = g->gfx->parent.layer; if (layer->gfx_tree != NULL) - pcb_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *)g->gfx); + rnd_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *)g->gfx); rnd_swap(rnd_coord_t, g->cx, g->gfx->cx); rnd_swap(rnd_coord_t, g->cy, g->gfx->cy); @@ -282,7 +282,7 @@ pcb_gfx_update(g->gfx); pcb_gfx_bbox(g->gfx); if (layer->gfx_tree != NULL) - pcb_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *)g->gfx); + rnd_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *)g->gfx); return 0; } @@ -335,7 +335,7 @@ dstly = &ctx->buffer.dst->Layer[lid]; } - pcb_r_delete_entry(srcly->gfx_tree, (rnd_rnd_box_t *) gfx); + rnd_r_delete_entry(srcly->gfx_tree, (rnd_rnd_box_t *) gfx); pcb_gfx_unreg(gfx); pcb_gfx_reg(dstly, gfx); @@ -343,8 +343,8 @@ PCB_FLAG_CLEAR(PCB_FLAG_FOUND, gfx); if (!dstly->gfx_tree) - dstly->gfx_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dstly->gfx_tree, (rnd_rnd_box_t *) gfx); + dstly->gfx_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dstly->gfx_tree, (rnd_rnd_box_t *) gfx); return gfx; } @@ -392,9 +392,9 @@ void *pcb_gfxop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_gfx_t *gfx) { - pcb_r_delete_entry(Layer->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_delete_entry(Layer->gfx_tree, (rnd_rnd_box_t *)gfx); pcb_gfxop_move_noclip(ctx, Layer, gfx); - pcb_r_insert_entry(Layer->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_insert_entry(Layer->gfx_tree, (rnd_rnd_box_t *)gfx); return gfx; } @@ -401,14 +401,14 @@ /* moves a gfx between layers; lowlevel routines */ void *pcb_gfxop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_gfx_t * gfx, pcb_layer_t * Destination) { - pcb_r_delete_entry(Source->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_delete_entry(Source->gfx_tree, (rnd_rnd_box_t *)gfx); pcb_gfx_unreg(gfx); pcb_gfx_reg(Destination, gfx); if (!Destination->gfx_tree) - Destination->gfx_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Destination->gfx_tree, (rnd_rnd_box_t *)gfx); + Destination->gfx_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Destination->gfx_tree, (rnd_rnd_box_t *)gfx); return gfx; } @@ -439,7 +439,7 @@ /* destroys a gfx from a layer */ void *pcb_gfxop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_gfx_t *gfx) { - pcb_r_delete_entry(Layer->gfx_tree, (rnd_rnd_box_t *) gfx); + rnd_r_delete_entry(Layer->gfx_tree, (rnd_rnd_box_t *) gfx); pcb_gfx_free(gfx); return NULL; @@ -480,7 +480,7 @@ void pcb_gfx_rotate(pcb_layer_t *layer, pcb_gfx_t *gfx, rnd_coord_t X, rnd_coord_t Y, double cosa, double sina, rnd_angle_t angle) { if (layer->gfx_tree != NULL) - pcb_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *) gfx); + rnd_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *) gfx); gfx->rot = rnd_normalize_angle(gfx->rot + angle); TODO("rotate content") @@ -488,7 +488,7 @@ pcb_gfx_bbox(gfx); if (layer->gfx_tree != NULL) - pcb_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *) gfx); + rnd_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *) gfx); } void pcb_gfx_mirror(pcb_gfx_t *gfx, rnd_coord_t y_offs, rnd_bool undoable) @@ -511,13 +511,13 @@ void pcb_gfx_flip_side(pcb_layer_t *layer, pcb_gfx_t *gfx) { - pcb_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_delete_entry(layer->gfx_tree, (rnd_rnd_box_t *)gfx); gfx->cx = PCB_SWAP_X(gfx->cx); gfx->cy = PCB_SWAP_Y(gfx->cy); gfx->rot = RND_SWAP_ANGLE(gfx->rot); pcb_gfx_update(gfx); pcb_gfx_bbox(gfx); - pcb_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_insert_entry(layer->gfx_tree, (rnd_rnd_box_t *)gfx); } void pcb_gfx_chg_geo(pcb_gfx_t *gfx, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t sx, rnd_coord_t sy, rnd_angle_t rot, rnd_bool undoable) @@ -559,10 +559,10 @@ { pcb_gfx_invalidate_erase(gfx); if (Layer->gfx_tree != NULL) - pcb_r_delete_entry(Layer->gfx_tree, (rnd_rnd_box_t *) gfx); + rnd_r_delete_entry(Layer->gfx_tree, (rnd_rnd_box_t *) gfx); pcb_gfx_rotate90(gfx, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); if (Layer->gfx_tree != NULL) - pcb_r_insert_entry(Layer->gfx_tree, (rnd_rnd_box_t *) gfx); + rnd_r_insert_entry(Layer->gfx_tree, (rnd_rnd_box_t *) gfx); pcb_gfx_invalidate_draw(Layer, gfx); return gfx; } @@ -668,19 +668,19 @@ pcb_gfx_draw_(info, gfx, allow_term_gfx); } -pcb_r_dir_t pcb_gfx_draw_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_gfx_draw_callback(const rnd_rnd_box_t *b, void *cl) { pcb_gfx_t *gfx = (pcb_gfx_t *)b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(gfx->parent_type, &gfx->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_gfx_draw(info, gfx, 0); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* erases a gfx on a layer */ Index: trunk/src/obj_gfx_draw.h =================================================================== --- trunk/src/obj_gfx_draw.h (revision 31039) +++ trunk/src/obj_gfx_draw.h (revision 31040) @@ -31,7 +31,7 @@ /* Include rtree.h for this */ #ifdef RND_RTREE_H -pcb_r_dir_t pcb_gfx_draw_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_gfx_draw_callback(const rnd_rnd_box_t * b, void *cl); #endif void pcb_gfx_draw_(pcb_draw_info_t *info, pcb_gfx_t *gfx, int allow_term_gfx); Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 31039) +++ trunk/src/obj_line.c (revision 31040) @@ -110,7 +110,7 @@ void pcb_line_free(pcb_line_t *line) { if ((line->parent.layer != NULL) && (line->parent.layer->line_tree != NULL)) - pcb_r_delete_entry(line->parent.layer->line_tree, (rnd_rnd_box_t *)line); + rnd_r_delete_entry(line->parent.layer->line_tree, (rnd_rnd_box_t *)line); rnd_attribute_free(&line->Attributes); pcb_line_unreg(line); pcb_obj_common_free((pcb_any_obj_t *)line); @@ -134,7 +134,7 @@ pcb_layer_t *layer = g->line->parent.layer; if (layer->line_tree != NULL) - pcb_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *)g->line); + rnd_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *)g->line); pcb_poly_restore_to_poly(layer->parent.data, PCB_OBJ_LINE, layer, g->line); rnd_swap(rnd_point_t, g->Point1, g->line->Point1); @@ -144,7 +144,7 @@ pcb_line_bbox(g->line); if (layer->line_tree != NULL) - pcb_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *)g->line); + rnd_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *)g->line); pcb_poly_clear_from_poly(layer->parent.data, PCB_OBJ_LINE, layer, g->line); return 0; @@ -173,7 +173,7 @@ jmp_buf env; }; -static pcb_r_dir_t line_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t line_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; struct line_info *i = (struct line_info *) cl; @@ -180,7 +180,7 @@ /* do not merge to subc parts or terminals */ if ((pcb_obj_parent_subc((pcb_any_obj_t *)line) != NULL) || (line->term != NULL)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (line->Point1.X == i->X1 && line->Point2.X == i->X2 && line->Point1.Y == i->Y1 && line->Point2.Y == i->Y2) { i->ans = (pcb_line_t *) (-1); @@ -241,7 +241,7 @@ } } } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } @@ -274,7 +274,7 @@ * verify that the layer is on the board first! */ if (setjmp(info.env) == 0) { - pcb_r_search(Layer->line_tree, &search, NULL, line_callback, &info, NULL); + rnd_r_search(Layer->line_tree, &search, NULL, line_callback, &info, NULL); return pcb_line_new(Layer, X1, Y1, X2, Y2, Thickness, Clearance, Flags); } @@ -338,8 +338,8 @@ { pcb_line_bbox(Line); if (!Layer->line_tree) - Layer->line_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + Layer->line_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); Line->parent.layer = Layer; Line->parent_type = PCB_PARENT_LAYER; } @@ -454,7 +454,7 @@ if (ly == NULL) return; if (ly->line_tree != NULL) - pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)line); + rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)line); pcb_poly_restore_to_poly(ly->parent.data, PCB_OBJ_LINE, ly, line); } @@ -464,7 +464,7 @@ if (ly == NULL) return; if (ly->line_tree != NULL) - pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)line); + rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)line); pcb_poly_clear_from_poly(ly->parent.data, PCB_OBJ_LINE, ly, line); } @@ -505,7 +505,7 @@ } pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_LINE, srcly, line); - pcb_r_delete_entry(srcly->line_tree, (rnd_rnd_box_t *)line); + rnd_r_delete_entry(srcly->line_tree, (rnd_rnd_box_t *)line); pcb_line_unreg(line); pcb_line_reg(dstly, line); @@ -513,8 +513,8 @@ PCB_FLAG_CLEAR(PCB_FLAG_FOUND, line); if (!dstly->line_tree) - dstly->line_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dstly->line_tree, (rnd_rnd_box_t *)line); + dstly->line_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dstly->line_tree, (rnd_rnd_box_t *)line); pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_LINE, dstly, line); return line; @@ -530,11 +530,11 @@ if (value <= PCB_MAX_THICKNESS && value >= PCB_MIN_THICKNESS && value != Line->Thickness) { pcb_undo_add_obj_to_size(PCB_OBJ_LINE, Layer, Line, Line); pcb_line_invalidate_erase(Line); - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); Line->Thickness = value; pcb_line_bbox(Line); - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); return Line; @@ -558,10 +558,10 @@ pcb_undo_add_obj_to_clear_size(PCB_OBJ_LINE, Layer, Line, Line); pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_erase(Line); - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); Line->Clearance = value; pcb_line_bbox(Line); - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); return Line; @@ -638,12 +638,12 @@ void *pcb_lineop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (Layer->line_tree != NULL) - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); if (ctx->move.pcb != NULL) pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_lineop_move_noclip(ctx, Layer, Line); if (Layer->line_tree != NULL) - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); if (ctx->move.pcb != NULL) pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); return Line; @@ -652,12 +652,12 @@ void *pcb_lineop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (ctx->clip.restore) { - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); if (ctx->clip.pcb != NULL) pcb_poly_restore_to_poly(ctx->clip.pcb->Data, PCB_OBJ_LINE, Layer, Line); } if (ctx->clip.clear) { - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); if (ctx->clip.pcb != NULL) pcb_poly_clear_from_poly(ctx->clip.pcb->Data, PCB_OBJ_LINE, Layer, Line); } @@ -671,10 +671,10 @@ if (Layer->meta.real.vis) pcb_line_invalidate_erase(Line); pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); - pcb_r_delete_entry(Layer->line_tree, &Line->BoundingBox); + rnd_r_delete_entry(Layer->line_tree, &Line->BoundingBox); RND_MOVE_POINT(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); pcb_line_bbox(Line); - pcb_r_insert_entry(Layer->line_tree, &Line->BoundingBox); + rnd_r_insert_entry(Layer->line_tree, &Line->BoundingBox); pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); if (Layer->meta.real.vis) pcb_line_invalidate_draw(Layer, Line); @@ -684,10 +684,10 @@ if (ctx->move.pcb->RatOn) pcb_rat_invalidate_erase((pcb_rat_t *) Line); - pcb_r_delete_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox); + rnd_r_delete_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox); RND_MOVE_POINT(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); pcb_line_bbox(Line); - pcb_r_insert_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox); + rnd_r_insert_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox); if (ctx->move.pcb->RatOn) pcb_rat_invalidate_draw((pcb_rat_t *) Line); return Line; @@ -742,14 +742,14 @@ /* moves a line between layers; lowlevel routines */ void *pcb_lineop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_line_t * line, pcb_layer_t * Destination) { - pcb_r_delete_entry(Source->line_tree, (rnd_rnd_box_t *) line); + rnd_r_delete_entry(Source->line_tree, (rnd_rnd_box_t *) line); pcb_line_unreg(line); pcb_line_reg(Destination, line); if (!Destination->line_tree) - Destination->line_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Destination->line_tree, (rnd_rnd_box_t *) line); + Destination->line_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Destination->line_tree, (rnd_rnd_box_t *) line); return line; } @@ -762,7 +762,7 @@ jmp_buf env; }; -static pcb_r_dir_t moveline_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t moveline_callback(const rnd_rnd_box_t * b, void *cl) { struct via_info *i = (struct via_info *) cl; pcb_pstk_t *ps; @@ -814,7 +814,7 @@ info.X = newone->Point1.X; info.Y = newone->Point1.Y; if (setjmp(info.env) == 0) - pcb_r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL); + rnd_r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL); } /* consider via at Point2 */ sb.X1 = newone->Point2.X - newone->Thickness / 2; @@ -826,7 +826,7 @@ info.X = newone->Point2.X; info.Y = newone->Point2.Y; if (setjmp(info.env) == 0) - pcb_r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL); + rnd_r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL); } return newone; } @@ -834,7 +834,7 @@ /* destroys a line from a layer */ void *pcb_lineop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); pcb_line_free(Line); return NULL; @@ -846,12 +846,12 @@ pcb_line_t *line; rnd_point_t *point; }; -static pcb_r_dir_t remove_point(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t remove_point(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; struct rlp_info *info = (struct rlp_info *) cl; if (line == info->line) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if ((line->Point1.X == info->point->X) && (line->Point1.Y == info->point->Y)) { info->line = line; @@ -864,7 +864,7 @@ info->point = &line->Point2; longjmp(info->env, 1); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } /* removes a line point, or a line if the selected point is the end */ @@ -879,7 +879,7 @@ info.line = Line; info.point = Point; if (setjmp(info.env) == 0) { - pcb_r_search(Layer->line_tree, (const rnd_rnd_box_t *) Point, NULL, remove_point, &info, NULL); + rnd_r_search(Layer->line_tree, (const rnd_rnd_box_t *) Point, NULL, remove_point, &info, NULL); return pcb_lineop_remove(ctx, Layer, Line); } pcb_move_obj(PCB_OBJ_LINE_POINT, Layer, info.line, info.point, other.X - Point->X, other.Y - Point->Y); @@ -938,12 +938,12 @@ void pcb_line_rotate(pcb_layer_t *layer, pcb_line_t *line, rnd_coord_t X, rnd_coord_t Y, double cosa, double sina) { if (layer->line_tree != NULL) - pcb_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line); + rnd_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line); rnd_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina); rnd_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina); pcb_line_bbox(line); if (layer->line_tree != NULL) - pcb_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line); + rnd_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line); } void pcb_line_mirror(pcb_line_t *line, rnd_coord_t y_offs, rnd_bool undoable) @@ -992,13 +992,13 @@ void pcb_line_flip_side(pcb_layer_t *layer, pcb_line_t *line) { - pcb_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line); + rnd_r_delete_entry(layer->line_tree, (rnd_rnd_box_t *) line); line->Point1.X = PCB_SWAP_X(line->Point1.X); line->Point1.Y = PCB_SWAP_Y(line->Point1.Y); line->Point2.X = PCB_SWAP_X(line->Point2.X); line->Point2.Y = PCB_SWAP_Y(line->Point2.Y); pcb_line_bbox(line); - pcb_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line); + rnd_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) line); } static void rotate_line1(pcb_layer_t *Layer, pcb_line_t *Line) @@ -1008,10 +1008,10 @@ if (!Layer->is_bound) pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); if (Layer->line_tree != NULL) - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); } else - pcb_r_delete_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) Line); } static void rotate_line2(pcb_layer_t *Layer, pcb_line_t *Line) @@ -1019,13 +1019,13 @@ pcb_line_bbox(Line); if (Layer) { if (Layer->line_tree != NULL) - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); if (!Layer->is_bound) pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); } else { - pcb_r_insert_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) Line); pcb_rat_invalidate_draw((pcb_rat_t *) Line); } } @@ -1070,12 +1070,12 @@ Y = Line->Point2.Y; pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Layer, Line, &Line->Point2, ctx->insert.x - X, ctx->insert.y - Y); pcb_line_invalidate_erase(Line); - pcb_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_delete_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); Line->Point2.X = ctx->insert.x; Line->Point2.Y = ctx->insert.y; pcb_line_bbox(Line); - pcb_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); + rnd_r_insert_entry(Layer->line_tree, (rnd_rnd_box_t *) Line); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); /* we must create after playing with Line since creation may @@ -1248,34 +1248,34 @@ pcb_line_draw_(info, line, allow_term_gfx); } -pcb_r_dir_t pcb_line_draw_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_line_draw_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *)b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(line->parent_type, &line->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_line_draw(info, line, 0); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_line_draw_term_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_line_draw_term_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *)b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(line->parent_type, &line->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_line_draw(info, line, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* erases a line on a layer */ Index: trunk/src/obj_line_draw.h =================================================================== --- trunk/src/obj_line_draw.h (revision 31039) +++ trunk/src/obj_line_draw.h (revision 31040) @@ -32,8 +32,8 @@ /* Include rtree.h for this */ #ifdef RND_RTREE_H -pcb_r_dir_t pcb_line_draw_callback(const rnd_rnd_box_t * b, void *cl); -pcb_r_dir_t pcb_line_draw_term_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_line_draw_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_line_draw_term_callback(const rnd_rnd_box_t * b, void *cl); #endif void pcb_line_draw_(pcb_draw_info_t *info, pcb_line_t *line, int allow_term_gfx); Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 31039) +++ trunk/src/obj_line_drcenf.c (revision 31040) @@ -195,7 +195,7 @@ jmp_buf env; }; -static pcb_r_dir_t drcPstk_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t drcPstk_callback(const rnd_rnd_box_t *b, void *cl) { pcb_pstk_t *ps = (pcb_pstk_t *)b; struct drc_info *i = (struct drc_info *)cl; @@ -202,10 +202,10 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, ps) && pcb_isc_pstk_line(pcb_find0, ps, i->line)) longjmp(i->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t drcLine_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t drcLine_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; struct drc_info *i = (struct drc_info *) cl; @@ -212,10 +212,10 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_isc_line_line(pcb_find0, line, i->line)) longjmp(i->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t drcArc_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t drcArc_callback(const rnd_rnd_box_t * b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *) b; struct drc_info *i = (struct drc_info *) cl; @@ -222,7 +222,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_isc_line_arc(pcb_find0, i->line, arc)) longjmp(i->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } double pcb_drc_lines(pcb_board_t *pcb, const rnd_point_t *start, rnd_point_t *end, rnd_point_t *mid_out, rnd_bool way, rnd_bool optimize) @@ -333,20 +333,20 @@ last2 = length2; if (setjmp(info.env) == 0) { info.line = &line1; - pcb_r_search(PCB->Data->padstack_tree, &line1.BoundingBox, NULL, drcPstk_callback, &info, NULL); + rnd_r_search(PCB->Data->padstack_tree, &line1.BoundingBox, NULL, drcPstk_callback, &info, NULL); if (two_lines) { info.line = &line2; - pcb_r_search(PCB->Data->padstack_tree, &line2.BoundingBox, NULL, drcPstk_callback, &info, NULL); + rnd_r_search(PCB->Data->padstack_tree, &line2.BoundingBox, NULL, drcPstk_callback, &info, NULL); } PCB_COPPER_GROUP_LOOP(PCB->Data, group); { info.line = &line1; - pcb_r_search(layer->line_tree, &line1.BoundingBox, NULL, drcLine_callback, &info, NULL); - pcb_r_search(layer->arc_tree, &line1.BoundingBox, NULL, drcArc_callback, &info, NULL); + rnd_r_search(layer->line_tree, &line1.BoundingBox, NULL, drcLine_callback, &info, NULL); + rnd_r_search(layer->arc_tree, &line1.BoundingBox, NULL, drcArc_callback, &info, NULL); if (two_lines) { info.line = &line2; - pcb_r_search(layer->line_tree, &line2.BoundingBox, NULL, drcLine_callback, &info, NULL); - pcb_r_search(layer->arc_tree, &line2.BoundingBox, NULL, drcArc_callback, &info, NULL); + rnd_r_search(layer->line_tree, &line2.BoundingBox, NULL, drcLine_callback, &info, NULL); + rnd_r_search(layer->arc_tree, &line2.BoundingBox, NULL, drcArc_callback, &info, NULL); } } PCB_END_LOOP; @@ -438,12 +438,12 @@ pcb_line_bbox(&line); if (setjmp(info.env) == 0) { info.line = &line; - pcb_r_search(PCB->Data->padstack_tree, &line.BoundingBox, NULL, drcPstk_callback, &info, NULL); + rnd_r_search(PCB->Data->padstack_tree, &line.BoundingBox, NULL, drcPstk_callback, &info, NULL); PCB_COPPER_GROUP_LOOP(PCB->Data, group); { info.line = &line; - pcb_r_search(layer->line_tree, &line.BoundingBox, NULL, drcLine_callback, &info, NULL); - pcb_r_search(layer->arc_tree, &line.BoundingBox, NULL, drcArc_callback, &info, NULL); + rnd_r_search(layer->line_tree, &line.BoundingBox, NULL, drcLine_callback, &info, NULL); + rnd_r_search(layer->arc_tree, &line.BoundingBox, NULL, drcArc_callback, &info, NULL); } PCB_END_LOOP; /* no intersector! */ Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 31039) +++ trunk/src/obj_poly.c (revision 31040) @@ -109,7 +109,7 @@ void pcb_poly_free(pcb_poly_t *poly) { if ((poly->parent.layer != NULL) && (poly->parent.layer->polygon_tree != NULL)) - pcb_r_delete_entry(poly->parent.layer->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_delete_entry(poly->parent.layer->polygon_tree, (rnd_rnd_box_t *)poly); rnd_attribute_free(&poly->Attributes); pcb_poly_unreg(poly); pcb_obj_common_free((pcb_any_obj_t *)poly); @@ -192,7 +192,7 @@ void pcb_poly_rotate(pcb_layer_t *layer, pcb_poly_t *polygon, rnd_coord_t X, rnd_coord_t Y, double cosa, double sina) { if (layer->polygon_tree != NULL) - pcb_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); PCB_POLY_POINT_LOOP(polygon); { rnd_rotate(&point->X, &point->Y, X, Y, cosa, sina); @@ -202,7 +202,7 @@ pcb_poly_init_clip(layer->parent.data, layer, polygon); pcb_poly_bbox(polygon); if (layer->polygon_tree != NULL) - pcb_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); } int pcb_poly_is_valid(pcb_poly_t *p) @@ -292,7 +292,7 @@ pcb_layer_t *layer = g->poly->parent.layer; if (layer->polygon_tree != NULL) - pcb_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *)g->poly); + rnd_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *)g->poly); PCB_POLY_POINT_LOOP(g->poly); { point->X = PCB_SWAP_X(point->X); @@ -303,7 +303,7 @@ pcb_poly_init_clip(layer->parent.data, layer, g->poly); pcb_poly_bbox(g->poly); if (layer->polygon_tree != NULL) - pcb_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *)g->poly); + rnd_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *)g->poly); return 0; } @@ -338,7 +338,7 @@ void pcb_poly_flip_side(pcb_layer_t *layer, pcb_poly_t *polygon) { - pcb_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_delete_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); PCB_POLY_POINT_LOOP(polygon); { point->X = PCB_SWAP_X(point->X); @@ -348,7 +348,7 @@ if (layer->parent_type == PCB_PARENT_DATA) pcb_poly_init_clip(layer->parent.data, layer, polygon); pcb_poly_bbox(polygon); - pcb_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); /* hmmm, how to handle clip */ } @@ -480,8 +480,8 @@ { pcb_poly_bbox(polygon); if (!Layer->polygon_tree) - Layer->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) polygon); + Layer->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) polygon); PCB_SET_PARENT(polygon, layer, Layer); pcb_poly_clear_from_poly(Layer->parent.data, PCB_OBJ_POLY, Layer, polygon); } @@ -638,8 +638,8 @@ * skeleton polygon object, which won't have correct bounds. */ if (!layer->polygon_tree) - layer->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); + layer->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) polygon); PCB_FLAG_CLEAR(PCB_FLAG_FOUND | ctx->buffer.extraflg, polygon); return polygon; @@ -663,7 +663,7 @@ pcb_poly_pprestore(polygon); - pcb_r_delete_entry(srcly->polygon_tree, (rnd_rnd_box_t *)polygon); + rnd_r_delete_entry(srcly->polygon_tree, (rnd_rnd_box_t *)polygon); pcb_poly_unreg(polygon); pcb_poly_reg(dstly, polygon); @@ -671,8 +671,8 @@ PCB_FLAG_CLEAR(PCB_FLAG_FOUND, polygon); if (!dstly->polygon_tree) - dstly->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dstly->polygon_tree, (rnd_rnd_box_t *)polygon); + dstly->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dstly->polygon_tree, (rnd_rnd_box_t *)polygon); pcb_poly_ppclear(polygon); return polygon; @@ -694,10 +694,10 @@ pcb_undo_add_obj_to_clear_size(PCB_OBJ_POLY, Layer, poly, poly); pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_POLY, Layer, poly); pcb_poly_invalidate_erase(poly); - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *)poly); poly->Clearance = value; pcb_poly_bbox(poly); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *)poly); pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_POLY, Layer, poly); pcb_poly_invalidate_draw(Layer, poly); return poly; @@ -752,7 +752,7 @@ * second, shift the points up to make room for the new point */ pcb_poly_invalidate_erase(Polygon); - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); save = *pcb_poly_point_new(Polygon, ctx->insert.x, ctx->insert.y); for (n = Polygon->PointN - 1; n > ctx->insert.idx; n--) Polygon->Points[n] = Polygon->Points[n - 1]; @@ -767,7 +767,7 @@ pcb_undo_add_obj_to_insert_point(PCB_OBJ_POLY_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]); pcb_poly_bbox(Polygon); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); if (ctx->insert.forcible || !pcb_poly_remove_excess_points(Layer, Polygon)) pcb_poly_invalidate_draw(Layer, Polygon); @@ -824,10 +824,10 @@ void *pcb_polyop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon) { - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_pprestore(Polygon); pcb_polyop_move_noclip(ctx, Layer, Polygon); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_ppclear(Polygon); return Polygon; } @@ -835,11 +835,11 @@ void *pcb_polyop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon) { if (ctx->clip.restore) { - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_pprestore(Polygon); } if (ctx->clip.clear) { - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_ppclear(Polygon); } return Polygon; @@ -851,10 +851,10 @@ if (Layer->meta.real.vis) { pcb_poly_invalidate_erase(Polygon); } - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); RND_MOVE_POINT(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); pcb_poly_bbox(Polygon); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_remove_excess_points(Layer, Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); if (Layer->meta.real.vis) @@ -866,7 +866,7 @@ /* moves a polygon between layers; lowlevel routines */ void *pcb_polyop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_poly_t * polygon, pcb_layer_t * Destination) { - pcb_r_delete_entry(Source->polygon_tree, (rnd_rnd_box_t *) polygon); + rnd_r_delete_entry(Source->polygon_tree, (rnd_rnd_box_t *) polygon); pcb_poly_pprestore(polygon); pcb_poly_unreg(polygon); @@ -873,8 +873,8 @@ pcb_poly_reg(Destination, polygon); if (!Destination->polygon_tree) - Destination->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Destination->polygon_tree, (rnd_rnd_box_t *) polygon); + Destination->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Destination->polygon_tree, (rnd_rnd_box_t *) polygon); pcb_poly_ppclear(polygon); return polygon; @@ -906,7 +906,7 @@ /* destroys a polygon from a layer */ void *pcb_polyop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon) { - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_free_fields(Polygon); pcb_poly_free(Polygon); @@ -932,7 +932,7 @@ if (contour_points <= 3) return pcb_polyop_remove_counter(ctx, Layer, Polygon, contour); - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); /* remove point from list, keep point order */ for (i = point_idx; i < Polygon->PointN - 1; i++) @@ -945,7 +945,7 @@ Polygon->HoleIndex[i]--; pcb_poly_bbox(Polygon); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); pcb_poly_ppclear(Polygon); return Polygon; @@ -1041,7 +1041,7 @@ /* insert the polygon-point into the undo list */ pcb_undo_add_obj_to_remove_point(PCB_OBJ_POLY_POINT, Layer, Polygon, point_idx); - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); /* remove point from list, keep point order */ for (i = point_idx; i < Polygon->PointN - 1; i++) @@ -1054,7 +1054,7 @@ Polygon->HoleIndex[i]--; pcb_poly_bbox(Polygon); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_remove_excess_points(Layer, Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); @@ -1077,8 +1077,8 @@ pcb_poly_copy(polygon, Polygon, ctx->copy.DeltaX, ctx->copy.DeltaY); pcb_poly_copy_meta(polygon, Polygon); if (!Layer->polygon_tree) - Layer->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) polygon); + Layer->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) polygon); pcb_poly_init_clip(PCB->Data, Layer, polygon); pcb_poly_invalidate_draw(Layer, polygon); pcb_undo_add_obj_to_create(PCB_OBJ_POLY, Layer, polygon, polygon); @@ -1092,10 +1092,10 @@ if (Layer->meta.real.vis) pcb_poly_invalidate_erase(Polygon); if (Layer->polygon_tree != NULL) - pcb_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_delete_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_rotate90(Polygon, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); if (Layer->polygon_tree != NULL) - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); if (Layer->meta.real.vis) pcb_poly_invalidate_draw(Layer, Polygon); @@ -1151,7 +1151,7 @@ pcb_poly_pprestore(poly); if (ly->polygon_tree != NULL) - pcb_r_delete_entry(ly->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_delete_entry(ly->polygon_tree, (rnd_rnd_box_t *)poly); } void pcb_poly_post(pcb_poly_t *poly) @@ -1161,7 +1161,7 @@ return; if (ly->polygon_tree != NULL) - pcb_r_insert_entry(ly->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_insert_entry(ly->polygon_tree, (rnd_rnd_box_t *)poly); pcb_poly_ppclear(poly); } @@ -1419,32 +1419,32 @@ pcb_poly_draw_(info, polygon, allow_term_gfx); } -pcb_r_dir_t pcb_poly_draw_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_poly_draw_callback(const rnd_rnd_box_t * b, void *cl) { pcb_draw_info_t *i = cl; pcb_poly_t *polygon = (pcb_poly_t *) b; if (pcb_hidden_floater((pcb_any_obj_t*)b, i) || pcb_partial_export((pcb_any_obj_t*)b, i)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!polygon->Clipped) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(polygon->parent_type, &polygon->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_poly_draw(i, polygon, 0); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_poly_draw_term_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_poly_draw_term_callback(const rnd_rnd_box_t * b, void *cl) { pcb_draw_info_t *i = cl; pcb_poly_t *polygon = (pcb_poly_t *) b; if (pcb_hidden_floater((pcb_any_obj_t*)b, i) || pcb_partial_export((pcb_any_obj_t*)b, i)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (polygon->Clipped == NULL) { /* if poly is cleared out of existence, it may still have some annotations @@ -1452,15 +1452,15 @@ only thing affected is the as-drawn contour */ if (conf_core.editor.as_drawn_poly) pcb_draw_annotation_add((pcb_any_obj_t *)polygon); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(polygon->parent_type, &polygon->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_poly_draw(i, polygon, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* erases a polygon on a layer */ Index: trunk/src/obj_poly_draw.h =================================================================== --- trunk/src/obj_poly_draw.h (revision 31039) +++ trunk/src/obj_poly_draw.h (revision 31040) @@ -32,8 +32,8 @@ /* Include rtree.h for these */ #ifdef RND_RTREE_H -pcb_r_dir_t pcb_poly_draw_callback(const rnd_rnd_box_t * b, void *cl); -pcb_r_dir_t pcb_poly_draw_term_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_poly_draw_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_poly_draw_term_callback(const rnd_rnd_box_t * b, void *cl); #endif void pcb_poly_invalidate_erase(pcb_poly_t *Polygon); Index: trunk/src/obj_pstk.c =================================================================== --- trunk/src/obj_pstk.c (revision 31039) +++ trunk/src/obj_pstk.c (revision 31040) @@ -106,7 +106,7 @@ void pcb_pstk_free(pcb_pstk_t *ps) { if ((ps->parent.data != NULL) && (ps->parent.data->padstack_tree != NULL)) - pcb_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); rnd_attribute_free(&ps->Attributes); pcb_pstk_unreg(ps); free(ps->thermals.shape); @@ -151,8 +151,8 @@ { pcb_pstk_bbox(ps); if (!data->padstack_tree) - data->padstack_tree = pcb_r_create_tree(); - pcb_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); + data->padstack_tree = rnd_r_create_tree(); + rnd_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); PCB_SET_PARENT(ps, data, data); } @@ -529,7 +529,7 @@ } } -pcb_r_dir_t pcb_pstk_draw_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_pstk_draw_callback(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_pstk_t *ps = (pcb_pstk_t *)b; @@ -536,19 +536,19 @@ pcb_pstk_shape_t *shape; pcb_layergrp_t *grp = NULL; - pcb_obj_noexport(info, ps, return PCB_R_DIR_NOT_FOUND); + pcb_obj_noexport(info, ps, return RND_R_DIR_NOT_FOUND); if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_gobj_parent_subc(ps->parent_type, &ps->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (info->objcb.pstk.gid < 0) { if (info->objcb.pstk.shape_mask != 0) shape = pcb_pstk_shape(ps, info->objcb.pstk.shape_mask, info->objcb.pstk.comb); else - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } else { int n; @@ -557,7 +557,7 @@ for(n = 0, lid = grp->lid; n < grp->len; n++,lid++) { if (*lid < ps->thermals.used) { if ((ps->thermals.shape[*lid] & PCB_THERMAL_ON) && ((ps->thermals.shape[*lid] & 3) == PCB_THERMAL_NOSHAPE)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } } } @@ -575,10 +575,10 @@ pcb_pstk_draw_shape_solid(info, pcb_draw_out.fgGC, ps, shape); } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_pstk_draw_mark_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_pstk_draw_mark_callback(const rnd_rnd_box_t *b, void *cl) { pcb_pstk_t *ps = (pcb_pstk_t *)b; pcb_pstk_proto_t *proto; @@ -594,7 +594,7 @@ mark2 = mark*2; if (mark2 < rnd_render->coord_per_pix) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; /* draw the cross using xor */ set_ps_annot_color(pcb_draw_out.fgGC, ps); @@ -606,10 +606,10 @@ else rnd_render->draw_line(pcb_draw_out.fgGC, ps->x-rnd_render->coord_per_pix, ps->y, ps->x+rnd_render->coord_per_pix, ps->y); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_pstk_draw_label_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_pstk_draw_label_callback(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_pstk_t *ps = (pcb_pstk_t *)b; @@ -623,28 +623,28 @@ if (ps->noexport) pcb_obj_noexport_mark(ps, ps->x, ps->y); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_pstk_draw_hole_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_pstk_draw_hole_callback(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_pstk_t *ps = (pcb_pstk_t *)b; pcb_pstk_proto_t *proto; - pcb_obj_noexport(info, ps, return PCB_R_DIR_NOT_FOUND); + pcb_obj_noexport(info, ps, return RND_R_DIR_NOT_FOUND); if (pcb_hidden_floater(ps, info) || pcb_partial_export(ps, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; /* hide subc parts if requested */ if (!info->pcb->SubcPartsOn && pcb_gobj_parent_subc(ps->parent_type, &ps->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* no hole in this layer group */ if (info->objcb.pstk.gid >= 0) { if (!pcb_pstk_bb_drills(info->pcb, ps, info->objcb.pstk.gid, &proto)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } else proto = pcb_pstk_get_proto(ps); @@ -651,19 +651,19 @@ /* No hole at all */ if ((proto == NULL) || (proto->hdia <= 0)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* hole is plated, but the caller doesn't want plated holes */ if (proto->hplated && (!(info->objcb.pstk.holetype & PCB_PHOLE_PLATED))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* hole is unplated, but the caller doesn't want unplated holes */ if (!proto->hplated && (!(info->objcb.pstk.holetype & PCB_PHOLE_UNPLATED))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* BBvia, but the caller doesn't want BBvias */ if (((proto->htop != 0) || (proto->hbottom != 0)) && (!(info->objcb.pstk.holetype & PCB_PHOLE_BB))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* actual hole */ rnd_hid_set_line_width(pcb_draw_out.drillGC, 0); @@ -680,10 +680,10 @@ rnd_render->draw_arc(pcb_draw_out.fgGC, ps->x, ps->y, r, r, 20, 290); } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_pstk_draw_slot_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_pstk_draw_slot_callback(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_pstk_t *ps = (pcb_pstk_t *)b; @@ -690,19 +690,19 @@ pcb_pstk_proto_t *proto; pcb_pstk_shape_t *shape; - pcb_obj_noexport(info, ps, return PCB_R_DIR_NOT_FOUND); + pcb_obj_noexport(info, ps, return RND_R_DIR_NOT_FOUND); if (pcb_hidden_floater(ps, info) || pcb_partial_export(ps, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; /* hide subc parts if requested */ if (!info->pcb->SubcPartsOn && pcb_gobj_parent_subc(ps->parent_type, &ps->parent)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* no slot in this layer group */ if (info->objcb.pstk.gid >= 0) { if (!pcb_pstk_bb_drills(info->pcb, ps, info->objcb.pstk.gid, &proto)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } else proto = pcb_pstk_get_proto(ps); @@ -709,19 +709,19 @@ /* No slot at all */ if (proto->mech_idx < 0) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* hole is plated, but the caller doesn't want plated holes */ if (proto->hplated && (!(info->objcb.pstk.holetype & PCB_PHOLE_PLATED))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* hole is unplated, but the caller doesn't want unplated holes */ if (!proto->hplated && (!(info->objcb.pstk.holetype & PCB_PHOLE_UNPLATED))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* BBslot, but the caller doesn't want BBslot */ if (((proto->htop != 0) || (proto->hbottom != 0)) && (!(info->objcb.pstk.holetype & PCB_PHOLE_BB))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* actual slot */ shape = pcb_pstk_shape(ps, PCB_LYT_MECH, PCB_LYC_AUTO); @@ -734,7 +734,7 @@ pcb_pstk_draw_shape_solid(info, pcb_draw_out.drillGC, ps, shape); } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } void pcb_pstk_thindraw(pcb_draw_info_t *info, rnd_hid_gc_t gc, pcb_pstk_t *ps) @@ -1200,13 +1200,13 @@ pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_erase(ps); if (ps->parent.data->padstack_tree != NULL) - pcb_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); ps->y = PCB_SWAP_Y(ps->y) + g->y_offs; pcb_pstk_bbox(ps); if (ps->parent.data->padstack_tree != NULL) - pcb_r_insert_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_draw(ps); } @@ -1415,7 +1415,7 @@ pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_erase(ps); if (ps->parent.data->padstack_tree != NULL) - pcb_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); swap(ps->proto, u->proto, rnd_cardinal_t); swap(ps->Clearance, u->clearance, rnd_coord_t); @@ -1429,7 +1429,7 @@ pcb_pstk_bbox(ps); if (ps->parent.data->padstack_tree != NULL) - pcb_r_insert_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_draw(ps); @@ -1566,7 +1566,7 @@ { pcb_data_t *data = pstk->parent.data; if (data->padstack_tree != NULL) - pcb_r_delete_entry(data->padstack_tree, (rnd_rnd_box_t *)pstk); + rnd_r_delete_entry(data->padstack_tree, (rnd_rnd_box_t *)pstk); pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, pstk); } @@ -1574,7 +1574,7 @@ { pcb_data_t *data = pstk->parent.data; if (data->padstack_tree != NULL) - pcb_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)pstk); + rnd_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)pstk); pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, pstk); } Index: trunk/src/obj_pstk_draw.h =================================================================== --- trunk/src/obj_pstk_draw.h (revision 31039) +++ trunk/src/obj_pstk_draw.h (revision 31040) @@ -35,14 +35,14 @@ #include "board.h" #include "draw.h" -pcb_r_dir_t pcb_pstk_draw_callback(const rnd_rnd_box_t *b, void *cl); -pcb_r_dir_t pcb_pstk_draw_hole_callback(const rnd_rnd_box_t *b, void *cl); -pcb_r_dir_t pcb_pstk_draw_slot_callback(const rnd_rnd_box_t *b, void *cl); -pcb_r_dir_t pcb_pstk_clear_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_pstk_draw_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_pstk_draw_hole_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_pstk_draw_slot_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_pstk_clear_callback(const rnd_rnd_box_t *b, void *cl); #endif -pcb_r_dir_t pcb_pstk_draw_mark_callback(const rnd_rnd_box_t *b, void *cl); -pcb_r_dir_t pcb_pstk_draw_label_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_pstk_draw_mark_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_pstk_draw_label_callback(const rnd_rnd_box_t *b, void *cl); void pcb_pstk_draw_label(pcb_draw_info_t *info, pcb_pstk_t *ps); void pcb_pstk_invalidate_erase(pcb_pstk_t *ps); void pcb_pstk_invalidate_draw(pcb_pstk_t *ps); Index: trunk/src/obj_pstk_op.c =================================================================== --- trunk/src/obj_pstk_op.c (revision 31039) +++ trunk/src/obj_pstk_op.c (revision 31040) @@ -52,7 +52,7 @@ npid = pcb_pstk_proto_insert_dup(ctx->buffer.dst, proto, 1, 0); pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_PSTK, NULL, ps); - pcb_r_delete_entry(ctx->buffer.src->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(ctx->buffer.src->padstack_tree, (rnd_rnd_box_t *)ps); pcb_pstk_unreg(ps); ps->proto = npid; @@ -62,9 +62,9 @@ PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND, ps); if (!ctx->buffer.dst->padstack_tree) - ctx->buffer.dst->padstack_tree = pcb_r_create_tree(); + ctx->buffer.dst->padstack_tree = rnd_r_create_tree(); - pcb_r_insert_entry(ctx->buffer.dst->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(ctx->buffer.dst->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_PSTK, NULL, ps); return ps; @@ -106,10 +106,10 @@ pcb_data_t *data = ps->parent.data; assert(ps->parent_type = PCB_PARENT_DATA); - pcb_r_delete_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps); pcb_pstkop_move_noclip(ctx, ps); - pcb_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps); pcb_subc_part_changed(ps); return ps; @@ -122,12 +122,12 @@ if (ctx->clip.restore) { if (data->padstack_tree != NULL) - pcb_r_delete_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps); } if (ctx->clip.clear) { if (data->padstack_tree != NULL) - pcb_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps); } @@ -144,7 +144,7 @@ void *pcb_pstkop_destroy(pcb_opctx_t *ctx, pcb_pstk_t *ps) { - pcb_r_delete_entry(ctx->remove.destroy_target->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(ctx->remove.destroy_target->padstack_tree, (rnd_rnd_box_t *)ps); pcb_pstk_free(ps); return NULL; } @@ -200,7 +200,7 @@ pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_erase(ps); if (ps->parent.data->padstack_tree != NULL) - pcb_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); rnd_rotate(&nx, &ny, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina); if ((nx != ps->x) || (ny != ps->y)) @@ -208,7 +208,7 @@ pcb_pstk_bbox(ps); if (ps->parent.data->padstack_tree != NULL) - pcb_r_insert_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(ps->parent.data->padstack_tree, (rnd_rnd_box_t *)ps); pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_draw(ps); Index: trunk/src/obj_pstk_proto.c =================================================================== --- trunk/src/obj_pstk_proto.c (revision 31039) +++ trunk/src/obj_pstk_proto.c (revision 31040) @@ -456,7 +456,7 @@ if (remove_src) { if (src->parent.data->padstack_tree != NULL) - pcb_r_delete_entry(src->parent.data->padstack_tree, (rnd_rnd_box_t *)src); + rnd_r_delete_entry(src->parent.data->padstack_tree, (rnd_rnd_box_t *)src); pcb_pstk_free(src); } Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 31039) +++ trunk/src/obj_rat.c (revision 31040) @@ -83,7 +83,7 @@ void pcb_rat_free(pcb_rat_t *rat) { if ((rat->parent.data != NULL) && (rat->parent.data->rat_tree != NULL)) - pcb_r_delete_entry(rat->parent.data->rat_tree, (rnd_rnd_box_t *)rat); + rnd_r_delete_entry(rat->parent.data->rat_tree, (rnd_rnd_box_t *)rat); pcb_rat_unreg(rat); free(rat->anchor[0]); free(rat->anchor[1]); @@ -117,8 +117,8 @@ Line->group2 = group2; pcb_line_bbox((pcb_line_t *) Line); if (!Data->rat_tree) - Data->rat_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Data->rat_tree, &Line->BoundingBox); + Data->rat_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Data->rat_tree, &Line->BoundingBox); if (anchor1 != NULL) Line->anchor[0] = pcb_obj2idpath(anchor1); @@ -223,31 +223,31 @@ if (l->line_tree != NULL) { for(n = rnd_rtree_first(&it, l->line_tree, &sb); n != NULL; n = rnd_rtree_next(&it)) { if (rat_meets_line((pcb_line_t *)n, x, y, -1)) { - pcb_r_end(&it); + rnd_r_end(&it); return (pcb_any_obj_t *)n; } } - pcb_r_end(&it); + rnd_r_end(&it); } if (l->arc_tree != NULL) { for(n = rnd_rtree_first(&it, l->arc_tree, &sb); n != NULL; n = rnd_rtree_next(&it)) { if (rat_meets_arc((pcb_arc_t *)n, x, y, -1)) { - pcb_r_end(&it); + rnd_r_end(&it); return (pcb_any_obj_t *)n; } } - pcb_r_end(&it); + rnd_r_end(&it); } if (l->polygon_tree != NULL) { for(n = rnd_rtree_first(&it, l->polygon_tree, &sb); n != NULL; n = rnd_rtree_next(&it)) { if (rat_meets_poly((pcb_poly_t *)n, x, y, -1)) { - pcb_r_end(&it); + rnd_r_end(&it); return (pcb_any_obj_t *)n; } } - pcb_r_end(&it); + rnd_r_end(&it); } TODO("find through text"); @@ -255,12 +255,12 @@ if (l->text_tree != NULL) { for(n = rnd_rtree_first(&it, l->text_tree, &sb); n != NULL; n = rnd_rtree_next(&it)) { if (rat_meets_text((pcb_text_t *)n, x, y, -1)) { - pcb_r_end(&it); + rnd_r_end(&it); return (pcb_any_obj_t *)n; } } - pcb_r_end(&it); + rnd_r_end(&it); } #endif return NULL; @@ -285,11 +285,11 @@ if (PCB->Data->padstack_tree != NULL) { for(n = rnd_rtree_first(&it, data->padstack_tree, &sb); n != NULL; n = rnd_rtree_next(&it)) { if (rat_meets_pstk(data, (pcb_pstk_t *)n, x, y, gid)) { - pcb_r_end(&it); + rnd_r_end(&it); return (pcb_any_obj_t *)n; } } - pcb_r_end(&it); + rnd_r_end(&it); } for(i = 0; i < g->len; i++) { @@ -367,7 +367,7 @@ /* moves a rat-line between board and buffer */ void *pcb_ratop_move_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat) { - pcb_r_delete_entry(ctx->buffer.src->rat_tree, (rnd_rnd_box_t *) rat); + rnd_r_delete_entry(ctx->buffer.src->rat_tree, (rnd_rnd_box_t *) rat); pcb_rat_unreg(rat); pcb_rat_reg(ctx->buffer.dst, rat); @@ -375,8 +375,8 @@ PCB_FLAG_CLEAR(PCB_FLAG_FOUND, rat); if (!ctx->buffer.dst->rat_tree) - ctx->buffer.dst->rat_tree = pcb_r_create_tree(); - pcb_r_insert_entry(ctx->buffer.dst->rat_tree, (rnd_rnd_box_t *) rat); + ctx->buffer.dst->rat_tree = rnd_r_create_tree(); + rnd_r_insert_entry(ctx->buffer.dst->rat_tree, (rnd_rnd_box_t *) rat); return rat; } @@ -425,7 +425,7 @@ void *pcb_ratop_destroy(pcb_opctx_t *ctx, pcb_rat_t *Rat) { if (ctx->remove.destroy_target->rat_tree) - pcb_r_delete_entry(ctx->remove.destroy_target->rat_tree, &Rat->BoundingBox); + rnd_r_delete_entry(ctx->remove.destroy_target->rat_tree, &Rat->BoundingBox); pcb_rat_free(Rat); return NULL; @@ -442,7 +442,7 @@ } /*** draw ***/ -pcb_r_dir_t pcb_rat_draw_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_rat_draw_callback(const rnd_rnd_box_t * b, void *cl) { pcb_rat_t *rat = (pcb_rat_t *) b; pcb_draw_info_t *info = cl; @@ -473,7 +473,7 @@ } else pcb_line_draw_(info, (pcb_line_t *) rat, 0); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } void pcb_rat_invalidate_erase(pcb_rat_t *Rat) Index: trunk/src/obj_rat_draw.h =================================================================== --- trunk/src/obj_rat_draw.h (revision 31039) +++ trunk/src/obj_rat_draw.h (revision 31040) @@ -30,7 +30,7 @@ /* Include rtree.h for these */ #ifdef RND_RTREE_H -pcb_r_dir_t pcb_rat_draw_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_rat_draw_callback(const rnd_rnd_box_t * b, void *cl); #endif void pcb_rat_invalidate_erase(pcb_rat_t *Rat); Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 31039) +++ trunk/src/obj_subc.c (revision 31040) @@ -135,7 +135,7 @@ { pcb_extobj_del_pre(sc); if ((sc->parent.data != NULL) && (sc->parent.data->subc_tree != NULL)) - pcb_r_delete_entry(sc->parent.data->subc_tree, (rnd_rnd_box_t *)sc); + rnd_r_delete_entry(sc->parent.data->subc_tree, (rnd_rnd_box_t *)sc); rnd_attribute_free(&sc->Attributes); if (sc->parent_type != PCB_PARENT_INVALID) pcb_subc_unreg(sc); @@ -968,7 +968,7 @@ /* bind the via rtree so that vias added in this subc show up on the board */ if (pcb != NULL) { if (pcb->Data->padstack_tree == NULL) - pcb->Data->padstack_tree = pcb_r_create_tree(); + pcb->Data->padstack_tree = rnd_r_create_tree(); sc->data->padstack_tree = pcb->Data->padstack_tree; } @@ -1018,8 +1018,8 @@ if (pcb != NULL) { if (!dst->subc_tree) - dst->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dst->subc_tree, (rnd_rnd_box_t *)sc); + dst->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dst->subc_tree, (rnd_rnd_box_t *)sc); } return sc; @@ -1076,9 +1076,9 @@ EraseSubc(sc); if (pcb_data_get_top(Data) != NULL) { if (Data->subc_tree != NULL) - pcb_r_delete_entry(Data->subc_tree, (rnd_rnd_box_t *)sc); + rnd_r_delete_entry(Data->subc_tree, (rnd_rnd_box_t *)sc); else - Data->subc_tree = pcb_r_create_tree(); + Data->subc_tree = rnd_r_create_tree(); } /* for calculating the new bounding box on the fly */ @@ -1158,7 +1158,7 @@ rnd_close_box(&sc->BoundingBox); rnd_close_box(&sc->bbox_naked); if (pcb_data_get_top(Data) != NULL) - pcb_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)sc); + rnd_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)sc); sc->part_changed_bbox_dirty = 0; /* we've just recalculated the bbox */ pcb_subc_part_changed_inhibit_dec(sc); @@ -1307,7 +1307,7 @@ linelist_foreach(&sl->Line, &it, line) { if (src_has_real_layer) { pcb_poly_restore_to_poly(src_data, PCB_OBJ_LINE, sl, line); - pcb_r_delete_entry(sl->line_tree, (rnd_rnd_box_t *)line); + rnd_r_delete_entry(sl->line_tree, (rnd_rnd_box_t *)line); chg++; } PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, line); @@ -1316,7 +1316,7 @@ pcb_line_reg(dl, line); } if ((dl != NULL) && (dl->line_tree != NULL)) { - pcb_r_insert_entry(dl->line_tree, (rnd_rnd_box_t *)line); + rnd_r_insert_entry(dl->line_tree, (rnd_rnd_box_t *)line); chg++; } if (dst_is_pcb && (dl != NULL)) @@ -1326,7 +1326,7 @@ arclist_foreach(&sl->Arc, &it, arc) { if (src_has_real_layer) { pcb_poly_restore_to_poly(src_data, PCB_OBJ_ARC, sl, arc); - pcb_r_delete_entry(sl->arc_tree, (rnd_rnd_box_t *)arc); + rnd_r_delete_entry(sl->arc_tree, (rnd_rnd_box_t *)arc); chg++; } PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, arc); @@ -1335,7 +1335,7 @@ pcb_arc_reg(dl, arc); } if ((dl != NULL) && (dl->arc_tree != NULL)) { - pcb_r_insert_entry(dl->arc_tree, (rnd_rnd_box_t *)arc); + rnd_r_insert_entry(dl->arc_tree, (rnd_rnd_box_t *)arc); chg++; } if (dst_is_pcb && (dl != NULL)) @@ -1345,7 +1345,7 @@ textlist_foreach(&sl->Text, &it, text) { if (src_has_real_layer) { pcb_poly_restore_to_poly(src_data, PCB_OBJ_LINE, sl, text); - pcb_r_delete_entry(sl->text_tree, (rnd_rnd_box_t *)text); + rnd_r_delete_entry(sl->text_tree, (rnd_rnd_box_t *)text); chg++; } PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, text); @@ -1354,7 +1354,7 @@ pcb_text_reg(dl, text); } if ((dl != NULL) && (dl->text_tree != NULL)) { - pcb_r_insert_entry(dl->text_tree, (rnd_rnd_box_t *)text); + rnd_r_insert_entry(dl->text_tree, (rnd_rnd_box_t *)text); chg++; } if (dst_is_pcb && (dl != NULL)) @@ -1364,7 +1364,7 @@ polylist_foreach(&sl->Polygon, &it, poly) { pcb_poly_pprestore(poly); if (src_has_real_layer) { - pcb_r_delete_entry(sl->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_delete_entry(sl->polygon_tree, (rnd_rnd_box_t *)poly); chg++; } PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, poly); @@ -1373,7 +1373,7 @@ pcb_poly_reg(dl, poly); } if ((dl != NULL) && (dl->polygon_tree != NULL)) { - pcb_r_insert_entry(dl->polygon_tree, (rnd_rnd_box_t *)poly); + rnd_r_insert_entry(dl->polygon_tree, (rnd_rnd_box_t *)poly); chg++; } if (dst_is_pcb && (dl != NULL)) @@ -1382,7 +1382,7 @@ gfxlist_foreach(&sl->Gfx, &it, gfx) { if (src_has_real_layer) { - pcb_r_delete_entry(sl->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_delete_entry(sl->gfx_tree, (rnd_rnd_box_t *)gfx); chg++; } PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, gfx); @@ -1391,7 +1391,7 @@ pcb_gfx_reg(dl, gfx); } if ((dl != NULL) && (dl->gfx_tree != NULL)) { - pcb_r_insert_entry(dl->gfx_tree, (rnd_rnd_box_t *)gfx); + rnd_r_insert_entry(dl->gfx_tree, (rnd_rnd_box_t *)gfx); chg++; } } @@ -1422,10 +1422,10 @@ assert(proto != NULL); /* the prototype must be accessible at the source else we can't add it in the dest */ pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); if (sc->data->padstack_tree != NULL) - pcb_r_delete_entry(sc->data->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_delete_entry(sc->data->padstack_tree, (rnd_rnd_box_t *)ps); PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, ps); if ((dst != NULL) && (dst->padstack_tree != NULL)) - pcb_r_insert_entry(dst->padstack_tree, (rnd_rnd_box_t *)ps); + rnd_r_insert_entry(dst->padstack_tree, (rnd_rnd_box_t *)ps); if ((move_obj) && (dst != NULL)) { pcb_pstk_unreg(ps); pcb_pstk_reg(dst, ps); @@ -1442,7 +1442,7 @@ /* bind globals */ if ((dst != NULL) && (dst_is_pcb)) { if (dst->padstack_tree == NULL) - dst->padstack_tree = pcb_r_create_tree(); + dst->padstack_tree = rnd_r_create_tree(); sc->data->padstack_tree = dst->padstack_tree; chg++; } @@ -1474,7 +1474,7 @@ clip.clip.pcb = ctx->buffer.pcb; pcb_subc_op(ctx->buffer.pcb->Data, sc, &ClipFunctions, &clip, PCB_SUBCOP_UNDO_SUBC); } - pcb_r_delete_entry(ctx->buffer.pcb->Data->subc_tree, (rnd_rnd_box_t *)sc); + rnd_r_delete_entry(ctx->buffer.pcb->Data->subc_tree, (rnd_rnd_box_t *)sc); } pcb_subc_unreg(sc); @@ -1482,8 +1482,8 @@ if (dst_is_pcb) { if (ctx->buffer.dst->subc_tree == NULL) - ctx->buffer.dst->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(ctx->buffer.dst->subc_tree, (rnd_rnd_box_t *)sc); + ctx->buffer.dst->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(ctx->buffer.dst->subc_tree, (rnd_rnd_box_t *)sc); } if (dst_is_pcb) @@ -1502,11 +1502,11 @@ } else { /* need to create the trees so that move and other ops work */ - if (sl->line_tree == NULL) sl->line_tree = pcb_r_create_tree(); - if (sl->arc_tree == NULL) sl->arc_tree = pcb_r_create_tree(); - if (sl->text_tree == NULL) sl->text_tree = pcb_r_create_tree(); - if (sl->polygon_tree == NULL) sl->polygon_tree = pcb_r_create_tree(); - if (sl->gfx_tree == NULL) sl->gfx_tree = pcb_r_create_tree(); + if (sl->line_tree == NULL) sl->line_tree = rnd_r_create_tree(); + if (sl->arc_tree == NULL) sl->arc_tree = rnd_r_create_tree(); + if (sl->text_tree == NULL) sl->text_tree = rnd_r_create_tree(); + if (sl->polygon_tree == NULL) sl->polygon_tree = rnd_r_create_tree(); + if (sl->gfx_tree == NULL) sl->gfx_tree = rnd_r_create_tree(); if (!(sl->meta.bound.type & PCB_LYT_VIRTUAL)) rnd_message(RND_MSG_ERROR, "Couldn't bind subc layer %s on buffer move\n", sl->name == NULL ? "" : sl->name); } @@ -1608,11 +1608,11 @@ continue; /* make sure all trees exist on the dest layer - if these are the first objects there we may need to create them */ - if (dl->line_tree == NULL) dl->line_tree = pcb_r_create_tree(); - if (dl->arc_tree == NULL) dl->arc_tree = pcb_r_create_tree(); - if (dl->text_tree == NULL) dl->text_tree = pcb_r_create_tree(); - if (dl->polygon_tree == NULL) dl->polygon_tree = pcb_r_create_tree(); - if (dl->gfx_tree == NULL) dl->gfx_tree = pcb_r_create_tree(); + if (dl->line_tree == NULL) dl->line_tree = rnd_r_create_tree(); + if (dl->arc_tree == NULL) dl->arc_tree = rnd_r_create_tree(); + if (dl->text_tree == NULL) dl->text_tree = rnd_r_create_tree(); + if (dl->polygon_tree == NULL) dl->polygon_tree = rnd_r_create_tree(); + if (dl->gfx_tree == NULL) dl->gfx_tree = rnd_r_create_tree(); } if (subc_relocate_layer_objs(dl, pcb->Data, sl, src_has_real_layer, 1, 0) > 0) @@ -1628,7 +1628,7 @@ void pcb_subc_bind_globals(pcb_board_t *pcb, pcb_subc_t *subc) { if (pcb->Data->padstack_tree == NULL) - pcb->Data->padstack_tree = pcb_r_create_tree(); + pcb->Data->padstack_tree = rnd_r_create_tree(); subc->data->padstack_tree = pcb->Data->padstack_tree; TODO("subc: subc-in-subc: bind subc rtree") } @@ -1768,7 +1768,7 @@ void *pcb_subcop_destroy(pcb_opctx_t *ctx, pcb_subc_t *sc) { if (ctx->remove.pcb->Data->subc_tree != NULL) - pcb_r_delete_entry(ctx->remove.pcb->Data->subc_tree, (rnd_rnd_box_t *)sc); + rnd_r_delete_entry(ctx->remove.pcb->Data->subc_tree, (rnd_rnd_box_t *)sc); EraseSubc(sc); pcb_subc_free(sc); @@ -1845,7 +1845,7 @@ pcb_data_t *data = g->subc->parent.data; if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)g->subc); + rnd_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)g->subc); pcb_undo_freeze_add(); pcb_data_mirror(g->subc->data, g->y_offs, g->smirror ? PCB_TXM_SIDE : PCB_TXM_COORD, g->smirror, 0); @@ -1853,7 +1853,7 @@ pcb_subc_bbox(g->subc); if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)g->subc); + rnd_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)g->subc); return 0; } @@ -1891,13 +1891,13 @@ void pcb_subc_scale(pcb_data_t *data, pcb_subc_t *subc, double sx, double sy, double sth, int recurse) { if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); pcb_data_scale(subc->data, sx, sy, sth, recurse); pcb_subc_bbox(subc); if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); } @@ -1919,7 +1919,7 @@ /* mirror object geometry and stackup */ if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); pcb_undo_freeze_add(); pcb_data_mirror(subc->data, yoff, PCB_TXM_SIDE, 1, 0); @@ -1935,7 +1935,7 @@ pcb_subc_bbox(subc); if ((data != NULL) && (data->subc_tree != NULL)) - pcb_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); pcb_undo_add_subc_to_otherside(PCB_OBJ_SUBC, subc, subc, subc, yoff); @@ -1955,7 +1955,7 @@ int on_bottom; \ if (pcb_subc_get_side(subc, &on_bottom) == 0) { \ if ((!!on_bottom) != (!!conf_core.editor.show_solder_side)) \ - return PCB_R_DIR_FOUND_CONTINUE; \ + return RND_R_DIR_FOUND_CONTINUE; \ } \ } \ } while(0) @@ -1965,7 +1965,7 @@ #include "draw.h" -pcb_r_dir_t pcb_draw_subc_mark(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t pcb_draw_subc_mark(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_subc_t *subc = (pcb_subc_t *) b; @@ -2002,10 +2002,10 @@ pcb_draw_dashed_line(info, pcb_draw_out.fgGC, bb->X2, bb->Y2, bb->X1, bb->Y2, freq, rnd_true); } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t draw_subc_mark_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t draw_subc_mark_callback(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_subc_t *subc = (pcb_subc_t *) b; @@ -2013,13 +2013,13 @@ if ((extobj != NULL) && (extobj->draw_mark != NULL)) { extobj->draw_mark(info, subc); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } return pcb_draw_subc_mark(b, cl); } -pcb_r_dir_t draw_subc_label_callback(const rnd_rnd_box_t *b, void *cl) +rnd_r_dir_t draw_subc_label_callback(const rnd_rnd_box_t *b, void *cl) { pcb_draw_info_t *info = cl; pcb_subc_t *subc = (pcb_subc_t *) b; @@ -2080,7 +2080,7 @@ else if (subc->refdes != NULL) pcb_label_draw(info, x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, subc->refdes); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } void pcb_subc_draw_preview(const pcb_subc_t *sc, const rnd_rnd_box_t *drawn_area) Index: trunk/src/obj_subc.h =================================================================== --- trunk/src/obj_subc.h (revision 31039) +++ trunk/src/obj_subc.h (revision 31040) @@ -119,9 +119,9 @@ pcb_layer_t *pcb_subc_get_layer(pcb_subc_t *sc, pcb_layer_type_t lyt, pcb_layer_combining_t comb, rnd_bool_t alloc, const char *name, rnd_bool req_name_match); #include -pcb_r_dir_t pcb_draw_subc_mark(const rnd_rnd_box_t *b, void *cl); /* low level version, does not do extobj */ -pcb_r_dir_t draw_subc_mark_callback(const rnd_rnd_box_t *b, void *cl); -pcb_r_dir_t draw_subc_label_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t pcb_draw_subc_mark(const rnd_rnd_box_t *b, void *cl); /* low level version, does not do extobj */ +rnd_r_dir_t draw_subc_mark_callback(const rnd_rnd_box_t *b, void *cl); +rnd_r_dir_t draw_subc_label_callback(const rnd_rnd_box_t *b, void *cl); void DrawSubc(pcb_subc_t *sc); void EraseSubc(pcb_subc_t *sc); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 31039) +++ trunk/src/obj_text.c (revision 31040) @@ -105,7 +105,7 @@ void pcb_text_free(pcb_text_t *text) { if ((text->parent.layer != NULL) && (text->parent.layer->text_tree != NULL)) - pcb_r_delete_entry(text->parent.layer->text_tree, (rnd_rnd_box_t *)text); + rnd_r_delete_entry(text->parent.layer->text_tree, (rnd_rnd_box_t *)text); rnd_attribute_free(&text->Attributes); pcb_text_unreg(text); free(text->TextString); @@ -133,7 +133,7 @@ pcb_board_t *pcb = pcb_data_get_top(layer->parent.data); if (layer->text_tree != NULL) - pcb_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *)g->text); + rnd_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *)g->text); pcb_poly_restore_to_poly(layer->parent.data, PCB_OBJ_TEXT, layer, g->text); rnd_swap(int, g->Scale, g->text->Scale); @@ -145,7 +145,7 @@ pcb_text_bbox(pcb_font(pcb, g->text->fid, 1), g->text); if (layer->text_tree != NULL) - pcb_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *)g->text); + rnd_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *)g->text); pcb_poly_clear_from_poly(layer->parent.data, PCB_OBJ_TEXT, layer, g->text); return 0; @@ -221,8 +221,8 @@ /* calculate size of the bounding box */ pcb_text_bbox(PCBFont, text); if (!Layer->text_tree) - Layer->text_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) text); + Layer->text_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) text); } static int pcb_text_render_str_cb(void *ctx, gds_t *s, const char **input) @@ -498,7 +498,7 @@ dstly = &ctx->buffer.dst->Layer[lid]; } - pcb_r_delete_entry(srcly->text_tree, (rnd_rnd_box_t *) text); + rnd_r_delete_entry(srcly->text_tree, (rnd_rnd_box_t *) text); pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_TEXT, srcly, text); pcb_text_unreg(text); @@ -505,8 +505,8 @@ pcb_text_reg(dstly, text); if (!dstly->text_tree) - dstly->text_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dstly->text_tree, (rnd_rnd_box_t *) text); + dstly->text_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dstly->text_tree, (rnd_rnd_box_t *) text); pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_TEXT, dstly, text); return text; @@ -523,11 +523,11 @@ if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE && value != Text->Scale) { pcb_undo_add_obj_to_size(PCB_OBJ_TEXT, Layer, Text, Text); pcb_text_invalidate_erase(Layer, Text); - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); Text->Scale = value; pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; @@ -545,11 +545,11 @@ if (value != Text->thickness) { pcb_undo_add_obj_to_2nd_size(PCB_OBJ_TEXT, Layer, Text, Text); pcb_text_invalidate_erase(Layer, Text); - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); Text->thickness = value; pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; @@ -567,11 +567,11 @@ if (value != Text->rot) { pcb_undo_add_obj_to_rot(PCB_OBJ_TEXT, Layer, Text, Text); pcb_text_invalidate_erase(Layer, Text); - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); Text->rot = value; pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; @@ -588,13 +588,13 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return NULL; pcb_text_invalidate_erase(Layer, Text); - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *)Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *)Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); Text->TextString = ctx->chgname.new_name; /* calculate size of the bounding box */ pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return old; @@ -666,10 +666,10 @@ void *pcb_textop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_textop_move_noclip(ctx, Layer, Text); - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); return Text; } @@ -677,11 +677,11 @@ void *pcb_textop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { if (ctx->clip.restore) { - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); } if (ctx->clip.clear) { - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); } return Text; @@ -692,7 +692,7 @@ void *pcb_textop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_text_t * text, pcb_layer_t * Destination) { pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Source, text); - pcb_r_delete_entry(Source->text_tree, (rnd_rnd_box_t *) text); + rnd_r_delete_entry(Source->text_tree, (rnd_rnd_box_t *) text); pcb_text_unreg(text); pcb_text_reg(Destination, text); @@ -705,8 +705,8 @@ /* re-calculate the bounding box (it could be mirrored now) */ pcb_text_bbox(pcb_font(PCB, text->fid, 1), text); if (!Destination->text_tree) - Destination->text_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Destination->text_tree, (rnd_rnd_box_t *) text); + Destination->text_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Destination->text_tree, (rnd_rnd_box_t *) text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Destination, text); return text; @@ -743,7 +743,7 @@ /* erase from screen */ if (Layer->meta.real.vis) { pcb_text_invalidate_erase(Layer, Text); - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *)Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *)Text); } pcb_undo_move_obj_to_remove(PCB_OBJ_TEXT, Layer, Text, Text); return NULL; @@ -800,10 +800,10 @@ pcb_text_invalidate_erase(Layer, Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); if (Layer->text_tree != NULL) - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_text_rotate90(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); if (Layer->text_tree != NULL) - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; @@ -814,7 +814,7 @@ pcb_text_invalidate_erase(Layer, Text); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); if (Layer->text_tree != NULL) - pcb_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_delete_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); if (Text->rot < 0.0) Text->rot += 360.0; @@ -827,7 +827,7 @@ pcb_text_bbox(NULL, Text); if (Layer->text_tree != NULL) - pcb_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); + rnd_r_insert_entry(Layer->text_tree, (rnd_rnd_box_t *) Text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; @@ -836,13 +836,13 @@ void pcb_text_flip_side(pcb_layer_t *layer, pcb_text_t *text, rnd_coord_t y_offs, rnd_bool undoable) { if (layer->text_tree != NULL) - pcb_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); text->X = PCB_SWAP_X(text->X); text->Y = PCB_SWAP_Y(text->Y) + y_offs; PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); pcb_text_bbox(pcb_font(PCB, text->fid, 1), text); if (layer->text_tree != NULL) - pcb_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); } void pcb_text_mirror_coords(pcb_text_t *text, rnd_coord_t y_offs, rnd_bool undoable) @@ -895,10 +895,10 @@ assert(text->parent_type = PCB_PARENT_LAYER); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, layer, text); - pcb_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); text->fid = fid; pcb_text_bbox(pcb_font(PCB, text->fid, 1), text); - pcb_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, layer, text); } @@ -908,7 +908,7 @@ if (ly == NULL) return; if (ly->text_tree != NULL) - pcb_r_delete_entry(ly->text_tree, (rnd_rnd_box_t *)text); + rnd_r_delete_entry(ly->text_tree, (rnd_rnd_box_t *)text); pcb_poly_restore_to_poly(ly->parent.data, PCB_OBJ_TEXT, ly, text); } @@ -918,7 +918,7 @@ if (ly == NULL) return; if (ly->text_tree != NULL) - pcb_r_insert_entry(ly->text_tree, (rnd_rnd_box_t *)text); + rnd_r_insert_entry(ly->text_tree, (rnd_rnd_box_t *)text); pcb_poly_clear_from_poly(ly->parent.data, PCB_OBJ_TEXT, ly, text); } @@ -932,9 +932,9 @@ return; pcb_poly_restore_to_poly(data, PCB_OBJ_TEXT, layer, text); - pcb_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_delete_entry(layer->text_tree, (rnd_rnd_box_t *) text); pcb_text_bbox(pcb_font(pcb, text->fid, 1), text); - pcb_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); + rnd_r_insert_entry(layer->text_tree, (rnd_rnd_box_t *) text); pcb_poly_clear_from_poly(data, PCB_OBJ_TEXT, layer, text); } @@ -947,7 +947,7 @@ pcb_poly_restore_to_poly(data, PCB_OBJ_TEXT, Text->parent.layer, Text); if (flagbits & PCB_FLAG_ONSOLDER) { /* bbox will also change, need to do rtree administration */ *save = Text->parent.layer; - pcb_r_delete_entry(Text->parent.layer->text_tree, (rnd_rnd_box_t *)Text); + rnd_r_delete_entry(Text->parent.layer->text_tree, (rnd_rnd_box_t *)Text); } } @@ -961,7 +961,7 @@ pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); if (orig_layer != NULL) - pcb_r_insert_entry(orig_layer->text_tree, (rnd_rnd_box_t *)Text); + rnd_r_insert_entry(orig_layer->text_tree, (rnd_rnd_box_t *)Text); if ((newflagbits & PCB_FLAG_CLEARLINE) || (orig_layer != NULL)) pcb_poly_clear_from_poly(data, PCB_OBJ_TEXT, Text->parent.layer, Text); @@ -1433,34 +1433,34 @@ pcb_text_draw_(info, text, min_silk_line, allow_term_gfx, PCB_TXT_TINY_CHEAP); } -pcb_r_dir_t pcb_text_draw_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_text_draw_callback(const rnd_rnd_box_t * b, void *cl) { pcb_text_t *text = (pcb_text_t *) b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; pcb_text_draw(info, text, 0); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t pcb_text_draw_term_callback(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t pcb_text_draw_term_callback(const rnd_rnd_box_t * b, void *cl) { pcb_text_t *text = (pcb_text_t *) b; pcb_draw_info_t *info = cl; if (pcb_hidden_floater((pcb_any_obj_t*)b, info) || pcb_partial_export((pcb_any_obj_t*)b, info)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent)) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; pcb_text_draw(info, text, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* erases a text on a layer */ @@ -1511,9 +1511,9 @@ int chg = pcb_text_font_chg_data(subc->data, fid); if (chg) { need_redraw = 1; - pcb_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_delete_entry(data->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_bbox(subc); - pcb_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); + rnd_r_insert_entry(data->subc_tree, (rnd_rnd_box_t *)subc); } } PCB_END_LOOP; Index: trunk/src/obj_text_draw.h =================================================================== --- trunk/src/obj_text_draw.h (revision 31039) +++ trunk/src/obj_text_draw.h (revision 31040) @@ -33,8 +33,8 @@ /* Include rtree.h for these */ #ifdef RND_RTREE_H -pcb_r_dir_t pcb_text_draw_callback(const rnd_rnd_box_t * b, void *cl); -pcb_r_dir_t pcb_text_draw_term_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_text_draw_callback(const rnd_rnd_box_t * b, void *cl); +rnd_r_dir_t pcb_text_draw_term_callback(const rnd_rnd_box_t * b, void *cl); #endif typedef enum pcb_text_tiny_e { /* How to draw text that is too tiny to be readable */ Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 31039) +++ trunk/src/polygon.c (revision 31040) @@ -480,10 +480,10 @@ if (pcb_poly_clip_prog != NULL) \ pcb_poly_clip_prog(pcb_poly_clip_prog_ctx); \ if (pcb_poly_clip_noop) \ - return PCB_R_DIR_FOUND_CONTINUE; \ + return RND_R_DIR_FOUND_CONTINUE; \ } while(0) -static pcb_r_dir_t padstack_sub_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t padstack_sub_callback(const rnd_rnd_box_t *b, void *cl) { pcb_pstk_t *ps = (pcb_pstk_t *)b; struct cpInfo *info = (struct cpInfo *)cl; @@ -494,18 +494,18 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; polygon = info->polygon; /* ps->Clearance == 0 doesn't mean no clearance because of the per shape clearances */ if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, ps)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; i = pcb_layer_id(info->data, info->layer); np = pcb_thermal_area_pstk(pcb_data_get_top(info->data), ps, i); if (np == 0) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; info->batch_size++; POLY_CLIP_PROG(); @@ -516,10 +516,10 @@ if (info->batch_size == SUBTRACT_PADSTACK_BATCH_SIZE) subtract_accumulated(info, polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t arc_sub_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t arc_sub_callback(const rnd_rnd_box_t * b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *) b; struct cpInfo *info = (struct cpInfo *) cl; @@ -527,9 +527,9 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (!PCB_NONPOLY_HAS_CLEARANCE(arc)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; POLY_CLIP_PROG(); @@ -537,7 +537,7 @@ if (SubtractArc(arc, polygon) < 0) longjmp(info->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* quick create a polygon area from a line, knowing the coords and width */ @@ -675,7 +675,7 @@ return 0; } -static pcb_r_dir_t poly_sub_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t poly_sub_callback(const rnd_rnd_box_t *b, void *cl) { pcb_poly_t *subpoly = (pcb_poly_t *)b; struct cpInfo *info = (struct cpInfo *) cl; @@ -685,13 +685,13 @@ /* don't do clearance in itself */ if (subpoly == polygon) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* don't subtract the object that was put back! */ if (b == info->other) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (!PCB_POLY_HAS_CLEARANCE(subpoly)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; POLY_CLIP_PROG(); @@ -698,10 +698,10 @@ if (SubtractPolyPoly(subpoly, polygon) < 0) longjmp(info->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t line_sub_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t line_sub_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; struct cpInfo *info = (struct cpInfo *) cl; @@ -711,9 +711,9 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (!PCB_NONPOLY_HAS_CLEARANCE(line)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; polygon = info->polygon; POLY_CLIP_PROG(); @@ -729,10 +729,10 @@ if (info->batch_size == SUBTRACT_LINE_BATCH_SIZE) subtract_accumulated(info, polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t text_sub_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t text_sub_callback(const rnd_rnd_box_t * b, void *cl) { pcb_text_t *text = (pcb_text_t *) b; struct cpInfo *info = (struct cpInfo *) cl; @@ -740,9 +740,9 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; POLY_CLIP_PROG(); @@ -749,7 +749,7 @@ polygon = info->polygon; if (SubtractText(text, polygon) < 0) longjmp(info->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static rnd_cardinal_t clearPoly(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *polygon, const rnd_rnd_box_t *here, rnd_coord_t expand, int noop) @@ -795,18 +795,18 @@ info.batch_size = 0; PCB_COPPER_GROUP_LOOP(Data, group); { - pcb_r_search(layer->line_tree, ®ion, NULL, line_sub_callback, &info, &seen); + rnd_r_search(layer->line_tree, ®ion, NULL, line_sub_callback, &info, &seen); r += seen; subtract_accumulated(&info, polygon); - pcb_r_search(layer->arc_tree, ®ion, NULL, arc_sub_callback, &info, &seen); + rnd_r_search(layer->arc_tree, ®ion, NULL, arc_sub_callback, &info, &seen); r += seen; - pcb_r_search(layer->text_tree, ®ion, NULL, text_sub_callback, &info, &seen); + rnd_r_search(layer->text_tree, ®ion, NULL, text_sub_callback, &info, &seen); r += seen; - pcb_r_search(layer->polygon_tree, ®ion, NULL, poly_sub_callback, &info, &seen); + rnd_r_search(layer->polygon_tree, ®ion, NULL, poly_sub_callback, &info, &seen); r += seen; } PCB_END_LOOP; - pcb_r_search(Data->padstack_tree, ®ion, NULL, padstack_sub_callback, &info, &seen); + rnd_r_search(Data->padstack_tree, ®ion, NULL, padstack_sub_callback, &info, &seen); r += seen; subtract_accumulated(&info, polygon); } @@ -1302,10 +1302,10 @@ pcb_layer_t *layer; pcb_data_t *data; void *user_data; - pcb_r_dir_t (*callback)(pcb_data_t *, pcb_layer_t *, pcb_poly_t *, int, void *, void *, void *user_data); + rnd_r_dir_t (*callback)(pcb_data_t *, pcb_layer_t *, pcb_poly_t *, int, void *, void *, void *user_data); }; -static pcb_r_dir_t subtract_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2, void *user_data) +static rnd_r_dir_t subtract_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2, void *user_data) { if (!Polygon->Clipped) return 0; @@ -1313,58 +1313,58 @@ case PCB_OBJ_PSTK: SubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon); Polygon->NoHolesValid = 0; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; case PCB_OBJ_LINE: SubtractLine((pcb_line_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; case PCB_OBJ_ARC: SubtractArc((pcb_arc_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; case PCB_OBJ_POLY: if (ptr2 != Polygon) { SubtractPolyPoly((pcb_poly_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } break; case PCB_OBJ_TEXT: SubtractText((pcb_text_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2, void *user_data) +static rnd_r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2, void *user_data) { switch (type) { case PCB_OBJ_PSTK: UnsubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; case PCB_OBJ_LINE: UnsubtractLine((pcb_line_t *) ptr2, Layer, Polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; case PCB_OBJ_ARC: UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; case PCB_OBJ_POLY: if (ptr2 != Polygon) { UnsubtractPolyPoly((pcb_poly_t *) ptr2, Polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } break; case PCB_OBJ_TEXT: UnsubtractText((pcb_text_t *) ptr2, Layer, Polygon); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } int pcb_poly_sub_obj(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *obj) { - if (subtract_plow(Data, Layer, Polygon, type, NULL, obj, NULL) == PCB_R_DIR_FOUND_CONTINUE) + if (subtract_plow(Data, Layer, Polygon, type, NULL, obj, NULL) == RND_R_DIR_FOUND_CONTINUE) return 0; return -1; } @@ -1371,13 +1371,13 @@ int pcb_poly_unsub_obj(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *obj) { - if (add_plow(Data, Layer, Polygon, type, NULL, obj, NULL) == PCB_R_DIR_FOUND_CONTINUE) + if (add_plow(Data, Layer, Polygon, type, NULL, obj, NULL) == RND_R_DIR_FOUND_CONTINUE) return 0; return -1; } -static pcb_r_dir_t plow_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t plow_callback(const rnd_rnd_box_t * b, void *cl) { struct plow_info *plow = (struct plow_info *) cl; pcb_poly_t *polygon = (pcb_poly_t *) b; @@ -1384,19 +1384,19 @@ if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon)) return plow->callback(plow->data, plow->layer, polygon, plow->type, plow->ptr1, plow->ptr2, plow->user_data); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } /* poly plows while clipping inhibit is on: mark any potentail polygon dirty */ -static pcb_r_dir_t poly_plows_inhibited_cb(pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2, void *user_data) +static rnd_r_dir_t poly_plows_inhibited_cb(pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2, void *user_data) { poly->clip_dirty = 1; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } int pcb_poly_plows(pcb_data_t *Data, int type, void *ptr1, void *ptr2, - pcb_r_dir_t (*call_back) (pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2, void *user_data), + rnd_r_dir_t (*call_back) (pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2, void *user_data), void *user_data) { rnd_rnd_box_t sb = ((pcb_any_obj_t *) ptr2)->BoundingBox; @@ -1456,7 +1456,7 @@ PCB_COPPER_GROUP_LOOP(Data, pcb_layer_get_group(PCB, pcb_layer_id(Data, ((pcb_layer_t *) ptr1)))); { info.layer = layer; - pcb_r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); + rnd_r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); r += seen; } PCB_END_LOOP; @@ -1607,7 +1607,7 @@ newone->Clipped = p; p = p->f; /* go to next pline */ newone->Clipped->b = newone->Clipped->f = newone->Clipped; /* unlink from others */ - pcb_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) newone); + rnd_r_insert_entry(layer->polygon_tree, (rnd_rnd_box_t *) newone); pcb_poly_invalidate_draw(layer, newone); } else { @@ -1707,8 +1707,8 @@ pcb_poly_init_clip(Destination, Layer, Polygon); pcb_poly_bbox(Polygon); if (!Layer->polygon_tree) - Layer->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + Layer->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); pcb_poly_invalidate_draw(Layer, Polygon); /* add to undo list */ Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 31039) +++ trunk/src/polygon.h (revision 31040) @@ -59,7 +59,7 @@ void pcb_polygon_hole_create_from_attached(void); int pcb_poly_holes(pcb_poly_t * ptr, const rnd_rnd_box_t * range, int (*callback) (rnd_pline_t *, void *user_data), void *user_data); int pcb_poly_plows(pcb_data_t *Data, int type, void *ptr1, void *ptr2, - pcb_r_dir_t (*cb)(pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2, void *user_data), + rnd_r_dir_t (*cb)(pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2, void *user_data), void *user_data); void pcb_poly_compute_no_holes(pcb_poly_t * poly); Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 31039) +++ trunk/src/route.c (revision 31040) @@ -467,7 +467,7 @@ /* Move the existing line point/s */ exto = pcb_extobj_float_pre((pcb_any_obj_t *)apply_to_line); pcb_line_invalidate_erase(apply_to_line); - pcb_r_delete_entry(apply_to_line_layer->line_tree, (rnd_rnd_box_t *) apply_to_line); + rnd_r_delete_entry(apply_to_line_layer->line_tree, (rnd_rnd_box_t *) apply_to_line); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, apply_to_line_layer, apply_to_line); apply_to_line->Point1.X = p_obj->point1.X; apply_to_line->Point1.Y = p_obj->point1.Y; @@ -474,7 +474,7 @@ apply_to_line->Point2.X = p_obj->point2.X; apply_to_line->Point2.Y = p_obj->point2.Y; pcb_line_bbox(apply_to_line); - pcb_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) apply_to_line); + rnd_r_insert_entry(layer->line_tree, (rnd_rnd_box_t *) apply_to_line); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, layer, apply_to_line); pcb_line_invalidate_draw(layer, apply_to_line); apply_to_line_layer = layer; @@ -599,7 +599,7 @@ exto = pcb_extobj_float_pre((pcb_any_obj_t *)apply_to_arc); pcb_arc_invalidate_erase(apply_to_arc); - pcb_r_delete_entry(apply_to_arc_layer->arc_tree, (rnd_rnd_box_t *) apply_to_arc); + rnd_r_delete_entry(apply_to_arc_layer->arc_tree, (rnd_rnd_box_t *) apply_to_arc); pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, apply_to_arc_layer, apply_to_arc); apply_to_arc->X = p_obj->point1.X; @@ -610,7 +610,7 @@ apply_to_arc->Delta = p_obj->delta_angle; apply_to_arc->Thickness = p_route->thickness; pcb_arc_bbox(apply_to_arc); - pcb_r_insert_entry(apply_to_arc_layer->arc_tree, (rnd_rnd_box_t *) apply_to_arc); + rnd_r_insert_entry(apply_to_arc_layer->arc_tree, (rnd_rnd_box_t *) apply_to_arc); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, apply_to_arc_layer, apply_to_arc); pcb_arc_invalidate_draw(layer, apply_to_arc); apply_to_arc_layer = layer; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 31039) +++ trunk/src/search.c (revision 31040) @@ -81,7 +81,7 @@ } while(0) #define TEST_OBJST(objst, req_flag, locality, obj, locked_obj) \ - TEST_OBJST_(objst, req_flag, locality, obj, locked_obj, return PCB_R_DIR_NOT_FOUND) + TEST_OBJST_(objst, req_flag, locality, obj, locked_obj, return RND_R_DIR_NOT_FOUND) struct ans_info { void **ptr1, **ptr2, **ptr3; @@ -95,7 +95,7 @@ /* --------------------------------------------------------------------------- * searches a padstack */ -static pcb_r_dir_t padstack_callback(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t padstack_callback(const rnd_rnd_box_t *box, void *cl) { struct ans_info *i = (struct ans_info *) cl; pcb_pstk_t *ps = (pcb_pstk_t *) box; @@ -104,11 +104,11 @@ TEST_OBJST(i->objst, i->req_flag, g, ps, ps); if (!pcb_is_point_in_pstk(PosX, PosY, SearchRadius, ps, NULL)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if ((i->on_current) && (pcb_pstk_shape_at(PCB, ps, PCB_CURRLAYER(PCB)) == NULL) && (!pcb_pstk_bb_drills(PCB, ps, PCB_CURRLAYER(PCB)->meta.real.grp, NULL))) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if ((i->on_lyt != 0) && (pcb_pstk_shape(ps, i->on_lyt, 0) == NULL)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; *i->ptr2 = *i->ptr3 = ps; assert(ps->parent_type == PCB_PARENT_DATA); pdata = ps->parent.data; @@ -116,7 +116,7 @@ *i->ptr1 = pdata->parent.subc; /* padstack of a subcircuit */ else *i->ptr1 = ps; /* padstack on a board (e.g. via) */ - return PCB_R_DIR_CANCEL; /* found, stop searching */ + return RND_R_DIR_CANCEL; /* found, stop searching */ } static rnd_bool SearchPadstackByLocation(unsigned long objst, unsigned long req_flag, pcb_pstk_t **ps, pcb_pstk_t **Dummy1, pcb_pstk_t **Dummy2, int on_current, pcb_layer_type_t on_lyt) @@ -135,7 +135,7 @@ info.on_current = on_current; info.on_lyt = on_lyt; - if (pcb_r_search(PCB->Data->padstack_tree, &SearchBox, NULL, padstack_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(PCB->Data->padstack_tree, &SearchBox, NULL, padstack_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } @@ -152,7 +152,7 @@ }; -static pcb_r_dir_t line_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t line_callback(const rnd_rnd_box_t * box, void *cl) { struct line_info *i = (struct line_info *) cl; pcb_line_t *l = (pcb_line_t *) box; @@ -160,11 +160,11 @@ TEST_OBJST(i->objst, i->req_flag, l, l, l); if (!pcb_is_point_in_line(PosX, PosY, SearchRadius, (pcb_any_line_t *)l)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; *i->Line = l; *i->Point = (rnd_point_t *) l; - return PCB_R_DIR_CANCEL; /* found what we were looking for */ + return RND_R_DIR_CANCEL; /* found what we were looking for */ } @@ -178,13 +178,13 @@ info.req_flag = req_flag; *Layer = SearchLayer; - if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, line_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(SearchLayer->line_tree, &SearchBox, NULL, line_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } -static pcb_r_dir_t rat_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t rat_callback(const rnd_rnd_box_t * box, void *cl) { pcb_line_t *line = (pcb_line_t *) box; struct ans_info *i = (struct ans_info *) cl; @@ -195,9 +195,9 @@ (rnd_distance(line->Point1.X, line->Point1.Y, PosX, PosY) <= line->Thickness * 2 + SearchRadius) : pcb_is_point_on_line(PosX, PosY, SearchRadius, line)) { *i->ptr1 = *i->ptr2 = *i->ptr3 = line; - return PCB_R_DIR_CANCEL; + return RND_R_DIR_CANCEL; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -213,7 +213,7 @@ info.objst = objst; info.req_flag = req_flag; - if (pcb_r_search(PCB->Data->rat_tree, &SearchBox, NULL, rat_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(PCB->Data->rat_tree, &SearchBox, NULL, rat_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } @@ -228,7 +228,7 @@ double least; }; -static pcb_r_dir_t arc_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t arc_callback(const rnd_rnd_box_t * box, void *cl) { struct arc_info *i = (struct arc_info *) cl; pcb_arc_t *a = (pcb_arc_t *) box; @@ -239,7 +239,7 @@ return 0; *i->Arc = a; *i->Dummy = a; - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ } @@ -253,7 +253,7 @@ info.req_flag = req_flag; *Layer = SearchLayer; - if (pcb_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arc_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arc_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } @@ -267,7 +267,7 @@ double least; }; -static pcb_r_dir_t gfx_callback(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t gfx_callback(const rnd_rnd_box_t *box, void *cl) { struct gfx_info *i = (struct gfx_info *)cl; pcb_gfx_t *g = (pcb_gfx_t *)box; @@ -278,7 +278,7 @@ return 0; *i->Gfx = g; *i->Dummy = g; - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ } static rnd_bool SearchGfxByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t **Layer, pcb_gfx_t **gfx, pcb_gfx_t **Dummy) @@ -291,12 +291,12 @@ info.req_flag = req_flag; *Layer = SearchLayer; - if (pcb_r_search(SearchLayer->gfx_tree, &SearchBox, NULL, gfx_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(SearchLayer->gfx_tree, &SearchBox, NULL, gfx_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } -static pcb_r_dir_t text_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t text_callback(const rnd_rnd_box_t * box, void *cl) { pcb_text_t *text = (pcb_text_t *) box; struct ans_info *i = (struct ans_info *) cl; @@ -305,9 +305,9 @@ if (PCB_POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { *i->ptr2 = *i->ptr3 = text; - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -323,12 +323,12 @@ info.objst = objst; info.req_flag = req_flag; - if (pcb_r_search(SearchLayer->text_tree, &SearchBox, NULL, text_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(SearchLayer->text_tree, &SearchBox, NULL, text_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } -static pcb_r_dir_t polygon_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t polygon_callback(const rnd_rnd_box_t * box, void *cl) { pcb_poly_t *polygon = (pcb_poly_t *) box; struct ans_info *i = (struct ans_info *) cl; @@ -336,13 +336,13 @@ TEST_OBJST(i->objst, i->req_flag, l, polygon, polygon); if (polygon->Clipped == NULL) - return PCB_R_DIR_NOT_FOUND; /* polygon cleared out of existence */ + return RND_R_DIR_NOT_FOUND; /* polygon cleared out of existence */ if (pcb_poly_is_point_in_p(PosX, PosY, SearchRadius, polygon)) { *i->ptr2 = *i->ptr3 = polygon; - return PCB_R_DIR_CANCEL; /* found */ + return RND_R_DIR_CANCEL; /* found */ } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } @@ -359,16 +359,16 @@ info.objst = objst; info.req_flag = req_flag; - if (pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polygon_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) + if (rnd_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polygon_callback, &info, NULL) != RND_R_DIR_NOT_FOUND) return rnd_true; return rnd_false; } -static pcb_r_dir_t linepoint_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t linepoint_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; struct line_info *i = (struct line_info *) cl; - pcb_r_dir_t ret_val = PCB_R_DIR_NOT_FOUND; + rnd_r_dir_t ret_val = RND_R_DIR_NOT_FOUND; double d; TEST_OBJST(i->objst, i->req_flag, l, line, line); @@ -379,7 +379,7 @@ i->least = d; *i->Line = line; *i->Point = &line->Point1; - ret_val = PCB_R_DIR_FOUND_CONTINUE; + ret_val = RND_R_DIR_FOUND_CONTINUE; } d = rnd_distance(PosX, PosY, line->Point2.X, line->Point2.Y); @@ -387,17 +387,17 @@ i->least = d; *i->Line = line; *i->Point = &line->Point2; - ret_val = PCB_R_DIR_FOUND_CONTINUE; + ret_val = RND_R_DIR_FOUND_CONTINUE; } return ret_val; } -static pcb_r_dir_t arcpoint_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t arcpoint_callback(const rnd_rnd_box_t * b, void *cl) { rnd_rnd_box_t ab; pcb_arc_t *arc = (pcb_arc_t *) b; struct arc_info *i = (struct arc_info *) cl; - pcb_r_dir_t ret_val = PCB_R_DIR_NOT_FOUND; + rnd_r_dir_t ret_val = RND_R_DIR_NOT_FOUND; double d; TEST_OBJST(i->objst, i->req_flag, l, arc, arc); @@ -411,7 +411,7 @@ i->least = d; *i->Arc = arc; *i->arc_pt = pcb_arc_start_ptr; - ret_val = PCB_R_DIR_FOUND_CONTINUE; + ret_val = RND_R_DIR_FOUND_CONTINUE; } d = rnd_distance(PosX, PosY, ab.X2, ab.Y2); @@ -419,7 +419,7 @@ i->least = d; *i->Arc = arc; *i->arc_pt = pcb_arc_end_ptr; - ret_val = PCB_R_DIR_FOUND_CONTINUE; + ret_val = RND_R_DIR_FOUND_CONTINUE; } return ret_val; } @@ -438,7 +438,7 @@ info.objst = objst; info.req_flag = req_flag; - if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, linepoint_callback, &info, NULL)) + if (rnd_r_search(SearchLayer->line_tree, &SearchBox, NULL, linepoint_callback, &info, NULL)) return rnd_true; return rnd_false; } @@ -457,7 +457,7 @@ info.objst = objst; info.req_flag = req_flag; - if (pcb_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arcpoint_callback, &info, NULL)) + if (rnd_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arcpoint_callback, &info, NULL)) return rnd_true; return rnd_false; } @@ -476,7 +476,7 @@ rnd_point_t **Point; } ptcb_t; -static pcb_r_dir_t polypoint_callback(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t polypoint_callback(const rnd_rnd_box_t *box, void *cl) { pcb_poly_t *polygon = (pcb_poly_t *)box; ptcb_t *ctx = (ptcb_t *)cl; @@ -487,11 +487,11 @@ if ((dt != NULL) && (dt->parent_type == PCB_PARENT_SUBC)) { /* do not find subc part poly points if not explicitly requested */ if (!(ctx->Type & PCB_OBJ_SUBC_PART)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* don't find subc poly points even as subc part unless we are editing a subc */ if (!PCB->loose_subc) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } PCB_POLY_POINT_LOOP(polygon); @@ -506,7 +506,7 @@ } PCB_END_LOOP; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static rnd_bool SearchPointByLocation(unsigned long Type, unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_poly_t ** Polygon, rnd_point_t ** Point) @@ -520,7 +520,7 @@ ctx.found = rnd_false;; ctx.least = SearchRadius + RND_MAX_POLYGON_POINT_DISTANCE; ctx.least = ctx.least * ctx.least; - pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polypoint_callback, &ctx, NULL); + rnd_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polypoint_callback, &ctx, NULL); if (ctx.found) return rnd_true; @@ -528,7 +528,7 @@ } -static pcb_r_dir_t subc_callback(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t subc_callback(const rnd_rnd_box_t *box, void *cl) { pcb_subc_t *subc = (pcb_subc_t *) box; struct ans_info *i = (struct ans_info *) cl; @@ -546,7 +546,7 @@ /* extended objects are special case: only the origin should be clickable to avoid problems with large extended objects that cover the board */ if ((PosX < ox) || (PosX > ox + PCB_SUBC_AUX_UNIT) || (PosY < oy) || (PosY > oy + PCB_SUBC_AUX_UNIT)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } /* use the subcircuit with the smallest bounding box */ newarea = (subc->BoundingBox.X2 - subc->BoundingBox.X1) * (double) (subc->BoundingBox.Y2 - subc->BoundingBox.Y1); @@ -553,10 +553,10 @@ if (newarea < i->area) { i->area = newarea; *i->ptr1 = *i->ptr2 = *i->ptr3 = subc; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } @@ -578,7 +578,7 @@ info.objst = objst; info.req_flag = req_flag; - if (pcb_r_search(PCB->Data->subc_tree, &SearchBox, NULL, subc_callback, &info, NULL)) + if (rnd_r_search(PCB->Data->subc_tree, &SearchBox, NULL, subc_callback, &info, NULL)) return rnd_true; return rnd_false; } @@ -1723,11 +1723,11 @@ } -pcb_r_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_rnd_box_t *query_box, pcb_r_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure) +rnd_r_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_rnd_box_t *query_box, rnd_r_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure) { pcb_layer_t *ly; rnd_layer_id_t lid; - pcb_r_dir_t res; + rnd_r_dir_t res; const rnd_rtree_box_t *query = (const rnd_rtree_box_t *)query_box; rnd_rtree_dir_t (*cb)(void *, void *, const rnd_rtree_box_t *) = (rnd_rtree_dir_t(*)(void *, void *, const rnd_rtree_box_t *))cb_; Index: trunk/src/search_r.h =================================================================== --- trunk/src/search_r.h (revision 31039) +++ trunk/src/search_r.h (revision 31040) @@ -32,6 +32,6 @@ #include /* Search data for given object types within a box using the usual rtree conventions for the callback */ -pcb_r_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_rnd_box_t *query_box, pcb_r_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure); +rnd_r_dir_t pcb_search_data_by_loc(pcb_data_t *data, pcb_objtype_t type, const rnd_rnd_box_t *query_box, rnd_r_dir_t (*cb_)(void *closure, pcb_any_obj_t *obj, void *box), void *closure); #endif Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 31039) +++ trunk/src/select.c (revision 31040) @@ -415,20 +415,20 @@ rnd_bool invert; } select_ctx_t; -static pcb_r_dir_t pcb_select_block_cb(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t pcb_select_block_cb(const rnd_rnd_box_t *box, void *cl) { select_ctx_t *ctx = cl; pcb_any_obj_t *obj = (pcb_any_obj_t *)box; if (!ctx->invert && (PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj) == ctx->flag)) /* cheap check on the flag: don't do anything if the flag is already right */ - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* do not let locked object selected, but allow deselection */ if ((PCB_FLAG_TEST(PCB_FLAG_LOCK, obj) == rnd_true) && (ctx->flag)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (!pcb_obj_near_box(obj, &ctx->box)) /* detailed box matching */ - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; pcb_undo_add_obj_to_flag((void *)obj); pcb_draw_obj(obj); @@ -437,7 +437,7 @@ else PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, ctx->flag, obj); pcb_extobj_sync_floater_flags(ctx->pcb, obj, 1, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* ---------------------------------------------------------------------- @@ -458,7 +458,7 @@ fix_box_dir(Box, 1); - return pcb_data_r_search(pcb->Data, PCB_OBJ_ANY, Box, NULL, pcb_select_block_cb, &ctx, NULL, vis_only) == PCB_R_DIR_FOUND_CONTINUE; + return pcb_data_r_search(pcb->Data, PCB_OBJ_ANY, Box, NULL, pcb_select_block_cb, &ctx, NULL, vis_only) == RND_R_DIR_FOUND_CONTINUE; } /* ---------------------------------------------------------------------- Index: trunk/src/undo_old.c =================================================================== --- trunk/src/undo_old.c (revision 31039) +++ trunk/src/undo_old.c (revision 31040) @@ -238,7 +238,7 @@ pcb_layer_t *Layer = (pcb_layer_t *) ptr1; pcb_arc_t *a = (pcb_arc_t *) ptr2; pcb_poly_restore_to_poly(PCB->Data, a->type, ptr1, ptr2); - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); old_sa = a->StartAngle; old_da = a->Delta; if (pcb_undo_and_draw) @@ -246,7 +246,7 @@ a->StartAngle = Entry->Data.AngleChange.angle[0]; a->Delta = Entry->Data.AngleChange.angle[1]; pcb_arc_bbox(a); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); pcb_poly_clear_from_poly(PCB->Data, a->type, ptr1, ptr2); Entry->Data.AngleChange.angle[0] = old_sa; Entry->Data.AngleChange.angle[1] = old_da; @@ -270,7 +270,7 @@ if (type == PCB_OBJ_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; pcb_arc_t *a = (pcb_arc_t *) ptr2; - pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); old_w = a->Width; old_h = a->Height; if (pcb_undo_and_draw) @@ -278,7 +278,7 @@ a->Width = Entry->Data.Move.DX; a->Height = Entry->Data.Move.DY; pcb_arc_bbox(a); - pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); + rnd_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a); Entry->Data.Move.DX = old_w; Entry->Data.Move.DY = old_h; pcb_draw_obj((pcb_any_obj_t *)a); Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 31039) +++ trunk/src_plugins/acompnet/acompnet.c (revision 31040) @@ -47,7 +47,7 @@ rnd_coord_t r; } overlap_t; -static pcb_r_dir_t overlap(const rnd_rnd_box_t *box, void *closure) +static rnd_r_dir_t overlap(const rnd_rnd_box_t *box, void *closure) { pcb_any_obj_t *obj = (pcb_any_obj_t *)box; overlap_t *ovl = (overlap_t *)closure; @@ -54,44 +54,44 @@ switch(obj->type) { case PCB_OBJ_LINE: if (pcb_is_point_in_line(ovl->x, ovl->y, ovl->r, (pcb_any_line_t *)obj)) - return PCB_R_DIR_CANCEL; + return RND_R_DIR_CANCEL; break; case PCB_OBJ_ARC: if (pcb_is_point_on_arc(ovl->x, ovl->y, ovl->r, (pcb_arc_t *)obj)) - return PCB_R_DIR_CANCEL; + return RND_R_DIR_CANCEL; break; case PCB_OBJ_TEXT: if (pcb_is_point_in_box(ovl->x, ovl->y, &obj->bbox_naked, ovl->r)) - return PCB_R_DIR_CANCEL; + return RND_R_DIR_CANCEL; break; case PCB_OBJ_POLY: if (pcb_poly_is_point_in_p(ovl->x, ovl->y, ovl->r, (pcb_poly_t *)obj)) - return PCB_R_DIR_CANCEL; + return RND_R_DIR_CANCEL; break; default: break; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } TODO("move this to search.[ch]") /* Search for object(s) on a specific layer */ -static pcb_r_dir_t pcb_search_on_layer(pcb_layer_t *layer, const rnd_rnd_box_t *bbox, pcb_r_dir_t (*cb)(const rnd_rnd_box_t *box, void *closure), void *closure) +static rnd_r_dir_t pcb_search_on_layer(pcb_layer_t *layer, const rnd_rnd_box_t *bbox, rnd_r_dir_t (*cb)(const rnd_rnd_box_t *box, void *closure), void *closure) { - pcb_r_dir_t res, fin = 0; + rnd_r_dir_t res, fin = 0; - if ((res = pcb_r_search(layer->line_tree, bbox, NULL, cb, closure, NULL)) == PCB_R_DIR_CANCEL) + if ((res = rnd_r_search(layer->line_tree, bbox, NULL, cb, closure, NULL)) == RND_R_DIR_CANCEL) return res; fin |= res; - if ((res = pcb_r_search(layer->arc_tree, bbox, NULL, cb, closure, NULL)) == PCB_R_DIR_CANCEL) + if ((res = rnd_r_search(layer->arc_tree, bbox, NULL, cb, closure, NULL)) == RND_R_DIR_CANCEL) return res; fin |= res; - if ((res = pcb_r_search(layer->polygon_tree, bbox, NULL, cb, closure, NULL)) == PCB_R_DIR_CANCEL) + if ((res = rnd_r_search(layer->polygon_tree, bbox, NULL, cb, closure, NULL)) == RND_R_DIR_CANCEL) return res; fin |= res; - if ((res = pcb_r_search(layer->text_tree, bbox, NULL, cb, closure, NULL)) == PCB_R_DIR_CANCEL) + if ((res = rnd_r_search(layer->text_tree, bbox, NULL, cb, closure, NULL)) == RND_R_DIR_CANCEL) return res; fin |= res; @@ -118,7 +118,7 @@ bbox.Y1 = y - ovl.r; bbox.Y2 = y + ovl.r; - if (pcb_search_on_layer(layer, &bbox, overlap, &ovl) == PCB_R_DIR_NOT_FOUND) { + if (pcb_search_on_layer(layer, &bbox, overlap, &ovl) == RND_R_DIR_NOT_FOUND) { bbox.X1 = x; bbox.X2 = x+1; bbox.Y1 = y; Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 31039) +++ trunk/src_plugins/autoplace/autoplace.c (revision 31040) @@ -230,7 +230,7 @@ t = (box).X1; (box).X1 = (box).X2; (box).X2 = t;\ } /* helper methods for __r_find_neighbor */ -static pcb_r_dir_t __r_find_neighbor_reg_in_sea(const rnd_rnd_box_t * region, void *cl) +static rnd_r_dir_t __r_find_neighbor_reg_in_sea(const rnd_rnd_box_t * region, void *cl) { struct r_neighbor_info *ni = (struct r_neighbor_info *) cl; rnd_rnd_box_t query = *region; @@ -242,11 +242,11 @@ * trap.x1 trap.x2 sides at 45-degree angle */ if ((query.Y2 > ni->trap.Y1) && (query.Y1 < ni->trap.Y2) && (query.X2 + ni->trap.Y2 > ni->trap.X1 + query.Y1) && (query.X1 + query.Y1 < ni->trap.X2 + ni->trap.Y2)) - return PCB_R_DIR_FOUND_CONTINUE; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t __r_find_neighbor_rect_in_reg(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t __r_find_neighbor_rect_in_reg(const rnd_rnd_box_t * box, void *cl) { struct r_neighbor_info *ni = (struct r_neighbor_info *) cl; rnd_rnd_box_t query = *box; @@ -265,7 +265,7 @@ ni->trap.Y1 = query.Y2; ni->neighbor = box; } - return r ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND; + return r ? RND_R_DIR_FOUND_CONTINUE : RND_R_DIR_NOT_FOUND; } /* main r_find_neighbor routine. Returns NULL if no neighbor in the @@ -289,7 +289,7 @@ ni.trap.Y2 = ni.trap.Y1; ni.trap.Y1 = bbox.Y1; /* do the search! */ - pcb_r_search(rtree, NULL, __r_find_neighbor_reg_in_sea, __r_find_neighbor_rect_in_reg, &ni, NULL); + rnd_r_search(rtree, NULL, __r_find_neighbor_reg_in_sea, __r_find_neighbor_rect_in_reg, &ni, NULL); return ni.neighbor; } @@ -488,10 +488,10 @@ } PCB_END_LOOP; - rt_s = pcb_r_create_tree(); - pcb_r_insert_array(rt_s, (const rnd_rnd_box_t **) seboxes.array, vtp0_len(&seboxes)); - rt_c = pcb_r_create_tree(); - pcb_r_insert_array(rt_c, (const rnd_rnd_box_t **) ceboxes.array, vtp0_len(&ceboxes)); + rt_s = rnd_r_create_tree(); + rnd_r_insert_array(rt_s, (const rnd_rnd_box_t **) seboxes.array, vtp0_len(&seboxes)); + rt_c = rnd_r_create_tree(); + rnd_r_insert_array(rt_c, (const rnd_rnd_box_t **) ceboxes.array, vtp0_len(&ceboxes)); vtp0_uninit(&seboxes); vtp0_uninit(&ceboxes); /* now, for each subcircuit, find its neighbor on all four sides */ @@ -530,10 +530,10 @@ PCB_END_LOOP; } /* free k-d tree memory */ - pcb_r_free_tree_data(rt_s, free); - pcb_r_free_tree_data(rt_c, free); - pcb_r_destroy_tree(&rt_s); - pcb_r_destroy_tree(&rt_c); + rnd_r_free_tree_data(rt_s, free); + rnd_r_free_tree_data(rt_c, free); + rnd_r_destroy_tree(&rt_s); + rnd_r_destroy_tree(&rt_c); } /* penalize total area used by this layout */ { Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 31039) +++ trunk/src_plugins/autoroute/autoroute.c (revision 31040) @@ -792,7 +792,7 @@ jmp_buf env; }; -static pcb_r_dir_t __found_one_on_lg(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t __found_one_on_lg(const rnd_rnd_box_t * box, void *cl) { struct rb_info *inf = (struct rb_info *) cl; routebox_t *rb = (routebox_t *) box; @@ -799,15 +799,15 @@ rnd_rnd_box_t sb; if (rb->flags.nonstraight) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; sb = rnd_shrink_box(&rb->box, rb->style->Clearance); if (inf->query.X1 >= sb.X2 || inf->query.X2 <= sb.X1 || inf->query.Y1 >= sb.Y2 || inf->query.Y2 <= sb.Y1) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; inf->winner = rb; if (rb->type == PLANE) - return PCB_R_DIR_FOUND_CONTINUE; /* keep looking for something smaller if a plane was found */ + return RND_R_DIR_FOUND_CONTINUE; /* keep looking for something smaller if a plane was found */ longjmp(inf->env, 1); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static routebox_t *FindRouteBoxOnLayerGroup(routedata_t * rd, rnd_coord_t X, rnd_coord_t Y, rnd_cardinal_t layergroup) @@ -816,7 +816,7 @@ info.winner = NULL; info.query = rnd_point_box(X, Y); if (setjmp(info.env) == 0) - pcb_r_search(rd->layergrouptree[layergroup], &info.query, NULL, __found_one_on_lg, &info, NULL); + rnd_r_search(rd->layergrouptree[layergroup], &info.query, NULL, __found_one_on_lg, &info, NULL); return info.winner; } @@ -1181,7 +1181,7 @@ vtp0_init(&layergroupboxes[i]); PCB_COPPER_GROUP_LOOP(PCB->Data, i); { - if (!PCB_RTREE_EMPTY(layer->line_tree) || !PCB_RTREE_EMPTY(layer->arc_tree)) + if (!RND_RTREE_EMPTY(layer->line_tree) || !RND_RTREE_EMPTY(layer->arc_tree)) usedGroup[i] = rnd_true; else usedGroup[i] = rnd_false; @@ -1199,8 +1199,8 @@ /* create r-trees from pointer lists */ for (i = 0; i < pcb_max_group(PCB); i++) { /* create the r-tree */ - rd->layergrouptree[i] = pcb_r_create_tree(); - pcb_r_insert_array(rd->layergrouptree[i], (const rnd_rnd_box_t **) layergroupboxes[i].array, vtp0_len(&layergroupboxes[i])); + rd->layergrouptree[i] = rnd_r_create_tree(); + rnd_r_insert_array(rd->layergrouptree[i], (const rnd_rnd_box_t **) layergroupboxes[i].array, vtp0_len(&layergroupboxes[i])); } if (AutoRouteParameters.use_vias) { @@ -1229,8 +1229,8 @@ { int i; for (i = 0; i < pcb_max_group(PCB); i++) { - pcb_r_free_tree_data((*rd)->layergrouptree[i], free); - pcb_r_destroy_tree(&(*rd)->layergrouptree[i]); + rnd_r_free_tree_data((*rd)->layergrouptree[i], free); + rnd_r_destroy_tree(&(*rd)->layergrouptree[i]); } if (AutoRouteParameters.use_vias) mtspace_destroy(&(*rd)->mtspace); @@ -1540,21 +1540,21 @@ routebox_t *nearest; rnd_heap_cost_t nearest_cost; }; -static pcb_r_dir_t __region_within_guess(const rnd_rnd_box_t * region, void *cl) +static rnd_r_dir_t __region_within_guess(const rnd_rnd_box_t * region, void *cl) { struct minpcb_cost_target_closure *mtc = (struct minpcb_cost_target_closure *) cl; rnd_heap_cost_t pcb_cost_to_region; if (mtc->nearest == NULL) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; pcb_cost_to_region = pcb_cost_to_layerless_box(mtc->CostPoint, mtc->CostPointLayer, region); assert(pcb_cost_to_region >= 0); /* if no guess yet, all regions are "close enough" */ /* note that cost is *strictly more* than minimum distance, so we'll * always search a region large enough. */ - return (pcb_cost_to_region < mtc->nearest_cost) ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND; + return (pcb_cost_to_region < mtc->nearest_cost) ? RND_R_DIR_FOUND_CONTINUE : RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t __found_new_guess(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t __found_new_guess(const rnd_rnd_box_t * box, void *cl) { struct minpcb_cost_target_closure *mtc = (struct minpcb_cost_target_closure *) cl; routebox_t *guess = (routebox_t *) box; @@ -1564,10 +1564,10 @@ if (pcb_cost_to_guess < mtc->nearest_cost) { mtc->nearest = guess; mtc->nearest_cost = pcb_cost_to_guess; /* this is our new guess! */ - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } else - return PCB_R_DIR_NOT_FOUND; /* not less expensive than our last guess */ + return RND_R_DIR_NOT_FOUND; /* not less expensive than our last guess */ } /* target_guess is our guess at what the nearest target is, or NULL if we @@ -1584,7 +1584,7 @@ mtc.nearest_cost = pcb_cost_to_routebox(mtc.CostPoint, mtc.CostPointLayer, mtc.nearest); else mtc.nearest_cost = EXPENSIVE; - pcb_r_search(targets, NULL, __region_within_guess, __found_new_guess, &mtc, NULL); + rnd_r_search(targets, NULL, __region_within_guess, __found_new_guess, &mtc, NULL); assert(mtc.nearest != NULL && mtc.nearest_cost >= 0); assert(mtc.nearest->flags.target); /* this is a target, right? */ return mtc.nearest; @@ -1925,7 +1925,7 @@ * like it wouldn't be seen. We do this while keep the inflated * box as large as possible. */ -static pcb_r_dir_t __Expand_this_rect(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t __Expand_this_rect(const rnd_rnd_box_t * box, void *cl) { struct E_result *res = (struct E_result *) cl; routebox_t *rb = (routebox_t *) box; @@ -1934,7 +1934,7 @@ /* we don't see conflicts already encountered */ if (rb->flags.touched) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* The inflated box outer edges include its own * track width plus its own clearance. @@ -1952,7 +1952,7 @@ bloat = res->bloat; if (rbox.X2 <= res->inflated.X1 + bloat || rbox.X1 >= res->inflated.X2 - bloat || rbox.Y1 >= res->inflated.Y2 - bloat || rbox.Y2 <= res->inflated.Y1 + bloat) - return PCB_R_DIR_NOT_FOUND; /* doesn't touch */ + return RND_R_DIR_NOT_FOUND; /* doesn't touch */ } else { if (rb->style->Clearance > res->keep) @@ -1962,13 +1962,13 @@ if (rbox.X2 <= res->inflated.X1 || rbox.X1 >= res->inflated.X2 || rbox.Y1 >= res->inflated.Y2 || rbox.Y2 <= res->inflated.Y1) - return PCB_R_DIR_NOT_FOUND; /* doesn't touch */ + return RND_R_DIR_NOT_FOUND; /* doesn't touch */ bloat = 0; } /* this is an intersecting box; it has to jump through a few more hoops */ if (rb == res->parent || rb->parent.expansion_area == res->parent) - return PCB_R_DIR_NOT_FOUND; /* don't see what we came from */ + return RND_R_DIR_NOT_FOUND; /* don't see what we came from */ /* if we are expanding a source edge, don't let other sources * or their expansions stop us. @@ -1976,7 +1976,7 @@ #if 1 if (res->parent->flags.source) if (rb->flags.source || (rb->type == EXPANSION_AREA && rb->parent.expansion_area->flags.source)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; #endif /* we ignore via expansion boxes because maybe its @@ -1984,12 +1984,12 @@ * the path we're exploring now. */ if (rb->flags.is_via && rb->type == EXPANSION_AREA) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (rb->type == PLANE) { /* expanding inside a plane is not good */ if (rbox.X1 < res->orig.X1 && rbox.X2 > res->orig.X2 && rbox.Y1 < res->orig.Y1 && rbox.Y2 > res->orig.Y2) { res->inflated = rnd_bloat_box(&res->orig, res->bloat); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } } /* calculate the distances from original box to this blocker */ @@ -2003,7 +2003,7 @@ if (!(res->done & _WEST) && rbox.X1 <= res->orig.X1 && rbox.X2 > res->inflated.X1) dw = res->orig.X1 - rbox.X2; if (dn <= 0 && de <= 0 && ds <= 0 && dw <= 0) - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; /* now shrink the inflated box to the largest blocking direction */ if (dn >= de && dn >= ds && dn >= dw) { res->inflated.Y1 = rbox.Y2 - bloat; @@ -2021,7 +2021,7 @@ res->inflated.X1 = rbox.X2 - bloat; res->w = rb; } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static rnd_bool boink_box(routebox_t * rb, struct E_result *res, rnd_direction_t dir) @@ -2166,7 +2166,7 @@ } ans.keep = e->rb->style->Clearance; ans.parent = nonhomeless_parent(e->rb); - pcb_r_search(rtree, &ans.inflated, NULL, __Expand_this_rect, &ans, NULL); + rnd_r_search(rtree, &ans.inflated, NULL, __Expand_this_rect, &ans, NULL); /* because the overlaping boxes are found in random order, some blockers * may have limited edges prematurely, so we check if the blockers realy * are blocking, and make another try if not @@ -2188,7 +2188,7 @@ else ans.done |= _WEST; if (ans.done != _NORTH + _EAST + _SOUTH + _WEST) { - pcb_r_search(rtree, &ans.inflated, NULL, __Expand_this_rect, &ans, NULL); + rnd_r_search(rtree, &ans.inflated, NULL, __Expand_this_rect, &ans, NULL); } if ((noshrink & _NORTH) == 0) ans.inflated.Y1 += ans.bloat; @@ -2388,7 +2388,7 @@ if (!rnd_box_is_good(&b)) return; /* how did this happen ? */ nrb = CreateBridge(&b, rb, dir); - pcb_r_insert_entry(tree, &nrb->box); + rnd_r_insert_entry(tree, &nrb->box); vector_append(area_vec, nrb); nrb->flags.homeless = 0; /* not homeless any more */ /* mark this one as conflicted */ @@ -2443,7 +2443,7 @@ assert(rnd_box_intersect(&b, &blocker->sbox)); b = rnd_shrink_box(&b, 1); nrb = CreateBridge(&b, rb, dir); - pcb_r_insert_entry(tree, &nrb->box); + rnd_r_insert_entry(tree, &nrb->box); vector_append(area_vec, nrb); nrb->flags.homeless = 0; /* not homeless any more */ ne = CreateEdge(nrb, nrb->cost_point.X, nrb->cost_point.Y, nrb->cost, blocker, dir, NULL); @@ -2460,7 +2460,7 @@ rnd_bool ignore_source; }; -static pcb_r_dir_t __GatherBlockers(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t __GatherBlockers(const rnd_rnd_box_t * box, void *cl) { routebox_t *rb = (routebox_t *) box; struct break_info *bi = (struct break_info *) cl; @@ -2467,17 +2467,17 @@ rnd_rnd_box_t b; if (bi->parent == rb || rb->flags.touched || bi->parent->parent.expansion_area == rb) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (rb->flags.source && bi->ignore_source) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; b = rb->sbox; if (rb->style->Clearance > AutoRouteParameters.style->Clearance) b = rnd_bloat_box(&b, rb->style->Clearance - AutoRouteParameters.style->Clearance); if (b.X2 <= bi->box.X1 || b.X1 >= bi->box.X2 || b.Y1 >= bi->box.Y2 || b.Y2 <= bi->box.Y1) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (blocker_to_heap(bi->heap, rb, &bi->box, bi->dir)) - return PCB_R_DIR_FOUND_CONTINUE; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_NOT_FOUND; } /* shrink the box to the last limit for the previous direction, @@ -2581,7 +2581,7 @@ bi.box.X1 = e->rb->sbox.X2; if (e->expand_dir == RND_SW) bi.box.X2 = e->rb->sbox.X1; - pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); + rnd_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); rb->n = tmp; break; case RND_EAST: @@ -2593,7 +2593,7 @@ bi.box.Y1 = e->rb->sbox.Y2; if (e->expand_dir == RND_NW) bi.box.Y2 = e->rb->sbox.Y1; - pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); + rnd_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); rb->e = tmp; break; case RND_SOUTH: @@ -2605,7 +2605,7 @@ bi.box.X1 = e->rb->sbox.X2; if (e->expand_dir == RND_NW) bi.box.X2 = e->rb->sbox.X1; - pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); + rnd_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); rb->s = tmp; break; case RND_WEST: @@ -2617,7 +2617,7 @@ bi.box.Y1 = e->rb->sbox.Y2; if (e->expand_dir == RND_NE) bi.box.Y2 = e->rb->sbox.Y1; - pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); + rnd_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp); rb->w = tmp; break; default: @@ -2798,22 +2798,22 @@ jmp_buf env; }; -static pcb_r_dir_t foib_rect_in_reg(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t foib_rect_in_reg(const rnd_rnd_box_t * box, void *cl) { struct foib_info *foib = (struct foib_info *) cl; rnd_rnd_box_t rbox; routebox_t *rb = (routebox_t *) box; if (rb->flags.touched) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* if (rb->type == EXPANSION_AREA && !rb->flags.is_via)*/ - /* return PCB_R_DIR_NOT_FOUND; */ + /* return RND_R_DIR_NOT_FOUND; */ rbox = bloat_routebox(rb); if (!rnd_box_intersect(&rbox, foib->box)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* this is an intersector! */ foib->intersect = (routebox_t *) box; longjmp(foib->env, 1); /* skip to the end! */ - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static routebox_t *FindOneInBox(rnd_rtree_t * rtree, routebox_t * rb) @@ -2826,7 +2826,7 @@ foib.intersect = NULL; if (setjmp(foib.env) == 0) - pcb_r_search(rtree, &r, NULL, foib_rect_in_reg, &foib, NULL); + rnd_r_search(rtree, &r, NULL, foib_rect_in_reg, &foib, NULL); return foib.intersect; } @@ -2835,7 +2835,7 @@ rnd_rnd_box_t query; jmp_buf env; }; -static pcb_r_dir_t ftherm_rect_in_reg(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t ftherm_rect_in_reg(const rnd_rnd_box_t * box, void *cl) { routebox_t *rbox = (routebox_t *) box; struct therm_info *ti = (struct therm_info *) cl; @@ -2842,9 +2842,9 @@ rnd_rnd_box_t sq, sb; if (rbox->type != TERM) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (rbox->group != ti->plane->group) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; sb = shrink_routebox(rbox); switch (rbox->type) { @@ -2852,7 +2852,7 @@ case VIA_SHADOW: sq = rnd_shrink_box(&ti->query, rbox->style->Diameter); if (!rnd_box_intersect(&sb, &sq)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; sb.X1 = RND_BOX_CENTER_X(sb); sb.Y1 = RND_BOX_CENTER_Y(sb); break; @@ -2861,7 +2861,7 @@ } ti->plane = rbox; longjmp(ti->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } /* check for a pin or via target that a polygon can just use a thermal to connect to */ @@ -2873,7 +2873,7 @@ info.query = shrink_routebox(rb); if (setjmp(info.env) == 0) { - pcb_r_search(rtree, &info.query, NULL, ftherm_rect_in_reg, &info, NULL); + rnd_r_search(rtree, &info.query, NULL, ftherm_rect_in_reg, &info, NULL); return NULL; } return info.plane; @@ -2901,7 +2901,7 @@ MergeNets(rb, subnet, NET); MergeNets(rb, subnet, SUBNET); /* add it to the r-tree, this may be the whole route! */ - pcb_r_insert_entry(rd->layergrouptree[rb->group], &rb->box); + rnd_r_insert_entry(rd->layergrouptree[rb->group], &rb->box); rb->flags.homeless = 0; } @@ -2953,7 +2953,7 @@ MergeNets(rb, subnet, SUBNET); assert(__routepcb_box_is_good(rb)); /* and add it to the r-tree! */ - pcb_r_insert_entry(rd->layergrouptree[rb->group], &rb->box); + rnd_r_insert_entry(rd->layergrouptree[rb->group], &rb->box); rb->flags.homeless = 0; /* not homeless anymore */ rb->livedraw_obj.via = live_via; } @@ -3041,7 +3041,7 @@ MergeNets(rb, qsn, SUBNET); assert(__routepcb_box_is_good(rb)); /* and add it to the r-tree! */ - pcb_r_insert_entry(rd->layergrouptree[rb->group], &rb->box); + rnd_r_insert_entry(rd->layergrouptree[rb->group], &rb->box); if (conf_core.editor.live_routing) { pcb_layer_t *layer = pcb_get_layer(PCB->Data, PCB->LayerGroups.grp[rb->group].lid[0]); @@ -3573,17 +3573,17 @@ #endif -static pcb_r_dir_t __conflict_source(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t __conflict_source(const rnd_rnd_box_t * box, void *cl) { routebox_t *rb = (routebox_t *) box; if (rb->flags.touched || rb->flags.fixed) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; else { routebox_t *dis = (routebox_t *) cl; path_conflicts(dis, rb, rnd_false); touch_conflicts(dis->conflicts_with, 1); } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static void source_conflicts(rnd_rtree_t * tree, routebox_t * rb) @@ -3590,7 +3590,7 @@ { if (!AutoRouteParameters.with_conflicts) return; - pcb_r_search(tree, &rb->sbox, NULL, __conflict_source, rb, NULL); + rnd_r_search(tree, &rb->sbox, NULL, __conflict_source, rb, NULL); touch_conflicts(NULL, 1); } @@ -3695,8 +3695,8 @@ #endif } PCB_END_LOOP; - targets = pcb_r_create_tree(); - pcb_r_insert_array(targets, (const rnd_rnd_box_t **)target_list, i); + targets = rnd_r_create_tree(); + rnd_r_insert_array(targets, (const rnd_rnd_box_t **)target_list, i); assert(i <= num_targets); free(target_list); @@ -3851,10 +3851,10 @@ /* this via candidate is in an open area; add it to r-tree as * an expansion area */ assert(e->rb->type == EXPANSION_AREA && e->rb->flags.is_via); - /*assert (!pcb_r_search(rd->layergrouptree[e->rb->group], + /*assert (!rnd_r_search(rd->layergrouptree[e->rb->group], &e->rb->box, NULL, no_planes,0)); */ - pcb_r_insert_entry(rd->layergrouptree[e->rb->group], &e->rb->box); + rnd_r_insert_entry(rd->layergrouptree[e->rb->group], &e->rb->box); e->rb->flags.homeless = 0; /* not homeless any more */ /* add to vector of all expansion areas in r-tree */ vector_append(area_vec, e->rb); @@ -3991,7 +3991,7 @@ if (!rnd_box_is_good(&ans->inflated)) goto dontexpand; nrb = CreateExpansionArea(&ans->inflated, e->rb->group, e->rb, rnd_true, e); - pcb_r_insert_entry(rd->layergrouptree[nrb->group], &nrb->box); + rnd_r_insert_entry(rd->layergrouptree[nrb->group], &nrb->box); vector_append(area_vec, nrb); nrb->flags.homeless = 0; /* not homeless any more */ broken = BreakManyEdges(&s, targets, rd->layergrouptree[nrb->group], area_vec, ans, nrb, e); @@ -4011,7 +4011,7 @@ } touch_conflicts(NULL, 1); rnd_heap_destroy(&s.workheap); - pcb_r_destroy_tree(&targets); + rnd_r_destroy_tree(&targets); assert(vector_is_empty(edge_vec)); vector_destroy(&edge_vec); @@ -4064,7 +4064,7 @@ assert(!rb->flags.homeless); if (rb->conflicts_with && rb->parent.expansion_area->conflicts_with != rb->conflicts_with) vector_destroy(&rb->conflicts_with); - pcb_r_delete_entry_free_data(rd->layergrouptree[rb->group], &rb->box, free); + rnd_r_delete_entry_free_data(rd->layergrouptree[rb->group], &rb->box, free); } vector_destroy(&area_vec); /* clean up; remove all 'source', 'target', and 'nobloat' flags */ @@ -4112,12 +4112,12 @@ } #ifndef NDEBUG -pcb_r_dir_t bad_boy(const rnd_rnd_box_t * b, void *cl) +rnd_r_dir_t bad_boy(const rnd_rnd_box_t * b, void *cl) { routebox_t *box = (routebox_t *) b; if (box->type == EXPANSION_AREA) - return PCB_R_DIR_FOUND_CONTINUE; - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_NOT_FOUND; } rnd_bool no_expansion_boxes(routedata_t * rd) @@ -4129,7 +4129,7 @@ big.Y1 = 0; big.Y2 = RND_MAX_COORD; for (i = 0; i < pcb_max_group(PCB); i++) { - if (pcb_r_search(rd->layergrouptree[i], &big, NULL, bad_boy, NULL, NULL)) + if (rnd_r_search(rd->layergrouptree[i], &big, NULL, bad_boy, NULL, NULL)) return rnd_false; } return rnd_true; @@ -4152,11 +4152,11 @@ } } -static pcb_r_dir_t ripout_livedraw_obj_cb(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t ripout_livedraw_obj_cb(const rnd_rnd_box_t * b, void *cl) { routebox_t *box = (routebox_t *) b; ripout_livedraw_obj(box); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } struct routeall_status { @@ -4281,7 +4281,7 @@ #ifndef NDEBUG del = #endif - pcb_r_delete_entry_free_data(rd->layergrouptree[p->group], &p->box, free); + rnd_r_delete_entry_free_data(rd->layergrouptree[p->group], &p->box, free); #ifndef NDEBUG assert(del); #endif @@ -4452,7 +4452,7 @@ jmp_buf env; }; -static pcb_r_dir_t fpstk_rect(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t fpstk_rect(const rnd_rnd_box_t * b, void *cl) { pcb_pstk_t *ps = (pcb_pstk_t *)b; struct fpin_info *info = (struct fpin_info *) cl; @@ -4460,7 +4460,7 @@ info->ps = ps; longjmp(info->env, 1); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static int FindPin(const rnd_rnd_box_t *box, pcb_pstk_t **ps_out) @@ -4471,7 +4471,7 @@ info.x = box->X1; info.y = box->Y1; if (setjmp(info.env) == 0) { - pcb_r_search(PCB->Data->padstack_tree, box, NULL, fpstk_rect, &info, NULL); + rnd_r_search(PCB->Data->padstack_tree, box, NULL, fpstk_rect, &info, NULL); } else { *ps_out = info.ps; @@ -4751,7 +4751,7 @@ int i; rnd_rnd_box_t big = { 0, 0, RND_MAX_COORD, RND_MAX_COORD }; for (i = 0; i < pcb_max_group(PCB); i++) { - pcb_r_search(rd->layergrouptree[i], &big, NULL, ripout_livedraw_obj_cb, NULL, NULL); + rnd_r_search(rd->layergrouptree[i], &big, NULL, ripout_livedraw_obj_cb, NULL, NULL); } } #ifdef ROUTE_DEBUG Index: trunk/src_plugins/autoroute/mtspace.c =================================================================== --- trunk/src_plugins/autoroute/mtspace.c (revision 31039) +++ trunk/src_plugins/autoroute/mtspace.c (revision 31040) @@ -105,9 +105,9 @@ /* create mtspace data structure */ mtspace = (mtspace_t *) malloc(sizeof(*mtspace)); - mtspace->ftree = pcb_r_create_tree(); - mtspace->etree = pcb_r_create_tree(); - mtspace->otree = pcb_r_create_tree(); + mtspace->ftree = rnd_r_create_tree(); + mtspace->etree = rnd_r_create_tree(); + mtspace->otree = rnd_r_create_tree(); /* done! */ return mtspace; } @@ -116,12 +116,12 @@ void mtspace_destroy(mtspace_t ** mtspacep) { assert(mtspacep); - pcb_r_free_tree_data((*mtspacep)->ftree, free); - pcb_r_free_tree_data((*mtspacep)->etree, free); - pcb_r_free_tree_data((*mtspacep)->otree, free); - pcb_r_destroy_tree(&(*mtspacep)->ftree); - pcb_r_destroy_tree(&(*mtspacep)->etree); - pcb_r_destroy_tree(&(*mtspacep)->otree); + rnd_r_free_tree_data((*mtspacep)->ftree, free); + rnd_r_free_tree_data((*mtspacep)->etree, free); + rnd_r_free_tree_data((*mtspacep)->otree, free); + rnd_r_destroy_tree(&(*mtspacep)->ftree); + rnd_r_destroy_tree(&(*mtspacep)->etree); + rnd_r_destroy_tree(&(*mtspacep)->otree); free(*mtspacep); *mtspacep = NULL; } @@ -133,7 +133,7 @@ jmp_buf env; }; -static pcb_r_dir_t mts_remove_one(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t mts_remove_one(const rnd_rnd_box_t * b, void *cl) { struct mts_info *info = (struct mts_info *) cl; mtspacebox_t *box = (mtspacebox_t *) b; @@ -142,10 +142,10 @@ /* the info box is pre-bloated, so just check equality */ if (b->X1 == info->box.X1 && b->X2 == info->box.X2 && b->Y1 == info->box.Y1 && b->Y2 == info->box.Y2 && box->clearance == info->clearance) { - pcb_r_delete_entry_free_data(info->tree, (rnd_rnd_box_t *)b, free); + rnd_r_delete_entry_free_data(info->tree, (rnd_rnd_box_t *)b, free); longjmp(info->env, 1); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } rnd_rtree_t *which_tree(mtspace_t * mtspace, mtspace_type_t which) @@ -164,7 +164,7 @@ void mtspace_add(mtspace_t * mtspace, const rnd_rnd_box_t * box, mtspace_type_t which, rnd_coord_t clearance) { mtspacebox_t *filler = mtspace_create_box(box, clearance); - pcb_r_insert_entry(which_tree(mtspace, which), (const rnd_rnd_box_t *) filler); + rnd_r_insert_entry(which_tree(mtspace, which), (const rnd_rnd_box_t *) filler); } /* remove a space-filler from the empty space representation. */ @@ -178,7 +178,7 @@ cl.tree = which_tree(mtspace, which); small_search = rnd_box_center(box); if (setjmp(cl.env) == 0) { - pcb_r_search(cl.tree, &small_search, NULL, mts_remove_one, &cl, NULL); + rnd_r_search(cl.tree, &small_search, NULL, mts_remove_one, &cl, NULL); assert(0); /* didn't find it?? */ } } @@ -213,7 +213,7 @@ * First check if it does intersect, then break it into * overlaping regions that don't intersect this box. */ -static pcb_r_dir_t query_one(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t query_one(const rnd_rnd_box_t * box, void *cl) { struct query_closure *qc = (struct query_closure *) cl; mtspacebox_t *mtsb = (mtspacebox_t *) box; @@ -238,7 +238,7 @@ * then we didn't actually touch this box */ if (qc->cbox->X1 + shrink >= mtsb->box.X2 || qc->cbox->X2 - shrink <= mtsb->box.X1 || qc->cbox->Y1 + shrink >= mtsb->box.Y2 || qc->cbox->Y2 - shrink <= mtsb->box.Y1) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* ok, we do touch this box, now create up to 4 boxes that don't */ if (mtsb->box.Y1 > qc->cbox->Y1 + shrink) { /* top region exists */ rnd_coord_t Y1 = qc->cbox->Y1; @@ -302,7 +302,7 @@ else free(qc->cbox); /* done with this one */ longjmp(qc->env, 1); - return PCB_R_DIR_FOUND_CONTINUE; /* never reached */ + return RND_R_DIR_FOUND_CONTINUE; /* never reached */ } /* qloop takes a vector (or heap) of regions to check (checking) if they don't intersect @@ -323,7 +323,7 @@ if (setjmp(qc->env) == 0) { assert(rnd_box_is_good(cbox)); qc->cbox = cbox; - pcb_r_search(tree, cbox, NULL, query_one, qc, &n); + rnd_r_search(tree, cbox, NULL, query_one, qc, &n); assert(n == 0); /* nothing intersected with this tree, put it in the result vector */ if (is_vec) Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 31039) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 31040) @@ -81,7 +81,7 @@ } } -static pcb_r_dir_t pinout_mouse_search_cb(void *closure, pcb_any_obj_t *obj, void *box) +static rnd_r_dir_t pinout_mouse_search_cb(void *closure, pcb_any_obj_t *obj, void *box) { pinout_ctx_t *ctx = closure; rnd_hid_attr_val_t val; @@ -102,7 +102,7 @@ } } } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static rnd_bool pinout_mouse(rnd_hid_attribute_t *attrib, rnd_hid_preview_t *prv, rnd_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y) Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 31039) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 31040) @@ -301,7 +301,7 @@ pcb_layer_t *l = &PCB->Data->Layer[i]; pcb_layer_type_t flags = pcb_layer_flags(PCB, i); int purpi = pcb_layer_purpose(PCB, i, NULL); - if (PCB_LAYER_IS_ROUTE(flags, purpi) && (!PCB_RTREE_EMPTY(l->line_tree) || !PCB_RTREE_EMPTY(l->arc_tree))) { + if (PCB_LAYER_IS_ROUTE(flags, purpi) && (!RND_RTREE_EMPTY(l->line_tree) || !RND_RTREE_EMPTY(l->arc_tree))) { draw_fab_layer(info, gc, e, l, found); found = 1; } Index: trunk/src_plugins/drc_orig/drc_orig.c =================================================================== --- trunk/src_plugins/drc_orig/drc_orig.c (revision 31039) +++ trunk/src_plugins/drc_orig/drc_orig.c (revision 31040) @@ -59,7 +59,7 @@ #define DRC_ORIG_CONF_FN "drc_orig.conf" /* DRC clearance callback */ -static pcb_r_dir_t drc_callback(pcb_data_t *data, pcb_layer_t *layer, pcb_poly_t *polygon, int type, void *ptr1, void *ptr2, void *user_data) +static rnd_r_dir_t drc_callback(pcb_data_t *data, pcb_layer_t *layer, pcb_poly_t *polygon, int type, void *ptr1, void *ptr2, void *user_data) { const char *message; pcb_view_t *violation; @@ -90,7 +90,7 @@ default: rnd_message(RND_MSG_ERROR, "hace: Bad Plow object in callback\n"); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; doIsBad: pcb_poly_invalidate_draw(layer, polygon); @@ -100,7 +100,7 @@ pcb_view_append_obj(violation, 0, (pcb_any_obj_t *)ptr2); pcb_view_set_bbox_by_objs(PCB->Data, violation); pcb_view_list_append(lst, violation); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static int drc_text(pcb_view_list_t *lst, pcb_layer_t *layer, pcb_text_t *text, rnd_coord_t min_wid) Index: trunk/src_plugins/export_openscad/scad_draw.c =================================================================== --- trunk/src_plugins/export_openscad/scad_draw.c (revision 31039) +++ trunk/src_plugins/export_openscad/scad_draw.c (revision 31040) @@ -122,9 +122,9 @@ fprintf(f, "module pcb_drill() {\n"); - for(obj = pcb_r_first(PCB->Data->padstack_tree, &it); obj != NULL; obj = pcb_r_next(&it)) + for(obj = rnd_r_first(PCB->Data->padstack_tree, &it); obj != NULL; obj = rnd_r_next(&it)) scad_draw_pstk((pcb_pstk_t *)obj); - pcb_r_end(&it); + rnd_r_end(&it); fprintf(f, "}\n"); } Index: trunk/src_plugins/exto_std/dimension.c =================================================================== --- trunk/src_plugins/exto_std/dimension.c (revision 31039) +++ trunk/src_plugins/exto_std/dimension.c (revision 31040) @@ -195,7 +195,7 @@ } else { /* modify the floater if it exists */ if (ly->line_tree != NULL) - pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)flt); + rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)flt); flt->Point1.X = x1 + arrx * dim->dx; flt->Point1.Y = y1 + arrx * dim->dy; flt->Point2.X = x2 - arrx * dim->dx; flt->Point2.Y = y2 - arrx * dim->dy; @@ -202,7 +202,7 @@ pcb_line_bbox(flt); if (ly->line_tree != NULL) - pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)flt); + rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)flt); } /* guide lines */ Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31039) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 31040) @@ -424,8 +424,8 @@ pcb_subc_reg(PCB->Data, sc); pcb_subc_bbox(sc); if (PCB->Data->subc_tree == NULL) - PCB->Data->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(PCB->Data->subc_tree, (rnd_rnd_box_t *)sc); + PCB->Data->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(PCB->Data->subc_tree, (rnd_rnd_box_t *)sc); pcb_subc_rebind(PCB, sc); } htsp_uninit(&subcs); Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 31039) +++ trunk/src_plugins/io_autotrax/read.c (revision 31040) @@ -1064,8 +1064,8 @@ } pcb_subc_bbox(new_module); if (st->pcb->Data->subc_tree == NULL) - st->pcb->Data->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)new_module); + st->pcb->Data->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)new_module); pcb_subc_rebind(st->pcb, new_module); return 0; Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 31039) +++ trunk/src_plugins/io_eagle/read.c (revision 31040) @@ -1181,8 +1181,8 @@ pcb_subc_bbox(subc); TODO("subc: revise this: are we loading an instance here? do we need to place it? do not even bump if not!") if (st->pcb->Data->subc_tree == NULL) - st->pcb->Data->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc); + st->pcb->Data->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_rebind(st->pcb, subc); TODO("revise rotation and flip") Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 31039) +++ trunk/src_plugins/io_hyp/parser.c (revision 31040) @@ -477,8 +477,8 @@ { pcb_subc_bbox(subc); if (hyp_dest->subc_tree == NULL) - hyp_dest->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(hyp_dest->subc_tree, (rnd_rnd_box_t *)subc); + hyp_dest->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(hyp_dest->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_rebind(hyp_dest->parent.board, subc); } Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 31039) +++ trunk/src_plugins/io_kicad/read.c (revision 31040) @@ -1061,8 +1061,8 @@ pcb_subc_bbox(subc); if (st->pcb != NULL) { if (st->pcb->Data->subc_tree == NULL) - st->pcb->Data->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc); + st->pcb->Data->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_rebind(st->pcb, subc); } else @@ -2512,8 +2512,8 @@ pcb_subc_bbox(subc); if (st->pcb != NULL) { if (st->pcb->Data->subc_tree == NULL) - st->pcb->Data->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc); + st->pcb->Data->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_rebind(st->pcb, subc); } else Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 31039) +++ trunk/src_plugins/io_lihata/read.c (revision 31040) @@ -1309,8 +1309,8 @@ pcb_subc_bbox(subc); if (dt->subc_tree == NULL) - dt->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)subc); + dt->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_rebind(pcb, subc); @@ -1333,7 +1333,7 @@ parse_minuid(sc->uid, lht_dom_hash_get(obj, "uid")); if (!dt->padstack_tree) - dt->padstack_tree = pcb_r_create_tree(); + dt->padstack_tree = rnd_r_create_tree(); sc->data->padstack_tree = dt->padstack_tree; pcb_subc_reg(dt, sc); @@ -1349,8 +1349,8 @@ pcb_data_bbox_naked(&sc->bbox_naked, sc->data, rnd_true); if (!dt->subc_tree) - dt->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)sc); + dt->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)sc); if (subc_out != NULL) *subc_out = sc; @@ -2315,11 +2315,11 @@ int l; for(l = 0; l < pcb->Data->LayerN; l++) { pcb_layer_t *layer = pcb->Data->Layer + l; - for(b = pcb_r_first(layer->polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) { + for(b = rnd_r_first(layer->polygon_tree, &it); b != NULL; b = rnd_r_next(&it)) { pcb_poly_t *p = (pcb_poly_t *)b; pcb_poly_init_clip(pcb->Data, layer, p); } - pcb_r_end(&it); + rnd_r_end(&it); } } Index: trunk/src_plugins/io_mentor_cell/read.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read.c (revision 31039) +++ trunk/src_plugins/io_mentor_cell/read.c (revision 31040) @@ -1122,8 +1122,8 @@ if ((dt != NULL) && (ctx->pcb != NULL)) { if (dt->subc_tree == NULL) - dt->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)subc); + dt->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)subc); pcb_subc_rebind(ctx->pcb, subc); } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 31039) +++ trunk/src_plugins/io_pcb/file.c (revision 31040) @@ -1028,7 +1028,7 @@ pcb_text_t *txt; pcb_subc_reg(Data, sc); if (Data->padstack_tree == NULL) - Data->padstack_tree = pcb_r_create_tree(); + Data->padstack_tree = rnd_r_create_tree(); sc->data->padstack_tree = Data->padstack_tree; yysubc_ox = 0; @@ -1072,8 +1072,8 @@ pcb_subc_bbox(yysubc); if (Data->subc_tree == NULL) - Data->subc_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)yysubc); + Data->subc_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)yysubc); } static pcb_layer_t *subc_silk_layer(pcb_subc_t *subc) Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 31039) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 31040) @@ -2454,8 +2454,8 @@ { pcb_poly_bbox(Polygon); if (!Layer->polygon_tree) - Layer->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + Layer->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); } } #line 2462 "parse_y.c" /* yacc.c:1652 */ Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 31039) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 31040) @@ -795,8 +795,8 @@ { pcb_poly_bbox(Polygon); if (!Layer->polygon_tree) - Layer->polygon_tree = pcb_r_create_tree(); - pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); + Layer->polygon_tree = rnd_r_create_tree(); + rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon); } } ; Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 31039) +++ trunk/src_plugins/io_tedax/tetest.c (revision 31040) @@ -131,7 +131,7 @@ tedax_fprint_escape(f, etestid); fputc('\n', f); - for(b = pcb_r_first(pcb->Data->padstack_tree, &it); b != NULL; b = pcb_r_next(&it)) { + for(b = rnd_r_first(pcb->Data->padstack_tree, &it); b != NULL; b = rnd_r_next(&it)) { pcb_pstk_t *ps = (pcb_pstk_t *)b; pcb_subc_t *sc; pcb_net_term_t *t; @@ -147,7 +147,7 @@ continue; tedax_etest_fsave_pstk(f, ps, t->parent.net->name, sc->refdes, ps->term); } - pcb_r_end(&it); + rnd_r_end(&it); fprintf(f, "end etest\n"); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 31039) +++ trunk/src_plugins/jostle/jostle.c (revision 31040) @@ -339,7 +339,7 @@ }; /* Process lines that intersect our 'brush'. */ -static pcb_r_dir_t jostle_callback(const rnd_rnd_box_t * targ, void *private) +static rnd_r_dir_t jostle_callback(const rnd_rnd_box_t * targ, void *private) { pcb_line_t *line = (pcb_line_t *) targ; struct info *info = private; @@ -494,7 +494,7 @@ rnd_fprintf(stderr, "search (%ms,%ms)->(%ms,%ms):\n", info.box.X1, info.box.Y1, info.box.X2, info.box.Y2); info.line = NULL; info.smallest = NULL; - pcb_r_search(info.layer->line_tree, &info.box, NULL, jostle_callback, &info, &found); + rnd_r_search(info.layer->line_tree, &info.box, NULL, jostle_callback, &info, &found); if (found) { expand = NULL; MakeBypassingLines(info.smallest, info.layer, info.line, info.side, &expand); Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31039) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 31040) @@ -173,7 +173,7 @@ e->y2 = y2; rnd_box_bump_box(&dst->bbox, b); - pcb_r_insert_entry(dst->edge_tree, (rnd_rnd_box_t *)e); + rnd_r_insert_entry(dst->edge_tree, (rnd_rnd_box_t *)e); } static void add_track(pcb_cpoly_edgetree_t *dst, rnd_pline_t *track) @@ -208,7 +208,7 @@ res->alloced = alloced; res->used = 0; - res->edge_tree = pcb_r_create_tree(); + res->edge_tree = rnd_r_create_tree(); res->bbox.X1 = res->bbox.Y1 = RND_MAX_COORD; res->bbox.X2 = res->bbox.Y2 = -RND_MAX_COORD; @@ -234,7 +234,7 @@ void pcb_cpoly_edgetree_destroy(pcb_cpoly_edgetree_t *etr) { - pcb_r_destroy_tree(&etr->edge_tree); + rnd_r_destroy_tree(&etr->edge_tree); free(etr); } @@ -244,7 +244,7 @@ rnd_coord_t coord[1]; } intersect_t; -static pcb_r_dir_t pcb_cploy_hatch_edge_hor(const rnd_rnd_box_t *region, void *cl) +static rnd_r_dir_t pcb_cploy_hatch_edge_hor(const rnd_rnd_box_t *region, void *cl) { intersect_t *is = (intersect_t *)cl; pcb_cpoly_edge_t *e = (pcb_cpoly_edge_t *)region; @@ -260,10 +260,10 @@ is->used++; } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t pcb_cploy_hatch_edge_ver(const rnd_rnd_box_t *region, void *cl) +static rnd_r_dir_t pcb_cploy_hatch_edge_ver(const rnd_rnd_box_t *region, void *cl) { intersect_t *is = (intersect_t *)cl; pcb_cpoly_edge_t *e = (pcb_cpoly_edge_t *)region; @@ -279,7 +279,7 @@ is->used++; } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static int coord_cmp(const void *p1, const void *p2) @@ -316,7 +316,7 @@ is->used = 0; is->at = y; - pcb_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_hor, is, NULL); + rnd_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_hor, is, NULL); qsort(is->coord, is->used, sizeof(rnd_coord_t), coord_cmp); for(n = 1; n < is->used; n+=2) /* call the callback for the odd scan lines */ cb(ctx, is->coord[n-1], y, is->coord[n], y); @@ -334,7 +334,7 @@ is->used = 0; is->at = x; - pcb_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_ver, is, NULL); + rnd_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_ver, is, NULL); qsort(is->coord, is->used, sizeof(rnd_coord_t), coord_cmp); for(n = 1; n < is->used; n+=2) /* call the callback for the odd scan lines */ cb(ctx, x, is->coord[n-1], x, is->coord[n]); Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 31039) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 31040) @@ -58,7 +58,7 @@ pcb_dynf_t mark; } next_conn_t; -static pcb_r_dir_t next_conn_found_arc(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t next_conn_found_arc(const rnd_rnd_box_t *box, void *cl) { rnd_coord_t ex, ey; next_conn_t *ctx = cl; @@ -66,7 +66,7 @@ int n; if (PCB_DFLAG_TEST(&obj->Flags, ctx->mark)) - return PCB_R_DIR_NOT_FOUND; /* object already mapped */ + return RND_R_DIR_NOT_FOUND; /* object already mapped */ for(n = 0; n < 2; n++) { pcb_arc_get_end((pcb_arc_t *)obj, n, &ex, &ey); @@ -75,14 +75,14 @@ vtp0_append(ctx->list, obj); PCB_DFLAG_SET(&obj->Flags, ctx->mark); ctx->result = obj; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t next_conn_found_line(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t next_conn_found_line(const rnd_rnd_box_t *box, void *cl) { next_conn_t *ctx = cl; pcb_any_obj_t *obj = (pcb_any_obj_t *)box; @@ -89,7 +89,7 @@ pcb_line_t *l = (pcb_line_t *)box; if (PCB_DFLAG_TEST(&obj->Flags, ctx->mark)) - return PCB_R_DIR_NOT_FOUND; /* object already mapped */ + return RND_R_DIR_NOT_FOUND; /* object already mapped */ if (NEAR(ctx->tx, l->Point1.X, ctx->ty, l->Point1.Y)) { vti0_append(ctx->endlist, 0); @@ -96,7 +96,7 @@ vtp0_append(ctx->list, obj); PCB_DFLAG_SET(&obj->Flags, ctx->mark); ctx->result = obj; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } if (NEAR(ctx->tx, l->Point2.X, ctx->ty, l->Point2.Y)) { @@ -104,10 +104,10 @@ vtp0_append(ctx->list, obj); PCB_DFLAG_SET(&obj->Flags, ctx->mark); ctx->result = obj; - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static pcb_any_obj_t *next_conn(vtp0_t *list, vti0_t *endlist, pcb_any_obj_t *curr, pcb_dynf_t df) @@ -149,7 +149,7 @@ ctx.tx = cx[n]; ctx.ty = cy[n]; - pcb_r_search(curr->parent.layer->arc_tree, ®ion, NULL, next_conn_found_arc, &ctx, &len); + rnd_r_search(curr->parent.layer->arc_tree, ®ion, NULL, next_conn_found_arc, &ctx, &len); if (len > 1) { rnd_message(RND_MSG_ERROR, "map_contour(): contour is not a clean loop: it contains at least one stub or subloop\n"); return NULL; @@ -157,7 +157,7 @@ if (ctx.result != NULL) return ctx.result; - pcb_r_search(curr->parent.layer->line_tree, ®ion, NULL, next_conn_found_line, &ctx, &len); + rnd_r_search(curr->parent.layer->line_tree, ®ion, NULL, next_conn_found_line, &ctx, &len); if (len > 1) { rnd_message(RND_MSG_ERROR, "map_contour(): contour is not a clean loop: it contains at least one stub or subloop\n"); return NULL; Index: trunk/src_plugins/millpath/toolpath.c =================================================================== --- trunk/src_plugins/millpath/toolpath.c (revision 31039) +++ trunk/src_plugins/millpath/toolpath.c (revision 31040) @@ -137,25 +137,25 @@ pcb_text_t *text; sub_layer_text_t slt; - for(line = (pcb_line_t *)pcb_r_first(layer->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it)) + for(line = (pcb_line_t *)rnd_r_first(layer->line_tree, &it); line != NULL; line = (pcb_line_t *)rnd_r_next(&it)) sub_layer_line(pcb, result, layer, line, centerline); - pcb_r_end(&it); + rnd_r_end(&it); - for(arc = (pcb_arc_t *)pcb_r_first(layer->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it)) + for(arc = (pcb_arc_t *)rnd_r_first(layer->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)rnd_r_next(&it)) sub_layer_arc(pcb, result, layer, arc, centerline); - pcb_r_end(&it); + rnd_r_end(&it); - for(poly = (pcb_poly_t *)pcb_r_first(layer->polygon_tree, &it); poly != NULL; poly = (pcb_poly_t *)pcb_r_next(&it)) + for(poly = (pcb_poly_t *)rnd_r_first(layer->polygon_tree, &it); poly != NULL; poly = (pcb_poly_t *)rnd_r_next(&it)) sub_layer_poly(pcb, result, layer, poly, centerline); - pcb_r_end(&it); + rnd_r_end(&it); slt.pcb = pcb; slt.layer = layer; slt.centerline = centerline; slt.result = result; - for(text = (pcb_text_t *)pcb_r_first(layer->text_tree, &it); text != NULL; text = (pcb_text_t *)pcb_r_next(&it)) + for(text = (pcb_text_t *)rnd_r_first(layer->text_tree, &it); text != NULL; text = (pcb_text_t *)rnd_r_next(&it)) pcb_text_decompose_text(NULL, text, sub_layer_text, &slt); - pcb_r_end(&it); + rnd_r_end(&it); } @@ -175,13 +175,13 @@ pcb_pstk_t *ps, ps_tmp; rnd_rtree_it_t it; - for(ps = (pcb_pstk_t *)pcb_r_first(pcb->Data->padstack_tree, &it); ps != NULL; ps = (pcb_pstk_t *)pcb_r_next(&it)) { + for(ps = (pcb_pstk_t *)rnd_r_first(pcb->Data->padstack_tree, &it); ps != NULL; ps = (pcb_pstk_t *)rnd_r_next(&it)) { memcpy(&ps_tmp, ps, sizeof(ps_tmp)); ps_tmp.Clearance = 1; ps_tmp.thermals.used = 0; pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_PSTK, &ps_tmp); } - pcb_r_end(&it); + rnd_r_end(&it); } static void setup_ui_layers(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layergrp_t *grp) @@ -253,13 +253,13 @@ if (l == NULL) continue; - for(line = (pcb_line_t *)pcb_r_first(l->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it)) + for(line = (pcb_line_t *)rnd_r_first(l->line_tree, &it); line != NULL; line = (pcb_line_t *)rnd_r_next(&it)) rnd_box_bump_box(&otlbb, (rnd_rnd_box_t *)line); - pcb_r_end(&it); + rnd_r_end(&it); - for(arc = (pcb_arc_t *)pcb_r_first(l->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it)) + for(arc = (pcb_arc_t *)rnd_r_first(l->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)rnd_r_next(&it)) rnd_box_bump_box(&otlbb, (rnd_rnd_box_t *)arc); - pcb_r_end(&it); + rnd_r_end(&it); } result->fill = pcb_poly_new_from_rectangle(result->res_ply, otlbb.X1, otlbb.Y1, otlbb.X2, otlbb.Y2, 0, pcb_flag_make(PCB_FLAG_FULLPOLY)); result->remain = pcb_poly_new_from_rectangle(result->res_remply, otlbb.X1, otlbb.Y1, otlbb.X2, otlbb.Y2, 0, pcb_flag_make(PCB_FLAG_FULLPOLY)); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 31039) +++ trunk/src_plugins/puller/puller.c (revision 31040) @@ -248,7 +248,7 @@ /* */ /*****************************************************************************/ -static pcb_r_dir_t line_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t line_callback(const rnd_rnd_box_t * b, void *cl) { /* pcb_layer_t *layer = (pcb_layer_t *)cl; */ pcb_line_t *l = (pcb_line_t *) b; @@ -271,10 +271,10 @@ printf("picked, exact %d\n", line_exact); #endif } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } -static pcb_r_dir_t arc_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t arc_callback(const rnd_rnd_box_t * b, void *cl) { /* pcb_layer_t *layer = (pcb_layer_t *) cl; */ pcb_arc_t *a = (pcb_arc_t *) b; @@ -305,7 +305,7 @@ printf("picked, exact %d\n", arc_exact); #endif } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static int find_pair(int Px, int Py) @@ -326,8 +326,8 @@ spot.Y1 = y - 1; spot.X2 = x + 1; spot.Y2 = y + 1; - pcb_r_search(PCB_CURRLAYER(PCB)->line_tree, &spot, NULL, line_callback, PCB_CURRLAYER(PCB), NULL); - pcb_r_search(PCB_CURRLAYER(PCB)->arc_tree, &spot, NULL, arc_callback, PCB_CURRLAYER(PCB), NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->line_tree, &spot, NULL, line_callback, PCB_CURRLAYER(PCB), NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->arc_tree, &spot, NULL, arc_callback, PCB_CURRLAYER(PCB), NULL); if (the_line && the_arc && !multi) return 1; x = Px; @@ -609,7 +609,7 @@ #define NEAR(a,b) ((a) <= (b) + 2 && (a) >= (b) - 2) -static pcb_r_dir_t find_pair_line_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t find_pair_line_callback(const rnd_rnd_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; #if TRACE1 @@ -618,7 +618,7 @@ FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl; if (line == fpcs->me) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; #ifdef CHECK_LINE_PT_NEG if (line->Point1.X < 0) abort1(); @@ -641,10 +641,10 @@ #endif } } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t find_pair_arc_callback(const rnd_rnd_box_t * b, void *cl) +static rnd_r_dir_t find_pair_arc_callback(const rnd_rnd_box_t * b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *) b; Extra *e = ARC2EXTRA(arc); @@ -651,7 +651,7 @@ FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl; if (arc == fpcs->me) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; #if TRACE1 rnd_printf(" - %p arc %#mD or %#mD\n", (void *)e, e->start.x, e->start.y, e->end.x, e->end.y); #endif @@ -666,7 +666,7 @@ else *fpcs->extra_ptr = e; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static void find_pairs_1(void *me, Extra ** e, int x, int y) @@ -688,8 +688,8 @@ b.X2 = x + 10; b.Y1 = y - 10; b.Y2 = y + 10; - pcb_r_search(PCB_CURRLAYER(PCB)->line_tree, &b, NULL, find_pair_line_callback, &fpcs, NULL); - pcb_r_search(PCB_CURRLAYER(PCB)->arc_tree, &b, NULL, find_pair_arc_callback, &fpcs, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->line_tree, &b, NULL, find_pair_line_callback, &fpcs, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->arc_tree, &b, NULL, find_pair_arc_callback, &fpcs, NULL); } static int check_point_in_pstk(pcb_pstk_t *ps, pcb_layer_t *layer, int x, int y, End *e) @@ -726,7 +726,7 @@ return 0; } -static pcb_r_dir_t find_pair_pstkline_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t find_pair_pstkline_callback(const rnd_rnd_box_t *b, void *cl) { pcb_line_t *line = (pcb_line_t *)b; pcb_pstk_t *pin = (pcb_pstk_t *)cl; @@ -743,7 +743,7 @@ hits += check_point_in_pstk(pin, line->parent.layer, line->Point2.X, line->Point2.Y, &(e->end)); if (hits) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* See if the line passes through this pin - if so, split it into two lines so they can be pulled independently. */ @@ -755,10 +755,10 @@ unlink_end(e, &e->start.next); unlink_end(e, &e->end.next); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t find_pair_pstkarc_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t find_pair_pstkarc_callback(const rnd_rnd_box_t *b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *)b; pcb_pstk_t *pin = (pcb_pstk_t *)cl; @@ -768,7 +768,7 @@ assert(arc->parent_type == PCB_PARENT_LAYER); hits = check_point_in_pstk(pin, arc->parent.layer, e->start.x, e->start.y, &(e->start)); hits += check_point_in_pstk(pin, arc->parent.layer, e->end.x, e->end.y, &(e->end)); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static void null_multi_next_ends(pcb_any_obj_t * ptr, Extra * extra, void *userdata) @@ -803,8 +803,8 @@ PCB_PADSTACK_LOOP(PCB->Data); { rnd_rnd_box_t box; box = padstack->BoundingBox; - pcb_r_search(PCB_CURRLAYER(PCB)->line_tree, &box, NULL, find_pair_pstkline_callback, padstack, NULL); - pcb_r_search(PCB_CURRLAYER(PCB)->arc_tree, &box, NULL, find_pair_pstkarc_callback, padstack, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->line_tree, &box, NULL, find_pair_pstkline_callback, padstack, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->arc_tree, &box, NULL, find_pair_pstkarc_callback, padstack, NULL); } PCB_END_LOOP; } @@ -1334,14 +1334,14 @@ return gp_point_force(x, y, t, e, esa, eda, 0, func); } -static pcb_r_dir_t gp_line_cb(const rnd_rnd_box_t * b, void *cb) +static rnd_r_dir_t gp_line_cb(const rnd_rnd_box_t * b, void *cb) { const pcb_line_t *l = (pcb_line_t *) b; Extra *e = LINE2EXTRA(l); if (l == start_line || l == end_line) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (e->deleted) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; #ifdef CHECK_LINE_PT_NEG if (l->Point1.X < 0) abort1(); @@ -1350,32 +1350,32 @@ gp_point(l->Point1.X, l->Point1.Y, l->Thickness / 2, &e->start); if (!e->end.next || !EXTRA_IS_ARC(e->end.next)) gp_point(l->Point2.X, l->Point2.Y, l->Thickness / 2, &e->end); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t gp_arc_cb(const rnd_rnd_box_t * b, void *cb) +static rnd_r_dir_t gp_arc_cb(const rnd_rnd_box_t * b, void *cb) { const pcb_arc_t *a = (pcb_arc_t *) b; Extra *e = ARC2EXTRA(a); if (a == start_arc || a == end_arc) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (e->deleted) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; gp_point_2(a->X, a->Y, a->Width + a->Thickness / 2, 0, a->StartAngle, a->Delta, "gp_arc_cb"); if (start_arc && a->X == start_arc->X && a->Y == start_arc->Y) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (end_arc && a->X != end_arc->X && a->Y != end_arc->Y) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (e->start.next || e->end.next) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; gp_point(e->start.x, e->start.y, a->Thickness / 2, 0); gp_point(e->end.x, e->end.y, a->Thickness / 2, 0); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t gp_text_cb(const rnd_rnd_box_t * b, void *cb) +static rnd_r_dir_t gp_text_cb(const rnd_rnd_box_t * b, void *cb) { const pcb_text_t *t = (pcb_text_t *) b; /* FIXME: drop in the actual text-line endpoints later. */ @@ -1383,19 +1383,19 @@ gp_point(t->BoundingBox.X1, t->BoundingBox.Y2, 0, 0); gp_point(t->BoundingBox.X2, t->BoundingBox.Y2, 0, 0); gp_point(t->BoundingBox.X2, t->BoundingBox.Y1, 0, 0); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t gp_poly_cb(const rnd_rnd_box_t * b, void *cb) +static rnd_r_dir_t gp_poly_cb(const rnd_rnd_box_t * b, void *cb) { int i; const pcb_poly_t *p = (pcb_poly_t *) b; for (i = 0; i < p->PointN; i++) gp_point(p->Points[i].X, p->Points[i].Y, 0, 0); - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t gp_pstk_cb(const rnd_rnd_box_t *b, void *cb) +static rnd_r_dir_t gp_pstk_cb(const rnd_rnd_box_t *b, void *cb) { pcb_pstk_t *ps = (pcb_pstk_t *)b; /* have to drop const because we may update the cache in ps */ pcb_layer_t *layer = PCB_CURRLAYER(PCB); @@ -1402,7 +1402,7 @@ pcb_pstk_shape_t *shape = pcb_pstk_shape_at(PCB, ps, layer), tmpshp; if (ps == start_pinpad || ps == end_pinpad) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (shape == NULL) return 0; retry:; @@ -1424,7 +1424,7 @@ gp_point(ps->BoundingBox.X2, ps->BoundingBox.Y2, 0, 0); break; } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static pcb_line_t *create_line(pcb_line_t *sample, int x1, int y1, int x2, int y2) @@ -1735,11 +1735,11 @@ end_pinpad = start_extra->end.pin; fp = 0; - pcb_r_search(PCB_CURRLAYER(PCB)->line_tree, &box, NULL, gp_line_cb, 0, NULL); - pcb_r_search(PCB_CURRLAYER(PCB)->arc_tree, &box, NULL, gp_arc_cb, 0, NULL); - pcb_r_search(PCB_CURRLAYER(PCB)->text_tree, &box, NULL, gp_text_cb, 0, NULL); - pcb_r_search(PCB_CURRLAYER(PCB)->polygon_tree, &box, NULL, gp_poly_cb, 0, NULL); - pcb_r_search(PCB->Data->padstack_tree, &box, NULL, gp_pstk_cb, 0, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->line_tree, &box, NULL, gp_line_cb, 0, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->arc_tree, &box, NULL, gp_arc_cb, 0, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->text_tree, &box, NULL, gp_text_cb, 0, NULL); + rnd_r_search(PCB_CURRLAYER(PCB)->polygon_tree, &box, NULL, gp_poly_cb, 0, NULL); + rnd_r_search(PCB->Data->padstack_tree, &box, NULL, gp_pstk_cb, 0, NULL); /* radians, absolute angle of (at the moment) the start_line */ abs_angle = fa + start_angle; Index: trunk/src_plugins/report/drill.c =================================================================== --- trunk/src_plugins/report/drill.c (revision 31039) +++ trunk/src_plugins/report/drill.c (revision 31040) @@ -80,7 +80,7 @@ AllDrills = (pcb_drill_info_t *)calloc(1, sizeof(pcb_drill_info_t)); - for(pb = pcb_r_first(top->padstack_tree, &it); pb != NULL; pb = pcb_r_next(&it)) { + for(pb = rnd_r_first(top->padstack_tree, &it); pb != NULL; pb = rnd_r_next(&it)) { pcb_pstk_t *ps = (pcb_pstk_t *)pb; pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); if (proto->hdia <= 0) @@ -112,7 +112,7 @@ drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated); } } - pcb_r_end(&it); + rnd_r_end(&it); qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(pcb_drill_t), drill_qsort_cmp); return AllDrills; Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 31039) +++ trunk/src_plugins/report/report.c (revision 31040) @@ -177,7 +177,7 @@ #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(PCB->Data->padstack_tree, 0); + rnd_r_dump_tree(PCB->Data->padstack_tree, 0); #endif proto = pcb_pstk_get_proto(ps); @@ -195,7 +195,7 @@ { #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(line->parent.layer->line_tree, 0); + rnd_r_dump_tree(line->parent.layer->line_tree, 0); #endif rnd_append_printf(dst, "%m+LINE ID# %ld; Flags:%s\n" "FirstPoint(X,Y) = %$mD, ID = %ld.\n" @@ -217,7 +217,7 @@ { #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(PCB->Data->rat_tree, 0); + rnd_r_dump_tree(PCB->Data->rat_tree, 0); #endif rnd_append_printf(dst, "%m+RAT-LINE ID# %ld; Flags:%s\n" "FirstPoint(X,Y) = %$mD; ID = %ld; " @@ -234,7 +234,7 @@ rnd_rnd_box_t box; #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(arc->parent.layer->arc_tree, 0); + rnd_r_dump_tree(arc->parent.layer->arc_tree, 0); #endif pcb_arc_get_end(arc, 0, &box.X1, &box.Y1); pcb_arc_get_end(arc, 1, &box.X2, &box.Y2); @@ -265,7 +265,7 @@ #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(poly->parent.layer->polygon_tree, 0); + rnd_r_dump_tree(poly->parent.layer->polygon_tree, 0); #endif aunit = rnd_conf.editor.grid_unit->suffix; @@ -300,7 +300,7 @@ { #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(PCB->Data->subc_tree, 0); + rnd_r_dump_tree(PCB->Data->subc_tree, 0); #endif rnd_append_printf(dst, "%m+SUBCIRCUIT ID# %ld; Flags:%s\n" "BoundingBox %$mD %$mD.\n" @@ -319,7 +319,7 @@ { #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(text->parent.layer->text_tree, 0); + rnd_r_dump_tree(text->parent.layer->text_tree, 0); #endif rnd_append_printf(dst, "%m+TEXT ID# %ld; Flags:%s\n" @@ -336,7 +336,7 @@ { #ifndef NDEBUG if (rnd_gui->shift_is_pressed(rnd_gui)) - pcb_r_dump_tree(gfx->parent.layer->gfx_tree, 0); + rnd_r_dump_tree(gfx->parent.layer->gfx_tree, 0); #endif rnd_append_printf(dst, "%m+GFX ID# %ld; Flags:%s\n" @@ -663,21 +663,21 @@ #undef MINDIST2 rnd_message(RND_MSG_INFO, "The two arms of the net are:\n"); - pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); ox = l->Point1.X; oy = l->Point1.Y; l->Point1.X = x; l->Point1.Y = y; - pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); report_net_length_(res, argc, argv, x, y); - pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); l->Point1.X = ox; l->Point1.Y = oy; - pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); - pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); ox = l->Point2.X; oy = l->Point2.Y; l->Point2.X = x; l->Point2.Y = y; - pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); report_net_length_(res, argc, argv, x, y); - pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l); l->Point2.X = ox; l->Point2.Y = oy; - pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); + rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l); PCB_FLAG_SET(PCB_FLAG_SELECTED, l); Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 31039) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 31040) @@ -138,10 +138,10 @@ static void CheckLinePointForRubberbandArcConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_line_t *, rnd_point_t *, rnd_bool); -static pcb_r_dir_t rubber_callback(const rnd_rnd_box_t *b, void *cl); -static pcb_r_dir_t rubber_callback_arc(const rnd_rnd_box_t *b, void *cl); +static rnd_r_dir_t rubber_callback(const rnd_rnd_box_t *b, void *cl); +static rnd_r_dir_t rubber_callback_arc(const rnd_rnd_box_t *b, void *cl); -static pcb_r_dir_t rubber_callback(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t rubber_callback(const rnd_rnd_box_t *b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; pcb_rb_line_t *have_line = NULL; @@ -166,13 +166,13 @@ } if (have_point1 && have_point2) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; if (line == i->line) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* * Check to see if the line touches a rectangular region. @@ -244,7 +244,7 @@ dist2 = x + y - rad; if (dist1 > 0 && dist2 > 0) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; #if 0 #ifdef CLOSEST_ONLY /* keep this to remind me */ if ((dist1 < dist2) && !have_point1) @@ -278,10 +278,10 @@ pcb_rubber_band_create(rbnd, i->layer, line, 1, i->delta_index); } - return touches1 || touches2 ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND; + return touches1 || touches2 ? RND_R_DIR_FOUND_CONTINUE : RND_R_DIR_NOT_FOUND; } -static pcb_r_dir_t rubber_callback_arc(const rnd_rnd_box_t *b, void *cl) +static rnd_r_dir_t rubber_callback_arc(const rnd_rnd_box_t *b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *) b; struct rubber_info *i = (struct rubber_info *)cl; @@ -296,7 +296,7 @@ /* If the arc is locked then don't add it to the rubberband list. */ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* Don't add the arc if both ends of it are already in the list. */ for(n = 0; n < rbnd->arcs.used; n++) @@ -306,7 +306,7 @@ } if (have_point1 && have_point2) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* Calculate the arc end points */ pcb_arc_get_end(arc, 0, &ex1, &ey1); @@ -333,7 +333,7 @@ dist2 = x + y - rad; if (dist1 > 0 && dist2 > 0) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; /* The Arc end-point is touching so create an entry in the rubberband arc list */ @@ -349,7 +349,7 @@ pcb_rubber_band_create_arc(rbnd, i->layer, arc, 1, i->delta_index); #endif - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } struct rinfo { @@ -361,7 +361,7 @@ int delta_index; }; -static pcb_r_dir_t rat_callback(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t rat_callback(const rnd_rnd_box_t *box, void *cl) { pcb_rat_t *rat = (pcb_rat_t *) box; struct rinfo *i = (struct rinfo *)cl; @@ -383,7 +383,7 @@ default: rnd_message(RND_MSG_ERROR, "hace: bad rubber-rat lookup callback\n"); } - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; } static void CheckPadstackForRat(rubber_ctx_t *rbnd, pcb_pstk_t *pstk) @@ -394,7 +394,7 @@ info.pstk = pstk; info.rbnd = rbnd; info.delta_index = 0; - pcb_r_search(PCB->Data->rat_tree, &pstk->BoundingBox, NULL, rat_callback, &info, NULL); + rnd_r_search(PCB->Data->rat_tree, &pstk->BoundingBox, NULL, rat_callback, &info, NULL); } static void CheckLinePointForRat(rubber_ctx_t *rbnd, pcb_layer_t *Layer, rnd_point_t *Point) @@ -406,7 +406,7 @@ info.rbnd = rbnd; info.delta_index = 0; - pcb_r_search(PCB->Data->rat_tree, (rnd_rnd_box_t *) Point, NULL, rat_callback, &info, NULL); + rnd_r_search(PCB->Data->rat_tree, (rnd_rnd_box_t *) Point, NULL, rat_callback, &info, NULL); } /* checks all visible lines which belong to the same group as the passed line. @@ -444,7 +444,7 @@ if (layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) { info.layer = layer; - pcb_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); + rnd_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); } } } @@ -485,7 +485,7 @@ if (layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) { info.layer = layer; - pcb_r_search(layer->arc_tree, &info.box, NULL, rubber_callback_arc, &info, NULL); + rnd_r_search(layer->arc_tree, &info.box, NULL, rubber_callback_arc, &info, NULL); } } } @@ -531,7 +531,7 @@ if (layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) { info.layer = layer; - pcb_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); + rnd_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); } } } @@ -579,7 +579,7 @@ if (layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) { /* check all visible lines of the group member */ info.layer = layer; - pcb_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); + rnd_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL); } } } @@ -1265,10 +1265,10 @@ pcb_line_invalidate_erase(ptr->Line); if (ptr->Layer) { pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, ptr->Layer, ptr->Line); - pcb_r_delete_entry(ptr->Layer->line_tree, (rnd_rnd_box_t *) ptr->Line); + rnd_r_delete_entry(ptr->Layer->line_tree, (rnd_rnd_box_t *) ptr->Line); } else - pcb_r_delete_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) ptr->Line); + rnd_r_delete_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) ptr->Line); if (dindex1 >= 0) pcb_point_rotate90(&ptr->Line->Point1, cx, cy, steps); @@ -1278,12 +1278,12 @@ pcb_line_bbox(ptr->Line); if (ptr->Layer) { - pcb_r_insert_entry(ptr->Layer->line_tree, (rnd_rnd_box_t *) ptr->Line); + rnd_r_insert_entry(ptr->Layer->line_tree, (rnd_rnd_box_t *) ptr->Line); pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, ptr->Layer, ptr->Line); pcb_line_invalidate_draw(ptr->Layer, ptr->Line); } else { - pcb_r_insert_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) ptr->Line); + rnd_r_insert_entry(PCB->Data->rat_tree, (rnd_rnd_box_t *) ptr->Line); pcb_rat_invalidate_draw((pcb_rat_t *) ptr->Line); } Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 31039) +++ trunk/src_plugins/shape/shape.c (revision 31040) @@ -252,7 +252,7 @@ if (data != PCB->Data) { pcb_buffer_clear(PCB, PCB_PASTEBUFFER); pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_POLY, PCB_CURRLAYER(PCB), p, p); - pcb_r_delete_entry(PCB_CURRLAYER(PCB)->polygon_tree, (rnd_rnd_box_t *)p); + rnd_r_delete_entry(PCB_CURRLAYER(PCB)->polygon_tree, (rnd_rnd_box_t *)p); pcb_poly_free_fields(p); pcb_poly_free(p); rnd_tool_select_by_name(&PCB->hidlib, "buffer"); @@ -301,7 +301,7 @@ if (data != PCB->Data) { pcb_buffer_clear(PCB, PCB_PASTEBUFFER); pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_LINE, PCB_CURRLAYER(PCB), l, l); - pcb_r_delete_entry(PCB_CURRLAYER(PCB)->line_tree, (rnd_rnd_box_t *)l); + rnd_r_delete_entry(PCB_CURRLAYER(PCB)->line_tree, (rnd_rnd_box_t *)l); pcb_line_free(l); rnd_tool_select_by_name(&PCB->hidlib, "buffer"); } Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 31039) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 31040) @@ -92,7 +92,7 @@ list_map0(&l->Line, pcb_line_t, pcb_line_free); if (l->line_tree) - pcb_r_destroy_tree(&l->line_tree); + rnd_r_destroy_tree(&l->line_tree); VTEDGE_FOREACH(e, &sk->cdt->edges) pcb_line_new(l, e->endp[0]->pos.x, -e->endp[0]->pos.y, e->endp[1]->pos.x, -e->endp[1]->pos.y, 1, 0, pcb_no_flags()); VTEDGE_FOREACH_END(); @@ -106,7 +106,7 @@ list_map0(&l->Line, pcb_line_t, pcb_line_free); if (l->line_tree) - pcb_r_destroy_tree(&l->line_tree); + rnd_r_destroy_tree(&l->line_tree); VTEWIRE_FOREACH(ew, &sk->ewires) ewire_point_t *ewp = &ew->points.array[0]; @@ -653,7 +653,7 @@ sketch_t *sk; }; -static pcb_r_dir_t r_search_cb(const rnd_rnd_box_t *box, void *cl) +static rnd_r_dir_t r_search_cb(const rnd_rnd_box_t *box, void *cl) { pcb_any_obj_t *obj = (pcb_any_obj_t *) box; struct search_info *i = (struct search_info *) cl; @@ -662,7 +662,7 @@ if (obj->type == PCB_OBJ_PSTK) { pcb_pstk_t *pstk = (pcb_pstk_t *) obj; if (pcb_pstk_shape_at(PCB, pstk, i->layer) == NULL) - return PCB_R_DIR_NOT_FOUND; + return RND_R_DIR_NOT_FOUND; point = cdt_insert_point(i->sk->cdt, pstk->x, -pstk->y); pointdata_create(point, obj); } @@ -685,7 +685,7 @@ htpp_insert(&i->sk->terminals, obj, point); } - return PCB_R_DIR_FOUND_CONTINUE; + return RND_R_DIR_FOUND_CONTINUE; } static void sketch_create_for_layer(sketch_t *sk, pcb_layer_t *layer) @@ -706,16 +706,16 @@ sk->ewires.elem_copy = NULL; vtewire_init(&sk->ewires); - sk->spoke_tree = pcb_r_create_tree(); + sk->spoke_tree = rnd_r_create_tree(); bbox.X1 = 0; bbox.Y1 = 0; bbox.X2 = PCB->hidlib.size_x; bbox.Y2 = PCB->hidlib.size_y; info.layer = layer; info.sk = sk; - pcb_r_search(PCB->Data->padstack_tree, &bbox, NULL, r_search_cb, &info, NULL); - pcb_r_search(layer->line_tree, &bbox, NULL, r_search_cb, &info, NULL); - pcb_r_search(layer->text_tree, &bbox, NULL, r_search_cb, &info, NULL); - pcb_r_search(layer->polygon_tree, &bbox, NULL, r_search_cb, &info, NULL); - pcb_r_search(layer->arc_tree, &bbox, NULL, r_search_cb, &info, NULL); + rnd_r_search(PCB->Data->padstack_tree, &bbox, NULL, r_search_cb, &info, NULL); + rnd_r_search(layer->line_tree, &bbox, NULL, r_search_cb, &info, NULL); + rnd_r_search(layer->text_tree, &bbox, NULL, r_search_cb, &info, NULL); + rnd_r_search(layer->polygon_tree, &bbox, NULL, r_search_cb, &info, NULL); + rnd_r_search(layer->arc_tree, &bbox, NULL, r_search_cb, &info, NULL); rnd_snprintf(name, sizeof(name), "%s: CDT", layer->name); sk->ui_layer_cdt = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, &layer->meta.real.color); @@ -748,7 +748,7 @@ vtwire_uninit(&sk->wires); vtewire_uninit(&sk->ewires); htpp_uninit(&sk->terminals); - pcb_r_destroy_tree(&sk->spoke_tree); + rnd_r_destroy_tree(&sk->spoke_tree); pcb_uilayer_free(sk->ui_layer_cdt); pcb_uilayer_free(sk->ui_layer_erbs); } Index: trunk/src_plugins/sketch_route/spoke.c =================================================================== --- trunk/src_plugins/sketch_route/spoke.c (revision 31039) +++ trunk/src_plugins/sketch_route/spoke.c (revision 31040) @@ -13,7 +13,7 @@ sp->p = p; /* TODO: spoke_bbox(sp); - pcb_r_insert_entry(spoke_tree, sp); + rnd_r_insert_entry(spoke_tree, sp); */ } @@ -20,7 +20,7 @@ void spoke_uninit(spoke_t *sp) { /* TODO: - pcb_r_delete_entry(spoke_tree, &pd->spokes[i]); + rnd_r_delete_entry(spoke_tree, &pd->spokes[i]); */ vtp0_uninit(&sp->slots); } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 31039) +++ trunk/src_plugins/teardrops/teardrops.c (revision 31040) @@ -39,7 +39,7 @@ static int new_arcs = 0; -static pcb_r_dir_t check_line_callback(const rnd_rnd_box_t * box, void *cl) +static rnd_r_dir_t check_line_callback(const rnd_rnd_box_t * box, void *cl) { pcb_layer_t *lay = &PCB->Data->Layer[layer]; pcb_line_t *l = (pcb_line_t *) box; @@ -244,7 +244,7 @@ spot.X2 = px + 10; spot.Y2 = py + 10; - pcb_r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL); + rnd_r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL); } } @@ -254,9 +254,9 @@ rnd_rtree_it_t it; new_arcs = 0; - for(b = pcb_r_first(PCB->Data->padstack_tree, &it); b != NULL; b = pcb_r_next(&it)) + for(b = rnd_r_first(PCB->Data->padstack_tree, &it); b != NULL; b = rnd_r_next(&it)) check_pstk((pcb_pstk_t *)b); - pcb_r_end(&it); + rnd_r_end(&it); rnd_gui->invalidate_all(rnd_gui);