Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5008) +++ trunk/doc-rnd/hacking/renames (revision 5009) @@ -831,3 +831,8 @@ POLYGON_NEAR_BOX -> PCB_POLYGON_NEAR_BOX ELEMENT_NEAR_BOX -> PCB_ELEMENT_NEAR_BOX ARC_NEAR_BOX -> PCB_ARC_NEAR_BOX +SearchObjectByLocation -> pcb_search_obj_by_location +SearchScreen -> pcb_search_screen +SearchScreenGridSlop -> pcb_search_grid_slop +SearchObjectByID -> pcb_search_obj_by_id +SearchElementByName -> pcb_search_elem_by_name Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5008) +++ trunk/src/action_helper.c (revision 5009) @@ -493,12 +493,12 @@ SetLocalRef(Crosshair.X, Crosshair.Y, pcb_true); switch (Crosshair.AttachedLine.State) { case STATE_FIRST: /* first point */ - if (PCB->RatDraw && SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr1, &ptr1) == PCB_TYPE_NONE) { + if (PCB->RatDraw && pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr1, &ptr1) == PCB_TYPE_NONE) { gui->beep(); break; } if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { - type = SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); pcb_lookup_conn(Crosshair.X, Crosshair.Y, pcb_true, 1, PCB_FLAG_FOUND); } if (type == PCB_TYPE_PIN || type == PCB_TYPE_VIA) { @@ -576,7 +576,7 @@ * (Note.Hit) */ for (test = (SELECT_TYPES | MOVE_TYPES) & ~PCB_TYPE_RATLINE; test; test &= ~type) { - type = SearchScreen(Note.X, Note.Y, test, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Note.X, Note.Y, test, &ptr1, &ptr2, &ptr3); if (!Note.Hit && (type & MOVE_TYPES) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) { Note.Hit = type; Note.ptr1 = ptr1; @@ -680,7 +680,7 @@ } case PCB_MODE_LOCK: { - type = SearchScreen(Note.X, Note.Y, PCB_TYPEMASK_LOCK, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Note.X, Note.Y, PCB_TYPEMASK_LOCK, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_ELEMENT) { pcb_element_t *element = (pcb_element_t *) ptr2; @@ -721,7 +721,7 @@ } case PCB_MODE_THERMAL: { - if (((type = SearchScreen(Note.X, Note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if (((type = pcb_search_screen(Note.X, Note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) && !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_pin_t *) ptr3)) { if (gui->shift_is_pressed()) { int tstyle = PCB_FLAG_THERM_GET(INDEXOFCURRENT, (pcb_pin_t *) ptr3); @@ -815,7 +815,7 @@ isn't a pin already here */ if (PCB->ViaOn && GetLayerGroupNumberByPointer(CURRENT) != GetLayerGroupNumberByPointer(lastLayer) && - SearchObjectByLocation(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, + pcb_search_obj_by_location(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, conf_core.design.via_thickness / 2) == @@ -971,7 +971,7 @@ /* first notify, lookup object */ case STATE_FIRST: Crosshair.AttachedObject.Type = - SearchScreen(Note.X, Note.Y, PCB_TYPE_POLYGON, + pcb_search_screen(Note.X, Note.Y, PCB_TYPE_POLYGON, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type == PCB_TYPE_NONE) { @@ -1060,7 +1060,7 @@ pcb_element_t *e = 0; if (gui->shift_is_pressed()) { - int type = SearchScreen(Note.X, Note.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, + int type = pcb_search_screen(Note.X, Note.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_ELEMENT) { e = (pcb_element_t *) ptr1; @@ -1077,7 +1077,7 @@ if (pcb_buffer_copy_to_layout(Note.X, Note.Y)) SetChangedFlag(pcb_true); if (e) { - int type = SearchScreen(Note.X, Note.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, + int type = pcb_search_screen(Note.X, Note.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_ELEMENT && ptr1) { int i, save_n; @@ -1102,7 +1102,7 @@ } case PCB_MODE_REMOVE: - if ((type = SearchScreen(Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); break; @@ -1145,7 +1145,7 @@ int types = (conf_core.editor.mode == PCB_MODE_COPY) ? COPY_TYPES : MOVE_TYPES; Crosshair.AttachedObject.Type = - SearchScreen(Note.X, Note.Y, types, + pcb_search_screen(Note.X, Note.Y, types, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { if (conf_core.editor.mode == PCB_MODE_MOVE && PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) @@ -1189,7 +1189,7 @@ /* first notify, lookup object */ case STATE_FIRST: Crosshair.AttachedObject.Type = - SearchScreen(Note.X, Note.Y, INSERT_TYPES, + pcb_search_screen(Note.X, Note.Y, INSERT_TYPES, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 5008) +++ trunk/src/change_act.c (revision 5009) @@ -82,12 +82,12 @@ if (funcid == F_Object) { gui->get_coords(_("Select an Object"), &x, &y); - type = SearchScreen(x, y, CHANGECLEARSIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, CHANGECLEARSIZE_TYPES, &ptr1, &ptr2, &ptr3); } if (strcmp(argv[1], "style") == 0) { - if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLYGON)) /* workaround: SearchScreen(CHANGECLEARSIZE_TYPES) wouldn't return elements */ - type = SearchScreen(x, y, CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); + if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLYGON)) /* workaround: pcb_search_screen(CHANGECLEARSIZE_TYPES) wouldn't return elements */ + type = pcb_search_screen(x, y, CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); if (pcb_get_style_size(funcid, &value, type, 2) != 0) return 1; absolute = 1; @@ -196,7 +196,7 @@ int type; void *ptr1, *ptr2, *ptr3; - if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (set_object(type, ptr1, ptr2, ptr3)) @@ -272,7 +272,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE && pcb_pin_change_hole((pcb_pin_t *) ptr3)) + if ((type = pcb_search_screen(x, y, PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE && pcb_pin_change_hole((pcb_pin_t *) ptr3)) IncrementUndoSerialNumber(); break; } @@ -314,7 +314,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE && pcb_pad_change_paste((pcb_pad_t *) ptr3)) + if ((type = pcb_search_screen(x, y, PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE && pcb_pad_change_paste((pcb_pad_t *) ptr3)) IncrementUndoSerialNumber(); break; } @@ -395,7 +395,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) - type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); if (strcmp(argv[1], "style") == 0) { if (pcb_get_style_size(funcid, &value, type, 0) != 0) @@ -498,7 +498,7 @@ if (funcid == F_Object) { gui->get_coords(_("Select an Object"), &x, &y); - type = SearchScreen(x, y, CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); } if (strcmp(argv[1], "style") == 0) { @@ -659,7 +659,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { SaveUndoSerialNumber(); if ((pinnums != NULL) && (strcasecmp(pinnums, "Number") == 0)) pinnum = 1; @@ -736,7 +736,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_chg_obj_join(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -791,7 +791,7 @@ gui->get_coords(_("Select an Element"), &x, &y); ptr3 = NULL; - type = SearchScreen(x, y, CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3); if (pcb_chg_obj_nonetlist(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -837,7 +837,7 @@ gui->get_coords(_("Select an Object"), &x, &y); ptr3 = NULL; - type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3); if (ptr3 != NULL) { int qstyle = PCB_FLAG_SQUARE_GET((pcb_pin_t *) ptr3); @@ -897,7 +897,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_set_obj_square(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -949,7 +949,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, CHANGESQUARE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_clr_obj_square(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -1000,7 +1000,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_chg_obj_octagon(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -1055,7 +1055,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_set_obj_octagon(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -1111,7 +1111,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGEOCTAGON_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_clr_obj_octagon(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); break; @@ -1187,7 +1187,7 @@ if (absolute) switch (pcb_funchash_get(function, NULL)) { case F_Object: - if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind); IncrementUndoSerialNumber(); pcb_draw(); @@ -1396,7 +1396,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) - type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); { /* convert angle from string */ char *end; @@ -1468,7 +1468,7 @@ int funcid = pcb_funchash_get(function, NULL); if (funcid == F_Object) - type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3); value = pcb_get_value(delta, units, &absolute, NULL); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5008) +++ trunk/src/crosshair.c (revision 5009) @@ -921,7 +921,7 @@ /* Pick the nearest grid-point in the x or y direction * to align with, then adjust until we hit the line */ - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE, &ptr1, &ptr2, &ptr3); if (ans == PCB_TYPE_NONE) return; @@ -1025,7 +1025,7 @@ ans = PCB_TYPE_NONE; if (!PCB->RatDraw) - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3); if (ans & PCB_TYPE_ELEMENT) { pcb_element_t *el = (pcb_element_t *) ptr1; @@ -1034,7 +1034,7 @@ ans = PCB_TYPE_NONE; if (PCB->RatDraw || conf_core.editor.snap_pin) - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3); /* Avoid self-snapping when moving */ if (ans != PCB_TYPE_NONE && @@ -1079,7 +1079,7 @@ ans = PCB_TYPE_NONE; if (PCB->RatDraw || conf_core.editor.snap_pin) - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3); /* Avoid self-snapping when moving */ if (ans != PCB_TYPE_NONE && @@ -1093,7 +1093,7 @@ ans = PCB_TYPE_NONE; if (conf_core.editor.snap_pin) - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); /* Avoid snapping vias to any other vias */ if (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_VIA && (ans & PCB_TYPEMASK_PIN)) @@ -1106,7 +1106,7 @@ ans = PCB_TYPE_NONE; if (conf_core.editor.snap_pin) - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans != PCB_TYPE_NONE) { pcb_point_t *pnt = (pcb_point_t *) ptr3; @@ -1121,7 +1121,7 @@ ans = PCB_TYPE_NONE; if (conf_core.editor.snap_pin) - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_POLYGON_POINT, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_POLYGON_POINT, &ptr1, &ptr2, &ptr3); if (ans != PCB_TYPE_NONE) { pcb_point_t *pnt = (pcb_point_t *) ptr3; @@ -1137,7 +1137,7 @@ onpoint_work(&Crosshair, Crosshair.X, Crosshair.Y); if (conf_core.editor.mode == PCB_MODE_ARROW) { - ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans == PCB_TYPE_NONE) pcb_hid_action("PointCursor"); else if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 5008) +++ trunk/src/file_act.c (revision 5009) @@ -305,7 +305,7 @@ FILE *fp; pcb_bool result; - if ((SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { + if ((pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { element = (pcb_element_t *) ptrtmp; if ((fp = pcb_check_and_open_file(name, pcb_true, pcb_false, &result, NULL)) != NULL) { pcb_lookup_element_conns(element, fp); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 5008) +++ trunk/src/find_misc.c (revision 5009) @@ -224,9 +224,9 @@ reassign_no_drc_flags(); - type = SearchObjectByLocation(LOOKUP_FIRST, &ptr1, &ptr2, &ptr3, X, Y, Range); + type = pcb_search_obj_by_location(LOOKUP_FIRST, &ptr1, &ptr2, &ptr3, X, Y, Range); if (type == PCB_TYPE_NONE) { - type = SearchObjectByLocation(LOOKUP_MORE, &ptr1, &ptr2, &ptr3, X, Y, Range); + type = pcb_search_obj_by_location(LOOKUP_MORE, &ptr1, &ptr2, &ptr3, X, Y, Range); if (type == PCB_TYPE_NONE) return; if (type & SILK_TYPE) { Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 5008) +++ trunk/src/gui_act.c (revision 5009) @@ -441,7 +441,7 @@ pcb_coord_t x, y; gui->get_coords(_("Click on an element"), &x, &y); - if ((SearchScreen(x, y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { + if ((pcb_search_screen(x, y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { element = (pcb_element_t *) ptrtmp; gui->show_item(element); } @@ -455,7 +455,7 @@ pcb_coord_t x, y; gui->get_coords(_("Click on an element"), &x, &y); - switch (SearchScreen(x, y, + switch (pcb_search_screen(x, y, PCB_TYPE_ELEMENT | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA, (void **) &ptr1, (void **) &ptr2, (void **) &ptr3)) { case PCB_TYPE_ELEMENT: @@ -816,7 +816,7 @@ over++; } - if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_LINE) != PCB_TYPE_NONE) { + if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_LINE) != PCB_TYPE_NONE) { /* line has two endpoints, check which one is close to the original x;y */ pcb_line_t *l = ptr2; if (close_enough(Note.X, l->Point1.X) && close_enough(Note.Y, l->Point1.Y)) { @@ -834,7 +834,7 @@ return 0; } } - else if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_VIA) != PCB_TYPE_NONE) { + else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_VIA) != PCB_TYPE_NONE) { Crosshair.AttachedObject.Type = PCB_TYPE_VIA; Crosshair.AttachedObject.Ptr1 = ptr1; Crosshair.AttachedObject.Ptr2 = ptr2; @@ -841,7 +841,7 @@ Crosshair.AttachedObject.Ptr3 = ptr3; return 0; } - else if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_PAD) != PCB_TYPE_NONE) { + else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_PAD) != PCB_TYPE_NONE) { Crosshair.AttachedObject.Type = PCB_TYPE_ELEMENT; Crosshair.AttachedObject.Ptr1 = ptr1; Crosshair.AttachedObject.Ptr2 = ptr1; @@ -848,7 +848,7 @@ Crosshair.AttachedObject.Ptr3 = ptr1; return 0; } - else if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_ARC) != PCB_TYPE_NONE) { + else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Crosshair.drags[Crosshair.drags_current], PCB_TYPE_ARC) != PCB_TYPE_NONE) { Crosshair.AttachedObject.Type = PCB_TYPE_ARC; Crosshair.AttachedObject.Ptr1 = ptr1; Crosshair.AttachedObject.Ptr2 = ptr2; @@ -917,7 +917,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr3); EraseElementName((pcb_element_t *) ptr2); PCB_FLAG_TOGGLE(PCB_FLAG_HIDENAME, (pcb_element_t *) ptr2); @@ -1135,7 +1135,7 @@ int type; pcb_layer_t *layer = CURRENT; - type = SearchScreen(x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3); /* set layer current and size from line or arc */ switch (type) { case PCB_TYPE_LINE: Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 5008) +++ trunk/src/obj_line.c (revision 5009) @@ -514,7 +514,7 @@ sb.X2 = newone->Point1.X + newone->Thickness / 2; sb.Y1 = newone->Point1.Y - newone->Thickness / 2; sb.Y2 = newone->Point1.Y + newone->Thickness / 2; - if ((SearchObjectByLocation(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, + if ((pcb_search_obj_by_location(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, newone->Point1.X, newone->Point1.Y, conf_core.design.via_thickness / 2) == PCB_TYPE_NONE)) { info.X = newone->Point1.X; info.Y = newone->Point1.Y; @@ -526,7 +526,7 @@ sb.X2 = newone->Point2.X + newone->Thickness / 2; sb.Y1 = newone->Point2.Y - newone->Thickness / 2; sb.Y2 = newone->Point2.Y + newone->Thickness / 2; - if ((SearchObjectByLocation(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, + if ((pcb_search_obj_by_location(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, newone->Point2.X, newone->Point2.Y, conf_core.design.via_thickness / 2) == PCB_TYPE_NONE)) { info.X = newone->Point2.X; info.Y = newone->Point2.Y; Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5008) +++ trunk/src/object_act.c (revision 5009) @@ -162,7 +162,7 @@ if (n_found == 0) { void *ptrtmp; gui->get_coords(_("Click on an element"), &x, &y); - if ((SearchScreen(x, y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) + if ((pcb_search_screen(x, y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) e = (pcb_element_t *) ptrtmp; else { pcb_message(PCB_MSG_DEFAULT, _("No element found there\n")); @@ -328,7 +328,7 @@ if (function) { switch (pcb_funchash_get(function, NULL)) { case F_Object: - if ((SearchScreen(x, y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { + if ((pcb_search_screen(x, y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { element = (pcb_element_t *) ptrtmp; pcb_element_change_side(element, 2 * Crosshair.Y - PCB->MaxHeight); IncrementUndoSerialNumber(); @@ -378,7 +378,7 @@ ny = pcb_get_value(y_str, units, &absolute1, NULL); nx = pcb_get_value(x_str, units, &absolute2, NULL); - type = SearchScreen(x, y, MOVE_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, MOVE_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_NONE) { pcb_message(PCB_MSG_DEFAULT, _("Nothing found under crosshair\n")); return 1; @@ -422,7 +422,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, MOVETOLAYER_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, MOVETOLAYER_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) if (pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, CURRENT, pcb_false)) SetChangedFlag(pcb_true); break; @@ -790,7 +790,7 @@ { void *ptr1, *ptr2, *ptr3; - if (SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3) != PCB_TYPE_NONE) { + if (pcb_search_screen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3) != PCB_TYPE_NONE) { Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); pcb_buffer_clear(PCB_PASTEBUFFER); Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 5008) +++ trunk/src/polygon_act.c (revision 5009) @@ -68,7 +68,7 @@ void *ptr1, *ptr2, *ptr3; gui->get_coords(_("Select an Object"), &x, &y); - if ((type = SearchScreen(x, y, PCB_TYPE_POLYGON, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_TYPE_POLYGON, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_poly_morph((pcb_layer_t *) ptr1, (pcb_polygon_t *) ptr3); pcb_draw(); IncrementUndoSerialNumber(); Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 5008) +++ trunk/src/rats.c (revision 5009) @@ -112,7 +112,7 @@ pcb_pad_t *pad; pcb_pin_t *pin; - if ((element = SearchElementByName(PCB->Data, ElementName)) == NULL) + if ((element = pcb_search_elem_by_name(PCB->Data, ElementName)) == NULL) return pcb_false; padlist_foreach(&element->Pad, &it, pad) { @@ -822,7 +822,7 @@ && Crosshair.AttachedLine.Point1.Y == Crosshair.AttachedLine.Point2.Y) return (NULL); - found = SearchObjectByLocation(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, + found = pcb_search_obj_by_location(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 5); if (found == PCB_TYPE_NONE) { pcb_message(PCB_MSG_DEFAULT, _("No pad/pin under rat line\n")); @@ -837,7 +837,7 @@ group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); strcpy(name1, pcb_connection_name(found, ptr1, ptr2)); - found = SearchObjectByLocation(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, + found = pcb_search_obj_by_location(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, 5); if (found == PCB_TYPE_NONE) { pcb_message(PCB_MSG_DEFAULT, _("No pad/pin under rat line\n")); Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 5008) +++ trunk/src/rotate.c (revision 5009) @@ -133,7 +133,7 @@ { int type; void *ptr1, *ptr2, *ptr3; - if ((type = SearchScreen(X, Y, ROTATE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(X, Y, ROTATE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 5008) +++ trunk/src/search.c (revision 5009) @@ -961,7 +961,7 @@ * Note that if Type includes PCB_TYPE_LOCKED, then the search includes * locked items. Otherwise, locked items are ignored. */ -int SearchObjectByLocation(unsigned Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius) +int pcb_search_obj_by_location(unsigned Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius) { void *r1, *r2, *r3; void **pr1 = &r1, **pr2 = &r2, **pr3 = &r3; @@ -1128,7 +1128,7 @@ * the results. * A type value is returned too which is PCB_TYPE_NONE if no objects has been found. */ -int SearchObjectByID(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type) +int pcb_search_obj_by_id(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type) { if (type == PCB_TYPE_LINE || type == PCB_TYPE_LINE_POINT) { PCB_LINE_ALL_LOOP(Base); @@ -1303,7 +1303,7 @@ * searches for an element by its board name. * The function returns a pointer to the element, NULL if not found */ -pcb_element_t *SearchElementByName(pcb_data_t *Base, const char *Name) +pcb_element_t *pcb_search_elem_by_name(pcb_data_t *Base, const char *Name) { pcb_element_t *result = NULL; @@ -1321,11 +1321,11 @@ /* --------------------------------------------------------------------------- * searches the cursor position for the type */ -int SearchScreen(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3) +int pcb_search_screen(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3) { int ans; - ans = SearchObjectByLocation(Type, Result1, Result2, Result3, X, Y, SLOP * pixel_slop); + ans = pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, SLOP * pixel_slop); return (ans); } @@ -1332,11 +1332,11 @@ /* --------------------------------------------------------------------------- * searches the cursor position for the type */ -int SearchScreenGridSlop(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3) +int pcb_search_grid_slop(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3) { int ans; - ans = SearchObjectByLocation(Type, Result1, Result2, Result3, X, Y, PCB->Grid / 2); + ans = pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, PCB->Grid / 2); return (ans); } Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 5008) +++ trunk/src/search.h (revision 5009) @@ -155,10 +155,10 @@ pcb_bool pcb_is_point_in_pad(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_pad_t *); pcb_bool pcb_is_point_in_box(pcb_coord_t, pcb_coord_t, pcb_box_t *, pcb_coord_t); -int SearchObjectByLocation(unsigned, void **, void **, void **, pcb_coord_t, pcb_coord_t, pcb_coord_t); -int SearchScreen(pcb_coord_t, pcb_coord_t, int, void **, void **, void **); -int SearchScreenGridSlop(pcb_coord_t, pcb_coord_t, int, void **, void **, void **); -int SearchObjectByID(pcb_data_t *, void **, void **, void **, int, int); -pcb_element_t *SearchElementByName(pcb_data_t *, const char *); +int pcb_search_obj_by_location(unsigned, void **, void **, void **, pcb_coord_t, pcb_coord_t, pcb_coord_t); +int pcb_search_screen(pcb_coord_t, pcb_coord_t, int, void **, void **, void **); +int pcb_search_grid_slop(pcb_coord_t, pcb_coord_t, int, void **, void **, void **); +int pcb_search_obj_by_id(pcb_data_t *, void **, void **, void **, int, int); +pcb_element_t *pcb_search_elem_by_name(pcb_data_t *, const char *); #endif Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 5008) +++ trunk/src/select.c (revision 5009) @@ -115,7 +115,7 @@ pcb_bool changed = pcb_true; - type = SearchScreen(Crosshair.X, Crosshair.Y, SELECT_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(Crosshair.X, Crosshair.Y, SELECT_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_NONE || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) return (pcb_false); switch (type) { Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 5008) +++ trunk/src/undo.c (revision 5009) @@ -189,7 +189,7 @@ size_t limit = ((size_t)conf_core.editor.undo_warning_size) * 1024; #ifdef DEBUG_ID - if (SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, ID, Kind) == PCB_TYPE_NONE) + if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, ID, Kind) == PCB_TYPE_NONE) pcb_message(PCB_MSG_DEFAULT, "hace: ID (%d) and Type (%x) mismatch in AddObject...\n", ID, Kind); #endif @@ -219,7 +219,7 @@ free(ptr->Data.ChangeName.Name); break; case UNDO_REMOVE: - type = SearchObjectByID(RemoveList, &ptr1, &ptr2, &ptr3, ptr->ID, ptr->Kind); + type = pcb_search_obj_by_id(RemoveList, &ptr1, &ptr2, &ptr3, ptr->ID, ptr->Kind); if (type != PCB_TYPE_NONE) { pcb_destroy_object(RemoveList, type, ptr1, ptr2, ptr3); } @@ -265,7 +265,7 @@ int type; /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { pcb_obj_rotate90(type, ptr1, ptr2, ptr3, Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, (4 - Entry->Data.Rotate.Steps) & 0x03); @@ -284,7 +284,7 @@ void *ptr1, *ptr2, *ptr3; int type; - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { if (Entry->Data.ClearPoly.Clear) pcb_poly_restore_to_poly(PCB->Data, type, Entry->Data.ClearPoly.Layer, ptr3); @@ -306,7 +306,7 @@ int type; /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_name(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); return (pcb_true); @@ -324,7 +324,7 @@ int type; /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_pinnum(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); return (pcb_true); @@ -342,7 +342,7 @@ pcb_coord_t swap; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { swap = ((pcb_pin_t *) ptr2)->DrillingHole; if (andDraw) @@ -365,7 +365,7 @@ double old_sa, old_da; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; pcb_arc_t *a = (pcb_arc_t *) ptr2; @@ -396,7 +396,7 @@ pcb_coord_t old_w, old_h; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; pcb_arc_t *a = (pcb_arc_t *) ptr2; @@ -427,7 +427,7 @@ pcb_coord_t swap; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { swap = ((pcb_pin_t *) ptr2)->Clearance; pcb_poly_restore_to_poly(PCB->Data, type, ptr1, ptr2); @@ -453,7 +453,7 @@ pcb_coord_t swap; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type & (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD)) { swap = (type == PCB_TYPE_PAD ? ((pcb_pad_t *) ptr2)->Mask : ((pcb_pin_t *) ptr2)->Mask); if (andDraw) @@ -481,7 +481,7 @@ pcb_coord_t swap; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ELEMENT_NAME) ptr1e = NULL; else @@ -515,7 +515,7 @@ int must_redraw; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { pcb_flag_t f1, f2; pcb_pin_t *pin = (pcb_pin_t *) ptr2; @@ -560,7 +560,7 @@ int type; /* lookup entry by ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ELEMENT) { pcb_element_t *element = (pcb_element_t *) ptr3; if (andDraw) @@ -584,7 +584,7 @@ int type; /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { if (!RemoveList) RemoveList = pcb_buffer_new(); @@ -608,7 +608,7 @@ int type; /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { pcb_move_obj(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY); Entry->Data.Move.DX *= -1; @@ -628,7 +628,7 @@ int type; /* lookup entry by it's ID */ - type = SearchObjectByID(RemoveList, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(RemoveList, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { if (andDraw) DrawRecoveredObject(type, ptr1, ptr2, ptr3); @@ -649,7 +649,7 @@ int type, swap; /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { swap = GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1); pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true); @@ -672,7 +672,7 @@ /* lookup entry (polygon not point was saved) by it's ID */ assert(Entry->Kind == PCB_TYPE_POLYGON); - type = SearchObjectByID(PCB->Data, (void **) &layer, (void **) &polygon, &ptr3, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, &ptr3, Entry->ID, Entry->Kind); switch (type) { case PCB_TYPE_POLYGON: /* restore the removed point */ { @@ -714,7 +714,7 @@ assert(Entry->Kind == PCB_TYPE_POLYGON_POINT); /* lookup entry by it's ID */ - type = SearchObjectByID(PCB->Data, (void **) &layer, (void **) &polygon, (void **) &pnt, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, (void **) &pnt, Entry->ID, Entry->Kind); switch (type) { case PCB_TYPE_POLYGON_POINT: /* removes an inserted polygon point */ { @@ -760,11 +760,11 @@ long int swap_id; /* lookup entry by it's ID */ - type = SearchObjectByID(RemoveList, &ptr1, &ptr2, &ptr3, Entry->Data.CopyID, Entry->Kind); + type = pcb_search_obj_by_id(RemoveList, &ptr1, &ptr2, &ptr3, Entry->Data.CopyID, Entry->Kind); if (type == PCB_TYPE_NONE) return pcb_false; - type = SearchObjectByID(PCB->Data, &ptr1b, &ptr2b, &ptr3b, Entry->ID, Entry->Kind); + type = pcb_search_obj_by_id(PCB->Data, &ptr1b, &ptr2b, &ptr3b, Entry->ID, Entry->Kind); if (type == PCB_TYPE_NONE) return pcb_false; Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 5008) +++ trunk/src/undo_act.c (revision 5009) @@ -156,7 +156,7 @@ void *ptr1, *ptr3, *ptrtmp; pcb_line_t *ptr2; /* this search is guaranteed to succeed */ - SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, + pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); ptr2 = (pcb_line_t *) ptrtmp; @@ -179,7 +179,7 @@ /* check if an intermediate point was removed */ if (type & UNDO_REMOVE) { /* this search should find the restored line */ - SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, + pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, 0); ptr2 = (pcb_line_t *) ptrtmp; if (conf_core.editor.auto_drc) { @@ -198,7 +198,7 @@ } else { /* this search is guaranteed to succeed too */ - SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, + pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); ptr2 = (pcb_line_t *) ptrtmp; lastLayer = (pcb_layer_t *) ptr1; @@ -217,7 +217,7 @@ void *ptr1, *ptr2, *ptr3; pcb_box_t *bx; /* guaranteed to succeed */ - SearchObjectByLocation(PCB_TYPE_ARC, &ptr1, &ptr2, &ptr3, + pcb_search_obj_by_location(PCB_TYPE_ARC, &ptr1, &ptr2, &ptr3, Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point1.Y, 0); bx = pcb_arc_get_ends((pcb_arc_t *) ptr2); Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = bx->X1; Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 5008) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 5009) @@ -204,7 +204,7 @@ int found_type; void *ptr1, *ptr2, *ptr3; - found_type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, object_id, object_type); + found_type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, object_id, object_type); if (found_type == PCB_TYPE_NONE) { pcb_message(PCB_MSG_DEFAULT, _("Object ID %i identified during DRC was not found. Stale DRC window?\n"), object_id); continue; Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 5008) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 5009) @@ -303,7 +303,7 @@ /* check if there are any pins or pads at that position */ - type = SearchObjectByLocation(PCB_TYPE_PIN | PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3, X, Y, Range); + type = pcb_search_obj_by_location(PCB_TYPE_PIN | PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3, X, Y, Range); if (type == PCB_TYPE_NONE) return NULL; Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 5008) +++ trunk/src_plugins/report/report.c (revision 5009) @@ -128,9 +128,9 @@ int type; char *report = NULL; - type = SearchScreen(x, y, REPORT_TYPES, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, REPORT_TYPES, &ptr1, &ptr2, &ptr3); if (type == PCB_TYPE_NONE) - type = SearchScreen(x, y, REPORT_TYPES | PCB_TYPE_LOCKED, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(x, y, REPORT_TYPES | PCB_TYPE_LOCKED, &ptr1, &ptr2, &ptr3); switch (type) { case PCB_TYPE_VIA: