Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4769) +++ trunk/src/action_helper.c (revision 4770) @@ -517,7 +517,7 @@ Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y = ((PinTypePtr) ptr2)->Y; } else if (type == PCB_TYPE_PAD) { - PadTypePtr pad = (PadTypePtr) ptr2; + pcb_pad_t *pad = (pcb_pad_t *) ptr2; double d1 = Distance(Crosshair.X, Crosshair.Y, pad->Point1.X, pad->Point1.Y); double d2 = Distance(Crosshair.X, Crosshair.Y, pad->Point2.X, pad->Point2.Y); double dm = Distance(Crosshair.X, Crosshair.Y, (pad->Point1.X + pad->Point2.X) / 2, (pad->Point1.Y + pad->Point2.Y)/2); Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4769) +++ trunk/src/change.c (revision 4770) @@ -1216,10 +1216,10 @@ case PCB_TYPE_PAD: if (pinnum) - sprintf(msg, _("%s Pad Number:"), EMPTY(((PadTypePtr) Ptr2)->Number)); + sprintf(msg, _("%s Pad Number:"), EMPTY(((pcb_pad_t *) Ptr2)->Number)); else - sprintf(msg, _("%s Pad Name:"), EMPTY(((PadTypePtr) Ptr2)->Number)); - name = gui->prompt_for(msg, EMPTY(((PadTypePtr) Ptr2)->Name)); + sprintf(msg, _("%s Pad Name:"), EMPTY(((pcb_pad_t *) Ptr2)->Number)); + name = gui->prompt_for(msg, EMPTY(((pcb_pad_t *) Ptr2)->Name)); break; case PCB_TYPE_TEXT: Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4769) +++ trunk/src/change_act.c (revision 4770) @@ -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 && ChangePaste((PadTypePtr) ptr3)) + if ((type = SearchScreen(x, y, PCB_TYPE_PAD, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE && ChangePaste((pcb_pad_t *) ptr3)) IncrementUndoSerialNumber(); break; } Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4769) +++ trunk/src/crosshair.c (revision 4770) @@ -250,7 +250,7 @@ { if (PCB->InvisibleObjectsOn || (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) != 0) == conf_core.editor.show_solder_side) { /* Make a copy of the pad structure, moved to the correct position */ - PadType moved_pad = *pad; + pcb_pad_t moved_pad = *pad; moved_pad.Point1.X += DX; moved_pad.Point1.Y += DY; moved_pad.Point2.X += DX; @@ -1043,7 +1043,7 @@ if (ans != PCB_TYPE_NONE && (conf_core.editor.mode == PCB_MODE_LINE || (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT))) { - PadTypePtr pad = (PadTypePtr) ptr2; + pcb_pad_t *pad = (pcb_pad_t *) ptr2; pcb_layer_t *desired_layer; pcb_cardinal_t desired_group; pcb_cardinal_t SLayer, CLayer; @@ -1073,7 +1073,7 @@ } if (ans != PCB_TYPE_NONE) { - PadType *pad = (PadType *) ptr2; + pcb_pad_t *pad = (pcb_pad_t *) ptr2; check_snap_object(&snap_data, (pad->Point1.X + pad->Point2.X) / 2, (pad->Point1.Y + pad->Point2.Y) / 2, pcb_true); } Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 4769) +++ trunk/src/data.h (revision 4770) @@ -100,7 +100,7 @@ typedef void (*pcb_earc_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_arc_t *arc); typedef void (*pcb_etext_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, TextType *text); typedef void (*pcb_epin_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, PinType *pin); -typedef void (*pcb_epad_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, PadType *pad); +typedef void (*pcb_epad_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_pad_t *pad); /* via callbacks */ typedef void (*pcb_via_cb_t)(void *ctx, pcb_board_t *pcb, PinType *via); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4769) +++ trunk/src/draw.c (revision 4770) @@ -514,7 +514,7 @@ EraseLine((pcb_line_t *) ptr); break; case PCB_TYPE_PAD: - ErasePad((PadTypePtr) ptr); + ErasePad((pcb_pad_t *) ptr); break; case PCB_TYPE_ARC: case PCB_TYPE_ELEMENT_ARC: @@ -563,7 +563,7 @@ break; case PCB_TYPE_PAD: if (PCB->PinOn) - DrawPad((PadTypePtr) ptr2); + DrawPad((pcb_pad_t *) ptr2); break; case PCB_TYPE_ELEMENT_NAME: if (PCB->ElementOn && (FRONT((ElementTypePtr) ptr2) || PCB->InvisibleObjectsOn)) Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 4769) +++ trunk/src/find.c (revision 4770) @@ -95,7 +95,7 @@ } #define PADLIST_ENTRY(L,I) \ - (((PadTypePtr *)PadList[(L)].Data)[(I)]) + (((pcb_pad_t **)PadList[(L)].Data)[(I)]) #define LINELIST_ENTRY(L,I) \ (((pcb_line_t **)LineList[(L)].Data)[(I)]) @@ -156,7 +156,7 @@ static pcb_bool LookupPVConnectionsToLOList(pcb_bool); static pcb_bool LookupPVConnectionsToPVList(void); static pcb_bool LookupLOConnectionsToLine(pcb_line_t *, pcb_cardinal_t, pcb_bool); -static pcb_bool LookupLOConnectionsToPad(PadTypePtr, pcb_cardinal_t); +static pcb_bool LookupLOConnectionsToPad(pcb_pad_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToPolygon(pcb_polygon_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToRatEnd(pcb_point_t *, pcb_cardinal_t); Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 4769) +++ trunk/src/find.h (revision 4770) @@ -63,8 +63,8 @@ pcb_bool LineLineIntersect(pcb_line_t *, pcb_line_t *); pcb_bool LineArcIntersect(pcb_line_t *, pcb_arc_t *); pcb_bool PinLineIntersect(PinTypePtr, pcb_line_t *); -pcb_bool LinePadIntersect(pcb_line_t *, PadTypePtr); -pcb_bool ArcPadIntersect(pcb_arc_t *, PadTypePtr); +pcb_bool LinePadIntersect(pcb_line_t *, pcb_pad_t *); +pcb_bool ArcPadIntersect(pcb_arc_t *, pcb_pad_t *); pcb_bool IsPolygonInPolygon(pcb_polygon_t *, pcb_polygon_t *); void LookupElementConnections(ElementTypePtr, FILE *); void LookupConnectionsToAllElements(FILE *); @@ -86,7 +86,7 @@ int DRCAll(void); pcb_bool IsLineInPolygon(pcb_line_t *, pcb_polygon_t *); pcb_bool IsArcInPolygon(pcb_arc_t *, pcb_polygon_t *); -pcb_bool IsPadInPolygon(PadTypePtr, pcb_polygon_t *); +pcb_bool IsPadInPolygon(pcb_pad_t *, pcb_polygon_t *); /* find_clear.c */ pcb_bool ClearFlagOnPinsViasAndPads(pcb_bool AndDraw, int flag); Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 4769) +++ trunk/src/find_deadcode.c (revision 4770) @@ -53,7 +53,7 @@ static int LOT_Padcallback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) Index: trunk/src/find_debug.c =================================================================== --- trunk/src/find_debug.c (revision 4769) +++ trunk/src/find_debug.c (revision 4770) @@ -80,7 +80,7 @@ static void PrintPadConnections(pcb_cardinal_t Layer, FILE * FP, pcb_bool IsFirst) { pcb_cardinal_t i; - PadTypePtr ptr; + pcb_pad_t *ptr; if (!PadList[Layer].Number) return; Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4769) +++ trunk/src/find_drc.c (revision 4770) @@ -161,7 +161,7 @@ } case PCB_TYPE_PAD: { - PadTypePtr pad = (PadTypePtr) thing_ptr3; + pcb_pad_t *pad = (pcb_pad_t *) thing_ptr3; *x = (pad->Point1.X + pad->Point2.X) / 2; *y = (pad->Point1.Y + pad->Point2.Y) / 2; break; @@ -235,7 +235,7 @@ pcb_line_t *line = (pcb_line_t *) ptr2; pcb_arc_t *arc = (pcb_arc_t *) ptr2; PinTypePtr pin = (PinTypePtr) ptr2; - PadTypePtr pad = (PadTypePtr) ptr2; + pcb_pad_t *pad = (pcb_pad_t *) ptr2; thing_type = type; thing_ptr1 = ptr1; Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4769) +++ trunk/src/find_geo.c (revision 4770) @@ -341,10 +341,10 @@ * cases where the "real" lines don't intersect but the * thick lines touch, and ensures that the dx/dy business * below does not cause a divide-by-zero. */ - if (IsPointInPad(Line2->Point1.X, Line2->Point1.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (PadTypePtr) Line1) - || IsPointInPad(Line2->Point2.X, Line2->Point2.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (PadTypePtr) Line1) - || IsPointInPad(Line1->Point1.X, Line1->Point1.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (PadTypePtr) Line2) - || IsPointInPad(Line1->Point2.X, Line1->Point2.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (PadTypePtr) Line2)) + if (IsPointInPad(Line2->Point1.X, Line2->Point1.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (pcb_pad_t *) Line1) + || IsPointInPad(Line2->Point2.X, Line2->Point2.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (pcb_pad_t *) Line1) + || IsPointInPad(Line1->Point1.X, Line1->Point1.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (pcb_pad_t *) Line2) + || IsPointInPad(Line1->Point2.X, Line1->Point2.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (pcb_pad_t *) Line2)) return pcb_true; /* setup some constants */ @@ -456,9 +456,9 @@ return (pcb_true); /* check arc end points */ box = GetArcEnds(Arc); - if (IsPointInPad(box->X1, box->Y1, Arc->Thickness * 0.5 + Bloat, (PadTypePtr) Line)) + if (IsPointInPad(box->X1, box->Y1, Arc->Thickness * 0.5 + Bloat, (pcb_pad_t *) Line)) return pcb_true; - if (IsPointInPad(box->X2, box->Y2, Arc->Thickness * 0.5 + Bloat, (PadTypePtr) Line)) + if (IsPointInPad(box->X2, box->Y2, Arc->Thickness * 0.5 + Bloat, (pcb_pad_t *) Line)) return pcb_true; return pcb_false; } @@ -535,7 +535,7 @@ * * The polygon is assumed to already have been proven non-clearing */ -pcb_bool IsPadInPolygon(PadTypePtr pad, pcb_polygon_t *polygon) +pcb_bool IsPadInPolygon(pcb_pad_t *pad, pcb_polygon_t *polygon) { return IsLineInPolygon((pcb_line_t *) pad, polygon); } @@ -599,12 +599,12 @@ * some of the 'pad' routines are the same as for lines because the 'pad' * struct starts with a line struct. See global.h for details */ -pcb_bool LinePadIntersect(pcb_line_t *Line, PadTypePtr Pad) +pcb_bool LinePadIntersect(pcb_line_t *Line, pcb_pad_t *Pad) { return LineLineIntersect((Line), (pcb_line_t *) Pad); } -pcb_bool ArcPadIntersect(pcb_arc_t *Arc, PadTypePtr Pad) +pcb_bool ArcPadIntersect(pcb_arc_t *Arc, pcb_pad_t *Pad) { return LineArcIntersect((pcb_line_t *) (Pad), (Arc)); } @@ -618,7 +618,7 @@ return pcb_true; } -static pcb_bool PadPadIntersect(PadTypePtr p1, PadTypePtr p2) +static pcb_bool PadPadIntersect(pcb_pad_t *p1, pcb_pad_t *p2) { return LinePadIntersect((pcb_line_t *) p1, p2); } @@ -694,5 +694,5 @@ /* the original round pin version */ - return IsPointInPad(PV->X, PV->Y, MAX(PIN_SIZE(PV) / 2.0 + Bloat, 0.0), (PadTypePtr) Line); + return IsPointInPad(PV->X, PV->Y, MAX(PIN_SIZE(PV) / 2.0 + Bloat, 0.0), (pcb_pad_t *) Line); } Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4769) +++ trunk/src/find_lookup.c (revision 4770) @@ -64,7 +64,7 @@ return pcb_false; } -static pcb_bool ADD_PAD_TO_LIST(pcb_cardinal_t L, PadTypePtr Pad, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_PAD_TO_LIST(pcb_cardinal_t L, pcb_pad_t *Pad, int from_type, void *from_ptr, found_conn_type_t type) { /*fprintf(stderr, "ADD_PAD_TO_LIST cardinal %d %p %d\n", L, Pad, from_type);*/ if (User) @@ -217,7 +217,7 @@ /*fprintf(stderr, "PadList alloc %d: %d\n", i, NumberOfPads[i]);*/ /* allocate memory for working list */ - PadList[i].Data = (void **) calloc(NumberOfPads[i], sizeof(PadTypePtr)); + PadList[i].Data = (void **) calloc(NumberOfPads[i], sizeof(pcb_pad_t *)); /* clear some struct members */ PadList[i].Location = 0; @@ -318,7 +318,7 @@ static r_dir_t LOCtoPVpad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct pv_info *i = (struct pv_info *) cl; if (!TEST_FLAG(TheFlag, pad) && IS_PV_ON_PAD(&i->pv, pad) && @@ -601,7 +601,7 @@ struct lo_info { pcb_cardinal_t layer; pcb_line_t line; - PadType pad; + pcb_pad_t pad; pcb_arc_t arc; pcb_polygon_t polygon; pcb_rat_t rat; @@ -853,7 +853,7 @@ static r_dir_t LOCtoArcPad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) @@ -965,7 +965,7 @@ static r_dir_t LOCtoLinePad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) @@ -1075,7 +1075,7 @@ static r_dir_t LOCtoPad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct rat_info *i = (struct rat_info *) cl; if (!TEST_FLAG(TheFlag, pad) && i->layer == @@ -1200,7 +1200,7 @@ static r_dir_t LOCtoPadPad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) @@ -1213,7 +1213,7 @@ * searches all LOs that are connected to the given pad on the given * layergroup. All found connections are added to the list */ -static pcb_bool LookupLOConnectionsToPad(PadTypePtr Pad, pcb_cardinal_t LayerGroup) +static pcb_bool LookupLOConnectionsToPad(pcb_pad_t *Pad, pcb_cardinal_t LayerGroup) { pcb_cardinal_t entry; struct lo_info info; @@ -1225,7 +1225,7 @@ ic = GET_INTCONN(Pad); if ((Pad->Element != NULL) && (ic > 0)) { ElementType *e = Pad->Element; - PadTypePtr orig_pad = Pad; + pcb_pad_t *orig_pad = Pad; int tlayer = -1; /*fprintf(stderr, "lg===\n");*/ @@ -1337,7 +1337,7 @@ static r_dir_t LOCtoPolyPad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4769) +++ trunk/src/find_misc.c (revision 4770) @@ -198,7 +198,7 @@ case PCB_TYPE_PAD: { - PadTypePtr pad = (PadTypePtr) ptr2; + pcb_pad_t *pad = (pcb_pad_t *) ptr2; if (ADD_PAD_TO_LIST(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, 0, NULL, FCT_START)) return pcb_true; break; Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4769) +++ trunk/src/global_typedefs.h (revision 4770) @@ -40,7 +40,7 @@ typedef struct pcb_rat_line_s pcb_rat_t; typedef struct pcb_polygon_s pcb_polygon_t; -typedef struct pad_st PadType, *PadTypePtr; +typedef struct pad_st pcb_pad_t; typedef struct pin_st PinType, *PinTypePtr, **PinTypeHandle; typedef struct rtree rtree_t; typedef struct rats_patch_line_s rats_patch_line_t; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4769) +++ trunk/src/gui_act.c (revision 4770) @@ -497,12 +497,12 @@ break; case PCB_TYPE_PAD: - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, (PadTypePtr) ptr2)) - ErasePadName((PadTypePtr) ptr2); + if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2)) + ErasePadName((pcb_pad_t *) ptr2); else - DrawPadName((PadTypePtr) ptr2); + DrawPadName((pcb_pad_t *) ptr2); AddObjectToFlagUndoList(PCB_TYPE_PAD, ptr1, ptr2, ptr3); - TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (PadTypePtr) ptr2); + TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); Draw(); Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 4769) +++ trunk/src/hid.h (revision 4770) @@ -286,8 +286,8 @@ void (*fill_polygon) (hidGC gc_, int n_coords_, Coord * x_, Coord * y_); void (*fill_pcb_polygon) (hidGC gc_, pcb_polygon_t * poly, const pcb_box_t * clip_box); void (*thindraw_pcb_polygon) (hidGC gc_, pcb_polygon_t * poly, const pcb_box_t * clip_box); - void (*fill_pcb_pad) (hidGC gc_, PadType * pad, pcb_bool clip, pcb_bool mask); - void (*thindraw_pcb_pad) (hidGC gc_, PadType * pad, pcb_bool clip, pcb_bool mask); + void (*fill_pcb_pad) (hidGC gc_, pcb_pad_t * pad, pcb_bool clip, pcb_bool mask); + void (*thindraw_pcb_pad) (hidGC gc_, pcb_pad_t * pad, pcb_bool clip, pcb_bool mask); void (*fill_pcb_pv) (hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); void (*thindraw_pcb_pv) (hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); void (*fill_rect) (hidGC gc_, Coord x1_, Coord y1_, Coord x2_, Coord y2_); Index: trunk/src/hid_draw_helpers.c =================================================================== --- trunk/src/hid_draw_helpers.c (revision 4769) +++ trunk/src/hid_draw_helpers.c (revision 4770) @@ -180,7 +180,7 @@ PolygonHoles(poly, clip_box, thindraw_hole_cb, gc); } -void common_thindraw_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) +void common_thindraw_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask) { Coord w = clear ? (mask ? pad->Mask : pad->Thickness + pad->Clearance) : pad->Thickness; @@ -244,7 +244,7 @@ } } -void common_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) +void common_fill_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask) { Coord w = clear ? (mask ? pad->Mask : pad->Thickness + pad->Clearance) : pad->Thickness; Index: trunk/src/hid_draw_helpers.h =================================================================== --- trunk/src/hid_draw_helpers.h (revision 4769) +++ trunk/src/hid_draw_helpers.h (revision 4770) @@ -2,8 +2,8 @@ #define PCB_HID_DRAW_HELPERS_H void common_fill_pcb_polygon(hidGC gc, pcb_polygon_t * poly, const pcb_box_t * clip_box); void common_thindraw_pcb_polygon(hidGC gc, pcb_polygon_t * poly, const pcb_box_t * clip_box); -void common_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask); -void common_thindraw_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask); +void common_fill_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask); +void common_thindraw_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask); void common_fill_pcb_pv(hidGC gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); void common_thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType * pv, pcb_bool drawHole, pcb_bool mask); void common_draw_helpers_init(HID * hid); Index: trunk/src/hid_nogui.c =================================================================== --- trunk/src/hid_nogui.c (revision 4769) +++ trunk/src/hid_nogui.c (revision 4770) @@ -123,12 +123,12 @@ CRASH("fill_pcb_polygon"); } -static void nogui_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) +static void nogui_fill_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask) { CRASH("fill_pcb_pad"); } -static void nogui_thindraw_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) +static void nogui_thindraw_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask) { CRASH("thindraw_pcb_pad"); } Index: trunk/src/ht_element.c =================================================================== --- trunk/src/ht_element.c (revision 4769) +++ trunk/src/ht_element.c (revision 4770) @@ -53,7 +53,7 @@ h_str(p->Name) ^ h_str(p->Number); } -int pcb_pad_eq(const ElementType *e1, const PadType *p1, const ElementType *e2, const PadType *p2) +int pcb_pad_eq(const ElementType *e1, const pcb_pad_t *p1, const ElementType *e2, const pcb_pad_t *p2) { if (neq(p1, p2, Thickness) || neq(p1, p2, Clearance)) return 0; if (neqox(e1, p1, e2, p2, Point1.X) || neqoy(e1, p1, e2, p2, Point1.Y)) return 0; @@ -64,7 +64,7 @@ return 1; } -unsigned int pcb_pad_hash(const ElementType *e, const PadType *p) +unsigned int pcb_pad_hash(const ElementType *e, const pcb_pad_t *p) { return h_coord(p->Thickness) ^ h_coord(p->Clearance) ^ @@ -129,7 +129,7 @@ } { - PadType *p; + pcb_pad_t *p; padlist_foreach(&e->Pad, &it, p) { val ^= pcb_pad_hash(e, p); } @@ -171,7 +171,7 @@ } { - PadType *p1, *p2; + pcb_pad_t *p1, *p2; p1 = padlist_first((padlist_t *)&e1->Pad); p2 = padlist_first((padlist_t *)&e2->Pad); for(;;) { Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 4769) +++ trunk/src/netlist.c (revision 4770) @@ -108,8 +108,8 @@ *y = ((PinType *) (conn.ptr2))->Y; return 0; case PCB_TYPE_PAD: - *x = ((PadType *) (conn.ptr2))->Point1.X; - *y = ((PadType *) (conn.ptr2))->Point1.Y; + *x = ((pcb_pad_t *) (conn.ptr2))->Point1.X; + *y = ((pcb_pad_t *) (conn.ptr2))->Point1.Y; return 0; } return 1; @@ -231,7 +231,7 @@ } -LibraryMenuTypePtr pcb_netlist_find_net4pad(pcb_board_t *pcb, const PadType *pad) +LibraryMenuTypePtr pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad) { const ElementType *e = pad->Element; Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 4769) +++ trunk/src/netlist.h (revision 4770) @@ -70,7 +70,7 @@ /* Same as pcb_netlist_find_net4pinname but with pin pointer */ LibraryMenuTypePtr pcb_netlist_find_net4pin(pcb_board_t *pcb, const PinType *pin); -LibraryMenuTypePtr pcb_netlist_find_net4pad(pcb_board_t *pcb, const PadType *pad); +LibraryMenuTypePtr pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad); /* Evaluate to const char * name of the network; lmt is (LibraryMenuType *) */ Index: trunk/src/obj_any.h =================================================================== --- trunk/src/obj_any.h (revision 4769) +++ trunk/src/obj_any.h (revision 4770) @@ -84,7 +84,7 @@ pcb_polygon_t *polygon; pcb_arc_t *arc; pcb_rat_t *rat; - PadType *pad; + pcb_pad_t *pad; PinType *pin; PinType *via; ElementType *element; Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4769) +++ trunk/src/obj_elem.c (revision 4770) @@ -100,7 +100,7 @@ END_LOOP; list_map0(&element->Pin, PinType, RemoveFreePin); - list_map0(&element->Pad, PadType, RemoveFreePad); + list_map0(&element->Pad, pcb_pad_t, RemoveFreePad); list_map0(&element->Line, pcb_line_t, RemoveFreeLine); list_map0(&element->Arc, pcb_arc_t, RemoveFreeArc); @@ -1767,7 +1767,7 @@ } if (padlist_length(&e->Pad) != 0) { - PadType *pad0 = padlist_first(&e->Pad); + pcb_pad_t *pad0 = padlist_first(&e->Pad); mark_size = MIN(mark_size, pad0->Thickness / 2); } Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 4769) +++ trunk/src/obj_line_drcenf.c (revision 4770) @@ -211,7 +211,7 @@ static r_dir_t drcPad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct drc_info *i = (struct drc_info *) cl; if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) == i->solder && !TEST_FLAG(PCB_FLAG_FOUND, pad) && LinePadIntersect(i->line, pad)) Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4769) +++ trunk/src/obj_pad.c (revision 4770) @@ -47,17 +47,17 @@ /*** allocation ***/ /* get next slot for a pad, allocates memory if necessary */ -PadType *GetPadMemory(ElementType * element) +pcb_pad_t *GetPadMemory(ElementType * element) { - PadType *new_obj; + pcb_pad_t *new_obj; - new_obj = calloc(sizeof(PadType), 1); + new_obj = calloc(sizeof(pcb_pad_t), 1); padlist_append(&element->Pad, new_obj); return new_obj; } -void RemoveFreePad(PadType * data) +void RemoveFreePad(pcb_pad_t * data) { padlist_remove(data); free(data); @@ -66,9 +66,9 @@ /*** utility ***/ /* creates a new pad in an element */ -PadTypePtr CreateNewPad(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, Coord Mask, char *Name, char *Number, FlagType Flags) +pcb_pad_t *CreateNewPad(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, Coord Mask, char *Name, char *Number, FlagType Flags) { - PadTypePtr pad = GetPadMemory(Element); + pcb_pad_t *pad = GetPadMemory(Element); /* copy values */ if (X1 > X2 || (X1 == X2 && Y1 > Y2)) { @@ -96,7 +96,7 @@ } /* sets the bounding box of a pad */ -void SetPadBoundingBox(PadTypePtr Pad) +void SetPadBoundingBox(pcb_pad_t *Pad) { Coord width; Coord deltax; @@ -140,7 +140,7 @@ } /* changes the nopaste flag of a pad */ -pcb_bool ChangePaste(PadTypePtr Pad) +pcb_bool ChangePaste(pcb_pad_t *Pad) { if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) return (pcb_false); @@ -155,7 +155,7 @@ /*** ops ***/ /* changes the size of a pad */ -void *ChangePadSize(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ChangePadSize(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pad->Thickness + ctx->chgsize.delta; @@ -179,7 +179,7 @@ } /* changes the clearance size of a pad */ -void *ChangePadClearSize(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ChangePadClearSize(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pad->Clearance + ctx->chgsize.delta; @@ -207,7 +207,7 @@ } /* changes the name of a pad */ -void *ChangePadName(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ChangePadName(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { char *old = Pad->Name; @@ -223,7 +223,7 @@ } /* changes the number of a pad */ -void *ChangePadNum(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ChangePadNum(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { char *old = Pad->Number; @@ -239,7 +239,7 @@ } /* changes the square flag of a pad */ -void *ChangePadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ChangePadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) return (NULL); @@ -255,7 +255,7 @@ } /* sets the square flag of a pad */ -void *SetPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *SetPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { if (TEST_FLAG(PCB_FLAG_LOCK, Pad) || TEST_FLAG(PCB_FLAG_SQUARE, Pad)) @@ -266,7 +266,7 @@ /* clears the square flag of a pad */ -void *ClrPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ClrPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { if (TEST_FLAG(PCB_FLAG_LOCK, Pad) || !TEST_FLAG(PCB_FLAG_SQUARE, Pad)) @@ -276,7 +276,7 @@ } /* changes the mask size of a pad */ -void *ChangePadMaskSize(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad) +void *ChangePadMaskSize(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pad->Mask + ctx->chgsize.delta; @@ -296,7 +296,7 @@ } /*** draw ***/ -static void draw_pad_name(PadType * pad) +static void draw_pad_name(pcb_pad_t * pad) { pcb_box_t box; pcb_bool vert; @@ -343,7 +343,7 @@ DrawTextLowLevel(&text, 0); } -static void _draw_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) +static void _draw_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask) { if (clear && !mask && pad->Clearance <= 0) return; @@ -354,7 +354,7 @@ gui->fill_pcb_pad(gc, pad, clear, mask); } -void draw_pad(PadType * pad) +void draw_pad(pcb_pad_t * pad) { const char *color = NULL; char buf[sizeof("#XXXXXX")]; @@ -391,7 +391,7 @@ r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; if (ON_SIDE(pad, *side)) @@ -401,7 +401,7 @@ r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; if (ON_SIDE(pad, *side) && pad->Mask) _draw_pad(Output.pmGC, pad, pcb_true, pcb_true); @@ -424,7 +424,7 @@ ENDALL_LOOP; } -static void GatherPadName(PadTypePtr Pad) +static void GatherPadName(pcb_pad_t *Pad) { pcb_box_t box; pcb_bool vert; @@ -453,7 +453,7 @@ return; } -void ErasePad(PadTypePtr Pad) +void ErasePad(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) @@ -461,12 +461,12 @@ EraseFlags(&Pad->Flags); } -void ErasePadName(PadTypePtr Pad) +void ErasePadName(pcb_pad_t *Pad) { GatherPadName(Pad); } -void DrawPad(PadTypePtr Pad) +void DrawPad(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); if (pcb_draw_doing_pinout || TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) @@ -473,7 +473,7 @@ DrawPadName(Pad); } -void DrawPadName(PadTypePtr Pad) +void DrawPadName(pcb_pad_t *Pad) { GatherPadName(Pad); } Index: trunk/src/obj_pad.h =================================================================== --- trunk/src/obj_pad.h (revision 4769) +++ trunk/src/obj_pad.h (revision 4770) @@ -41,12 +41,12 @@ }; -PadType *GetPadMemory(ElementType * element); -void RemoveFreePad(PadType * data); +pcb_pad_t *GetPadMemory(ElementType * element); +void RemoveFreePad(pcb_pad_t * data); -PadTypePtr CreateNewPad(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, Coord Mask, char *Name, char *Number, FlagType Flags); -void SetPadBoundingBox(PadTypePtr Pad); -pcb_bool ChangePaste(PadTypePtr Pad); +pcb_pad_t *CreateNewPad(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, Coord Mask, char *Name, char *Number, FlagType Flags); +void SetPadBoundingBox(pcb_pad_t *Pad); +pcb_bool ChangePaste(pcb_pad_t *Pad); /* Rather than move the line bounding box, we set it so the point bounding @@ -60,7 +60,7 @@ } #define PAD_LOOP(element) do { \ - PadType *pad; \ + pcb_pad_t *pad; \ gdl_iterator_t __it__; \ padlist_foreach(&(element)->Pad, &__it__, pad) { Index: trunk/src/obj_pad_draw.h =================================================================== --- trunk/src/obj_pad_draw.h (revision 4769) +++ trunk/src/obj_pad_draw.h (revision 4770) @@ -33,9 +33,9 @@ r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl); #endif -void draw_pad(PadType * pad); +void draw_pad(pcb_pad_t * pad); void DrawPaste(int side, const pcb_box_t * drawn_area); -void ErasePad(PadTypePtr Pad); -void ErasePadName(PadTypePtr Pad); -void DrawPad(PadTypePtr Pad); -void DrawPadName(PadTypePtr Pad); +void ErasePad(pcb_pad_t *Pad); +void ErasePadName(pcb_pad_t *Pad); +void DrawPad(pcb_pad_t *Pad); +void DrawPadName(pcb_pad_t *Pad); Index: trunk/src/obj_pad_list.h =================================================================== --- trunk/src/obj_pad_list.h (revision 4769) +++ trunk/src/obj_pad_list.h (revision 4770) @@ -28,7 +28,7 @@ /* List of Pads */ #define TDL(x) padlist_ ## x #define TDL_LIST_T padlist_t -#define TDL_ITEM_T PadType +#define TDL_ITEM_T pcb_pad_t #define TDL_FIELD link #define TDL_SIZE_T size_t #define TDL_FUNC Index: trunk/src/obj_pad_op.h =================================================================== --- trunk/src/obj_pad_op.h (revision 4769) +++ trunk/src/obj_pad_op.h (revision 4770) @@ -28,14 +28,14 @@ #include "operation.h" -void *ChangePadSize(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *ChangePadClearSize(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *ChangePadName(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *ChangePadNum(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *ChangePadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *SetPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *ClrPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); -void *ChangePadMaskSize(pcb_opctx_t *ctx, ElementTypePtr Element, PadTypePtr Pad); +void *ChangePadSize(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *ChangePadClearSize(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *ChangePadName(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *ChangePadNum(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *ChangePadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *SetPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *ClrPadSquare(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); +void *ChangePadMaskSize(pcb_opctx_t *ctx, ElementTypePtr Element, pcb_pad_t *Pad); Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 4769) +++ trunk/src/operation.h (revision 4770) @@ -117,7 +117,7 @@ void *(*Element)(pcb_opctx_t *ctx, ElementTypePtr); void *(*ElementName)(pcb_opctx_t *ctx, ElementTypePtr); void *(*Pin)(pcb_opctx_t *ctx, ElementTypePtr, PinTypePtr); - void *(*Pad)(pcb_opctx_t *ctx, ElementTypePtr, PadTypePtr); + void *(*Pad)(pcb_opctx_t *ctx, ElementTypePtr, pcb_pad_t *); void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *, pcb_point_t *); void *(*Point)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_polygon_t *, pcb_point_t *); void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_arc_t *); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4769) +++ trunk/src/polygon.c (revision 4770) @@ -624,7 +624,7 @@ } /* make a rounded-corner rectangle */ -POLYAREA *SquarePadPoly(PadType * pad, Coord clear) +POLYAREA *SquarePadPoly(pcb_pad_t * pad, Coord clear) { PLINE *contour = NULL; POLYAREA *np = NULL; @@ -632,8 +632,8 @@ double d; double tx, ty; double cx, cy; - PadType _t = *pad, *t = &_t; - PadType _c = *pad, *c = &_c; + pcb_pad_t _t = *pad, *t = &_t; + pcb_pad_t _c = *pad, *c = &_c; int halfthick = (pad->Thickness + 1) / 2; int halfclear = (clear + 1) / 2; @@ -830,7 +830,7 @@ return Subtract(np, p, pcb_true); } -static int SubtractPad(PadType * pad, pcb_polygon_t * p) +static int SubtractPad(pcb_pad_t * pad, pcb_polygon_t * p) { POLYAREA *np = NULL; @@ -925,7 +925,7 @@ static r_dir_t pad_sub_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct cpInfo *info = (struct cpInfo *) cl; pcb_polygon_t *polygon; @@ -1154,7 +1154,7 @@ return 1; } -static int UnsubtractPad(PadType * pad, pcb_layer_t * l, pcb_polygon_t * p) +static int UnsubtractPad(pcb_pad_t * pad, pcb_layer_t * l, pcb_polygon_t * p) { POLYAREA *np; @@ -1412,7 +1412,7 @@ Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_PAD: - SubtractPad((PadTypePtr) ptr2, Polygon); + SubtractPad((pcb_pad_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return R_DIR_FOUND_CONTINUE; case PCB_TYPE_TEXT: @@ -1437,7 +1437,7 @@ UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_PAD: - UnsubtractPad((PadTypePtr) ptr2, Layer, Polygon); + UnsubtractPad((pcb_pad_t *) ptr2, Layer, Polygon); return R_DIR_FOUND_CONTINUE; case PCB_TYPE_TEXT: UnsubtractText((TextTypePtr) ptr2, Layer, Polygon); @@ -1510,7 +1510,7 @@ break; case PCB_TYPE_PAD: { - pcb_cardinal_t group = GetLayerGroupNumberByNumber(TEST_FLAG(PCB_FLAG_ONSOLDER, (PadType *) ptr2) ? + pcb_cardinal_t group = GetLayerGroupNumberByNumber(TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? solder_silk_layer : component_silk_layer); GROUP_LOOP(Data, group); { Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4769) +++ trunk/src/rats.c (revision 4770) @@ -109,7 +109,7 @@ { ElementTypePtr element; gdl_iterator_t it; - PadType *pad; + pcb_pad_t *pad; PinType *pin; if ((element = SearchElementByName(PCB->Data, ElementName)) == NULL) @@ -237,7 +237,7 @@ ("Error! Element %s pin %s appears multiple times in the netlist file.\n"), NAMEONPCB_NAME((ElementTypePtr) LastPoint.ptr1), (LastPoint.type == - PCB_TYPE_PIN) ? ((PinTypePtr) LastPoint.ptr2)->Number : ((PadTypePtr) LastPoint.ptr2)->Number); + PCB_TYPE_PIN) ? ((PinTypePtr) LastPoint.ptr2)->Number : ((pcb_pad_t *) LastPoint.ptr2)->Number); else { connection = GetConnectionMemory(net); *connection = LastPoint; @@ -248,7 +248,7 @@ if (LastPoint.type == PCB_TYPE_PIN) ((PinTypePtr) LastPoint.ptr2)->Spare = (void *) menu; else - ((PadTypePtr) LastPoint.ptr2)->Spare = (void *) menu; + ((pcb_pad_t *) LastPoint.ptr2)->Spare = (void *) menu; } } else @@ -264,7 +264,7 @@ if (LastPoint.type == PCB_TYPE_PIN) ((PinTypePtr) LastPoint.ptr2)->Spare = (void *) menu; else - ((PadTypePtr) LastPoint.ptr2)->Spare = (void *) menu; + ((pcb_pad_t *) LastPoint.ptr2)->Spare = (void *) menu; } } END_LOOP; @@ -834,7 +834,7 @@ } /* will work for pins to since the FLAG is common */ - group1 = (TEST_FLAG(PCB_FLAG_ONSOLDER, (PadTypePtr) ptr2) ? + group1 = (TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); strcpy(name1, ConnectionName(found, ptr1, ptr2)); found = SearchObjectByLocation(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, @@ -847,7 +847,7 @@ Message(PCB_MSG_DEFAULT, _("You must name the ending element first\n")); return (NULL); } - group2 = (TEST_FLAG(PCB_FLAG_ONSOLDER, (PadTypePtr) ptr2) ? + group2 = (TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); name2 = ConnectionName(found, ptr1, ptr2); @@ -914,7 +914,7 @@ num = ((PinTypePtr) ptr2)->Number; break; case PCB_TYPE_PAD: - num = ((PadTypePtr) ptr2)->Number; + num = ((pcb_pad_t *) ptr2)->Number; break; default: return (NULL); Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 4769) +++ trunk/src/rubberband.c (revision 4770) @@ -42,7 +42,7 @@ /* --------------------------------------------------------------------------- * some local prototypes */ -static void CheckPadForRubberbandConnection(PadTypePtr); +static void CheckPadForRubberbandConnection(pcb_pad_t *); static void CheckPinForRubberbandConnection(PinTypePtr); static void CheckLinePointForRubberbandConnection(pcb_layer_t *, pcb_line_t *, pcb_point_t *, pcb_bool); static void CheckPolygonForRubberbandConnection(pcb_layer_t *, pcb_polygon_t *); @@ -175,7 +175,7 @@ * passed pad. If one of the endpoints of the line lays inside the pad, * the line is added to the 'rubberband' list */ -static void CheckPadForRubberbandConnection(PadTypePtr Pad) +static void CheckPadForRubberbandConnection(pcb_pad_t *Pad) { Coord half = Pad->Thickness / 2; pcb_cardinal_t i, group; @@ -206,7 +206,7 @@ int type; pcb_cardinal_t group; PinTypePtr pin; - PadTypePtr pad; + pcb_pad_t *pad; pcb_point_t *point; }; @@ -252,7 +252,7 @@ return R_DIR_NOT_FOUND; } -static void CheckPadForRat(PadTypePtr Pad) +static void CheckPadForRat(pcb_pad_t *Pad) { struct rinfo info; pcb_cardinal_t i; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4769) +++ trunk/src/search.c (revision 4770) @@ -59,7 +59,7 @@ static pcb_bool SearchTextByLocation(int, pcb_layer_t **, TextTypePtr *, TextTypePtr *); static pcb_bool SearchPolygonByLocation(int, pcb_layer_t **, pcb_polygon_t **, pcb_polygon_t **); static pcb_bool SearchPinByLocation(int, ElementTypePtr *, PinTypePtr *, PinTypePtr *); -static pcb_bool SearchPadByLocation(int, ElementTypePtr *, PadTypePtr *, PadTypePtr *, pcb_bool); +static pcb_bool SearchPadByLocation(int, ElementTypePtr *, pcb_pad_t **, pcb_pad_t **, pcb_bool); static pcb_bool SearchViaByLocation(int, PinTypePtr *, PinTypePtr *, PinTypePtr *); static pcb_bool SearchElementNameByLocation(int, ElementTypePtr *, TextTypePtr *, TextTypePtr *, pcb_bool); static pcb_bool SearchLinePointByLocation(int, pcb_layer_t **, pcb_line_t **, pcb_point_t **); @@ -133,7 +133,7 @@ static r_dir_t pad_callback(const pcb_box_t * b, void *cl) { - PadTypePtr pad = (PadTypePtr) b; + pcb_pad_t *pad = (pcb_pad_t *) b; struct ans_info *i = (struct ans_info *) cl; AnyObjectType *ptr1 = pad->Element; @@ -154,7 +154,7 @@ * searches a pad * starts with the newest element */ -static pcb_bool SearchPadByLocation(int locked, ElementTypePtr * Element, PadTypePtr * Pad, PadTypePtr * Dummy, pcb_bool BackToo) +static pcb_bool SearchPadByLocation(int locked, ElementTypePtr * Element, pcb_pad_t ** Pad, pcb_pad_t ** Dummy, pcb_bool BackToo) { struct ans_info info; @@ -190,7 +190,7 @@ if (TEST_FLAG(i->locked, l)) return R_DIR_NOT_FOUND; - if (!IsPointInPad(PosX, PosY, SearchRadius, (PadTypePtr) l)) + if (!IsPointInPad(PosX, PosY, SearchRadius, (pcb_pad_t *) l)) return R_DIR_NOT_FOUND; *i->Line = l; *i->Point = (pcb_point_t *) l; @@ -785,7 +785,7 @@ * Check if a circle of Radius with center at (X, Y) intersects a Pad. * Written to enable arbitrary pad directions; for rounded pads, too. */ -pcb_bool IsPointInPad(Coord X, Coord Y, Coord Radius, PadTypePtr Pad) +pcb_bool IsPointInPad(Coord X, Coord Y, Coord Radius, pcb_pad_t *Pad) { double r, Sin, Cos; Coord x; @@ -1007,7 +1007,7 @@ HigherAvail = PCB_TYPE_PIN; if (!HigherAvail && Type & PCB_TYPE_PAD && - SearchPadByLocation(locked, (ElementTypePtr *) pr1, (PadTypePtr *) pr2, (PadTypePtr *) pr3, pcb_false)) + SearchPadByLocation(locked, (ElementTypePtr *) pr1, (pcb_pad_t **) pr2, (pcb_pad_t **) pr3, pcb_false)) HigherAvail = PCB_TYPE_PAD; if (!HigherAvail && Type & PCB_TYPE_ELEMENT_NAME && @@ -1106,7 +1106,7 @@ return (PCB_TYPE_NONE); if (Type & PCB_TYPE_PAD && - SearchPadByLocation(locked, (ElementTypePtr *) Result1, (PadTypePtr *) Result2, (PadTypePtr *) Result3, pcb_true)) + SearchPadByLocation(locked, (ElementTypePtr *) Result1, (pcb_pad_t **) Result2, (pcb_pad_t **) Result3, pcb_true)) return (PCB_TYPE_PAD); if (Type & PCB_TYPE_ELEMENT_NAME && Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 4769) +++ trunk/src/search.h (revision 4770) @@ -152,7 +152,7 @@ pcb_bool IsLineInRectangle(Coord, Coord, Coord, Coord, pcb_line_t *); pcb_bool IsLineInQuadrangle(pcb_point_t p[4], pcb_line_t *Line); pcb_bool IsArcInRectangle(Coord, Coord, Coord, Coord, pcb_arc_t *); -pcb_bool IsPointInPad(Coord, Coord, Coord, PadTypePtr); +pcb_bool IsPointInPad(Coord, Coord, Coord, pcb_pad_t *); pcb_bool IsPointInBox(Coord, Coord, pcb_box_t *, Coord); int SearchObjectByLocation(unsigned, void **, void **, void **, Coord, Coord, Coord); int SearchScreen(Coord, Coord, int, void **, void **, void **); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4769) +++ trunk/src/select.c (revision 4770) @@ -188,8 +188,8 @@ case PCB_TYPE_PAD: AddObjectToFlagUndoList(PCB_TYPE_PAD, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, (PadTypePtr) ptr2); - DrawPad((PadTypePtr) ptr2); + TOGGLE_FLAG(PCB_FLAG_SELECTED, (pcb_pad_t *) ptr2); + DrawPad((pcb_pad_t *) ptr2); break; case PCB_TYPE_ELEMENT_NAME: @@ -534,7 +534,7 @@ case PCB_TYPE_PAD: if (F->Pad) - return (F->Pad(ctx, (ElementTypePtr) Ptr1, (PadTypePtr) Ptr2)); + return (F->Pad(ctx, (ElementTypePtr) Ptr1, (pcb_pad_t *) Ptr2)); break; case PCB_TYPE_ELEMENT_NAME: Index: trunk/src/stub_mincut.c =================================================================== --- trunk/src/stub_mincut.c (revision 4769) +++ trunk/src/stub_mincut.c (revision 4770) @@ -30,7 +30,7 @@ { } -static void stub_rat_found_short_dummy(PinType * pin, PadType * pad, const char *with_net) +static void stub_rat_found_short_dummy(PinType * pin, pcb_pad_t * pad, const char *with_net) { /* original behavior: just warn at random pins/pads */ if (pin != NULL) @@ -41,5 +41,5 @@ stub_rat_proc_shorts_dummy(); } -void (*stub_rat_found_short)(PinType * pin, PadType * pad, const char *with_net) = stub_rat_found_short_dummy; +void (*stub_rat_found_short)(PinType * pin, pcb_pad_t * pad, const char *with_net) = stub_rat_found_short_dummy; void (*stub_rat_proc_shorts)(void) = stub_rat_proc_shorts_dummy; Index: trunk/src/stub_mincut.h =================================================================== --- trunk/src/stub_mincut.h (revision 4769) +++ trunk/src/stub_mincut.h (revision 4770) @@ -22,6 +22,6 @@ #include "global_typedefs.h" -extern void (*stub_rat_found_short)(PinType * pin, PadType * pad, const char *with_net); +extern void (*stub_rat_found_short)(PinType * pin, pcb_pad_t * pad, const char *with_net); extern void (*stub_rat_proc_shorts)(void); Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4769) +++ trunk/src/undo.c (revision 4770) @@ -455,11 +455,11 @@ /* lookup entry by ID */ type = SearchObjectByID(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 ? ((PadTypePtr) ptr2)->Mask : ((PinTypePtr) ptr2)->Mask); + swap = (type == PCB_TYPE_PAD ? ((pcb_pad_t *) ptr2)->Mask : ((PinTypePtr) ptr2)->Mask); if (andDraw) EraseObject(type, ptr1, ptr2); if (type == PCB_TYPE_PAD) - ((PadTypePtr) ptr2)->Mask = Entry->Data.Size; + ((pcb_pad_t *) ptr2)->Mask = Entry->Data.Size; else ((PinTypePtr) ptr2)->Mask = Entry->Data.Size; Entry->Data.Size = swap; @@ -1416,7 +1416,7 @@ undo->Data.Size = ((TextTypePtr) ptr2)->Scale; break; case PCB_TYPE_PAD: - undo->Data.Size = ((PadTypePtr) ptr2)->Thickness; + undo->Data.Size = ((pcb_pad_t *) ptr2)->Thickness; break; case PCB_TYPE_ARC: case PCB_TYPE_ELEMENT_ARC: @@ -1444,7 +1444,7 @@ undo->Data.Size = ((pcb_line_t *) ptr2)->Clearance; break; case PCB_TYPE_PAD: - undo->Data.Size = ((PadTypePtr) ptr2)->Clearance; + undo->Data.Size = ((pcb_pad_t *) ptr2)->Clearance; break; case PCB_TYPE_ARC: undo->Data.Size = ((pcb_arc_t *) ptr2)->Clearance; @@ -1468,7 +1468,7 @@ undo->Data.Size = ((PinTypePtr) ptr2)->Mask; break; case PCB_TYPE_PAD: - undo->Data.Size = ((PadTypePtr) ptr2)->Mask; + undo->Data.Size = ((pcb_pad_t *) ptr2)->Mask; break; } } Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4769) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4770) @@ -155,8 +155,8 @@ case PCB_TYPE_PAD: c->group = TEST_FLAG(PCB_FLAG_ONSOLDER, (ElementTypePtr) c->ptr1) ? SLayer : CLayer; - c->X = ((PadTypePtr) c->ptr2)->Point1.X; - c->Y = ((PadTypePtr) c->ptr2)->Point1.Y; + c->X = ((pcb_pad_t *) c->ptr2)->Point1.X; + c->Y = ((pcb_pad_t *) c->ptr2)->Point1.Y; break; case PCB_TYPE_PIN: c->group = SLayer; /* any layer will do */ Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4769) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4770) @@ -222,7 +222,7 @@ typedef struct routebox { pcb_box_t box, sbox; union { - PadTypePtr pad; + pcb_pad_t *pad; PinTypePtr pin; PinTypePtr via; struct routebox *via_shadow; /* points to the via in r-tree which @@ -626,7 +626,7 @@ return lastrb; } -static routebox_t *AddPad(PointerListType layergroupboxes[], ElementTypePtr element, PadTypePtr pad, RouteStyleType * style) +static routebox_t *AddPad(PointerListType layergroupboxes[], ElementTypePtr element, pcb_pad_t *pad, RouteStyleType * style) { Coord halfthick; routebox_t **rbpp; @@ -995,7 +995,7 @@ else switch (connection->type) { case PCB_TYPE_PAD: - rb = AddPad(layergroupboxes, (ElementType *) connection->ptr1, (PadType *) connection->ptr2, rd->styles[j]); + rb = AddPad(layergroupboxes, (ElementType *) connection->ptr1, (pcb_pad_t *) connection->ptr2, rd->styles[j]); break; case PCB_TYPE_PIN: rb = AddPin(layergroupboxes, (PinType *) connection->ptr2, pcb_false, rd->styles[j]); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4769) +++ trunk/src_plugins/djopt/djopt.c (revision 4770) @@ -87,7 +87,7 @@ int x, y; int net; PinType *via; - PadType *pad; + pcb_pad_t *pad; PinType *pin; int miter; int n_lines; @@ -2402,7 +2402,7 @@ } } -static int pad_orient(PadType * p) +static int pad_orient(pcb_pad_t * p) { if (p->Point1.X == p->Point2.X) return O_VERT; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 4769) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 4770) @@ -174,7 +174,7 @@ gpmi_event(h->module, HIDE_fill_pcb_pv, h, fg_gc, bg_gc, pad, drawHole, mask); } -void gpmi_hid_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask) +void gpmi_hid_fill_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask) { hid_t *h = hid_gpmi_data_get(exporter); gpmi_event(h->module, HIDE_fill_pcb_pad, h, gc, pad, clear, mask); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h (revision 4769) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h (revision 4770) @@ -18,5 +18,5 @@ void gpmi_hid_fill_pcb_polygon(hidGC gc, pcb_polygon_t *poly, const pcb_box_t *clip_box); void gpmi_hid_fill_rect(hidGC gc, Coord x1, Coord y1, Coord x2, Coord y2); void gpmi_hid_fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pad, pcb_bool drawHole, pcb_bool mask); -void gpmi_hid_fill_pcb_pad(hidGC gc, PadType * pad, pcb_bool clear, pcb_bool mask); +void gpmi_hid_fill_pcb_pad(hidGC gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask); void gpmi_hid_use_mask(int use_it); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4769) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 4770) @@ -259,8 +259,8 @@ void fill_polygon(dctx_t *ctx, int n_ints_, int *x_, int *y_); void fill_pcb_polygon(dctx_t *ctx, pcb_polygon_t *poly, const pcb_box_t *clip_box); void thindraw_pcb_polygon(dctx_t *ctx, pcb_polygon_t *poly, const pcb_box_t *clip_box); -void fill_pcb_pad(dctx_t *ctx, PadType *pad, pcb_bool clip, pcb_bool mask); -void thindraw_pcb_pad(dctx_t *ctx, PadType *pad, pcb_bool clip, pcb_bool mask); +void fill_pcb_pad(dctx_t *ctx, pcb_pad_t *pad, pcb_bool clip, pcb_bool mask); +void thindraw_pcb_pad(dctx_t *ctx, pcb_pad_t *pad, pcb_bool clip, pcb_bool mask); void fill_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pv, pcb_bool drawHole, pcb_bool mask); void thindraw_pcb_pv(hidGC fg_gc, hidGC bg_gc, PinType *pv, pcb_bool drawHole, pcb_bool mask); void fill_rect(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_); Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4769) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4770) @@ -276,7 +276,7 @@ } case PCB_TYPE_PAD: { - PadTypePtr pad = (PadTypePtr) conn.ptr2; + pcb_pad_t *pad = (pcb_pad_t *) conn.ptr2; x = pad->Point1.X + (pad->Point2.X - pad->Point1.X) / 2; y = pad->Point1.Y + (pad->Point2.Y - pad->Point2.Y) / 2; gui->set_crosshair(x, y, 0); Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4769) +++ trunk/src_plugins/io_kicad/write.c (revision 4770) @@ -818,7 +818,7 @@ elementlist_foreach(&Data->Element, &eit, element) { gdl_iterator_t it; PinType *pin; - PadType *pad; + pcb_pad_t *pad; elementlist_dedup_skip(ededup, element); /* skip duplicate elements */ @@ -1061,7 +1061,7 @@ elementlist_foreach(&Data->Element, &eit, element) { gdl_iterator_t it; PinType *pin; - PadType *pad; + pcb_pad_t *pad; /* elementlist_dedup_skip(ededup, element); */ /* let's not skip duplicate elements for layout export*/ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4769) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4770) @@ -778,7 +778,7 @@ elementlist_foreach(&Data->Element, &eit, element) { gdl_iterator_t it; PinType *pin; - PadType *pad; + pcb_pad_t *pad; elementlist_dedup_skip(ededup, element); /* skip duplicate elements */ @@ -1013,7 +1013,7 @@ elementlist_foreach(&Data->Element, &eit, element) { gdl_iterator_t it; PinType *pin; - PadType *pad; + pcb_pad_t *pad; /* elementlist_dedup_skip(ededup, element); */ /* let's not skip duplicate elements for layout export*/ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4769) +++ trunk/src_plugins/io_lihata/read.c (revision 4770) @@ -617,7 +617,7 @@ static int parse_pad(ElementType *el, lht_node_t *obj, Coord dx, Coord dy) { - PadType *pad; + pcb_pad_t *pad; pad = GetPadMemory(el); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4769) +++ trunk/src_plugins/io_lihata/write.c (revision 4770) @@ -294,7 +294,7 @@ return obj; } -static lht_node_t *build_pad(PadType *pad, Coord dx, Coord dy) +static lht_node_t *build_pad(pcb_pad_t *pad, Coord dx, Coord dy) { char buff[128]; lht_node_t *obj; @@ -381,7 +381,7 @@ pcb_line_t *li; pcb_arc_t *ar; PinType *pi; - PadType *pa; + pcb_pad_t *pa; lht_node_t *obj, *lst; sprintf(buff, "element.%ld", elem->ID); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4769) +++ trunk/src_plugins/io_pcb/file.c (revision 4770) @@ -377,7 +377,7 @@ elementlist_foreach(&Data->Element, &eit, element) { gdl_iterator_t it; PinType *pin; - PadType *pad; + pcb_pad_t *pad; /* only non empty elements */ if (!linelist_length(&element->Line) && !pinlist_length(&element->Pin) && !arclist_length(&element->Arc) && !padlist_length(&element->Pad)) Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 4769) +++ trunk/src_plugins/loghid/hid-logger.c (revision 4770) @@ -144,13 +144,13 @@ delegatee_->thindraw_pcb_polygon(gc, poly, clip_box); } -static void log_fill_pcb_pad(hidGC gc, PadType *pad, pcb_bool clip, pcb_bool mask) { +static void log_fill_pcb_pad(hidGC gc, pcb_pad_t *pad, pcb_bool clip, pcb_bool mask) { pcb_fprintf(out_, "fill_pcb_pad(gc, pad->name=%s, clip=%s, mask=%s)\n", pad->Name, clip ? "true" : "false", mask ? "true" : "false"); delegatee_->fill_pcb_pad(gc, pad, clip, mask); } -static void log_thindraw_pcb_pad(hidGC gc, PadType *pad, pcb_bool clip, pcb_bool mask) { +static void log_thindraw_pcb_pad(hidGC gc, pcb_pad_t *pad, pcb_bool clip, pcb_bool mask) { pcb_fprintf(out_, "thindraw_pcb_pad(gc, pad->name=%s, clip=%s, mask=%s)\n", pad->Name, clip ? "true" : "false", mask ? "true" : "false"); delegatee_->thindraw_pcb_pad(gc, pad, clip, mask); Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 4769) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 4770) @@ -97,7 +97,7 @@ } /* returns 0 on succes */ -static int proc_short(PinType * pin, PadType * pad, int ignore) +static int proc_short(PinType * pin, pcb_pad_t * pad, int ignore) { find_callback_t old_cb; Coord x, y; @@ -180,7 +180,7 @@ break; case PCB_TYPE_PAD: typ = "pad"; - parent = ((PadType *) (n->to))->Element; + parent = ((pcb_pad_t *) (n->to))->Element; break; case PCB_TYPE_LINE: typ = "line"; @@ -239,7 +239,7 @@ if (n->to_type == PCB_TYPE_PIN) spare = ((PinType *) n->to)->Spare; if (n->to_type == PCB_TYPE_PAD) - spare = ((PadType *) n->to)->Spare; + spare = ((pcb_pad_t *) n->to)->Spare; if (spare != NULL) { void *net = &(((LibraryMenuTypePtr) spare)->Name[2]); debprintf(" net=%s\n", net); @@ -339,7 +339,7 @@ struct pinpad_s { int ignore; /* if 1, changed our mind, do not check */ PinType *pin; - PadType *pad; + pcb_pad_t *pad; const char *with_net; /* the name of the net this pin/pad is in short with */ pinpad_t *next; }; @@ -346,7 +346,7 @@ static pinpad_t *shorts = NULL; -void rat_found_short(PinType * pin, PadType * pad, const char *with_net) +void rat_found_short(PinType * pin, pcb_pad_t * pad, const char *with_net) { pinpad_t *pp; pp = malloc(sizeof(pinpad_t)); Index: trunk/src_plugins/mincut/rats_mincut.h =================================================================== --- trunk/src_plugins/mincut/rats_mincut.h (revision 4769) +++ trunk/src_plugins/mincut/rats_mincut.h (revision 4770) @@ -23,5 +23,5 @@ * */ -void rat_found_short(PinType * pin, PadType * pad, const char *with_net); +void rat_found_short(PinType * pin, pcb_pad_t * pad, const char *with_net); void rat_proc_shorts(void); Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4769) +++ trunk/src_plugins/propedit/propsel.c (revision 4770) @@ -155,7 +155,7 @@ map_attr(ctx, &pin->Attributes); } -static void map_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, PadType *pad) +static void map_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_pad_t *pad) { map_chk_skip(ctx, pad); map_add_prop(ctx, "p/pad/mask", Coord, pad->Mask); @@ -377,7 +377,7 @@ ChangeObject2ndSize(PCB_TYPE_PIN, pin->Element, pin, NULL, st->c, st->c_absolute, pcb_false)) DONE; } -static void set_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, PadType *pad) +static void set_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_pad_t *pad) { set_ctx_t *st = (set_ctx_t *)ctx; const char *pn = st->name + 6; @@ -534,7 +534,7 @@ del_attr(ctx, &pin->Attributes); } -static void del_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, PadType *pad) +static void del_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_pad_t *pad) { map_chk_skip(ctx, pad); del_attr(ctx, &pad->Attributes); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4769) +++ trunk/src_plugins/puller/puller.c (revision 4770) @@ -793,7 +793,7 @@ return R_DIR_NOT_FOUND; } -static r_dir_t check_point_in_pad(PadTypePtr pad, int x, int y, End * e) +static r_dir_t check_point_in_pad(pcb_pad_t *pad, int x, int y, End * e) { int inside_p; int t; @@ -840,7 +840,7 @@ static r_dir_t find_pair_padline_callback(const pcb_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *) b; - PadTypePtr pad = (PadTypePtr) cl; + pcb_pad_t *pad = (pcb_pad_t *) cl; Extra *e = LINE2EXTRA(line); int hits; double t; @@ -898,7 +898,7 @@ static r_dir_t find_pair_padarc_callback(const pcb_box_t * b, void *cl) { pcb_arc_t *arc = (pcb_arc_t *) b; - PadTypePtr pad = (PadTypePtr) cl; + pcb_pad_t *pad = (pcb_pad_t *) cl; Extra *e = ARC2EXTRA(arc); int hits; @@ -1575,7 +1575,7 @@ static r_dir_t gp_pad_cb(const pcb_box_t * b, void *cb) { - const PadTypePtr p = (PadTypePtr) b; + const pcb_pad_t *p = (pcb_pad_t *) b; int t2 = (p->Thickness + 1) / 2; if (p == start_pinpad || p == end_pinpad) Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4769) +++ trunk/src_plugins/query/query_access.c (revision 4770) @@ -96,7 +96,7 @@ APPEND(ctx, PCB_OBJ_PIN, pin, PCB_PARENT_ELEMENT, element); } -static void list_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, PadType *pad) +static void list_epad_cb(void *ctx, pcb_board_t *pcb, ElementType *element, pcb_pad_t *pad) { APPEND(ctx, PCB_OBJ_PAD, pad, PCB_PARENT_ELEMENT, element); } @@ -624,7 +624,7 @@ static int field_pad(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - PadType *p = obj->data.pad; + pcb_pad_t *p = obj->data.pad; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4769) +++ trunk/src_plugins/report/report.c (revision 4770) @@ -324,7 +324,7 @@ case PCB_TYPE_PAD: { Coord len; - PadTypePtr Pad; + pcb_pad_t *Pad; ElementTypePtr element; #ifndef NDEBUG if (gui->shift_is_pressed()) { @@ -332,7 +332,7 @@ return 0; } #endif - Pad = (PadTypePtr) ptr2; + Pad = (pcb_pad_t *) ptr2; element = (ElementTypePtr) ptr1; PAD_LOOP(element); @@ -772,8 +772,8 @@ net_found = 1; break; case PCB_TYPE_PAD: - x = ((PadType *) (conn.ptr2))->Point1.X; - y = ((PadType *) (conn.ptr2))->Point1.Y; + x = ((pcb_pad_t *) (conn.ptr2))->Point1.X; + y = ((pcb_pad_t *) (conn.ptr2))->Point1.Y; net_found = 1; break; } Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 4769) +++ trunk/src_plugins/teardrops/teardrops.c (revision 4770) @@ -37,7 +37,7 @@ /* #define MAX_DISTANCE 1000000 */ static PinType *pin; -static PadType *pad; +static pcb_pad_t *pad; static int layer; static int px, py; static Coord thickness; @@ -245,7 +245,7 @@ /*! * \brief Draw teardrops for pads. */ -static void check_pad(PadType * _pad) +static void check_pad(pcb_pad_t * _pad) { pad = _pad; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4769) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4770) @@ -306,7 +306,7 @@ drawing_context_t *dc = (drawing_context_t *) data; toporouter_vertex_t *tv; PinType *pin; - PadType *pad; + pcb_pad_t *pad; gdouble blue; if (TOPOROUTER_IS_VERTEX((GtsObject *) item)) { @@ -335,7 +335,7 @@ if (!dc->mode) { if (tv->bbox) { pin = (PinType *) tv->bbox->data; - pad = (PadType *) tv->bbox->data; + pad = (pcb_pad_t *) tv->bbox->data; blue = 0.0f; switch (tv->bbox->type) { @@ -605,7 +605,7 @@ return ((PinType *) box->data)->Thickness; } else if (box->type == PAD) { - PadType *pad = (PadType *) box->data; + pcb_pad_t *pad = (pcb_pad_t *) box->data; if (pad->Point1.X == pad->Point2.X && pad->Point1.Y == pad->Point2.Y && !TEST_FLAG(PCB_FLAG_SQUARE, pad)) { return pad->Thickness; } @@ -646,7 +646,7 @@ /* if(box->type == PIN || box->type == VIA) return ((PinType *)box->data)->Clearance; else if(box->type == PAD) - return ((PadType *)box->data)->Clearance; */ + return ((pcb_pad_t *)box->data)->Clearance; */ } @@ -1749,7 +1749,7 @@ return gts_point_new(gts_point_class(), (a->x + b->x) / 2., (a->y + b->y) / 2., 0.); } -static inline gdouble pad_rad(PadType * pad) +static inline gdouble pad_rad(pcb_pad_t * pad) { return (lookup_thickness(pad->Name) / 2.) + lookup_clearance(pad->Name); } @@ -2725,7 +2725,7 @@ #endif } else if (connection->type == PCB_TYPE_PAD) { - PadType *pad = (PadType *) connection->ptr2; + pcb_pad_t *pad = (pcb_pad_t *) connection->ptr2; toporouter_bbox_t *box = toporouter_bbox_locate(r, PAD, pad, connection->X, connection->Y, connection->group); cluster_join_bbox(cluster, box); @@ -8151,8 +8151,8 @@ PinTypePtr via; pcb_line_t *line; - PadType *pad0 = element->Pad->data; - PadType *pad1 = g_list_next(element->Pad)->data; + pcb_pad_t *pad0 = element->Pad->data; + pcb_pad_t *pad1 = g_list_next(element->Pad)->data; pitch = sqrt(pow(abs(pad0->Point1.X - pad1->Point1.X), 2) + pow(abs(pad0->Point1.Y - pad1->Point1.Y), 2)); length = sqrt(pow(pitch, 2) + pow(pitch, 2)) / 2.;