Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5070) +++ trunk/doc-rnd/hacking/renames (revision 5071) @@ -1131,3 +1131,6 @@ POLY_CIRC_SEGS_F -> PCB_POLY_CIRC_SEGS_F POLY_CIRC_RADIUS_ADJ -> PCB_POLY_CIRC_RADIUS_ADJ POLY_ARC_MAX_DEVIATION -> PCB_POLY_ARC_MAX_DEVIATION +R_DIR_NOT_FOUND -> PCB_R_DIR_NOT_FOUND +R_DIR_FOUND_CONTINUE -> PCB_R_DIR_FOUND_CONTINUE +R_DIR_CANCEL -> PCB_R_DIR_CANCEL Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 5070) +++ trunk/src/board.c (revision 5071) @@ -191,7 +191,7 @@ hcs->nunplated++; else hcs->nplated++; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } void pcb_board_count_holes(int *plated, int *unplated, const pcb_box_t * within_area) Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5070) +++ trunk/src/crosshair.c (revision 5071) @@ -733,10 +733,10 @@ vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line); DrawLine(NULL, line); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } else { - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } } @@ -763,10 +763,10 @@ vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) arc); DrawArc(NULL, arc); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } else { - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 5070) +++ trunk/src/find_drc.c (revision 5071) @@ -286,7 +286,7 @@ default: pcb_message(PCB_MSG_DEFAULT, "hace: Bad Plow object in callback\n"); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; doIsBad: pcb_undo_add_obj_to_flag(PCB_TYPE_POLYGON, layer, polygon, polygon); @@ -306,11 +306,11 @@ free(object_type_list); if (!throw_drc_dialog()) { IsBad = pcb_true; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } pcb_undo_inc_serial(); pcb_undo(pcb_true); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 5070) +++ trunk/src/find_lookup.c (revision 5071) @@ -301,7 +301,7 @@ if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PIN, &i->pv, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPVarc_callback(const pcb_box_t * b, void *cl) @@ -313,7 +313,7 @@ if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PIN, &i->pv, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPVpad_callback(const pcb_box_t * b, void *cl) @@ -325,7 +325,7 @@ !PCB_FLAG_TEST(PCB_FLAG_HOLE, &i->pv) && ADD_PAD_TO_LIST(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, PCB_TYPE_PIN, &i->pv, PCB_FCT_COPPER)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPVrat_callback(const pcb_box_t * b, void *cl) @@ -335,7 +335,7 @@ if (!PCB_FLAG_TEST(TheFlag, rat) && IS_PV_ON_RAT(&i->pv, rat) && ADD_RAT_TO_LIST(rat, PCB_TYPE_PIN, &i->pv, PCB_FCT_RAT)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPVpoly_callback(const pcb_box_t * b, void *cl) @@ -372,7 +372,7 @@ && ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PIN, &i->pv, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -546,7 +546,7 @@ else if (ADD_PV_TO_LIST(pin, PCB_TYPE_PIN, &i->pv, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -622,7 +622,7 @@ else if (ADD_PV_TO_LIST(pv, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t pv_pad_callback(const pcb_box_t * b, void *cl) @@ -639,7 +639,7 @@ else if (ADD_PV_TO_LIST(pv, PCB_TYPE_PAD, &i->pad, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t pv_arc_callback(const pcb_box_t * b, void *cl) @@ -656,7 +656,7 @@ else if (ADD_PV_TO_LIST(pv, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t pv_poly_callback(const pcb_box_t * b, void *cl) @@ -688,7 +688,7 @@ longjmp(i->env, 1); } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t pv_rat_callback(const pcb_box_t * b, void *cl) @@ -699,7 +699,7 @@ /* rats can't cause DRC so there is no early exit */ if (!PCB_FLAG_TEST(TheFlag, pv) && IS_PV_ON_RAT(pv, &i->rat)) ADD_PV_TO_LIST(pv, PCB_TYPE_RATLINE, &i->rat, PCB_FCT_RAT); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -822,7 +822,7 @@ if (!PCB_FLAG_TEST(TheFlag, pin) && pcb_intersect_line_pin(pin, &i->line)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoArcLine_callback(const pcb_box_t * b, void *cl) @@ -834,7 +834,7 @@ if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoArcArc_callback(const pcb_box_t * b, void *cl) @@ -848,7 +848,7 @@ if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoArcPad_callback(const pcb_box_t * b, void *cl) @@ -859,7 +859,7 @@ if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && pcb_intersect_arc_pad(&i->arc, pad) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -926,7 +926,7 @@ if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoLineArc_callback(const pcb_box_t * b, void *cl) @@ -940,7 +940,7 @@ if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoLineRat_callback(const pcb_box_t * b, void *cl) @@ -960,7 +960,7 @@ longjmp(i->env, 1); } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoLinePad_callback(const pcb_box_t * b, void *cl) @@ -971,7 +971,7 @@ if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && pcb_intersect_line_pad(&i->line, pad) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -1056,7 +1056,7 @@ if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_RATLINE, &i->Point, PCB_FCT_RAT)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t PolygonToRat_callback(const pcb_box_t * b, void *cl) @@ -1070,7 +1070,7 @@ if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_RATLINE, &i->Point, PCB_FCT_RAT)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPad_callback(const pcb_box_t * b, void *cl) @@ -1086,7 +1086,7 @@ (pad->Point1.Y + pad->Point2.Y) / 2 == i->Point->Y)) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_RATLINE, &i->Point, PCB_FCT_RAT)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -1142,7 +1142,7 @@ if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PAD, &i->pad, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPadArc_callback(const pcb_box_t * b, void *cl) @@ -1156,7 +1156,7 @@ if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PAD, &i->pad, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPadPoly_callback(const pcb_box_t * b, void *cl) @@ -1169,7 +1169,7 @@ if (pcb_is_pad_in_poly(&i->pad, polygon) && ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PAD, &i->pad, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPadRat_callback(const pcb_box_t * b, void *cl) @@ -1195,7 +1195,7 @@ longjmp(i->env, 1); } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPadPad_callback(const pcb_box_t * b, void *cl) @@ -1206,7 +1206,7 @@ if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && PadPadIntersect(pad, &i->pad) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_PAD, &i->pad, PCB_FCT_COPPER)) longjmp(i->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -1318,7 +1318,7 @@ if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPolyArc_callback(const pcb_box_t * b, void *cl) @@ -1345,7 +1345,7 @@ if (ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t LOCtoPolyRat_callback(const pcb_box_t * b, void *cl) @@ -1362,7 +1362,7 @@ if (ADD_RAT_TO_LIST(rat, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_RAT)) longjmp(i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 5070) +++ trunk/src/obj_arc.c (revision 5071) @@ -595,7 +595,7 @@ pcb_r_dir_t draw_arc_callback(const pcb_box_t * b, void *cl) { draw_arc((pcb_layer_t *) cl, (pcb_arc_t *) b); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* erases an arc on a layer */ Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5070) +++ trunk/src/obj_elem.c (revision 5071) @@ -1687,11 +1687,11 @@ int *side = cl; if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (PCB_ON_SIDE(element, *side)) draw_element_name(element); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } void draw_element_pins_and_pads(pcb_element_t * element) @@ -1749,7 +1749,7 @@ if (PCB_ON_SIDE(element, *side)) draw_element_package(element); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static void DrawEMark(pcb_element_t *e, pcb_coord_t X, pcb_coord_t Y, pcb_bool invisible) @@ -1795,7 +1795,7 @@ pcb_element_t *element = (pcb_element_t *) b; DrawEMark(element, element->MarkX, element->MarkY, !PCB_FRONT(element)); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } void EraseElement(pcb_element_t *Element) Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 5070) +++ trunk/src/obj_line.c (revision 5071) @@ -141,7 +141,7 @@ } } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } @@ -558,7 +558,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct rlp_info *info = (struct rlp_info *) cl; if (line == info->line) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if ((line->Point1.X == info->point->X) && (line->Point1.Y == info->point->Y)) { info->line = line; @@ -571,7 +571,7 @@ info->point = &line->Point2; longjmp(info->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* removes a line point, or a line if the selected point is the end */ @@ -744,7 +744,7 @@ pcb_r_dir_t draw_line_callback(const pcb_box_t * b, void *cl) { draw_line((pcb_layer_t *) cl, (pcb_line_t *) b); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* erases a line on a layer */ Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5070) +++ trunk/src/obj_line_drcenf.c (revision 5071) @@ -206,7 +206,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && pcb_intersect_line_pin(via, i->line)) longjmp(i->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t drcPad_callback(const pcb_box_t * b, void *cl) @@ -216,7 +216,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) == i->solder && !PCB_FLAG_TEST(PCB_FLAG_FOUND, pad) && pcb_intersect_line_pad(i->line, pad)) longjmp(i->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t drcLine_callback(const pcb_box_t * b, void *cl) @@ -226,7 +226,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_intersect_line_line(line, i->line)) longjmp(i->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t drcArc_callback(const pcb_box_t * b, void *cl) @@ -236,7 +236,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_intersect_line_arc(i->line, arc)) longjmp(i->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* drc_lines() checks for intersectors against two lines and Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 5070) +++ trunk/src/obj_pad.c (revision 5071) @@ -396,7 +396,7 @@ if (PCB_ON_SIDE(pad, *side)) draw_pad(pad); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } pcb_r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl) @@ -405,7 +405,7 @@ int *side = cl; if (PCB_ON_SIDE(pad, *side) && pad->Mask) _draw_pad(Output.pmGC, pad, pcb_true, pcb_true); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* draws solder paste layer for a given side of the board - only pads get paste */ Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 5070) +++ trunk/src/obj_pinvia.c (revision 5071) @@ -867,7 +867,7 @@ pcb_r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl) { draw_pin((pcb_pin_t *) b, pcb_false); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } pcb_r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl) @@ -877,7 +877,7 @@ pcb_gui->thindraw_pcb_pv(Output.pmGC, Output.pmGC, pin, pcb_false, pcb_true); else pcb_gui->fill_pcb_pv(Output.pmGC, Output.pmGC, pin, pcb_false, pcb_true); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } @@ -890,7 +890,7 @@ pcb_r_dir_t draw_via_callback(const pcb_box_t * b, void *cl) { draw_via((pcb_pin_t *) b, pcb_false); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } pcb_r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl) @@ -901,7 +901,7 @@ char buf[sizeof("#XXXXXX")]; if ((plated == 0 && !PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) || (plated == 1 && PCB_FLAG_TEST(PCB_FLAG_HOLE, pv))) - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; if (conf_core.editor.thin_draw) { if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { @@ -932,7 +932,7 @@ pcb_gui->set_line_width(Output.fgGC, 0); pcb_gui->draw_arc(Output.fgGC, pv->X, pv->Y, pv->DrillingHole / 2, pv->DrillingHole / 2, 0, 360); } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static void GatherPVName(pcb_pin_t *Ptr) Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 5070) +++ trunk/src/obj_poly.c (revision 5071) @@ -411,7 +411,7 @@ struct mptlc *d = (struct mptlc *) cl; pcb_pin_t *pin = (pcb_pin_t *) b; if (!PCB_FLAG_THERM_TEST(d->snum, pin) || !pcb_poly_is_point_in_p(pin->X, pin->Y, pin->Thickness + pin->Clearance + 2, d->polygon)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (d->type == PCB_TYPE_PIN) pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, pin->Element, pin, pin); else @@ -418,7 +418,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, pin, pin, pin); PCB_FLAG_THERM_ASSIGN(d->dnum, PCB_FLAG_THERM_GET(d->snum, pin), pin); PCB_FLAG_THERM_CLEAR(d->snum, pin); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* moves a polygon between layers */ @@ -641,7 +641,7 @@ char buf[sizeof("#XXXXXX")]; if (!polygon->Clipped) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (PCB_FLAG_TEST(PCB_FLAG_WARN, polygon)) color = PCB->WarnColor; @@ -671,7 +671,7 @@ pcb_gui->thindraw_pcb_polygon(Output.fgGC, &poly, i->drawn_area); } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* erases a polygon on a layer */ Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 5070) +++ trunk/src/obj_rat.c (revision 5071) @@ -247,7 +247,7 @@ } else _draw_line((pcb_line_t *) rat); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } void EraseRat(pcb_rat_t *Rat) Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 5070) +++ trunk/src/obj_text.c (revision 5071) @@ -556,7 +556,7 @@ else min_silk_line = PCB->minWid; DrawTextLowLevel(text, min_silk_line); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* erases a text on a layer */ Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5070) +++ trunk/src/polygon.c (revision 5071) @@ -877,16 +877,16 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; polygon = info->polygon; if (pin->Clearance == 0) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; i = GetLayerNumber(info->data, info->layer); if (PCB_FLAG_THERM_TEST(i, pin)) { np = ThermPoly((pcb_board_t *) (info->data->pcb), pin, i); if (!np) - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } else { np = pcb_poly_from_pin(pin, PIN_SIZE(pin), pin->Clearance); @@ -902,7 +902,7 @@ if (info->batch_size == SUBTRACT_PIN_VIA_BATCH_SIZE) subtract_accumulated(info, polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t arc_sub_callback(const pcb_box_t * b, void *cl) @@ -913,13 +913,13 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, arc)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; polygon = info->polygon; if (SubtractArc(arc, polygon) < 0) longjmp(info->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t pad_sub_callback(const pcb_box_t * b, void *cl) @@ -930,16 +930,16 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (pad->Clearance == 0) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; polygon = info->polygon; if (PCB_XOR(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad), !info->solder)) { if (SubtractPad(pad, polygon) < 0) longjmp(info->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t line_sub_callback(const pcb_box_t * b, void *cl) @@ -952,9 +952,9 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; polygon = info->polygon; if (!(np = pcb_poly_from_line(line, line->Thickness + line->Clearance))) @@ -967,7 +967,7 @@ if (info->batch_size == SUBTRACT_LINE_BATCH_SIZE) subtract_accumulated(info, polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t text_sub_callback(const pcb_box_t * b, void *cl) @@ -978,13 +978,13 @@ /* don't subtract the object that was put back! */ if (b == info->other) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; polygon = info->polygon; if (SubtractText(text, polygon) < 0) longjmp(info->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static int Group(pcb_data_t *Data, pcb_cardinal_t layer) @@ -1401,25 +1401,25 @@ case PCB_TYPE_VIA: SubtractPin(Data, (pcb_pin_t *) ptr2, Layer, Polygon); Polygon->NoHolesValid = 0; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_LINE: SubtractLine((pcb_line_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_ARC: SubtractArc((pcb_arc_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_PAD: SubtractPad((pcb_pad_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_TEXT: SubtractText((pcb_text_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_polygon_t *Polygon, int type, void *ptr1, void *ptr2) @@ -1428,21 +1428,21 @@ case PCB_TYPE_PIN: case PCB_TYPE_VIA: UnsubtractPin((pcb_pin_t *) ptr2, Layer, Polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_LINE: UnsubtractLine((pcb_line_t *) ptr2, Layer, Polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_ARC: UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_PAD: UnsubtractPad((pcb_pad_t *) ptr2, Layer, Polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; case PCB_TYPE_TEXT: UnsubtractText((pcb_text_t *) ptr2, Layer, Polygon); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t plow_callback(const pcb_box_t * b, void *cl) @@ -1452,7 +1452,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon)) return plow->callback(plow->data, plow->layer, polygon, plow->type, plow->ptr1, plow->ptr2); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } int Index: trunk/src/polygon1.c =================================================================== --- trunk/src/polygon1.c (revision 5070) +++ trunk/src/polygon1.c (revision 5071) @@ -541,14 +541,14 @@ double y1, y2; /* for zero slope the search is aligned on the axis so it is already pruned */ if (i->m == 0.) - return R_DIR_FOUND_CONTINUE; + return PCB_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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (max(y1, y2) < b->Y1) - return R_DIR_NOT_FOUND; - return R_DIR_FOUND_CONTINUE; /* might intersect */ + return PCB_R_DIR_NOT_FOUND; + return PCB_R_DIR_FOUND_CONTINUE; /* might intersect */ } /* Prepend a deferred node-insertion task to a list */ @@ -585,11 +585,11 @@ * already been intersected this pass, skip it until the next pass. */ if (s->intersected || i->s->intersected) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; cnt = pcb_vect_inters2(s->v->point, s->v->next->point, i->v->point, i->v->next->point, s1, s2); if (!cnt) - return R_DIR_NOT_FOUND; + return PCB_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; @@ -612,7 +612,7 @@ #endif i->node_insert_list = prepend_insert_node_task(i->node_insert_list, s, new_node); s->intersected = 1; - return R_DIR_NOT_FOUND; /* Keep looking for intersections with segment "i" */ + return PCB_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. @@ -620,7 +620,7 @@ if (done_insert_on_i) longjmp(*i->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static void *make_edge_tree(pcb_pline_t * pb) @@ -662,9 +662,9 @@ struct seg *s = (struct seg *) b; if (i->v == s->v) { i->s = s; - return R_DIR_CANCEL; /* found */ + return PCB_R_DIR_CANCEL; /* found */ } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* @@ -735,7 +735,7 @@ /* 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 == R_DIR_CANCEL); + assert(rres == PCB_R_DIR_CANCEL); /* If we're going to have another pass anyway, skip this */ if (info.s->intersected && info.node_insert_list != NULL) @@ -758,7 +758,7 @@ c_info->node_insert_list = info.node_insert_list; if (info.need_restart) c_info->need_restart = 1; - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static int intersect_impl(jmp_buf * jb, pcb_polyarea_t * b, pcb_polyarea_t * a, int add) @@ -893,8 +893,8 @@ pcb_pline_t *check = (pcb_pline_t *) b; if (pcb_poly_contour_in_contour(check, me)) - return R_DIR_FOUND_CONTINUE; - return R_DIR_NOT_FOUND; + return PCB_R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_NOT_FOUND; } /* cntr_in_M_pcb_polyarea_t @@ -1150,9 +1150,9 @@ struct polyarea_info *pa_info = (struct polyarea_info *) b; pcb_pline_t *p = pa_info->pa->contours; if (p->Count == 0) - return R_DIR_NOT_FOUND; /* how did this happen? */ + return PCB_R_DIR_NOT_FOUND; /* how did this happen? */ pcb_heap_insert(heap, p->area, pa_info); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } struct find_inside_info { @@ -1168,13 +1168,13 @@ /* Do test on check to see if it inside info->want_inside */ /* If it is: */ if (check->Flags.orient == PCB_PLF_DIR) { - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } if (pcb_poly_contour_in_contour(info->want_inside, check)) { info->result = check; longjmp(info->jb, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static void InsertHoles(jmp_buf * e, pcb_polyarea_t * dest, pcb_pline_t ** src) @@ -1762,15 +1762,15 @@ pcb_pline_t *check = (pcb_pline_t *) b; /* Don't report for the main contour */ if (check->Flags.orient == PCB_PLF_DIR) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* Don't look at contours marked as being intersected */ if (check->Flags.status == ISECTED) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (cntr_in_M_pcb_polyarea_t(check, info->want_inside, pcb_false)) { info->result = check; longjmp(info->jb, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } @@ -2365,7 +2365,7 @@ { struct seg *s = (struct seg *) b; s->v = s->v->prev; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } void pcb_poly_contour_inv(pcb_pline_t * c) @@ -2574,7 +2574,7 @@ p->f -= 1; } } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } int pcb_poly_contour_inside(pcb_pline_t * c, pcb_vector_t p) Index: trunk/src/rtree.c =================================================================== --- trunk/src/rtree.c (revision 5070) +++ trunk/src/rtree.c (revision 5071) @@ -432,11 +432,11 @@ (node->u.rects[i].bounds.Y1 < query->Y2) && (node->u.rects[i].bounds.Y2 > query->Y1)) { res = arg->found_it(node->u.rects[i].bptr, arg->closure); - if (res == R_DIR_CANCEL) { + if (res == PCB_R_DIR_CANCEL) { arg->cancel = 1; return seen; } - if (res != R_DIR_NOT_FOUND) + if (res != PCB_R_DIR_NOT_FOUND) seen++; } } @@ -464,7 +464,7 @@ (*n)->box.Y1 >= query->Y2 || (*n)->box.Y2 <= query->Y1) continue; res = arg->check_it(&(*n)->box, arg->closure); - if (res == R_DIR_CANCEL) { + if (res == PCB_R_DIR_CANCEL) { arg->cancel = 1; return seen; } @@ -539,10 +539,10 @@ if (num_found != NULL) *num_found = res; if (arg.cancel) - return R_DIR_CANCEL; + return PCB_R_DIR_CANCEL; if (res == 0) - return R_DIR_NOT_FOUND; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_NOT_FOUND; + return PCB_R_DIR_FOUND_CONTINUE; } /*------ r_region_is_empty ------*/ Index: trunk/src/rtree.h =================================================================== --- trunk/src/rtree.h (revision 5070) +++ trunk/src/rtree.h (revision 5071) @@ -28,11 +28,8 @@ * */ +/* r-tree: efficient lookup of screenobjects */ - -/* prototypes for r-tree routines. - */ - #ifndef PCB_RTREE_H #define PCB_RTREE_H @@ -45,9 +42,9 @@ /* callback direction to the search engine */ typedef enum pcb_r_dir_e { - R_DIR_NOT_FOUND = 0, /* object not found or not accepted */ - R_DIR_FOUND_CONTINUE = 1, /* object found or accepted, go on searching */ - R_DIR_CANCEL /* cancel the search and return immediately */ + 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 /* cancel the search and return immediately */ } pcb_r_dir_t; /* create an rtree from the list of boxes. if 'manage' is pcb_true, then Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 5070) +++ trunk/src/rubberband.c (revision 5071) @@ -68,9 +68,9 @@ t = line->Thickness / 2; if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (line == i->line) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* * Check to see if the line touches a rectangular region. * To do this we need to look for the intersection of a circular @@ -133,7 +133,7 @@ found++; } } - return found ? R_DIR_FOUND_CONTINUE : R_DIR_NOT_FOUND; + return found ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND; } /* circular search region */ if (i->radius < 0) @@ -154,7 +154,7 @@ dist2 = x + y - rad; if (dist1 > 0 && dist2 > 0) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; #ifdef CLOSEST_ONLY /* keep this to remind me */ if (dist1 < dist2) @@ -167,7 +167,7 @@ if (dist2 <= 0) pcb_rubber_band_create(i->layer, line, &line->Point2); #endif - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* --------------------------------------------------------------------------- @@ -249,7 +249,7 @@ default: pcb_message(PCB_MSG_DEFAULT, "hace: bad rubber-rat lookup callback\n"); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static void CheckPadForRat(pcb_pad_t *Pad) Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 5070) +++ trunk/src/search.c (revision 5071) @@ -83,13 +83,13 @@ pcb_any_obj_t *ptr1 = pin->Element ? pin->Element : pin; if (PCB_FLAG_TEST(i->locked, ptr1)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (!pcb_is_point_in_pin(PosX, PosY, SearchRadius, pin)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; *i->ptr1 = ptr1; *i->ptr2 = *i->ptr3 = pin; - return R_DIR_CANCEL; /* found, stop searching */ + return PCB_R_DIR_CANCEL; /* found, stop searching */ } static pcb_bool SearchViaByLocation(int locked, pcb_pin_t ** Via, pcb_pin_t ** Dummy1, pcb_pin_t ** Dummy2) @@ -105,7 +105,7 @@ info.ptr3 = (void **) Dummy2; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; - if (pcb_r_search(PCB->Data->via_tree, &SearchBox, NULL, pinorvia_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(PCB->Data->via_tree, &SearchBox, NULL, pinorvia_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -126,7 +126,7 @@ info.ptr3 = (void **) Dummy; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; - if (pcb_r_search(PCB->Data->pin_tree, &SearchBox, NULL, pinorvia_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(PCB->Data->pin_tree, &SearchBox, NULL, pinorvia_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -138,16 +138,16 @@ pcb_any_obj_t *ptr1 = pad->Element; if (PCB_FLAG_TEST(i->locked, ptr1)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (PCB_FRONT(pad) || i->BackToo) { if (pcb_is_point_in_pad(PosX, PosY, SearchRadius, pad)) { *i->ptr1 = ptr1; *i->ptr2 = *i->ptr3 = pad; - return R_DIR_CANCEL; /* found */ + return PCB_R_DIR_CANCEL; /* found */ } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -166,7 +166,7 @@ info.ptr3 = (void **) Dummy; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; info.BackToo = (BackToo && PCB->InvisibleObjectsOn); - if (pcb_r_search(PCB->Data->pad_tree, &SearchBox, NULL, pad_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(PCB->Data->pad_tree, &SearchBox, NULL, pad_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -188,14 +188,14 @@ pcb_line_t *l = (pcb_line_t *) box; if (PCB_FLAG_TEST(i->locked, l)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (!pcb_is_point_in_pad(PosX, PosY, SearchRadius, (pcb_pad_t *) l)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; *i->Line = l; *i->Point = (pcb_point_t *) l; - return R_DIR_CANCEL; /* found what we were looking for */ + return PCB_R_DIR_CANCEL; /* found what we were looking for */ } @@ -208,7 +208,7 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; *Layer = SearchLayer; - if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, line_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, line_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; @@ -220,15 +220,15 @@ struct ans_info *i = (struct ans_info *) cl; if (PCB_FLAG_TEST(i->locked, line)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (PCB_FLAG_TEST(PCB_FLAG_VIA, line) ? (pcb_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 R_DIR_CANCEL; + return PCB_R_DIR_CANCEL; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -243,7 +243,7 @@ info.ptr3 = (void **) Dummy2; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; - if (pcb_r_search(PCB->Data->rat_tree, &SearchBox, NULL, rat_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(PCB->Data->rat_tree, &SearchBox, NULL, rat_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -262,13 +262,13 @@ pcb_arc_t *a = (pcb_arc_t *) box; if (PCB_FLAG_TEST(i->locked, a)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (!pcb_is_point_on_arc(PosX, PosY, SearchRadius, a)) return 0; *i->Arc = a; *i->Dummy = a; - return R_DIR_CANCEL; /* found */ + return PCB_R_DIR_CANCEL; /* found */ } @@ -281,7 +281,7 @@ info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; *Layer = SearchLayer; - if (pcb_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arc_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arc_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -292,13 +292,13 @@ struct ans_info *i = (struct ans_info *) cl; if (PCB_FLAG_TEST(i->locked, text)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (PCB_POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { *i->ptr2 = *i->ptr3 = text; - return R_DIR_CANCEL; /* found */ + return PCB_R_DIR_CANCEL; /* found */ } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -313,7 +313,7 @@ info.ptr3 = (void **) Dummy; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; - if (pcb_r_search(SearchLayer->text_tree, &SearchBox, NULL, text_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(SearchLayer->text_tree, &SearchBox, NULL, text_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -324,13 +324,13 @@ struct ans_info *i = (struct ans_info *) cl; if (PCB_FLAG_TEST(i->locked, polygon)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (pcb_poly_is_point_in_p(PosX, PosY, SearchRadius, polygon)) { *i->ptr2 = *i->ptr3 = polygon; - return R_DIR_CANCEL; /* found */ + return PCB_R_DIR_CANCEL; /* found */ } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } @@ -346,7 +346,7 @@ info.ptr3 = (void **) Dummy; info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; - if (pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polygon_callback, &info, NULL) != R_DIR_NOT_FOUND) + if (pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polygon_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND) return pcb_true; return pcb_false; } @@ -355,11 +355,11 @@ { pcb_line_t *line = (pcb_line_t *) b; struct line_info *i = (struct line_info *) cl; - pcb_r_dir_t ret_val = R_DIR_NOT_FOUND; + pcb_r_dir_t ret_val = PCB_R_DIR_NOT_FOUND; double d; if (PCB_FLAG_TEST(i->locked, line)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* some stupid code to check both points */ d = pcb_distance(PosX, PosY, line->Point1.X, line->Point1.Y); @@ -367,7 +367,7 @@ i->least = d; *i->Line = line; *i->Point = &line->Point1; - ret_val = R_DIR_FOUND_CONTINUE; + ret_val = PCB_R_DIR_FOUND_CONTINUE; } d = pcb_distance(PosX, PosY, line->Point2.X, line->Point2.Y); @@ -375,7 +375,7 @@ i->least = d; *i->Line = line; *i->Point = &line->Point2; - ret_val = R_DIR_FOUND_CONTINUE; + ret_val = PCB_R_DIR_FOUND_CONTINUE; } return ret_val; } @@ -436,7 +436,7 @@ double newarea; if (PCB_FLAG_TEST(i->locked, text)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if ((PCB_FRONT(element) || i->BackToo) && !PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element) && PCB_POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { /* use the text with the smallest bounding box */ @@ -446,9 +446,9 @@ *i->ptr1 = element; *i->ptr2 = *i->ptr3 = text; } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- @@ -481,7 +481,7 @@ double newarea; if (PCB_FLAG_TEST(i->locked, element)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if ((PCB_FRONT(element) || i->BackToo) && PCB_POINT_IN_BOX(PosX, PosY, &element->VBox)) { /* use the element with the smallest bounding box */ @@ -489,10 +489,10 @@ if (newarea < i->area) { i->area = newarea; *i->ptr1 = *i->ptr2 = *i->ptr3 = element; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* --------------------------------------------------------------------------- Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 5070) +++ trunk/src_plugins/autoplace/autoplace.c (revision 5071) @@ -233,8 +233,8 @@ * 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 R_DIR_FOUND_CONTINUE; - return R_DIR_NOT_FOUND; + return PCB_R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t __r_find_neighbor_rect_in_reg(const pcb_box_t * box, void *cl) @@ -256,7 +256,7 @@ ni->trap.Y1 = query.Y2; ni->neighbor = box; } - return r ? R_DIR_FOUND_CONTINUE : R_DIR_NOT_FOUND; + return r ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND; } /* main r_find_neighbor routine. Returns NULL if no neighbor in the Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 5070) +++ trunk/src_plugins/autoroute/autoroute.c (revision 5071) @@ -784,15 +784,15 @@ pcb_box_t sb; if (rb->flags.nonstraight) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; sb = pcb_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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; inf->winner = rb; if (rb->type == PLANE) - return R_DIR_FOUND_CONTINUE; /* keep looking for something smaller if a plane was found */ + return PCB_R_DIR_FOUND_CONTINUE; /* keep looking for something smaller if a plane was found */ longjmp(inf->env, 1); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static routebox_t *FindRouteBoxOnLayerGroup(routedata_t * rd, pcb_coord_t X, pcb_coord_t Y, pcb_cardinal_t layergroup) @@ -1477,13 +1477,13 @@ struct minpcb_cost_target_closure *mtc = (struct minpcb_cost_target_closure *) cl; pcb_cost_t pcb_cost_to_region; if (mtc->nearest == NULL) - return R_DIR_FOUND_CONTINUE; + return PCB_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) ? R_DIR_FOUND_CONTINUE : R_DIR_NOT_FOUND; + return (pcb_cost_to_region < mtc->nearest_cost) ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t __found_new_guess(const pcb_box_t * box, void *cl) @@ -1496,10 +1496,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 R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } else - return R_DIR_NOT_FOUND; /* not less expensive than our last guess */ + return PCB_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 @@ -1858,7 +1858,7 @@ /* we don't see conflicts already encountered */ if (rb->flags.touched) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* The inflated box outer edges include its own * track width plus its own clearance. @@ -1876,7 +1876,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 R_DIR_NOT_FOUND; /* doesn't touch */ + return PCB_R_DIR_NOT_FOUND; /* doesn't touch */ } else { if (rb->style->Clearance > res->keep) @@ -1886,13 +1886,13 @@ if (rbox.X2 <= res->inflated.X1 || rbox.X1 >= res->inflated.X2 || rbox.Y1 >= res->inflated.Y2 || rbox.Y2 <= res->inflated.Y1) - return R_DIR_NOT_FOUND; /* doesn't touch */ + return PCB_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 R_DIR_NOT_FOUND; /* don't see what we came from */ + return PCB_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. @@ -1900,7 +1900,7 @@ #if 1 if (res->parent->flags.source) if (rb->flags.source || (rb->type == EXPANSION_AREA && rb->parent.expansion_area->flags.source)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; #endif /* we ignore via expansion boxes because maybe its @@ -1908,12 +1908,12 @@ * the path we're exploring now. */ if (rb->flags.is_via && rb->type == EXPANSION_AREA) - return R_DIR_NOT_FOUND; + return PCB_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 = pcb_bloat_box(&res->orig, res->bloat); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } } /* calculate the distances from original box to this blocker */ @@ -1927,7 +1927,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 R_DIR_FOUND_CONTINUE; + return PCB_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; @@ -1945,7 +1945,7 @@ res->inflated.X1 = rbox.X2 - bloat; res->w = rb; } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_bool boink_box(routebox_t * rb, struct E_result *res, pcb_direction_t dir) @@ -2391,17 +2391,17 @@ pcb_box_t b; if (bi->parent == rb || rb->flags.touched || bi->parent->parent.expansion_area == rb) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (rb->flags.source && bi->ignore_source) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; b = rb->sbox; if (rb->style->Clearance > AutoRouteParameters.style->Clearance) b = pcb_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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (blocker_to_heap(bi->heap, rb, &bi->box, bi->dir)) - return R_DIR_FOUND_CONTINUE; - return R_DIR_NOT_FOUND; + return PCB_R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_NOT_FOUND; } /* shrink the box to the last limit for the previous direction, @@ -2728,16 +2728,16 @@ pcb_box_t rbox; routebox_t *rb = (routebox_t *) box; if (rb->flags.touched) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* if (rb->type == EXPANSION_AREA && !rb->flags.is_via)*/ - /* return R_DIR_NOT_FOUND; */ + /* return PCB_R_DIR_NOT_FOUND; */ rbox = bloat_routebox(rb); if (!pcb_box_intersect(&rbox, foib->box)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* this is an intersector! */ foib->intersect = (routebox_t *) box; longjmp(foib->env, 1); /* skip to the end! */ - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static routebox_t *FindOneInBox(pcb_rtree_t * rtree, routebox_t * rb) @@ -2766,9 +2766,9 @@ pcb_box_t sq, sb; if (rbox->type != PIN && rbox->type != VIA && rbox->type != VIA_SHADOW) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (rbox->group != ti->plane->group) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; sb = shrink_routebox(rbox); switch (rbox->type) { @@ -2775,7 +2775,7 @@ case PIN: sq = pcb_shrink_box(&ti->query, rbox->parent.pin->Thickness); if (!pcb_box_intersect(&sb, &sq)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; sb.X1 = rbox->parent.pin->X; sb.Y1 = rbox->parent.pin->Y; break; @@ -2791,12 +2791,12 @@ sb.Y1 = PCB_BOX_CENTER_Y(sb); } if (!pcb_box_intersect(&sb, &sq)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; break; case VIA_SHADOW: sq = pcb_shrink_box(&ti->query, rbox->style->Diameter); if (!pcb_box_intersect(&sb, &sq)) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; sb.X1 = PCB_BOX_CENTER_X(sb); sb.Y1 = PCB_BOX_CENTER_Y(sb); break; @@ -2805,7 +2805,7 @@ } ti->plane = rbox; longjmp(ti->env, 1); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } /* check for a pin or via target that a polygon can just use a thermal to connect to */ @@ -3517,13 +3517,13 @@ { routebox_t *rb = (routebox_t *) box; if (rb->flags.touched || rb->flags.fixed) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; else { routebox_t *dis = (routebox_t *) cl; path_conflicts(dis, rb, pcb_false); touch_conflicts(dis->conflicts_with, 1); } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static void source_conflicts(pcb_rtree_t * tree, routebox_t * rb) @@ -4055,8 +4055,8 @@ { routebox_t *box = (routebox_t *) b; if (box->type == EXPANSION_AREA) - return R_DIR_FOUND_CONTINUE; - return R_DIR_NOT_FOUND; + return PCB_R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_NOT_FOUND; } pcb_bool no_expansion_boxes(routedata_t * rd) @@ -4094,7 +4094,7 @@ { routebox_t *box = (routebox_t *) b; ripout_livedraw_obj(box); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } struct routeall_status { @@ -4398,7 +4398,7 @@ info->pin = (pcb_pin_t *) b; longjmp(info->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static int FindPin(const pcb_box_t * box, pcb_pin_t ** pin) Index: trunk/src_plugins/autoroute/mtspace.c =================================================================== --- trunk/src_plugins/autoroute/mtspace.c (revision 5070) +++ trunk/src_plugins/autoroute/mtspace.c (revision 5071) @@ -137,7 +137,7 @@ pcb_r_delete_entry(info->tree, b); longjmp(info->env, 1); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } pcb_rtree_t *which_tree(mtspace_t * mtspace, mtspace_type_t which) @@ -220,7 +220,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 R_DIR_NOT_FOUND; + return PCB_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 */ pcb_coord_t Y1 = qc->cbox->Y1; @@ -284,7 +284,7 @@ else free(qc->cbox); /* done with this one */ longjmp(qc->env, 1); - return R_DIR_FOUND_CONTINUE; /* never reached */ + return PCB_R_DIR_FOUND_CONTINUE; /* never reached */ } /* qloop takes a vector (or heap) of regions to check (checking) if they don't intersect Index: trunk/src_plugins/gl/hidgl.c =================================================================== --- trunk/src_plugins/gl/hidgl.c (revision 5070) +++ trunk/src_plugins/gl/hidgl.c (revision 5071) @@ -554,11 +554,11 @@ /* Ignore the outer contour - we draw it first explicitly */ if (curc->Flags.orient == PCB_PLF_DIR) { - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } tesselate_contour(info->tobj, curc, info->vertices, info->scale); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static GLint stencil_bits; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 5070) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 5071) @@ -34,7 +34,7 @@ static pcb_r_dir_t search_callback (const pcb_box_t * b, void *cl) { search_append(cl, (void *)b); - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } hash_t *layout_searches = NULL; Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 5070) +++ trunk/src_plugins/puller/puller.c (revision 5071) @@ -297,7 +297,7 @@ printf("picked, exact %d\n", line_exact); #endif } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static pcb_r_dir_t arc_callback(const pcb_box_t * b, void *cl) @@ -331,7 +331,7 @@ printf("picked, exact %d\n", arc_exact); #endif } - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } static int find_pair(int Px, int Py) @@ -656,7 +656,7 @@ FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl; if (line == fpcs->me) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; #ifdef CHECK_LINE_PT_NEG if (line->Point1.X < 0) abort1(); @@ -679,7 +679,7 @@ #endif } } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t find_pair_arc_callback(const pcb_box_t * b, void *cl) @@ -689,7 +689,7 @@ FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl; if (arc == fpcs->me) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; #if TRACE1 pcb_printf(" - %p arc %#mD or %#mD\n", (void *)e, e->start.x, e->start.y, e->end.x, e->end.y); #endif @@ -704,7 +704,7 @@ else *fpcs->extra_ptr = e; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static void find_pairs_1(void *me, Extra ** e, int x, int y) @@ -765,7 +765,7 @@ hits += check_point_in_pin(pin, line->Point2.X, line->Point2.Y, &(e->end)); if (hits) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* See if the line passes through this pin. */ /* FIXME: this assumes round pads, but it's good enough for square @@ -778,7 +778,7 @@ unlink_end(e, &e->start.next); unlink_end(e, &e->end.next); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t find_pair_pinarc_callback(const pcb_box_t * b, void *cl) @@ -790,7 +790,7 @@ hits = check_point_in_pin(pin, e->start.x, e->start.y, &(e->start)); hits += check_point_in_pin(pin, e->end.x, e->end.y, &(e->end)); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t check_point_in_pad(pcb_pad_t *pad, int x, int y, End * e) @@ -832,9 +832,9 @@ e->at_pin = 1; e->pin = pad; e->is_pad = 1; - return R_DIR_FOUND_CONTINUE; + return PCB_R_DIR_FOUND_CONTINUE; } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t find_pair_padline_callback(const pcb_box_t * b, void *cl) @@ -849,11 +849,11 @@ if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad)) { if (!current_is_solder) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } else { if (!current_is_component) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } #ifdef CHECK_LINE_PT_NEG @@ -865,7 +865,7 @@ hits += check_point_in_pad(pad, line->Point2.X, line->Point2.Y, &(e->end)); if (hits) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* Ok, something strange. The line intersects our space, but doesn't end in our space. See if it just passes through us, and @@ -892,7 +892,7 @@ unlink_end(e, &e->end.next); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t find_pair_padarc_callback(const pcb_box_t * b, void *cl) @@ -904,16 +904,16 @@ if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad)) { if (!current_is_solder) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } else { if (!current_is_component) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } hits = check_point_in_pad(pad, e->start.x, e->start.y, &(e->start)); hits += check_point_in_pad(pad, e->end.x, e->end.y, &(e->end)); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static void null_multi_next_ends(pcb_any_obj_t * ptr, Extra * extra, void *userdata) @@ -1495,9 +1495,9 @@ const pcb_line_t *l = (pcb_line_t *) b; Extra *e = LINE2EXTRA(l); if (l == start_line || l == end_line) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (e->deleted) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; #ifdef CHECK_LINE_PT_NEG if (l->Point1.X < 0) abort1(); @@ -1506,7 +1506,7 @@ 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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t gp_arc_cb(const pcb_box_t * b, void *cb) @@ -1514,21 +1514,21 @@ const pcb_arc_t *a = (pcb_arc_t *) b; Extra *e = ARC2EXTRA(a); if (a == start_arc || a == end_arc) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (e->deleted) - return R_DIR_NOT_FOUND; + return PCB_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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (end_arc && a->X != end_arc->X && a->Y != end_arc->Y) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (e->start.next || e->end.next) - return R_DIR_NOT_FOUND; + return PCB_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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t gp_text_cb(const pcb_box_t * b, void *cb) @@ -1539,7 +1539,7 @@ 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 R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t gp_poly_cb(const pcb_box_t * b, void *cb) @@ -1548,7 +1548,7 @@ const pcb_polygon_t *p = (pcb_polygon_t *) b; for (i = 0; i < p->PointN; i++) gp_point(p->Points[i].X, p->Points[i].Y, 0, 0); - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t gp_pin_cb(const pcb_box_t * b, void *cb) @@ -1557,7 +1557,7 @@ int t2 = (p->Thickness + 1) / 2; if (p == start_pinpad || p == end_pinpad) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; /* FIXME: we lump octagonal pins in with square; safe, but not optimal. */ @@ -1570,7 +1570,7 @@ else { gp_point(p->X, p->Y, t2, 0); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_r_dir_t gp_pad_cb(const pcb_box_t * b, void *cb) @@ -1579,15 +1579,15 @@ int t2 = (p->Thickness + 1) / 2; if (p == start_pinpad || p == end_pinpad) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, p)) { if (!current_is_solder) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } else { if (!current_is_component) - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } /* FIXME: we lump octagonal pads in with square; safe, but not @@ -1616,7 +1616,7 @@ gp_point(p->Point1.X, p->Point1.Y, t2, 0); gp_point(p->Point2.X, p->Point2.Y, t2, 0); } - return R_DIR_NOT_FOUND; + return PCB_R_DIR_NOT_FOUND; } static pcb_line_t *create_line(pcb_line_t *sample, int x1, int y1, int x2, int y2)