Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4756) +++ trunk/src/action_helper.c (revision 4757) @@ -224,7 +224,7 @@ * some local identifiers */ static PointType InsertedPoint; -LayerTypePtr lastLayer; +pcb_layer_t *lastLayer; static struct { PolygonTypePtr poly; LineType line; @@ -1043,7 +1043,7 @@ */ SaveUndoSerialNumber(); Flags = ((PolygonType *) Crosshair.AttachedObject.Ptr2)->Flags; - PolyToPolygonsOnLayer(PCB->Data, (LayerType *) Crosshair.AttachedObject.Ptr1, result, Flags); + PolyToPolygonsOnLayer(PCB->Data, (pcb_layer_t *) Crosshair.AttachedObject.Ptr1, result, Flags); RemoveObject(PCB_TYPE_POLYGON, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3); RestoreUndoSerialNumber(); Index: trunk/src/action_helper.h =================================================================== --- trunk/src/action_helper.h (revision 4756) +++ trunk/src/action_helper.h (revision 4757) @@ -50,7 +50,7 @@ extern int defer_updates; extern int defer_needs_update; -extern LayerTypePtr lastLayer; +extern pcb_layer_t *lastLayer; void NotifyLine(void); void NotifyBlock(void); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4756) +++ trunk/src/buffer.c (revision 4757) @@ -406,7 +406,7 @@ return; } for (i = 0; i < max_copper_layer + 2; i++) { - LayerTypePtr layer = Buffer->Data->Layer + i; + pcb_layer_t *layer = Buffer->Data->Layer + i; if (textlist_length(&layer->Text)) { Message(PCB_MSG_DEFAULT, _("You can't mirror a buffer that has text!\n")); return; @@ -460,7 +460,7 @@ { int j, k; pcb_cardinal_t sgroup, cgroup; - LayerType swap; + pcb_layer_t swap; ELEMENT_LOOP(Buffer->Data); { Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4756) +++ trunk/src/change.c (revision 4757) @@ -363,7 +363,7 @@ /* --------------------------------------------------------------------------- * changes the name of a layer; memory has to be already allocated */ -pcb_bool ChangeLayerName(LayerTypePtr Layer, char *Name) +pcb_bool ChangeLayerName(pcb_layer_t *Layer, char *Name) { free((char*)CURRENT->Name); CURRENT->Name = Name; Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 4756) +++ trunk/src/change.h (revision 4757) @@ -67,7 +67,7 @@ (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_PAD) pcb_bool ChangeLayoutName(char *); -pcb_bool ChangeLayerName(LayerTypePtr, char *); +pcb_bool ChangeLayerName(pcb_layer_t *, char *); pcb_bool ChangeSelectedSize(int, Coord, pcb_bool); pcb_bool ChangeSelectedClearSize(int, Coord, pcb_bool); pcb_bool ChangeSelected2ndSize(int, Coord, pcb_bool); Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 4756) +++ trunk/src/copy.c (revision 4757) @@ -78,7 +78,7 @@ /* paste all layers */ for (i = 0; i < max_copper_layer + 2; i++) { - LayerTypePtr sourcelayer = &PASTEBUFFER->Data->Layer[i], destlayer = LAYER_PTR(i); + pcb_layer_t *sourcelayer = &PASTEBUFFER->Data->Layer[i], *destlayer = LAYER_PTR(i); if (destlayer->On) { changed = changed || (!LAYER_IS_EMPTY(sourcelayer)); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4756) +++ trunk/src/crosshair.c (revision 4757) @@ -286,7 +286,7 @@ /* draw all visible layers */ for (i = 0; i < max_copper_layer + 2; i++) if (PCB->Data->Layer[i].On) { - LayerTypePtr layer = &Buffer->Data->Layer[i]; + pcb_layer_t *layer = &Buffer->Data->Layer[i]; LINE_LOOP(layer); { @@ -829,7 +829,7 @@ info.Y = Y; for (i = 0; i < max_copper_layer; i++) { - LayerType *layer = &PCB->Data->Layer[i]; + pcb_layer_t *layer = &PCB->Data->Layer[i]; /* Only find points of arcs and lines on currently visible layers. */ if (!layer->On) continue; @@ -1044,7 +1044,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; - LayerType *desired_layer; + pcb_layer_t *desired_layer; pcb_cardinal_t desired_group; pcb_cardinal_t SLayer, CLayer; int found_our_layer = pcb_false; @@ -1051,7 +1051,7 @@ desired_layer = CURRENT; if (conf_core.editor.mode == PCB_MODE_MOVE && Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT) { - desired_layer = (LayerType *) Crosshair.AttachedObject.Ptr1; + desired_layer = (pcb_layer_t *) Crosshair.AttachedObject.Ptr1; } /* find layer groups of the component side and solder side */ Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4756) +++ trunk/src/data.c (revision 4757) @@ -180,7 +180,7 @@ */ void FreeDataMemory(pcb_data_t * data) { - LayerTypePtr layer; + pcb_layer_t *layer; int i; if (data == NULL) Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 4756) +++ trunk/src/data.h (revision 4757) @@ -47,7 +47,7 @@ rtree_t *via_tree, *element_tree, *pin_tree, *pad_tree, *name_tree[3], /* for element names */ *rat_tree; pcb_board_t *pcb; - LayerType Layer[MAX_LAYER + 2]; /* add 2 silkscreen layers */ + pcb_layer_t Layer[MAX_LAYER + 2]; /* add 2 silkscreen layers */ plug_io_t *loader; ratlist_t Rat; }; @@ -88,11 +88,11 @@ */ /* layer object callbacks */ -typedef int (*pcb_layer_cb_t)(void *ctx, pcb_board_t *pcb, LayerType *layer, int enter); -typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, LayerType *layer, LineType *line); -typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, LayerType *layer, ArcType *arc); -typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, LayerType *layer, TextType *text); -typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, LayerType *layer, PolygonType *poly); +typedef int (*pcb_layer_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter); +typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line); +typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc); +typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text); +typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly); /* element callbacks */ typedef int (*pcb_element_cb_t)(void *ctx, pcb_board_t *pcb, ElementType *element, int enter); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4756) +++ trunk/src/draw.c (revision 4757) @@ -191,7 +191,7 @@ memset(do_group, 0, sizeof(do_group)); for (ngroups = 0, i = 0; i < max_copper_layer; i++) { - LayerType *l = LAYER_ON_STACK(i); + pcb_layer_t *l = LAYER_ON_STACK(i); int group = GetLayerGroupNumberByNumber(LayerStack[i]); if (l->On && !do_group[group]) { do_group[group] = 1; @@ -431,7 +431,7 @@ gui->use_mask(HID_MASK_OFF); } -void DrawLayer(LayerTypePtr Layer, const BoxType * screen) +void DrawLayer(pcb_layer_t *Layer, const BoxType * screen) { struct draw_poly_info info; @@ -472,7 +472,7 @@ { int i, rv = 1; int layernum; - LayerTypePtr Layer; + pcb_layer_t *Layer; int n_entries = PCB->LayerGroups.Number[group]; pcb_cardinal_t *layers = PCB->LayerGroups.Entries[group]; @@ -500,7 +500,7 @@ break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: - EraseText((LayerTypePtr) lptr, (TextTypePtr) ptr); + EraseText((pcb_layer_t *) lptr, (TextTypePtr) ptr); break; case PCB_TYPE_POLYGON: ErasePolygon((PolygonTypePtr) ptr); @@ -534,20 +534,20 @@ DrawVia((PinTypePtr) ptr2); break; case PCB_TYPE_LINE: - if (((LayerTypePtr) ptr1)->On) - DrawLine((LayerTypePtr) ptr1, (LineTypePtr) ptr2); + if (((pcb_layer_t *) ptr1)->On) + DrawLine((pcb_layer_t *) ptr1, (LineTypePtr) ptr2); break; case PCB_TYPE_ARC: - if (((LayerTypePtr) ptr1)->On) - DrawArc((LayerTypePtr) ptr1, (ArcTypePtr) ptr2); + if (((pcb_layer_t *) ptr1)->On) + DrawArc((pcb_layer_t *) ptr1, (ArcTypePtr) ptr2); break; case PCB_TYPE_TEXT: - if (((LayerTypePtr) ptr1)->On) - DrawText((LayerTypePtr) ptr1, (TextTypePtr) ptr2); + if (((pcb_layer_t *) ptr1)->On) + DrawText((pcb_layer_t *) ptr1, (TextTypePtr) ptr2); break; case PCB_TYPE_POLYGON: - if (((LayerTypePtr) ptr1)->On) - DrawPolygon((LayerTypePtr) ptr1, (PolygonTypePtr) ptr2); + if (((pcb_layer_t *) ptr1)->On) + DrawPolygon((pcb_layer_t *) ptr1, (PolygonTypePtr) ptr2); break; case PCB_TYPE_ELEMENT: if (PCB->ElementOn && (FRONT((ElementTypePtr) ptr2) || PCB->InvisibleObjectsOn)) Index: trunk/src/draw.h =================================================================== --- trunk/src/draw.h (revision 4756) +++ trunk/src/draw.h (revision 4757) @@ -79,7 +79,7 @@ void Draw(void); void Redraw(void); void DrawObject(int, void *, void *); -void DrawLayer(LayerTypePtr, const BoxType *); +void DrawLayer(pcb_layer_t *, const BoxType *); void EraseObject(int, void *, void *); #endif Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4756) +++ trunk/src/find_drc.c (revision 4757) @@ -223,7 +223,7 @@ } /* DRC clearance callback */ -static r_dir_t drc_callback(pcb_data_t *data, LayerTypePtr layer, PolygonTypePtr polygon, int type, void *ptr1, void *ptr2) +static r_dir_t drc_callback(pcb_data_t *data, pcb_layer_t *layer, PolygonTypePtr polygon, int type, void *ptr1, void *ptr2) { const char *message; Coord x, y; @@ -835,7 +835,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_POLYGON: - ChangeGroupVisibility(GetLayerNumber(PCB->Data, (LayerTypePtr) thing_ptr1), pcb_true, pcb_true); + ChangeGroupVisibility(GetLayerNumber(PCB->Data, (pcb_layer_t *) thing_ptr1), pcb_true, pcb_true); } CenterDisplay(X, Y); } Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4756) +++ trunk/src/find_lookup.c (revision 4757) @@ -237,7 +237,7 @@ /* initialize line arc and polygon data */ for (i = 0; i < max_copper_layer; i++) { - LayerTypePtr layer = LAYER_PTR(i); + pcb_layer_t *layer = LAYER_PTR(i); if (linelist_length(&layer->Line)) { LineList[i].Size = linelist_length(&layer->Line); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4756) +++ trunk/src/find_misc.c (revision 4757) @@ -49,7 +49,7 @@ int layer; for (layer = 0; layer < max_copper_layer; layer++) { - LayerTypePtr l = LAYER_PTR(layer); + pcb_layer_t *l = LAYER_PTR(layer); l->no_drc = AttributeGet(l, "PCB::skip-drc") != NULL; } } @@ -169,7 +169,7 @@ case PCB_TYPE_LINE: { int layer = GetLayerNumber(PCB->Data, - (LayerTypePtr) ptr1); + (pcb_layer_t *) ptr1); if (ADD_LINE_TO_LIST(layer, (LineTypePtr) ptr2, 0, NULL, FCT_START)) return pcb_true; @@ -179,7 +179,7 @@ case PCB_TYPE_ARC: { int layer = GetLayerNumber(PCB->Data, - (LayerTypePtr) ptr1); + (pcb_layer_t *) ptr1); if (ADD_ARC_TO_LIST(layer, (ArcTypePtr) ptr2, 0, NULL, FCT_START)) return pcb_true; @@ -189,7 +189,7 @@ case PCB_TYPE_POLYGON: { int layer = GetLayerNumber(PCB->Data, - (LayerTypePtr) ptr1); + (pcb_layer_t *) ptr1); if (ADD_POLYGON_TO_LIST(layer, (PolygonTypePtr) ptr2, 0, NULL, FCT_START)) return pcb_true; @@ -231,10 +231,10 @@ return; if (type & SILK_TYPE) { int laynum = GetLayerNumber(PCB->Data, - (LayerTypePtr) ptr1); + (pcb_layer_t *) ptr1); /* don't mess with non-conducting objects! */ - if (laynum >= max_copper_layer || ((LayerTypePtr) ptr1)->no_drc) + if (laynum >= max_copper_layer || ((pcb_layer_t *) ptr1)->no_drc) return; } } Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4756) +++ trunk/src/global_typedefs.h (revision 4757) @@ -27,7 +27,7 @@ typedef struct pcb_board_s pcb_board_t; typedef struct pcb_data_s pcb_data_t; typedef struct pcb_layer_group_s pcb_layer_group_t; -typedef struct pcb_layer_s LayerType, *LayerTypePtr; +typedef struct pcb_layer_s pcb_layer_t; typedef struct pcb_buffer_s BufferType, *BufferTypePtr; typedef struct pcb_net_s NetType, *NetTypePtr; typedef struct pcb_connection_s ConnectionType, *ConnectionTypePtr; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4756) +++ trunk/src/gui_act.c (revision 4757) @@ -1133,7 +1133,7 @@ { void *ptr1, *ptr2, *ptr3; int type; - LayerTypePtr layer = CURRENT; + pcb_layer_t *layer = CURRENT; type = SearchScreen(x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3); /* set layer current and size from line or arc */ @@ -1141,7 +1141,7 @@ case PCB_TYPE_LINE: notify_crosshair_change(pcb_false); set_same_(((LineTypePtr) ptr2)->Thickness, 0, 0, ((LineTypePtr) ptr2)->Clearance / 2, NULL); - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; if (conf_core.editor.mode != PCB_MODE_LINE) SetMode(PCB_MODE_LINE); notify_crosshair_change(pcb_true); @@ -1151,7 +1151,7 @@ case PCB_TYPE_ARC: notify_crosshair_change(pcb_false); set_same_(((ArcTypePtr) ptr2)->Thickness, 0, 0, ((ArcTypePtr) ptr2)->Clearance / 2, NULL); - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; if (conf_core.editor.mode != PCB_MODE_ARC) SetMode(PCB_MODE_ARC); notify_crosshair_change(pcb_true); @@ -1159,7 +1159,7 @@ break; case PCB_TYPE_POLYGON: - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; break; case PCB_TYPE_VIA: Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 4756) +++ trunk/src/layer.c (revision 4757) @@ -46,7 +46,7 @@ } SavedStack; -pcb_bool IsLayerEmpty(LayerTypePtr layer) +pcb_bool IsLayerEmpty(pcb_layer_t *layer) { return LAYER_IS_EMPTY(layer); } @@ -158,7 +158,7 @@ /* --------------------------------------------------------------------------- * returns the layer number for the passed pointer */ -int GetLayerNumber(pcb_data_t *Data, LayerTypePtr Layer) +int GetLayerNumber(pcb_data_t *Data, pcb_layer_t *Layer) { int i; @@ -344,7 +344,7 @@ /* --------------------------------------------------------------------------- * returns the layergroup number for the passed pointer */ -int GetLayerGroupNumberByPointer(LayerTypePtr Layer) +int GetLayerGroupNumberByPointer(pcb_layer_t *Layer) { return (GetLayerGroupNumberByNumber(GetLayerNumber(PCB->Data, Layer))); } Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 4756) +++ trunk/src/layer.h (revision 4757) @@ -57,7 +57,7 @@ }; /* Returns pcb_true if the given layer is empty (there are no objects on the layer) */ -pcb_bool IsLayerEmpty(LayerTypePtr); +pcb_bool IsLayerEmpty(pcb_layer_t *); pcb_bool IsLayerNumEmpty(int); /* Returns pcb_true if all layers in a group are empty */ @@ -68,8 +68,8 @@ int ParseGroupString(const char *, pcb_layer_group_t *, int /* LayerN */ ); -int GetLayerNumber(pcb_data_t *, LayerTypePtr); -int GetLayerGroupNumberByPointer(LayerTypePtr); +int GetLayerNumber(pcb_data_t *, pcb_layer_t *); +int GetLayerGroupNumberByPointer(pcb_layer_t *); int GetLayerGroupNumberByNumber(pcb_cardinal_t); int GetGroupOfLayer(int); int ChangeGroupVisibility(int, pcb_bool, pcb_bool); @@ -131,7 +131,7 @@ pcb_cardinal_t entry; \ for (entry = 0; entry < ((pcb_board_t *)(data->pcb))->LayerGroups.Number[(group)]; entry++) \ { \ - LayerTypePtr layer; \ + pcb_layer_t *layer; \ pcb_cardinal_t number; \ number = ((pcb_board_t *)(data->pcb))->LayerGroups.Entries[(group)][entry]; \ if (number >= max_copper_layer) \ @@ -142,7 +142,7 @@ pcb_cardinal_t n; \ for (n = 0; n < ml; n++) \ { \ - LayerTypePtr layer = (&data->Layer[(n)]); + pcb_layer_t *layer = (&data->Layer[(n)]); #define LAYER_IS_EMPTY(layer) LAYER_IS_EMPTY_((layer)) Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 4756) +++ trunk/src/move.c (revision 4757) @@ -131,7 +131,7 @@ * moves the object identified by its data pointers and the type * to a new layer without changing it's position */ -void *MoveObjectToLayer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, LayerTypePtr Target, pcb_bool enmasse) +void *MoveObjectToLayer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_layer_t *Target, pcb_bool enmasse) { void *result; pcb_opctx_t ctx; @@ -149,7 +149,7 @@ * moves the selected objects to a new layer without changing their * positions */ -pcb_bool MoveSelectedObjectsToLayer(LayerTypePtr Target) +pcb_bool MoveSelectedObjectsToLayer(pcb_layer_t *Target) { pcb_bool changed; pcb_opctx_t ctx; @@ -231,7 +231,7 @@ int MoveLayer(int old_index, int new_index) { int groups[MAX_LAYER + 2], l, g; - LayerType saved_layer; + pcb_layer_t saved_layer; int saved_group; AddLayerChangeToUndoList(old_index, new_index); @@ -266,7 +266,7 @@ groups[PCB->LayerGroups.Entries[g][l]] = g; if (old_index == -1) { - LayerTypePtr lp; + pcb_layer_t *lp; if (max_copper_layer == MAX_LAYER) { Message(PCB_MSG_DEFAULT, "No room for new layers\n"); return 1; @@ -274,10 +274,10 @@ /* Create a new layer at new_index. */ lp = &PCB->Data->Layer[new_index]; memmove(&PCB->Data->Layer[new_index + 1], - &PCB->Data->Layer[new_index], (max_copper_layer - new_index + 2) * sizeof(LayerType)); + &PCB->Data->Layer[new_index], (max_copper_layer - new_index + 2) * sizeof(pcb_layer_t)); memmove(&groups[new_index + 1], &groups[new_index], (max_copper_layer - new_index + 2) * sizeof(int)); max_copper_layer++; - memset(lp, 0, sizeof(LayerType)); + memset(lp, 0, sizeof(pcb_layer_t)); lp->On = 1; lp->Name = pcb_strdup("New Layer"); lp->Color = conf_core.appearance.color.layer[new_index]; @@ -290,8 +290,8 @@ else if (new_index == -1) { /* Delete the layer at old_index */ memmove(&PCB->Data->Layer[old_index], - &PCB->Data->Layer[old_index + 1], (max_copper_layer - old_index + 2 - 1) * sizeof(LayerType)); - memset(&PCB->Data->Layer[max_copper_layer + 1], 0, sizeof(LayerType)); + &PCB->Data->Layer[old_index + 1], (max_copper_layer - old_index + 2 - 1) * sizeof(pcb_layer_t)); + memset(&PCB->Data->Layer[max_copper_layer + 1], 0, sizeof(pcb_layer_t)); memmove(&groups[old_index], &groups[old_index + 1], (max_copper_layer - old_index + 2 - 1) * sizeof(int)); for (l = 0; l < max_copper_layer; l++) if (LayerStack[l] == old_index) @@ -303,17 +303,17 @@ } else { /* Move an existing layer */ - memcpy(&saved_layer, &PCB->Data->Layer[old_index], sizeof(LayerType)); + memcpy(&saved_layer, &PCB->Data->Layer[old_index], sizeof(pcb_layer_t)); saved_group = groups[old_index]; if (old_index < new_index) { - memmove(&PCB->Data->Layer[old_index], &PCB->Data->Layer[old_index + 1], (new_index - old_index) * sizeof(LayerType)); + memmove(&PCB->Data->Layer[old_index], &PCB->Data->Layer[old_index + 1], (new_index - old_index) * sizeof(pcb_layer_t)); memmove(&groups[old_index], &groups[old_index + 1], (new_index - old_index) * sizeof(int)); } else { - memmove(&PCB->Data->Layer[new_index + 1], &PCB->Data->Layer[new_index], (old_index - new_index) * sizeof(LayerType)); + memmove(&PCB->Data->Layer[new_index + 1], &PCB->Data->Layer[new_index], (old_index - new_index) * sizeof(pcb_layer_t)); memmove(&groups[new_index + 1], &groups[new_index], (old_index - new_index) * sizeof(int)); } - memcpy(&PCB->Data->Layer[new_index], &saved_layer, sizeof(LayerType)); + memcpy(&PCB->Data->Layer[new_index], &saved_layer, sizeof(pcb_layer_t)); groups[new_index] = saved_group; } Index: trunk/src/move.h =================================================================== --- trunk/src/move.h (revision 4756) +++ trunk/src/move.h (revision 4757) @@ -51,9 +51,9 @@ * prototypes */ void *MoveObject(int, void *, void *, void *, Coord, Coord); -void *MoveObjectToLayer(int, void *, void *, void *, LayerTypePtr, pcb_bool); +void *MoveObjectToLayer(int, void *, void *, void *, pcb_layer_t *, pcb_bool); void *MoveObjectAndRubberband(int, void *, void *, void *, Coord, Coord); -pcb_bool MoveSelectedObjectsToLayer(LayerTypePtr); +pcb_bool MoveSelectedObjectsToLayer(pcb_layer_t *); /* index is 0..MAX_LAYER-1. If old_index is -1, a new layer is inserted at that index. If new_index is -1, the specified layer is Index: trunk/src/obj_any.h =================================================================== --- trunk/src/obj_any.h (revision 4756) +++ trunk/src/obj_any.h (revision 4757) @@ -89,13 +89,13 @@ PinType *via; ElementType *element; NetType *net; - LayerType *layer; + pcb_layer_t *layer; } data; pcb_parenttype_t parent_type; union { void *any; - LayerType *layer; + pcb_layer_t *layer; pcb_data_t *data; ElementType *element; } parent; Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4756) +++ trunk/src/obj_arc.c (revision 4757) @@ -45,7 +45,7 @@ #include "obj_arc_draw.h" -ArcTypePtr GetArcMemory(LayerType * layer) +ArcTypePtr GetArcMemory(pcb_layer_t * layer) { ArcType *new_obj; @@ -141,7 +141,7 @@ } /* doesn't these belong in change.c ?? */ -void ChangeArcAngles(LayerTypePtr Layer, ArcTypePtr a, Angle new_sa, Angle new_da) +void ChangeArcAngles(pcb_layer_t *Layer, ArcTypePtr a, Angle new_sa, Angle new_da) { if (new_da >= 360) { new_da = 360; @@ -158,7 +158,7 @@ } -void ChangeArcRadii(LayerTypePtr Layer, ArcTypePtr a, Coord new_width, Coord new_height) +void ChangeArcRadii(pcb_layer_t *Layer, ArcTypePtr a, Coord new_width, Coord new_height) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, a); r_delete_entry(Layer->arc_tree, (BoxTypePtr) a); @@ -172,7 +172,7 @@ /* creates a new arc on a layer */ -ArcType *CreateNewArcOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags) +ArcType *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags) { ArcTypePtr Arc; @@ -201,7 +201,7 @@ return (Arc); } -void pcb_add_arc_on_layer(LayerType *Layer, ArcType *Arc) +void pcb_add_arc_on_layer(pcb_layer_t *Layer, ArcType *Arc) { SetArcBoundingBox(Arc); if (!Layer->arc_tree) @@ -221,9 +221,9 @@ /***** operations *****/ /* copies an arc to buffer */ -void *AddArcToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { - LayerTypePtr layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; + pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; return (CreateNewArcOnLayer(layer, Arc->X, Arc->Y, Arc->Width, Arc->Height, Arc->StartAngle, Arc->Delta, @@ -231,9 +231,9 @@ } /* moves an arc to buffer */ -void *MoveArcToBuffer(pcb_opctx_t *ctx, LayerType * layer, ArcType * arc) +void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, ArcType * arc) { - LayerType *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; + pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; RestoreToPolygon(ctx->buffer.src, PCB_TYPE_ARC, layer, arc); r_delete_entry(layer->arc_tree, (BoxType *) arc); @@ -251,7 +251,7 @@ } /* changes the size of an arc */ -void *ChangeArcSize(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Thickness + ctx->chgsize.delta; @@ -273,7 +273,7 @@ } /* changes the clearance size of an arc */ -void *ChangeArcClearSize(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Clearance + ctx->chgsize.delta; @@ -300,7 +300,7 @@ } /* changes the radius of an arc (is_primary 0=width or 1=height or 2=both) */ -void *ChangeArcRadius(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { Coord value, *dst; void *a0, *a1; @@ -337,7 +337,7 @@ } /* changes the angle of an arc (is_primary 0=start or 1=end) */ -void *ChangeArcAngle(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { Angle value, *dst; void *a0, *a1; @@ -377,7 +377,7 @@ } /* changes the clearance flag of an arc */ -void *ChangeArcJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) return (NULL); @@ -397,7 +397,7 @@ } /* sets the clearance flag of an arc */ -void *SetArcJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) return (NULL); @@ -405,7 +405,7 @@ } /* clears the clearance flag of an arc */ -void *ClrArcJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) return (NULL); @@ -413,7 +413,7 @@ } /* copies an arc */ -void *CopyArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { ArcTypePtr arc; @@ -428,7 +428,7 @@ } /* moves an arc */ -void *MoveArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); r_delete_entry(Layer->arc_tree, (BoxType *) Arc); @@ -447,7 +447,7 @@ } /* moves an arc between layers; lowlevel routines */ -void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, ArcType * arc, LayerType * Destination) +void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, ArcType * arc, pcb_layer_t * Destination) { r_delete_entry(Source->arc_tree, (BoxType *) arc); @@ -462,7 +462,7 @@ /* moves an arc between layers */ -void *MoveArcToLayer(pcb_opctx_t *ctx, LayerType * Layer, ArcType * Arc) +void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, ArcType * Arc) { ArcTypePtr newone; @@ -489,7 +489,7 @@ } /* destroys an arc from a layer */ -void *DestroyArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { r_delete_entry(Layer->arc_tree, (BoxTypePtr) Arc); @@ -499,7 +499,7 @@ } /* removes an arc from a layer */ -void *RemoveArc_op(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { /* erase from screen */ if (Layer->On) { @@ -511,7 +511,7 @@ return NULL; } -void *RemoveArc(LayerTypePtr Layer, ArcTypePtr Arc) +void *RemoveArc(pcb_layer_t *Layer, ArcTypePtr Arc) { pcb_opctx_t ctx; @@ -541,7 +541,7 @@ } /* rotates an arc */ -void *RotateArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc) +void *RotateArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc) { EraseArc(Arc); r_delete_entry(Layer->arc_tree, (BoxTypePtr) Arc); @@ -567,7 +567,7 @@ gui->draw_arc(Output.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta); } -void draw_arc(LayerType * layer, ArcType * arc) +void draw_arc(pcb_layer_t * layer, ArcType * arc) { const char *color; char buf[sizeof("#XXXXXX")]; @@ -594,7 +594,7 @@ r_dir_t draw_arc_callback(const BoxType * b, void *cl) { - draw_arc((LayerTypePtr) cl, (ArcTypePtr) b); + draw_arc((pcb_layer_t *) cl, (ArcTypePtr) b); return R_DIR_FOUND_CONTINUE; } @@ -607,7 +607,7 @@ EraseFlags(&Arc->Flags); } -void DrawArc(LayerTypePtr Layer, ArcTypePtr Arc) +void DrawArc(pcb_layer_t *Layer, ArcTypePtr Arc) { pcb_draw_invalidate(Arc); } Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4756) +++ trunk/src/obj_arc.h (revision 4757) @@ -42,7 +42,7 @@ /*** Memory ***/ -ArcTypePtr GetArcMemory(LayerTypePtr); +ArcTypePtr GetArcMemory(pcb_layer_t *); ArcType *GetElementArcMemory(ElementType *Element); void RemoveFreeArc(ArcType *data); @@ -49,13 +49,13 @@ /*** Utility ***/ void SetArcBoundingBox(ArcTypePtr Arc); BoxTypePtr GetArcEnds(ArcTypePtr Arc); -void ChangeArcAngles(LayerTypePtr Layer, ArcTypePtr a, Angle new_sa, Angle new_da); -void ChangeArcRadii(LayerTypePtr Layer, ArcTypePtr a, Coord new_width, Coord new_height); -void *RemoveArc(LayerTypePtr Layer, ArcTypePtr Arc); -ArcType *CreateNewArcOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags); +void ChangeArcAngles(pcb_layer_t *Layer, ArcTypePtr a, Angle new_sa, Angle new_da); +void ChangeArcRadii(pcb_layer_t *Layer, ArcTypePtr a, Coord new_width, Coord new_height); +void *RemoveArc(pcb_layer_t *Layer, ArcTypePtr Arc); +ArcType *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_arc_on_layer(LayerType *Layer, ArcType *Arc); +void pcb_add_arc_on_layer(pcb_layer_t *Layer, ArcType *Arc); void RotateArcLowLevel(ArcTypePtr Arc, Coord X, Coord Y, unsigned Number); @@ -72,7 +72,7 @@ #define ALLARC_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l =0; l < max_copper_layer + 2; l++, layer++) \ { \ ARC_LOOP(layer) @@ -79,7 +79,7 @@ #define COPPERARC_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l =0; l < max_copper_layer; l++, layer++) \ { \ ARC_LOOP(layer) @@ -86,7 +86,7 @@ #define SILKARC_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ layer += max_copper_layer; \ for (l = 0; l < 2; l++, layer++) \ { \ @@ -94,7 +94,7 @@ #define VISIBLEARC_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ if (layer->On) \ Index: trunk/src/obj_arc_draw.h =================================================================== --- trunk/src/obj_arc_draw.h (revision 4756) +++ trunk/src/obj_arc_draw.h (revision 4757) @@ -32,6 +32,6 @@ #endif void _draw_arc(ArcType * arc); -void draw_arc(LayerType * layer, ArcType * arc); +void draw_arc(pcb_layer_t * layer, ArcType * arc); void EraseArc(ArcTypePtr Arc); -void DrawArc(LayerTypePtr Layer, ArcTypePtr Arc); +void DrawArc(pcb_layer_t *Layer, ArcTypePtr Arc); Index: trunk/src/obj_arc_op.h =================================================================== --- trunk/src/obj_arc_op.h (revision 4756) +++ trunk/src/obj_arc_op.h (revision 4757) @@ -28,19 +28,19 @@ #include "operation.h" -void *AddArcToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *MoveArcToBuffer(pcb_opctx_t *ctx, LayerType *layer, ArcType *arc); -void *ChangeArcSize(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *ChangeArcClearSize(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *ChangeArcRadius(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *ChangeArcAngle(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *ChangeArcJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *SetArcJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *ClrArcJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *CopyArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *MoveArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, ArcType * arc, LayerType * Destination); -void *MoveArcToLayer(pcb_opctx_t *ctx, LayerType * Layer, ArcType * Arc); -void *DestroyArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *RemoveArc_op(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); -void *RotateArc(pcb_opctx_t *ctx, LayerTypePtr Layer, ArcTypePtr Arc); +void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *layer, ArcType *arc); +void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, ArcType * arc, pcb_layer_t * Destination); +void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, ArcType * Arc); +void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); +void *RotateArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, ArcTypePtr Arc); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4756) +++ trunk/src/obj_elem.c (revision 4757) @@ -162,7 +162,7 @@ { ElementTypePtr element; pcb_cardinal_t group; - LayerTypePtr clayer, slayer; + pcb_layer_t *clayer, *slayer; if (elementlist_length(&Buffer->Data->Element) != 1) { Message(PCB_MSG_DEFAULT, _("Error! Buffer doesn't contain a single element\n")); Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4756) +++ trunk/src/obj_line.c (revision 4757) @@ -52,7 +52,7 @@ /**** allocation ****/ /* get next slot for a line, allocates memory if necessary */ -LineType *GetLineMemory(LayerType * layer) +LineType *GetLineMemory(pcb_layer_t * layer) { LineType *new_obj; @@ -146,7 +146,7 @@ /* creates a new line on a layer and checks for overlap and extension */ -LineTypePtr CreateDrawnLineOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) +LineTypePtr CreateDrawnLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) { struct line_info info; BoxType search; @@ -191,7 +191,7 @@ return CreateNewLineOnLayer(Layer, X1, Y1, X2, Y2, Thickness, Clearance, Flags); } -LineTypePtr CreateNewLineOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) +LineTypePtr CreateNewLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags) { LineTypePtr Line; @@ -213,7 +213,7 @@ return (Line); } -void pcb_add_line_on_layer(LayerType *Layer, LineType *Line) +void pcb_add_line_on_layer(pcb_layer_t *Layer, LineType *Line) { SetLineBoundingBox(Line); if (!Layer->line_tree) @@ -244,10 +244,10 @@ /*** ops ***/ /* copies a line to buffer */ -void *AddLineToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *AddLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { LineTypePtr line; - LayerTypePtr layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; + pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; line = CreateNewLineOnLayer(layer, Line->Point1.X, Line->Point1.Y, Line->Point2.X, Line->Point2.Y, @@ -258,9 +258,9 @@ } /* moves a line to buffer */ -void *MoveLineToBuffer(pcb_opctx_t *ctx, LayerType * layer, LineType * line) +void *MoveLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, LineType * line) { - LayerTypePtr lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; + pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; RestoreToPolygon(ctx->buffer.src, PCB_TYPE_LINE, layer, line); r_delete_entry(layer->line_tree, (BoxType *) line); @@ -278,7 +278,7 @@ } /* changes the size of a line */ -void *ChangeLineSize(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *ChangeLineSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Line->Thickness + ctx->chgsize.delta; @@ -300,7 +300,7 @@ } /*changes the clearance size of a line */ -void *ChangeLineClearSize(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *ChangeLineClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { Coord value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Line->Clearance + ctx->chgsize.delta; @@ -327,7 +327,7 @@ } /* changes the name of a line */ -void *ChangeLineName(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *ChangeLineName(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { char *old = Line->Number; @@ -337,7 +337,7 @@ } /* changes the clearance flag of a line */ -void *ChangeLineJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { if (TEST_FLAG(PCB_FLAG_LOCK, Line)) return (NULL); @@ -357,7 +357,7 @@ } /* sets the clearance flag of a line */ -void *SetLineJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { if (TEST_FLAG(PCB_FLAG_LOCK, Line) || TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) return (NULL); @@ -365,7 +365,7 @@ } /* clears the clearance flag of a line */ -void *ClrLineJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { if (TEST_FLAG(PCB_FLAG_LOCK, Line) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) return (NULL); @@ -373,7 +373,7 @@ } /* copies a line */ -void *CopyLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *CopyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { LineTypePtr line; @@ -391,7 +391,7 @@ } /* moves a line */ -void *MoveLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *MoveLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { if (Layer->On) EraseLine(Line); @@ -408,7 +408,7 @@ } /* moves one end of a line */ -void *MoveLinePoint(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point) +void *MoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point) { if (Layer) { if (Layer->On) @@ -442,7 +442,7 @@ } /* moves a line between layers; lowlevel routines */ -void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, LineType * line, LayerType * Destination) +void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, LineType * line, pcb_layer_t * Destination) { r_delete_entry(Source->line_tree, (BoxType *) line); @@ -477,7 +477,7 @@ longjmp(i->env, 1); } -void *MoveLineToLayer(pcb_opctx_t *ctx, LayerType * Layer, LineType * Line) +void *MoveLineToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, LineType * Line) { struct via_info info; BoxType sb; @@ -538,7 +538,7 @@ } /* destroys a line from a layer */ -void *DestroyLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *DestroyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { r_delete_entry(Layer->line_tree, (BoxTypePtr) Line); free(Line->Number); @@ -575,7 +575,7 @@ } /* removes a line point, or a line if the selected point is the end */ -void *RemoveLinePoint(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point) +void *RemoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point) { PointType other; struct rlp_info info; @@ -594,7 +594,7 @@ } /* removes a line from a layer */ -void *RemoveLine_op(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *RemoveLine_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { /* erase from screen */ if (Layer->On) { @@ -606,7 +606,7 @@ return NULL; } -void *RemoveLine(LayerTypePtr Layer, LineTypePtr Line) +void *RemoveLine(pcb_layer_t *Layer, LineTypePtr Line) { pcb_opctx_t ctx; @@ -645,7 +645,7 @@ /* rotates a line's point */ -void *RotateLinePoint(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point) +void *RotateLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point) { EraseLine(Line); if (Layer) { @@ -670,7 +670,7 @@ } /* inserts a point into a line */ -void *InsertPointIntoLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line) +void *InsertPointIntoLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line) { LineTypePtr line; Coord X, Y; @@ -715,7 +715,7 @@ gui->draw_line(Output.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); } -void draw_line(LayerType * layer, LineType * line) +void draw_line(pcb_layer_t * layer, LineType * line) { const char *color; char buf[sizeof("#XXXXXX")]; @@ -743,7 +743,7 @@ r_dir_t draw_line_callback(const BoxType * b, void *cl) { - draw_line((LayerType *) cl, (LineType *) b); + draw_line((pcb_layer_t *) cl, (LineType *) b); return R_DIR_FOUND_CONTINUE; } @@ -754,7 +754,7 @@ EraseFlags(&Line->Flags); } -void DrawLine(LayerTypePtr Layer, LineTypePtr Line) +void DrawLine(pcb_layer_t *Layer, LineTypePtr Line) { pcb_draw_invalidate(Line); } Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 4756) +++ trunk/src/obj_line.h (revision 4757) @@ -46,17 +46,17 @@ } AttachedLineType, *AttachedLineTypePtr; -LineType *GetLineMemory(LayerType * layer); +LineType *GetLineMemory(pcb_layer_t * layer); void RemoveFreeLine(LineType * data); -LineTypePtr CreateDrawnLineOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); -LineTypePtr CreateNewLineOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); +LineTypePtr CreateDrawnLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); +LineTypePtr CreateNewLineOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness, Coord Clearance, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_line_on_layer(LayerType *Layer, LineType *Line); +void pcb_add_line_on_layer(pcb_layer_t *Layer, LineType *Line); void SetLineBoundingBox(LineTypePtr Line); -void *RemoveLine(LayerTypePtr Layer, LineTypePtr Line); +void *RemoveLine(pcb_layer_t *Layer, LineTypePtr Line); void RotateLineLowLevel(LineTypePtr Line, Coord X, Coord Y, unsigned Number); /*** DRC enforcement (obj_line_drcenf.c) ***/ @@ -83,7 +83,7 @@ #define ALLLINE_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ LINE_LOOP(layer) @@ -90,7 +90,7 @@ #define COPPERLINE_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer; l++, layer++) \ { \ LINE_LOOP(layer) @@ -97,7 +97,7 @@ #define SILKLINE_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ layer += max_copper_layer; \ for (l = 0; l < 2; l++, layer++) \ { \ @@ -105,7 +105,7 @@ #define VISIBLELINE_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ if (layer->On) \ Index: trunk/src/obj_line_draw.h =================================================================== --- trunk/src/obj_line_draw.h (revision 4756) +++ trunk/src/obj_line_draw.h (revision 4757) @@ -32,6 +32,6 @@ #endif void _draw_line(LineType * line); -void draw_line(LayerType * layer, LineType * line); +void draw_line(pcb_layer_t * layer, LineType * line); void EraseLine(LineTypePtr Line); -void DrawLine(LayerTypePtr Layer, LineTypePtr Line); +void DrawLine(pcb_layer_t *Layer, LineTypePtr Line); Index: trunk/src/obj_line_op.h =================================================================== --- trunk/src/obj_line_op.h (revision 4756) +++ trunk/src/obj_line_op.h (revision 4757) @@ -28,24 +28,24 @@ #include "operation.h" -void *AddLineToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *ChangeLineSize(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *ChangeLineClearSize(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *ChangeLineName(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *ChangeLineJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *SetLineJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *ClrLineJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *InsertPointIntoLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *MoveLineToBuffer(pcb_opctx_t *ctx, LayerType * layer, LineType * line); -void *CopyLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *MoveLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *MoveLinePoint(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point); -void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, LineType * line, LayerType * Destination); -void *MoveLineToLayer(pcb_opctx_t *ctx, LayerType * Layer, LineType * Line); -void *DestroyLine(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *RemoveLinePoint(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point); -void *RemoveLine_op(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line); -void *RotateLinePoint(pcb_opctx_t *ctx, LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point); +void *AddLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *ChangeLineSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *ChangeLineClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *ChangeLineName(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *InsertPointIntoLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *MoveLineToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, LineType * line); +void *CopyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *MoveLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *MoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point); +void *MoveLineToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, LineType * line, pcb_layer_t * Destination); +void *MoveLineToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, LineType * Line); +void *DestroyLine(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *RemoveLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point); +void *RemoveLine_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line); +void *RotateLinePoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr Point); Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4756) +++ trunk/src/obj_poly.c (revision 4757) @@ -54,7 +54,7 @@ /*** allocation ***/ /* get next slot for a polygon object, allocates memory if necessary */ -PolygonType *GetPolygonMemory(LayerType * layer) +PolygonType *GetPolygonMemory(pcb_layer_t * layer) { PolygonType *new_obj; @@ -148,7 +148,7 @@ } /* creates a new polygon from the old formats rectangle data */ -PolygonTypePtr CreateNewPolygonFromRectangle(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, FlagType Flags) +PolygonTypePtr CreateNewPolygonFromRectangle(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, FlagType Flags) { PolygonTypePtr polygon = CreateNewPolygon(Layer, Flags); if (!polygon) @@ -163,7 +163,7 @@ return (polygon); } -void pcb_add_polygon_on_layer(LayerType *Layer, PolygonType *polygon) +void pcb_add_polygon_on_layer(pcb_layer_t *Layer, PolygonType *polygon) { SetPolygonBoundingBox(polygon); if (!Layer->polygon_tree) @@ -172,7 +172,7 @@ } /* creates a new polygon on a layer */ -PolygonTypePtr CreateNewPolygon(LayerTypePtr Layer, FlagType Flags) +PolygonTypePtr CreateNewPolygon(pcb_layer_t *Layer, FlagType Flags) { PolygonTypePtr polygon = GetPolygonMemory(Layer); @@ -227,9 +227,9 @@ /*** ops ***/ /* copies a polygon to buffer */ -void *AddPolygonToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *AddPolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { - LayerTypePtr layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; + pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; PolygonTypePtr polygon; polygon = CreateNewPolygon(layer, Polygon->Flags); @@ -249,9 +249,9 @@ /* moves a polygon to buffer. Doesn't allocate memory for the points */ -void *MovePolygonToBuffer(pcb_opctx_t *ctx, LayerType * layer, PolygonType * polygon) +void *MovePolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, PolygonType * polygon) { - LayerType *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; + pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; r_delete_entry(layer->polygon_tree, (BoxType *) polygon); @@ -267,7 +267,7 @@ } /* Handle attempts to change the clearance of a polygon. */ -void *ChangePolygonClearSize(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr poly) +void *ChangePolygonClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr poly) { static int shown_this_message = 0; if (!shown_this_message) { @@ -282,7 +282,7 @@ } /* changes the CLEARPOLY flag of a polygon */ -void *ChangePolyClear(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *ChangePolyClear(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { if (TEST_FLAG(PCB_FLAG_LOCK, Polygon)) return (NULL); @@ -295,7 +295,7 @@ } /* inserts a point into a polygon */ -void *InsertPointIntoPolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *InsertPointIntoPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { PointType save; pcb_cardinal_t n; @@ -351,7 +351,7 @@ } /* moves a polygon */ -void *MovePolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *MovePolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { if (Layer->On) { ErasePolygon(Polygon); @@ -368,7 +368,7 @@ } /* moves a polygon-point */ -void *MovePolygonPoint(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, PointTypePtr Point) +void *MovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, PointTypePtr Point) { if (Layer->On) { ErasePolygon(Polygon); @@ -387,7 +387,7 @@ } /* moves a polygon between layers; lowlevel routines */ -void *MovePolygonToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, PolygonType * polygon, LayerType * Destination) +void *MovePolygonToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, PolygonType * polygon, pcb_layer_t * Destination) { r_delete_entry(Source->polygon_tree, (BoxType *) polygon); @@ -423,7 +423,7 @@ } /* moves a polygon between layers */ -void *MovePolygonToLayer(pcb_opctx_t *ctx, LayerType * Layer, PolygonType * Polygon) +void *MovePolygonToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, PolygonType * Polygon) { PolygonTypePtr newone; struct mptlc d; @@ -456,7 +456,7 @@ /* destroys a polygon from a layer */ -void *DestroyPolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *DestroyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { r_delete_entry(Layer->polygon_tree, (BoxTypePtr) Polygon); FreePolygonMemory(Polygon); @@ -467,7 +467,7 @@ } /* removes a polygon-point from a polygon and destroys the data */ -void *DestroyPolygonPoint(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, PointTypePtr Point) +void *DestroyPolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, PointTypePtr Point) { pcb_cardinal_t point_idx; pcb_cardinal_t i; @@ -502,7 +502,7 @@ } /* removes a polygon from a layer */ -void *RemovePolygon_op(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *RemovePolygon_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { /* erase from screen */ if (Layer->On) { @@ -514,7 +514,7 @@ return NULL; } -void *RemovePolygon(LayerTypePtr Layer, PolygonTypePtr Polygon) +void *RemovePolygon(pcb_layer_t *Layer, PolygonTypePtr Polygon) { pcb_opctx_t ctx; @@ -527,7 +527,7 @@ /* Removes a contour from a polygon. If removing the outer contour, it removes the whole polygon. */ -void *RemovePolygonContour(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, pcb_cardinal_t contour) +void *RemovePolygonContour(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, pcb_cardinal_t contour) { pcb_cardinal_t contour_start, contour_end, contour_points; pcb_cardinal_t i; @@ -569,7 +569,7 @@ } /* removes a polygon-point from a polygon */ -void *RemovePolygonPoint(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, PointTypePtr Point) +void *RemovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, PointTypePtr Point) { pcb_cardinal_t point_idx; pcb_cardinal_t i; @@ -617,7 +617,7 @@ } /* copies a polygon */ -void *CopyPolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon) +void *CopyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon) { PolygonTypePtr polygon; @@ -682,7 +682,7 @@ EraseFlags(&Polygon->Flags); } -void DrawPolygon(LayerTypePtr Layer, PolygonTypePtr Polygon) +void DrawPolygon(pcb_layer_t *Layer, PolygonTypePtr Polygon) { pcb_draw_invalidate(Polygon); } Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 4756) +++ trunk/src/obj_poly.h (revision 4757) @@ -48,7 +48,7 @@ -PolygonType *GetPolygonMemory(LayerType * layer); +PolygonType *GetPolygonMemory(pcb_layer_t * layer); void RemoveFreePolygon(PolygonType * data); PointTypePtr GetPointMemoryInPolygon(PolygonTypePtr Polygon); pcb_cardinal_t *GetHoleIndexMemoryInPolygon(PolygonTypePtr Polygon); @@ -55,11 +55,11 @@ void FreePolygonMemory(PolygonType * polygon); void SetPolygonBoundingBox(PolygonTypePtr Polygon); -PolygonTypePtr CreateNewPolygonFromRectangle(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, FlagType Flags); -PolygonTypePtr CreateNewPolygon(LayerTypePtr Layer, FlagType Flags); +PolygonTypePtr CreateNewPolygonFromRectangle(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, FlagType Flags); +PolygonTypePtr CreateNewPolygon(pcb_layer_t *Layer, FlagType Flags); PointTypePtr CreateNewPointInPolygon(PolygonTypePtr Polygon, Coord X, Coord Y); PolygonType *CreateNewHoleInPolygon(PolygonType * Polygon); -void *RemovePolygon(LayerTypePtr Layer, PolygonTypePtr Polygon); +void *RemovePolygon(pcb_layer_t *Layer, PolygonTypePtr Polygon); void MovePolygonLowLevel(PolygonTypePtr Polygon, Coord DX, Coord DY); void RotatePolygonLowLevel(PolygonTypePtr Polygon, Coord X, Coord Y, unsigned Number); @@ -66,7 +66,7 @@ PolygonTypePtr CopyPolygonLowLevel(PolygonTypePtr Dest, PolygonTypePtr Src); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_polygon_on_layer(LayerType *Layer, PolygonType *polygon); +void pcb_add_polygon_on_layer(pcb_layer_t *Layer, PolygonType *polygon); #define POLYGON_LOOP(layer) do { \ PolygonType *polygon; \ @@ -82,7 +82,7 @@ #define ALLPOLYGON_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ POLYGON_LOOP(layer) @@ -89,7 +89,7 @@ #define COPPERPOLYGON_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer; l++, layer++) \ { \ POLYGON_LOOP(layer) @@ -96,7 +96,7 @@ #define SILKPOLYGON_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ layer += max_copper_layer; \ for (l = 0; l < 2; l++, layer++) \ { \ @@ -104,7 +104,7 @@ #define VISIBLEPOLYGON_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ if (layer->On) \ Index: trunk/src/obj_poly_draw.h =================================================================== --- trunk/src/obj_poly_draw.h (revision 4756) +++ trunk/src/obj_poly_draw.h (revision 4757) @@ -30,10 +30,10 @@ #ifdef PCB_RTREE_H struct draw_poly_info { const BoxType *drawn_area; - LayerType *layer; + pcb_layer_t *layer; }; r_dir_t draw_poly_callback(const BoxType * b, void *cl); #endif void ErasePolygon(PolygonTypePtr Polygon); -void DrawPolygon(LayerTypePtr Layer, PolygonTypePtr Polygon); +void DrawPolygon(pcb_layer_t *Layer, PolygonTypePtr Polygon); Index: trunk/src/obj_poly_op.h =================================================================== --- trunk/src/obj_poly_op.h (revision 4756) +++ trunk/src/obj_poly_op.h (revision 4757) @@ -28,20 +28,20 @@ #include "operation.h" -void *AddPolygonToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); -void *MovePolygonToBuffer(pcb_opctx_t *ctx, LayerType * layer, PolygonType * polygon); -void *ChangePolygonClearSize(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr poly); -void *ChangePolyClear(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); -void *InsertPointIntoPolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); -void *MovePolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); -void *MovePolygonPoint(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, PointTypePtr Point); -void *MovePolygonToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, PolygonType * polygon, LayerType * Destination); -void *MovePolygonToLayer(pcb_opctx_t *ctx, LayerType * Layer, PolygonType * Polygon); -void *DestroyPolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); -void *DestroyPolygonPoint(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, PointTypePtr Point); -void *RemovePolygon_op(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); -void *RemovePolygonContour(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, pcb_cardinal_t contour); -void *RemovePolygonPoint(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon, PointTypePtr Point); -void *CopyPolygon(pcb_opctx_t *ctx, LayerTypePtr Layer, PolygonTypePtr Polygon); +void *AddPolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); +void *MovePolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, PolygonType * polygon); +void *ChangePolygonClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr poly); +void *ChangePolyClear(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); +void *InsertPointIntoPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); +void *MovePolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); +void *MovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, PointTypePtr Point); +void *MovePolygonToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, PolygonType * polygon, pcb_layer_t * Destination); +void *MovePolygonToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, PolygonType * Polygon); +void *DestroyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); +void *DestroyPolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, PointTypePtr Point); +void *RemovePolygon_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); +void *RemovePolygonContour(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, pcb_cardinal_t contour); +void *RemovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon, PointTypePtr Point); +void *CopyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, PolygonTypePtr Polygon); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4756) +++ trunk/src/obj_text.c (revision 4757) @@ -48,7 +48,7 @@ /*** allocation ***/ /* get next slot for a text object, allocates memory if necessary */ -TextTypePtr GetTextMemory(LayerType * layer) +TextTypePtr GetTextMemory(pcb_layer_t * layer) { TextType *new_obj; @@ -67,7 +67,7 @@ /*** utility ***/ /* creates a new text on a layer */ -TextTypePtr CreateNewText(LayerTypePtr Layer, FontTypePtr PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags) +TextTypePtr CreateNewText(pcb_layer_t *Layer, FontTypePtr PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags) { TextType *text; @@ -93,7 +93,7 @@ return (text); } -void pcb_add_text_on_layer(LayerType *Layer, TextType *text, FontType *PCBFont) +void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, FontType *PCBFont) { /* calculate size of the bounding box */ SetTextBoundingBox(PCBFont, text); @@ -217,17 +217,17 @@ /*** ops ***/ /* copies a text to buffer */ -void *AddTextToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *AddTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { - LayerTypePtr layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; + pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)]; return (CreateNewText(layer, &PCB->Font, Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, MaskFlags(Text->Flags, ctx->buffer.extraflg))); } /* moves a text to buffer without allocating memory for the name */ -void *MoveTextToBuffer(pcb_opctx_t *ctx, LayerType * layer, TextType * text) +void *MoveTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text) { - LayerType *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; + pcb_layer_t *lay = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, layer)]; r_delete_entry(layer->text_tree, (BoxType *) text); RestoreToPolygon(ctx->buffer.src, PCB_TYPE_TEXT, layer, text); @@ -243,7 +243,7 @@ } /* changes the scaling factor of a text object */ -void *ChangeTextSize(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *ChangeTextSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { int value = ctx->chgsize.absolute ? PCB_COORD_TO_MIL(ctx->chgsize.absolute) : Text->Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); @@ -267,7 +267,7 @@ /* sets data of a text object and calculates bounding box; memory must have already been allocated the one for the new string is allocated */ -void *ChangeTextName(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *ChangeTextName(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { char *old = Text->TextString; @@ -287,7 +287,7 @@ } /* changes the clearance flag of a text */ -void *ChangeTextJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { if (TEST_FLAG(PCB_FLAG_LOCK, Text)) return (NULL); @@ -307,7 +307,7 @@ } /* sets the clearance flag of a text */ -void *SetTextJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { if (TEST_FLAG(PCB_FLAG_LOCK, Text) || TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) return (NULL); @@ -315,7 +315,7 @@ } /* clears the clearance flag of a text */ -void *ClrTextJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { if (TEST_FLAG(PCB_FLAG_LOCK, Text) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) return (NULL); @@ -323,7 +323,7 @@ } /* copies a text */ -void *CopyText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *CopyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { TextTypePtr text; @@ -335,7 +335,7 @@ } /* moves a text object */ -void *MoveText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *MoveText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); r_delete_entry(Layer->text_tree, (BoxType *) Text); @@ -353,7 +353,7 @@ } /* moves a text object between layers; lowlevel routines */ -void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, TextType * text, LayerType * Destination) +void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, TextType * text, pcb_layer_t * Destination) { RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Source, text); r_delete_entry(Source->text_tree, (BoxType *) text); @@ -377,7 +377,7 @@ } /* moves a text object between layers */ -void *MoveTextToLayer(pcb_opctx_t *ctx, LayerType * layer, TextType * text) +void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text) { if (TEST_FLAG(PCB_FLAG_LOCK, text)) { Message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); @@ -397,7 +397,7 @@ } /* destroys a text from a layer */ -void *DestroyText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *DestroyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { free(Text->TextString); r_delete_entry(Layer->text_tree, (BoxTypePtr) Text); @@ -408,7 +408,7 @@ } /* removes a text from a layer */ -void *RemoveText_op(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *RemoveText_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { /* erase from screen */ if (Layer->On) { @@ -421,7 +421,7 @@ return NULL; } -void *RemoveText(LayerTypePtr Layer, TextTypePtr Text) +void *RemoveText(pcb_layer_t *Layer, TextTypePtr Text) { pcb_opctx_t ctx; @@ -450,7 +450,7 @@ } /* rotates a text object and redraws it */ -void *RotateText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text) +void *RotateText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text) { EraseText(Layer, Text); RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); @@ -543,7 +543,7 @@ r_dir_t draw_text_callback(const BoxType * b, void *cl) { - LayerType *layer = cl; + pcb_layer_t *layer = cl; TextType *text = (TextType *) b; int min_silk_line; @@ -560,12 +560,12 @@ } /* erases a text on a layer */ -void EraseText(LayerTypePtr Layer, TextTypePtr Text) +void EraseText(pcb_layer_t *Layer, TextTypePtr Text) { pcb_draw_invalidate(Text); } -void DrawText(LayerTypePtr Layer, TextTypePtr Text) +void DrawText(pcb_layer_t *Layer, TextTypePtr Text) { pcb_draw_invalidate(Text); } Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 4756) +++ trunk/src/obj_text.h (revision 4757) @@ -42,16 +42,16 @@ }; -TextTypePtr GetTextMemory(LayerType * layer); +TextTypePtr GetTextMemory(pcb_layer_t * layer); void RemoveFreeText(TextType * data); -TextTypePtr CreateNewText(LayerTypePtr Layer, FontTypePtr PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags); +TextTypePtr CreateNewText(pcb_layer_t *Layer, FontTypePtr PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_text_on_layer(LayerType *Layer, TextType *text, FontType *PCBFont); +void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, FontType *PCBFont); void SetTextBoundingBox(FontTypePtr FontPtr, TextTypePtr Text); -void *RemoveText(LayerTypePtr Layer, TextTypePtr Text); +void *RemoveText(pcb_layer_t *Layer, TextTypePtr Text); void RotateTextLowLevel(TextTypePtr Text, Coord X, Coord Y, unsigned Number); #define MOVE_TEXT_LOWLEVEL(t,dx,dy) \ @@ -71,7 +71,7 @@ #define ALLTEXT_LOOP(top) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (top)->Layer; \ + pcb_layer_t *layer = (top)->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ TEXT_LOOP(layer) @@ -78,7 +78,7 @@ #define VISIBLETEXT_LOOP(board) do { \ pcb_cardinal_t l; \ - LayerTypePtr layer = (board)->Data->Layer; \ + pcb_layer_t *layer = (board)->Data->Layer; \ for (l = 0; l < max_copper_layer + 2; l++, layer++) \ { \ TEXT_LOOP(layer); \ Index: trunk/src/obj_text_draw.h =================================================================== --- trunk/src/obj_text_draw.h (revision 4756) +++ trunk/src/obj_text_draw.h (revision 4757) @@ -33,5 +33,5 @@ #endif void DrawTextLowLevel(TextTypePtr Text, Coord min_line_width); -void EraseText(LayerTypePtr Layer, TextTypePtr Text); -void DrawText(LayerTypePtr Layer, TextTypePtr Text); +void EraseText(pcb_layer_t *Layer, TextTypePtr Text); +void DrawText(pcb_layer_t *Layer, TextTypePtr Text); Index: trunk/src/obj_text_op.h =================================================================== --- trunk/src/obj_text_op.h (revision 4756) +++ trunk/src/obj_text_op.h (revision 4757) @@ -28,17 +28,17 @@ #include "operation.h" -void *AddTextToBuffer(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *MoveTextToBuffer(pcb_opctx_t *ctx, LayerType * layer, TextType * text); -void *ChangeTextSize(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *ChangeTextName(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *ChangeTextJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *SetTextJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *ClrTextJoin(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *CopyText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *MoveText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, LayerType * Source, TextType * text, LayerType * Destination); -void *MoveTextToLayer(pcb_opctx_t *ctx, LayerType * layer, TextType * text); -void *DestroyText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *RemoveText_op(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); -void *RotateText(pcb_opctx_t *ctx, LayerTypePtr Layer, TextTypePtr Text); +void *AddTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *MoveTextToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text); +void *ChangeTextSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *ChangeTextName(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *CopyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *MoveText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *MoveTextToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, TextType * text, pcb_layer_t * Destination); +void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, TextType * text); +void *DestroyText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *RemoveText_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); +void *RotateText(pcb_opctx_t *ctx, pcb_layer_t *Layer, TextTypePtr Text); Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4756) +++ trunk/src/object_act.c (revision 4757) @@ -122,7 +122,7 @@ case F_Layer: { - LayerType *layer = CURRENT; + pcb_layer_t *layer = CURRENT; if (layername) { int i; layer = NULL; Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 4756) +++ trunk/src/operation.h (revision 4757) @@ -79,7 +79,7 @@ typedef struct { pcb_board_t *pcb; Coord dx, dy; /* used by local routines as offset */ - LayerTypePtr dst_layer; + pcb_layer_t *dst_layer; pcb_bool more_to_come; } pcb_opctx_move_t; @@ -110,17 +110,17 @@ /* pointer to low-level operation (copy, move and rotate) functions */ typedef struct { - void *(*Line)(pcb_opctx_t *ctx, LayerTypePtr, LineTypePtr); - void *(*Text)(pcb_opctx_t *ctx, LayerTypePtr, TextTypePtr); - void *(*Polygon)(pcb_opctx_t *ctx, LayerTypePtr, PolygonTypePtr); + void *(*Line)(pcb_opctx_t *ctx, pcb_layer_t *, LineTypePtr); + void *(*Text)(pcb_opctx_t *ctx, pcb_layer_t *, TextTypePtr); + void *(*Polygon)(pcb_opctx_t *ctx, pcb_layer_t *, PolygonTypePtr); void *(*Via)(pcb_opctx_t *ctx, PinTypePtr); 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 *(*LinePoint)(pcb_opctx_t *ctx, LayerTypePtr, LineTypePtr, PointTypePtr); - void *(*Point)(pcb_opctx_t *ctx, LayerTypePtr, PolygonTypePtr, PointTypePtr); - void *(*Arc)(pcb_opctx_t *ctx, LayerTypePtr, ArcTypePtr); + void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, LineTypePtr, PointTypePtr); + void *(*Point)(pcb_opctx_t *ctx, pcb_layer_t *, PolygonTypePtr, PointTypePtr); + void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, ArcTypePtr); void *(*Rat)(pcb_opctx_t *ctx, RatTypePtr); } pcb_opfunc_t; Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4756) +++ trunk/src/polygon.c (revision 4757) @@ -774,7 +774,7 @@ } /* remove the pin clearance from the polygon */ -static int SubtractPin(pcb_data_t * d, PinType * pin, LayerType * l, PolygonType * p) +static int SubtractPin(pcb_data_t * d, PinType * pin, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; pcb_cardinal_t i; @@ -850,7 +850,7 @@ struct cpInfo { const BoxType *other; pcb_data_t *data; - LayerType *layer; + pcb_layer_t *layer; PolygonType *polygon; pcb_bool solder; POLYAREA *accumulate; @@ -998,7 +998,7 @@ return i; } -static int clearPoly(pcb_data_t *Data, LayerTypePtr Layer, PolygonType * polygon, const BoxType * here, Coord expand) +static int clearPoly(pcb_data_t *Data, pcb_layer_t *Layer, PolygonType * polygon, const BoxType * here, Coord expand) { int r = 0, seen; BoxType region; @@ -1084,7 +1084,7 @@ return 0; } -static int UnsubtractPin(PinType * pin, LayerType * l, PolygonType * p) +static int UnsubtractPin(PinType * pin, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1100,7 +1100,7 @@ return 1; } -static int UnsubtractArc(ArcType * arc, LayerType * l, PolygonType * p) +static int UnsubtractArc(ArcType * arc, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1118,7 +1118,7 @@ return 1; } -static int UnsubtractLine(LineType * line, LayerType * l, PolygonType * p) +static int UnsubtractLine(LineType * line, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1136,7 +1136,7 @@ return 1; } -static int UnsubtractText(TextType * text, LayerType * l, PolygonType * p) +static int UnsubtractText(TextType * text, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1154,7 +1154,7 @@ return 1; } -static int UnsubtractPad(PadType * pad, LayerType * l, PolygonType * p) +static int UnsubtractPad(PadType * pad, pcb_layer_t * l, PolygonType * p) { POLYAREA *np; @@ -1171,7 +1171,7 @@ static pcb_bool inhibit = pcb_false; -int InitClip(pcb_data_t *Data, LayerTypePtr layer, PolygonType * p) +int InitClip(pcb_data_t *Data, pcb_layer_t *layer, PolygonType * p) { if (inhibit) return 0; @@ -1194,7 +1194,7 @@ * line between the points on either side of it is redundant. * returns pcb_true if any points are removed */ -pcb_bool RemoveExcessPolygonPoints(LayerTypePtr Layer, PolygonTypePtr Polygon) +pcb_bool RemoveExcessPolygonPoints(pcb_layer_t *Layer, PolygonTypePtr Polygon) { PointTypePtr p; pcb_cardinal_t n, prev, next; @@ -1388,12 +1388,12 @@ struct plow_info { int type; void *ptr1, *ptr2; - LayerTypePtr layer; + pcb_layer_t *layer; pcb_data_t *data; - r_dir_t (*callback) (pcb_data_t *, LayerTypePtr, PolygonTypePtr, int, void *, void *); + r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, PolygonTypePtr, int, void *, void *); }; -static r_dir_t subtract_plow(pcb_data_t *Data, LayerTypePtr Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2) +static r_dir_t subtract_plow(pcb_data_t *Data, pcb_layer_t *Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2) { if (!Polygon->Clipped) return 0; @@ -1423,7 +1423,7 @@ return R_DIR_NOT_FOUND; } -static r_dir_t add_plow(pcb_data_t *Data, LayerTypePtr Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2) +static r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2) { switch (type) { case PCB_TYPE_PIN: @@ -1458,7 +1458,7 @@ int PlowsPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2, - r_dir_t (*call_back) (pcb_data_t *data, LayerTypePtr lay, PolygonTypePtr poly, int type, void *ptr1, void *ptr2)) + r_dir_t (*call_back) (pcb_data_t *data, pcb_layer_t *lay, PolygonTypePtr poly, int type, void *ptr1, void *ptr2)) { BoxType sb = ((PinTypePtr) ptr2)->BoundingBox; int r = 0, seen; @@ -1482,7 +1482,7 @@ END_LOOP; } else { - GROUP_LOOP(Data, GetLayerGroupNumberByNumber(GetLayerNumber(Data, ((LayerTypePtr) ptr1)))); + GROUP_LOOP(Data, GetLayerGroupNumberByNumber(GetLayerNumber(Data, ((pcb_layer_t *) ptr1)))); { info.layer = layer; r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); @@ -1498,9 +1498,9 @@ if (!TEST_FLAG(PCB_FLAG_CLEARLINE, (LineTypePtr) ptr2)) return 0; /* silk doesn't plow */ - if (GetLayerNumber(Data, (LayerTypePtr) ptr1) >= max_copper_layer) + if (GetLayerNumber(Data, (pcb_layer_t *) ptr1) >= max_copper_layer) return 0; - GROUP_LOOP(Data, GetLayerGroupNumberByNumber(GetLayerNumber(Data, ((LayerTypePtr) ptr1)))); + GROUP_LOOP(Data, GetLayerGroupNumberByNumber(GetLayerNumber(Data, ((pcb_layer_t *) ptr1)))); { info.layer = layer; r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen); @@ -1543,7 +1543,7 @@ void RestoreToPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2) { if (type == PCB_TYPE_POLYGON) - InitClip(PCB->Data, (LayerTypePtr) ptr1, (PolygonTypePtr) ptr2); + InitClip(PCB->Data, (pcb_layer_t *) ptr1, (PolygonTypePtr) ptr2); else PlowsPolygon(Data, type, ptr1, ptr2, add_plow); } @@ -1551,7 +1551,7 @@ void ClearFromPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2) { if (type == PCB_TYPE_POLYGON) - InitClip(PCB->Data, (LayerTypePtr) ptr1, (PolygonTypePtr) ptr2); + InitClip(PCB->Data, (pcb_layer_t *) ptr1, (PolygonTypePtr) ptr2); else PlowsPolygon(Data, type, ptr1, ptr2, subtract_plow); } @@ -1685,7 +1685,7 @@ } /* make a polygon split into multiple parts into multiple polygons */ -pcb_bool MorphPolygon(LayerTypePtr layer, PolygonTypePtr poly) +pcb_bool MorphPolygon(pcb_layer_t *layer, PolygonTypePtr poly) { POLYAREA *p, *start; pcb_bool many = pcb_false; @@ -1798,7 +1798,7 @@ /* Convert a POLYAREA (and all linked POLYAREA) to * raw PCB polygons on the given layer. */ -void PolyToPolygonsOnLayer(pcb_data_t * Destination, LayerType * Layer, POLYAREA * Input, FlagType Flags) +void PolyToPolygonsOnLayer(pcb_data_t * Destination, pcb_layer_t * Layer, POLYAREA * Input, FlagType Flags) { PolygonType *Polygon; POLYAREA *pa; Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 4756) +++ trunk/src/polygon.h (revision 4757) @@ -57,13 +57,13 @@ pcb_cardinal_t prev_contour_point(PolygonTypePtr polygon, pcb_cardinal_t point); pcb_cardinal_t next_contour_point(PolygonTypePtr polygon, pcb_cardinal_t point); pcb_cardinal_t GetLowestDistancePolygonPoint(PolygonTypePtr, Coord, Coord); -pcb_bool RemoveExcessPolygonPoints(LayerTypePtr, PolygonTypePtr); +pcb_bool RemoveExcessPolygonPoints(pcb_layer_t *, PolygonTypePtr); void GoToPreviousPoint(void); void ClosePolygon(void); void CopyAttachedPolygonToLayer(void); int PolygonHoles(PolygonType * ptr, const BoxType * range, int (*callback) (PLINE *, void *user_data), void *user_data); int PlowsPolygon(pcb_data_t *, int, void *, void *, - r_dir_t (*callback) (pcb_data_t *, LayerTypePtr, PolygonTypePtr, int, void *, void *)); + r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, PolygonTypePtr, int, void *, void *)); void ComputeNoHoles(PolygonType * poly); POLYAREA *ContourToPoly(PLINE *); POLYAREA *PolygonToPoly(PolygonType *); @@ -75,7 +75,7 @@ POLYAREA *PinPoly(PinType * l, Coord thick, Coord clear); POLYAREA *BoxPolyBloated(BoxType * box, Coord radius); void frac_circle(PLINE *, Coord, Coord, Vector, int); -int InitClip(pcb_data_t * d, LayerType * l, PolygonType * p); +int InitClip(pcb_data_t * d, pcb_layer_t * l, PolygonType * p); void RestoreToPolygon(pcb_data_t *, int, void *, void *); void ClearFromPolygon(pcb_data_t *, int, void *, void *); @@ -83,9 +83,9 @@ pcb_bool IsPointInPolygonIgnoreHoles(Coord, Coord, PolygonTypePtr); pcb_bool IsRectangleInPolygon(Coord, Coord, Coord, Coord, PolygonTypePtr); pcb_bool isects(POLYAREA *, PolygonTypePtr, pcb_bool); -pcb_bool MorphPolygon(LayerTypePtr, PolygonTypePtr); +pcb_bool MorphPolygon(pcb_layer_t *, PolygonTypePtr); void NoHolesPolygonDicer(PolygonType * p, const BoxType * clip, void (*emit) (PLINE *, void *), void *user_data); -void PolyToPolygonsOnLayer(pcb_data_t *, LayerType *, POLYAREA *, FlagType); +void PolyToPolygonsOnLayer(pcb_data_t *, pcb_layer_t *, POLYAREA *, FlagType); void square_pin_factors(int style, double *xm, double *ym); Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 4756) +++ trunk/src/polygon_act.c (revision 4757) @@ -69,7 +69,7 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, PCB_TYPE_POLYGON, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { - MorphPolygon((LayerType *) ptr1, (PolygonType *) ptr3); + MorphPolygon((pcb_layer_t *) ptr1, (PolygonType *) ptr3); Draw(); IncrementUndoSerialNumber(); } Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 4756) +++ trunk/src/rubberband.c (revision 4757) @@ -44,9 +44,9 @@ */ static void CheckPadForRubberbandConnection(PadTypePtr); static void CheckPinForRubberbandConnection(PinTypePtr); -static void CheckLinePointForRubberbandConnection(LayerTypePtr, LineTypePtr, PointTypePtr, pcb_bool); -static void CheckPolygonForRubberbandConnection(LayerTypePtr, PolygonTypePtr); -static void CheckLinePointForRat(LayerTypePtr, PointTypePtr); +static void CheckLinePointForRubberbandConnection(pcb_layer_t *, LineTypePtr, PointTypePtr, pcb_bool); +static void CheckPolygonForRubberbandConnection(pcb_layer_t *, PolygonTypePtr); +static void CheckLinePointForRat(pcb_layer_t *, PointTypePtr); static r_dir_t rubber_callback(const BoxType * b, void *cl); struct rubber_info { @@ -54,7 +54,7 @@ Coord X, Y; LineTypePtr line; BoxType box; - LayerTypePtr layer; + pcb_layer_t *layer; }; static r_dir_t rubber_callback(const BoxType * b, void *cl) @@ -274,7 +274,7 @@ r_search(PCB->Data->rat_tree, &Pin->BoundingBox, NULL, rat_callback, &info, NULL); } -static void CheckLinePointForRat(LayerTypePtr Layer, PointTypePtr Point) +static void CheckLinePointForRat(pcb_layer_t *Layer, PointTypePtr Point) { struct rinfo info; info.group = GetLayerGroupNumberByPointer(Layer); @@ -322,7 +322,7 @@ * If one of the endpoints of the line lays * inside the passed line, * the scanned line is added to the 'rubberband' list */ -static void CheckLinePointForRubberbandConnection(LayerTypePtr Layer, LineTypePtr Line, PointTypePtr LinePoint, pcb_bool Exact) +static void CheckLinePointForRubberbandConnection(pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr LinePoint, pcb_bool Exact) { pcb_cardinal_t group; struct rubber_info info; @@ -354,7 +354,7 @@ * If one of the endpoints of the line lays inside the passed polygon, * the scanned line is added to the 'rubberband' list */ -static void CheckPolygonForRubberbandConnection(LayerTypePtr Layer, PolygonTypePtr Polygon) +static void CheckPolygonForRubberbandConnection(pcb_layer_t *Layer, PolygonTypePtr Polygon) { pcb_cardinal_t group; @@ -423,7 +423,7 @@ case PCB_TYPE_LINE: { - LayerTypePtr layer = (LayerTypePtr) Ptr1; + pcb_layer_t *layer = (pcb_layer_t *) Ptr1; LineTypePtr line = (LineTypePtr) Ptr2; if (GetLayerNumber(PCB->Data, layer) < max_copper_layer) { CheckLinePointForRubberbandConnection(layer, line, &line->Point1, pcb_false); @@ -433,8 +433,8 @@ } case PCB_TYPE_LINE_POINT: - if (GetLayerNumber(PCB->Data, (LayerTypePtr) Ptr1) < max_copper_layer) - CheckLinePointForRubberbandConnection((LayerTypePtr) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3, pcb_true); + if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < max_copper_layer) + CheckLinePointForRubberbandConnection((pcb_layer_t *) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3, pcb_true); break; case PCB_TYPE_VIA: @@ -442,8 +442,8 @@ break; case PCB_TYPE_POLYGON: - if (GetLayerNumber(PCB->Data, (LayerTypePtr) Ptr1) < max_copper_layer) - CheckPolygonForRubberbandConnection((LayerTypePtr) Ptr1, (PolygonTypePtr) Ptr2); + if (GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1) < max_copper_layer) + CheckPolygonForRubberbandConnection((pcb_layer_t *) Ptr1, (PolygonTypePtr) Ptr2); break; } } @@ -470,7 +470,7 @@ case PCB_TYPE_LINE: { - LayerTypePtr layer = (LayerTypePtr) Ptr1; + pcb_layer_t *layer = (pcb_layer_t *) Ptr1; LineTypePtr line = (LineTypePtr) Ptr2; CheckLinePointForRat(layer, &line->Point1); @@ -479,7 +479,7 @@ } case PCB_TYPE_LINE_POINT: - CheckLinePointForRat((LayerTypePtr) Ptr1, (PointTypePtr) Ptr3); + CheckLinePointForRat((pcb_layer_t *) Ptr1, (PointTypePtr) Ptr3); break; case PCB_TYPE_VIA: @@ -509,7 +509,7 @@ * adds a new line to the rubberband list of 'Crosshair.AttachedObject' * if Layer == 0 it is a rat line */ -RubberbandTypePtr CreateNewRubberbandEntry(LayerTypePtr Layer, LineTypePtr Line, PointTypePtr MovedPoint) +RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr MovedPoint) { RubberbandTypePtr ptr = GetRubberbandMemory(); Index: trunk/src/rubberband.h =================================================================== --- trunk/src/rubberband.h (revision 4756) +++ trunk/src/rubberband.h (revision 4757) @@ -35,7 +35,7 @@ * as well as for merging of elements */ typedef struct { /* rubberband lines for element moves */ - LayerTypePtr Layer; /* layer that holds the line */ + pcb_layer_t *Layer; /* layer that holds the line */ LineTypePtr Line; /* the line itself */ PointTypePtr MovedPoint; /* and finally the point */ } RubberbandType, *RubberbandTypePtr; @@ -44,6 +44,6 @@ void LookupRubberbandLines(int, void *, void *, void *); void LookupRatLines(int, void *, void *, void *); RubberbandTypePtr GetRubberbandMemory(void); -RubberbandTypePtr CreateNewRubberbandEntry(LayerTypePtr Layer, LineTypePtr Line, PointTypePtr MovedPoint); +RubberbandTypePtr CreateNewRubberbandEntry(pcb_layer_t *Layer, LineTypePtr Line, PointTypePtr MovedPoint); #endif Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4756) +++ trunk/src/search.c (revision 4757) @@ -47,23 +47,23 @@ static double PosX, PosY; /* search position for subroutines */ static Coord SearchRadius; static BoxType SearchBox; -static LayerTypePtr SearchLayer; +static pcb_layer_t *SearchLayer; /* --------------------------------------------------------------------------- * some local prototypes. The first parameter includes PCB_TYPE_LOCKED if we * want to include locked types in the search. */ -static pcb_bool SearchLineByLocation(int, LayerTypePtr *, LineTypePtr *, LineTypePtr *); -static pcb_bool SearchArcByLocation(int, LayerTypePtr *, ArcTypePtr *, ArcTypePtr *); +static pcb_bool SearchLineByLocation(int, pcb_layer_t **, LineTypePtr *, LineTypePtr *); +static pcb_bool SearchArcByLocation(int, pcb_layer_t **, ArcTypePtr *, ArcTypePtr *); static pcb_bool SearchRatLineByLocation(int, RatTypePtr *, RatTypePtr *, RatTypePtr *); -static pcb_bool SearchTextByLocation(int, LayerTypePtr *, TextTypePtr *, TextTypePtr *); -static pcb_bool SearchPolygonByLocation(int, LayerTypePtr *, PolygonTypePtr *, PolygonTypePtr *); +static pcb_bool SearchTextByLocation(int, pcb_layer_t **, TextTypePtr *, TextTypePtr *); +static pcb_bool SearchPolygonByLocation(int, pcb_layer_t **, PolygonTypePtr *, PolygonTypePtr *); static pcb_bool SearchPinByLocation(int, ElementTypePtr *, PinTypePtr *, PinTypePtr *); static pcb_bool SearchPadByLocation(int, ElementTypePtr *, PadTypePtr *, PadTypePtr *, 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, LayerTypePtr *, LineTypePtr *, PointTypePtr *); -static pcb_bool SearchPointByLocation(int, LayerTypePtr *, PolygonTypePtr *, PointTypePtr *); +static pcb_bool SearchLinePointByLocation(int, pcb_layer_t **, LineTypePtr *, PointTypePtr *); +static pcb_bool SearchPointByLocation(int, pcb_layer_t **, PolygonTypePtr *, PointTypePtr *); static pcb_bool SearchElementByLocation(int, ElementTypePtr *, ElementTypePtr *, ElementTypePtr *, pcb_bool); /* --------------------------------------------------------------------------- @@ -199,7 +199,7 @@ } -static pcb_bool SearchLineByLocation(int locked, LayerTypePtr * Layer, LineTypePtr * Line, LineTypePtr * Dummy) +static pcb_bool SearchLineByLocation(int locked, pcb_layer_t ** Layer, LineTypePtr * Line, LineTypePtr * Dummy) { struct line_info info; @@ -272,7 +272,7 @@ } -static pcb_bool SearchArcByLocation(int locked, LayerTypePtr * Layer, ArcTypePtr * Arc, ArcTypePtr * Dummy) +static pcb_bool SearchArcByLocation(int locked, pcb_layer_t ** Layer, ArcTypePtr * Arc, ArcTypePtr * Dummy) { struct arc_info info; @@ -304,7 +304,7 @@ /* --------------------------------------------------------------------------- * searches text on the SearchLayer */ -static pcb_bool SearchTextByLocation(int locked, LayerTypePtr * Layer, TextTypePtr * Text, TextTypePtr * Dummy) +static pcb_bool SearchTextByLocation(int locked, pcb_layer_t ** Layer, TextTypePtr * Text, TextTypePtr * Dummy) { struct ans_info info; @@ -337,7 +337,7 @@ /* --------------------------------------------------------------------------- * searches a polygon on the SearchLayer */ -static pcb_bool SearchPolygonByLocation(int locked, LayerTypePtr * Layer, PolygonTypePtr * Polygon, PolygonTypePtr * Dummy) +static pcb_bool SearchPolygonByLocation(int locked, pcb_layer_t ** Layer, PolygonTypePtr * Polygon, PolygonTypePtr * Dummy) { struct ans_info info; @@ -383,7 +383,7 @@ /* --------------------------------------------------------------------------- * searches a line-point on all the search layer */ -static pcb_bool SearchLinePointByLocation(int locked, LayerTypePtr * Layer, LineTypePtr * Line, PointTypePtr * Point) +static pcb_bool SearchLinePointByLocation(int locked, pcb_layer_t ** Layer, LineTypePtr * Line, PointTypePtr * Point) { struct line_info info; *Layer = SearchLayer; @@ -401,7 +401,7 @@ * searches a polygon-point on all layers that are switched on * in layerstack order */ -static pcb_bool SearchPointByLocation(int locked, LayerTypePtr * Layer, PolygonTypePtr * Polygon, PointTypePtr * Point) +static pcb_bool SearchPointByLocation(int locked, pcb_layer_t ** Layer, PolygonTypePtr * Polygon, PointTypePtr * Point) { double d, least; pcb_bool found = pcb_false; @@ -1037,28 +1037,28 @@ if (SearchLayer->On) { if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_POLYGON_POINT && - SearchPointByLocation(locked, (LayerTypePtr *) Result1, (PolygonTypePtr *) Result2, (PointTypePtr *) Result3)) + SearchPointByLocation(locked, (pcb_layer_t **) Result1, (PolygonTypePtr *) Result2, (PointTypePtr *) Result3)) return (PCB_TYPE_POLYGON_POINT); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_LINE_POINT && - SearchLinePointByLocation(locked, (LayerTypePtr *) Result1, (LineTypePtr *) Result2, (PointTypePtr *) Result3)) + SearchLinePointByLocation(locked, (pcb_layer_t **) Result1, (LineTypePtr *) Result2, (PointTypePtr *) Result3)) return (PCB_TYPE_LINE_POINT); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_LINE - && SearchLineByLocation(locked, (LayerTypePtr *) Result1, (LineTypePtr *) Result2, (LineTypePtr *) Result3)) + && SearchLineByLocation(locked, (pcb_layer_t **) Result1, (LineTypePtr *) Result2, (LineTypePtr *) Result3)) return (PCB_TYPE_LINE); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_ARC && - SearchArcByLocation(locked, (LayerTypePtr *) Result1, (ArcTypePtr *) Result2, (ArcTypePtr *) Result3)) + SearchArcByLocation(locked, (pcb_layer_t **) Result1, (ArcTypePtr *) Result2, (ArcTypePtr *) Result3)) return (PCB_TYPE_ARC); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_TEXT - && SearchTextByLocation(locked, (LayerTypePtr *) Result1, (TextTypePtr *) Result2, (TextTypePtr *) Result3)) + && SearchTextByLocation(locked, (pcb_layer_t **) Result1, (TextTypePtr *) Result2, (TextTypePtr *) Result3)) return (PCB_TYPE_TEXT); if (Type & PCB_TYPE_POLYGON && - SearchPolygonByLocation(locked, (LayerTypePtr *) Result1, (PolygonTypePtr *) Result2, (PolygonTypePtr *) Result3)) { + SearchPolygonByLocation(locked, (pcb_layer_t **) Result1, (PolygonTypePtr *) Result2, (PolygonTypePtr *) Result3)) { if (HigherAvail) { BoxTypePtr box = &(*(PolygonTypePtr *) Result2)->BoundingBox; double area = (double) (box->X2 - box->X1) * (double) (box->X2 - box->X1); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4756) +++ trunk/src/select.c (revision 4757) @@ -110,7 +110,7 @@ pcb_bool SelectObject(void) { void *ptr1, *ptr2, *ptr3; - LayerTypePtr layer; + pcb_layer_t *layer; int type; pcb_bool changed = pcb_true; @@ -129,7 +129,7 @@ { LineType *line = (LineTypePtr) ptr2; - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_LINE, ptr1, ptr2, ptr2); TOGGLE_FLAG(PCB_FLAG_SELECTED, line); DrawLine(layer, line); @@ -150,7 +150,7 @@ { ArcType *arc = (ArcTypePtr) ptr2; - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_ARC, ptr1, ptr2, ptr2); TOGGLE_FLAG(PCB_FLAG_SELECTED, arc); DrawArc(layer, arc); @@ -161,7 +161,7 @@ { TextType *text = (TextTypePtr) ptr2; - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_TEXT, ptr1, ptr2, ptr2); TOGGLE_FLAG(PCB_FLAG_SELECTED, text); DrawText(layer, text); @@ -172,7 +172,7 @@ { PolygonType *poly = (PolygonTypePtr) ptr2; - layer = (LayerTypePtr) ptr1; + layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_POLYGON, ptr1, ptr2, ptr2); TOGGLE_FLAG(PCB_FLAG_SELECTED, poly); DrawPolygon(layer, poly); @@ -489,32 +489,32 @@ switch (Type) { case PCB_TYPE_LINE: if (F->Line) - return (F->Line(ctx, (LayerTypePtr) Ptr1, (LineTypePtr) Ptr2)); + return (F->Line(ctx, (pcb_layer_t *) Ptr1, (LineTypePtr) Ptr2)); break; case PCB_TYPE_ARC: if (F->Arc) - return (F->Arc(ctx, (LayerTypePtr) Ptr1, (ArcTypePtr) Ptr2)); + return (F->Arc(ctx, (pcb_layer_t *) Ptr1, (ArcTypePtr) Ptr2)); break; case PCB_TYPE_LINE_POINT: if (F->LinePoint) - return (F->LinePoint(ctx, (LayerTypePtr) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3)); + return (F->LinePoint(ctx, (pcb_layer_t *) Ptr1, (LineTypePtr) Ptr2, (PointTypePtr) Ptr3)); break; case PCB_TYPE_TEXT: if (F->Text) - return (F->Text(ctx, (LayerTypePtr) Ptr1, (TextTypePtr) Ptr2)); + return (F->Text(ctx, (pcb_layer_t *) Ptr1, (TextTypePtr) Ptr2)); break; case PCB_TYPE_POLYGON: if (F->Polygon) - return (F->Polygon(ctx, (LayerTypePtr) Ptr1, (PolygonTypePtr) Ptr2)); + return (F->Polygon(ctx, (pcb_layer_t *) Ptr1, (PolygonTypePtr) Ptr2)); break; case PCB_TYPE_POLYGON_POINT: if (F->Point) - return (F->Point(ctx, (LayerTypePtr) Ptr1, (PolygonTypePtr) Ptr2, (PointTypePtr) Ptr3)); + return (F->Point(ctx, (pcb_layer_t *) Ptr1, (PolygonTypePtr) Ptr2, (PointTypePtr) Ptr3)); break; case PCB_TYPE_VIA: Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4756) +++ trunk/src/undo.c (revision 4757) @@ -96,7 +96,7 @@ typedef struct { /* information about moves between layers */ pcb_cardinal_t OriginalLayer; /* the index of the original layer */ -} MoveToLayerType, *MoveToLayerTypePtr; +} MoveToLayer; typedef struct { /* information about layer changes */ int old_index; @@ -105,7 +105,7 @@ typedef struct { /* information about poly clear/restore */ pcb_bool Clear; /* pcb_true was clear, pcb_false was restore */ - LayerTypePtr Layer; + pcb_layer_t *Layer; } ClearPolyType, *ClearPolyTypePtr; typedef struct { @@ -127,7 +127,7 @@ MoveType Move; RemovedPointType RemovedPoint; RotateType Rotate; - MoveToLayerType MoveToLayer; + MoveToLayer MoveToLayer; FlagType Flags; Coord Size; LayerChangeType LayerChange; @@ -246,9 +246,9 @@ static void DrawRecoveredObject(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (Type & (PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_ARC)) { - LayerTypePtr layer; + pcb_layer_t *layer; - layer = LAYER_PTR(GetLayerNumber(RemoveList, (LayerTypePtr) Ptr1)); + layer = LAYER_PTR(GetLayerNumber(RemoveList, (pcb_layer_t *) Ptr1)); DrawObject(Type, (void *) layer, Ptr2); } else @@ -367,7 +367,7 @@ /* lookup entry by ID */ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ARC) { - LayerTypePtr Layer = (LayerTypePtr) ptr1; + pcb_layer_t *Layer = (pcb_layer_t *) ptr1; ArcTypePtr a = (ArcTypePtr) ptr2; r_delete_entry(Layer->arc_tree, (BoxTypePtr) a); old_sa = a->StartAngle; @@ -398,7 +398,7 @@ /* lookup entry by ID */ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type == PCB_TYPE_ARC) { - LayerTypePtr Layer = (LayerTypePtr) ptr1; + pcb_layer_t *Layer = (pcb_layer_t *) ptr1; ArcTypePtr a = (ArcTypePtr) ptr2; r_delete_entry(Layer->arc_tree, (BoxTypePtr) a); old_w = a->Width; @@ -651,7 +651,7 @@ /* lookup entry by it's ID */ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { - swap = GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1); + swap = GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1); MoveObjectToLayer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true); Entry->Data.MoveToLayer.OriginalLayer = swap; return (pcb_true); @@ -665,7 +665,7 @@ */ static pcb_bool UndoRemovePoint(UndoListTypePtr Entry) { - LayerTypePtr layer; + pcb_layer_t *layer; PolygonTypePtr polygon; void *ptr3; int type; @@ -704,7 +704,7 @@ */ static pcb_bool UndoInsertPoint(UndoListTypePtr Entry) { - LayerTypePtr layer; + pcb_layer_t *layer; PolygonTypePtr polygon; PointTypePtr pnt; int type; @@ -782,7 +782,7 @@ obj = (AnyObjectType *) MoveObjectToBuffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); if (Entry->Kind == PCB_TYPE_POLYGON) - InitClip(PCB->Data, (LayerTypePtr) ptr1b, (PolygonType *) obj); + InitClip(PCB->Data, (pcb_layer_t *) ptr1b, (PolygonType *) obj); return (pcb_true); } @@ -1187,7 +1187,7 @@ if (!Locked) { undo = GetUndoSlot(UNDO_CLEAR, OBJECT_ID(Ptr3), Type); undo->Data.ClearPoly.Clear = clear; - undo->Data.ClearPoly.Layer = (LayerTypePtr) Ptr1; + undo->Data.ClearPoly.Layer = (pcb_layer_t *) Ptr1; } } @@ -1303,7 +1303,7 @@ * adds an object to the list of removed contours * (Actually just takes a copy of the whole polygon to restore) */ -void AddObjectToRemoveContourUndoList(int Type, LayerType * Layer, PolygonType * Polygon) +void AddObjectToRemoveContourUndoList(int Type, pcb_layer_t * Layer, PolygonType * Polygon) { CopyObjectToUndoList(UNDO_REMOVE_CONTOUR, Type, Layer, Polygon, NULL); } @@ -1312,7 +1312,7 @@ * adds an object to the list of insert contours * (Actually just takes a copy of the whole polygon to restore) */ -void AddObjectToInsertContourUndoList(int Type, LayerType * Layer, PolygonType * Polygon) +void AddObjectToInsertContourUndoList(int Type, pcb_layer_t * Layer, PolygonType * Polygon) { CopyObjectToUndoList(UNDO_INSERT_CONTOUR, Type, Layer, Polygon, NULL); } @@ -1366,7 +1366,7 @@ if (!Locked) { undo = GetUndoSlot(UNDO_MOVETOLAYER, OBJECT_ID(Ptr3), Type); - undo->Data.MoveToLayer.OriginalLayer = GetLayerNumber(PCB->Data, (LayerTypePtr) Ptr1); + undo->Data.MoveToLayer.OriginalLayer = GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1); } } Index: trunk/src/undo.h =================================================================== --- trunk/src/undo.h (revision 4756) +++ trunk/src/undo.h (revision 4757) @@ -45,8 +45,8 @@ void MoveObjectToRemoveUndoList(int, void *, void *, void *); void AddObjectToRemovePointUndoList(int, void *, void *, pcb_cardinal_t); void AddObjectToInsertPointUndoList(int, void *, void *, void *); -void AddObjectToRemoveContourUndoList(int, LayerType *, PolygonType *); -void AddObjectToInsertContourUndoList(int, LayerType *, PolygonType *); +void AddObjectToRemoveContourUndoList(int, pcb_layer_t *, PolygonType *); +void AddObjectToInsertContourUndoList(int, pcb_layer_t *, PolygonType *); void AddObjectToMoveUndoList(int, void *, void *, void *, Coord, Coord); void AddObjectToChangeNameUndoList(int, void *, void *, void *, char *); void AddObjectToChangePinnumUndoList(int, void *, void *, void *, char *); Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 4756) +++ trunk/src/undo_act.c (revision 4757) @@ -201,7 +201,7 @@ SearchObjectByLocation(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); ptr2 = (LineTypePtr) ptrtmp; - lastLayer = (LayerTypePtr) ptr1; + lastLayer = (pcb_layer_t *) ptr1; } notify_crosshair_change(pcb_true); return 0; Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 4756) +++ trunk/src_plugins/autocrop/autocrop.c (revision 4757) @@ -75,7 +75,7 @@ return Via; } -static void *MyMoveLineLowLevel(pcb_data_t * Data, LayerType * Layer, LineType * Line, Coord dx, Coord dy) +static void *MyMoveLineLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, LineType * Line, Coord dx, Coord dy) { if (Data) { RestoreToPolygon(Data, PCB_TYPE_LINE, Layer, Line); @@ -89,7 +89,7 @@ return Line; } -static void *MyMoveArcLowLevel(pcb_data_t * Data, LayerType * Layer, ArcType * Arc, Coord dx, Coord dy) +static void *MyMoveArcLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, ArcType * Arc, Coord dx, Coord dy) { if (Data) { RestoreToPolygon(Data, PCB_TYPE_ARC, Layer, Arc); @@ -103,7 +103,7 @@ return Arc; } -static void *MyMovePolygonLowLevel(pcb_data_t * Data, LayerType * Layer, PolygonType * Polygon, Coord dx, Coord dy) +static void *MyMovePolygonLowLevel(pcb_data_t * Data, pcb_layer_t * Layer, PolygonType * Polygon, Coord dx, Coord dy) { if (Data) { r_delete_entry(Layer->polygon_tree, (BoxType *) Polygon); @@ -117,7 +117,7 @@ return Polygon; } -static void *MyMoveTextLowLevel(LayerType * Layer, TextType * Text, Coord dx, Coord dy) +static void *MyMoveTextLowLevel(pcb_layer_t * Layer, TextType * Text, Coord dx, Coord dy) { if (Layer) r_delete_entry(Layer->text_tree, (BoxType *) Text); Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4756) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4757) @@ -193,7 +193,7 @@ static void showboxes(BoxListTypePtr blist) { pcb_cardinal_t i; - LayerTypePtr SLayer = &(PCB->Data->Layer[solder_silk_layer]); + pcb_layer_t *SLayer = &(PCB->Data->Layer[solder_silk_layer]); for (i = 0; i < blist->BoxN; i++) { CreateNewLineOnLayer(SLayer, blist->Box[i].X1, blist->Box[i].Y1, blist->Box[i].X2, blist->Box[i].Y1, 1, 1, 0); CreateNewLineOnLayer(SLayer, blist->Box[i].X1, blist->Box[i].Y2, blist->Box[i].X2, blist->Box[i].Y2, 1, 1, 0); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4756) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4757) @@ -1006,7 +1006,7 @@ case PCB_TYPE_POLYGON: rb = AddPolygon(layergroupboxes, - GetLayerNumber(PCB->Data, (LayerType *) connection->ptr1), + GetLayerNumber(PCB->Data, (pcb_layer_t *) connection->ptr1), (struct polygon_st *) connection->ptr2, rd->styles[j]); break; } @@ -1319,7 +1319,7 @@ static void showbox(BoxType b, pcb_dimension_t thickness, int group) { LineTypePtr line; - LayerTypePtr SLayer = LAYER_PTR(group); + pcb_layer_t *SLayer = LAYER_PTR(group); if (showboxen < -1) return; if (showboxen != -1 && showboxen != group) @@ -2985,7 +2985,7 @@ r_insert_entry(rd->layergrouptree[rb->group], &rb->box, 1); if (conf_core.editor.live_routing) { - LayerType *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]); + pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]); LineType *line = CreateNewLineOnLayer(layer, qX1, qY1, qX2, qY2, 2 * qhthick, 0, MakeFlags(0)); rb->livedraw_obj.line = line; @@ -4079,7 +4079,7 @@ static void ripout_livedraw_obj(routebox_t * rb) { if (rb->type == LINE && rb->livedraw_obj.line) { - LayerType *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]); + pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.Entries[rb->group][0]); EraseLine(rb->livedraw_obj.line); DestroyObject(PCB->Data, PCB_TYPE_LINE, layer, rb->livedraw_obj.line, NULL); rb->livedraw_obj.line = NULL; @@ -4431,7 +4431,7 @@ pcb_bool IronDownAllUnfixedPaths(routedata_t * rd) { pcb_bool changed = pcb_false; - LayerTypePtr layer; + pcb_layer_t *layer; routebox_t *net, *p; int i; LIST_LOOP(rd->first_net, different_net, net); Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4756) +++ trunk/src_plugins/djopt/djopt.c (revision 4757) @@ -448,7 +448,7 @@ { char *from, *to; LineType *nl; - LayerType *lyr = LAYER_PTR(layer); + pcb_layer_t *lyr = LAYER_PTR(layer); from = (char *) linelist_first(&lyr->Line); nl = CreateNewLineOnLayer(PCB->Data->Layer + layer, x1, y1, x2, y2, thick, clear, flags); @@ -651,7 +651,7 @@ static void remove_line(line_s * l) { int i, j; - LayerType *layer = &(PCB->Data->Layer[l->layer]); + pcb_layer_t *layer = &(PCB->Data->Layer[l->layer]); check(0, 0); @@ -674,7 +674,7 @@ static void move_line_to_layer(line_s * l, int layer) { - LayerType *ls, *ld; + pcb_layer_t *ls, *ld; ls = LAYER_PTR(l->layer); ld = LAYER_PTR(layer); @@ -2608,7 +2608,7 @@ } for (layn = 0; layn < max_copper_layer; layn++) { - LayerType *layer = LAYER_PTR(layn); + pcb_layer_t *layer = LAYER_PTR(layn); LINE_LOOP(layer); { Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 4756) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 4757) @@ -238,7 +238,7 @@ } yoff = -TEXT_LINE; for (i = 0; i < max_copper_layer; i++) { - LayerType *l = LAYER_PTR(i); + pcb_layer_t *l = LAYER_PTR(i); if (l->Name && (linelist_length(&l->Line) || arclist_length(&l->Arc))) { if (strcmp("route", l->Name) == 0) break; @@ -262,7 +262,7 @@ PCB_COORD_TO_MIL(FAB_LINE_W), PCB_COORD_TO_MIL(PCB->MaxWidth), PCB_COORD_TO_MIL(PCB->MaxHeight)); } else { - LayerTypePtr layer = LAYER_PTR(i); + pcb_layer_t *layer = LAYER_PTR(i); gui->set_line_width(gc, PCB_MIL_TO_COORD(10)); LINE_LOOP(layer); { Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 4756) +++ trunk/src_plugins/export_bboard/bboard.c (revision 4757) @@ -205,7 +205,7 @@ return 0; } -static void bboard_get_layer_color(LayerType * layer, int *clr_r, int *clr_g, int *clr_b) +static void bboard_get_layer_color(pcb_layer_t * layer, int *clr_r, int *clr_g, int *clr_b) { char *clr; unsigned int r, g, b; @@ -496,7 +496,7 @@ { int i; int clr_r, clr_g, clr_b; - LayerType *layer; + pcb_layer_t *layer; if (!options) { Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 4756) +++ trunk/src_plugins/export_dsn/dsn.c (revision 4757) @@ -169,7 +169,7 @@ } for (group = 0; group < max_group; group++) { - LayerType *first_layer; + pcb_layer_t *first_layer; if (group == top_group || group == bot_group) continue; @@ -213,7 +213,7 @@ fprintf(fp, " (structure\n"); for (GList * iter = layerlist; iter; iter = g_list_next(iter)) { - LayerType *layer = iter->data; + pcb_layer_t *layer = iter->data; char *layeropts = pcb_strdup("(type signal)"); /* see if layer has same name as a net and make it a power layer */ /* loop thru all nets */ @@ -306,7 +306,7 @@ if (!pin->Number) { /* if pin is null just make it a keepout */ for (GList * iter = layerlist; iter; iter = g_list_next(iter)) { - LayerType *lay = iter->data; + pcb_layer_t *lay = iter->data; pcb_fprintf(fp, " (keepout \"\" (circle \"%s\" %.6mm %.6mm %.6mm))\n", lay->Name, pinthickness, lx, ly); } } @@ -345,7 +345,7 @@ padstack = pcb_strdup_printf("Smd_rect_%mIx%mI", xlen, ylen); if (!pad->Number) { /* if pad is null just make it a keepout */ - LayerType *lay; + pcb_layer_t *lay; lay = g_list_nth_data(layerlist, partside); pcb_fprintf(fp, " (keepout \"\" (rect \"%s\" %.6mm %.6mm %.6mm %.6mm))\n", lay->Name, lx - xlen / 2, ly - ylen / 2, lx + xlen / 2, ly + ylen / 2); @@ -387,7 +387,7 @@ if (sscanf(padstack, "Smd_rect_%ldx%ld", &dim1, &dim2) == 2) { /* then pad is smd */ pcb_fprintf(fp, " (shape (rect \"%s\" %.6mm %.6mm %.6mm %.6mm))\n", - ((LayerType *) (g_list_first(layerlist)->data))->Name, dim1 / -2, dim2 / -2, dim1 / 2, dim2 / 2); + ((pcb_layer_t *) (g_list_first(layerlist)->data))->Name, dim1 / -2, dim2 / -2, dim1 / 2, dim2 / 2); } else if (sscanf(padstack, "Th_square_%ld", &dim1) == 1) { pcb_fprintf(fp, " (shape (rect signal %.6mm %.6mm %.6mm %.6mm))\n", dim1 / -2, dim1 / -2, dim1 / 2, dim1 / 2); @@ -453,7 +453,7 @@ static void print_wires(FILE * fp) { GList *iter; - LayerType *lay; + pcb_layer_t *lay; fprintf(fp, " (wiring\n"); for (iter = layerlist; iter; iter = g_list_next(iter)) { Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 4756) +++ trunk/src_plugins/export_gcode/gcode.c (revision 4757) @@ -252,7 +252,7 @@ void gcode_choose_groups() { int n, m; - LayerType *layer; + pcb_layer_t *layer; /* Set entire array to 0 (don't export any layer groups by default */ memset(gcode_export_group, 0, sizeof(gcode_export_group)); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 4756) +++ trunk/src_plugins/export_gerber/gerber.c (revision 4757) @@ -84,7 +84,7 @@ static int flash_drills; static int copy_outline_mode; static int name_style; -static LayerTypePtr outline_layer; +static pcb_layer_t *outline_layer; enum ApertureShape { ROUND, /* Shaped like a circle */ @@ -528,7 +528,7 @@ outline_layer = NULL; for (i = 0; i < max_copper_layer; i++) { - LayerType *layer = PCB->Data->Layer + i; + pcb_layer_t *layer = PCB->Data->Layer + i; if (strcmp(layer->Name, "outline") == 0 || strcmp(layer->Name, "route") == 0) { outline_layer = layer; } @@ -551,7 +551,7 @@ hid_save_and_show_layer_ons(save_ons); for (i = 0; i < max_copper_layer; i++) { - LayerType *layer = PCB->Data->Layer + i; + pcb_layer_t *layer = PCB->Data->Layer + i; if (!LAYER_IS_EMPTY(layer)) print_group[GetLayerGroupNumberByNumber(i)] = 1; } Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 4756) +++ trunk/src_plugins/export_nelma/nelma.c (revision 4757) @@ -497,7 +497,7 @@ void nelma_choose_groups() { int n, m; - LayerType *layer; + pcb_layer_t *layer; /* Set entire array to 0 (don't export any layer groups by default */ memset(nelma_export_group, 0, sizeof(nelma_export_group)); Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 4756) +++ trunk/src_plugins/export_openscad/scad.c (revision 4757) @@ -502,7 +502,7 @@ int inner_layers; float layer_spacing, layer_offset, cut_offset = 0.; BoxType region; - LayerType *layer; + pcb_layer_t *layer; conf_force_set_bool(conf_core.editor.thin_draw, 0); conf_force_set_bool(conf_core.editor.thin_draw_poly, 0); Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 4756) +++ trunk/src_plugins/export_png/png.c (revision 4757) @@ -449,7 +449,7 @@ memset(print_layer, 0, sizeof(print_layer)); for (i = 0; i < max_copper_layer; i++) { - LayerType *layer = PCB->Data->Layer + i; + pcb_layer_t *layer = PCB->Data->Layer + i; if (!LAYER_IS_EMPTY(layer)) print_group[GetLayerGroupNumberByNumber(i)] = 1; } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 4756) +++ trunk/src_plugins/export_ps/eps.c (revision 4757) @@ -205,7 +205,7 @@ /* Figure out which layers actually have stuff on them. */ for (i = 0; i < max_copper_layer; i++) { - LayerType *layer = PCB->Data->Layer + i; + pcb_layer_t *layer = PCB->Data->Layer + i; if (layer->On) if (!LAYER_IS_EMPTY(layer)) print_group[GetLayerGroupNumberByNumber(i)] = 1; Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 4756) +++ trunk/src_plugins/export_ps/ps.c (revision 4757) @@ -400,7 +400,7 @@ pcb_bool drillcopper; pcb_bool legend; - LayerTypePtr outline_layer; + pcb_layer_t *outline_layer; double scale_factor; @@ -650,7 +650,7 @@ global.outline_layer = NULL; for (i = 0; i < max_copper_layer; i++) { - LayerType *layer = PCB->Data->Layer + i; + pcb_layer_t *layer = PCB->Data->Layer + i; if (!LAYER_IS_EMPTY(layer)) global.print_group[GetLayerGroupNumberByNumber(i)] = 1; Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4756) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4757) @@ -70,7 +70,7 @@ { FontType *font; SymbolType *symbol; - LayerTypePtr lfont, lorig, lwidth, lgrid; + pcb_layer_t *lfont, *lorig, *lwidth, *lgrid; int s, l; if (hid_actionl("New", "Font", 0)) @@ -162,7 +162,7 @@ int i; LineType *l; gdl_iterator_t it; - LayerTypePtr lfont, lwidth; + pcb_layer_t *lfont, *lwidth; font = &PCB->Font; lfont = PCB->Data->Layer + 0; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 4756) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 4757) @@ -131,7 +131,7 @@ { pcb_cardinal_t l, n; layout_search_t *s = new_search(search_ID); - LayerType *layer = PCB->Data->Layer; + pcb_layer_t *layer = PCB->Data->Layer; for (l =0; l < MAX_LAYER + 2; l++, layer++) { s->layer = l; Index: trunk/src_plugins/hid_gtk/gui-config.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-config.c (revision 4756) +++ trunk/src_plugins/hid_gtk/gui-config.c (revision 4757) @@ -1290,7 +1290,7 @@ static void config_layers_apply(void) { - LayerType *layer; + pcb_layer_t *layer; const gchar *s; gint group, i; gint componentgroup = 0, soldergroup = 0; @@ -1366,7 +1366,7 @@ static void layer_name_entry_cb(GtkWidget * entry, gpointer data) { gint i = GPOINTER_TO_INT(data); - LayerType *layer; + pcb_layer_t *layer; const gchar *name; layer = &PCB->Data->Layer[i]; @@ -1487,7 +1487,7 @@ /* change default layer names to the current ones in dest */ for (n = 0; n < max_copper_layer; n++) { - LayerType *layer; + pcb_layer_t *layer; char lnp[128]; lht_node_t *nd; sprintf(lnp, "design/default_layer_name[%d]", n); Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4756) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4757) @@ -215,7 +215,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_POLYGON: - ChangeGroupVisibility(GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1), pcb_true, pcb_true); + ChangeGroupVisibility(GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true); } DrawObject(object_type, ptr1, ptr2); } Index: trunk/src_plugins/hid_gtk/gui-output-events.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-output-events.c (revision 4756) +++ trunk/src_plugins/hid_gtk/gui-output-events.c (revision 4757) @@ -308,7 +308,7 @@ return NULL; /* don't mess with silk objects! */ - if (type & SILK_TYPE && GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1) >= max_copper_layer) + if (type & SILK_TYPE && GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1) >= max_copper_layer) return NULL; if (type == PCB_TYPE_PIN || type == PCB_TYPE_PAD) Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 4756) +++ trunk/src_plugins/import_dsn/dsn.c (revision 4757) @@ -94,7 +94,7 @@ Coord dim1, dim2, x0 = 0, y0 = 0, x1, y1; Coord linethick = 0, lineclear, viadiam, viadrill; char lname[200]; - LayerType *rlayer = NULL; + pcb_layer_t *rlayer = NULL; LineType *line = NULL; fname = argc ? argv[0] : 0; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4756) +++ trunk/src_plugins/io_kicad/write.c (revision 4757) @@ -570,7 +570,7 @@ } int write_kicad_layout_tracks(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) + pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { gdl_iterator_t it; LineType *line; @@ -608,7 +608,7 @@ } int write_kicad_layout_arcs(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) + pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { gdl_iterator_t it; ArcType *arc; @@ -670,7 +670,7 @@ } int write_kicad_layout_text(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) + pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { FontType *myfont = &PCB->Font; Coord mWidth = myfont->MaxWidth; /* kicad needs the width of the widest letter */ @@ -1255,7 +1255,7 @@ */ int write_kicad_layout_polygons(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) + pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { int i, j; gdl_iterator_t it; Index: trunk/src_plugins/io_kicad/write.h =================================================================== --- trunk/src_plugins/io_kicad/write.h (revision 4756) +++ trunk/src_plugins/io_kicad/write.h (revision 4757) @@ -35,13 +35,13 @@ int write_kicad_module_header(FILE * FP, pcb_cardinal_t indentation); int write_kicad_layout_header(FILE * FP, pcb_cardinal_t indentation); int write_kicad_layout_vias(FILE * FP, pcb_data_t *Data, Coord MaxWidth, Coord MaxHeight, pcb_cardinal_t indentation); -int write_kicad_layout_tracks(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, +int write_kicad_layout_tracks(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord MaxWidth, Coord MaxHeight, pcb_cardinal_t indentation); -int write_kicad_layout_arcs(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, +int write_kicad_layout_arcs(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation); -int write_kicad_layout_text(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, +int write_kicad_layout_text(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation); int write_kicad_equipotential_netlists(FILE * FP, pcb_board_t *Layout, pcb_cardinal_t indentation); int write_kicad_layout_elements(FILE * FP, pcb_board_t *Layout, pcb_data_t *Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation); -int write_kicad_layout_polygons(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation); +int write_kicad_layout_polygons(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation); Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4756) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4757) @@ -529,7 +529,7 @@ } int write_kicad_legacy_layout_tracks(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset) + pcb_layer_t *layer, Coord xOffset, Coord yOffset) { gdl_iterator_t it; LineType *line; @@ -569,7 +569,7 @@ } int write_kicad_legacy_layout_arcs(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset) + pcb_layer_t *layer, Coord xOffset, Coord yOffset) { gdl_iterator_t it; ArcType *arc; @@ -634,7 +634,7 @@ } int write_kicad_legacy_layout_text(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset) + pcb_layer_t *layer, Coord xOffset, Coord yOffset) { FontType *myfont = &PCB->Font; Coord mWidth = myfont->MaxWidth; /* kicad needs the width of the widest letter */ @@ -1185,7 +1185,7 @@ */ int write_kicad_legacy_layout_polygons(FILE * FP, pcb_cardinal_t number, - LayerTypePtr layer, Coord xOffset, Coord yOffset) + pcb_layer_t *layer, Coord xOffset, Coord yOffset) { int i, j; gdl_iterator_t it; Index: trunk/src_plugins/io_kicad_legacy/write.h =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.h (revision 4756) +++ trunk/src_plugins/io_kicad_legacy/write.h (revision 4757) @@ -35,13 +35,13 @@ int write_kicad_legacy_module_header(FILE * FP); int write_kicad_legacy_layout_header(FILE * FP); int write_kicad_legacy_layout_vias(FILE * FP, pcb_data_t *Data, Coord MaxWidth, Coord MaxHeight); -int write_kicad_legacy_layout_tracks(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, +int write_kicad_legacy_layout_tracks(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord MaxWidth, Coord MaxHeight); -int write_kicad_legacy_layout_arcs(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, +int write_kicad_legacy_layout_arcs(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset); -int write_kicad_legacy_layout_text(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, +int write_kicad_legacy_layout_text(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset); int write_kicad_legacy_equipotential_netlists(FILE * FP, pcb_board_t *Layout); int write_kicad_legacy_layout_elements(FILE * FP, pcb_board_t *Layout, pcb_data_t *Data, Coord xOffset, Coord yOffset); -int write_kicad_legacy_layout_polygons(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer, Coord xOffset, Coord yOffset); +int write_kicad_legacy_layout_polygons(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset); Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4756) +++ trunk/src_plugins/io_lihata/read.c (revision 4757) @@ -336,7 +336,7 @@ } -static int parse_line(LayerType *ly, ElementType *el, lht_node_t *obj, int no_id, Coord dx, Coord dy) +static int parse_line(pcb_layer_t *ly, ElementType *el, lht_node_t *obj, int no_id, Coord dx, Coord dy) { LineType *line; @@ -404,7 +404,7 @@ return 0; } -static int parse_arc(LayerType *ly, ElementType *el, lht_node_t *obj, Coord dx, Coord dy) +static int parse_arc(pcb_layer_t *ly, ElementType *el, lht_node_t *obj, Coord dx, Coord dy) { ArcType *arc; @@ -438,7 +438,7 @@ } -static int parse_polygon(LayerType *ly, ElementType *el, lht_node_t *obj) +static int parse_polygon(pcb_layer_t *ly, ElementType *el, lht_node_t *obj) { PolygonType *poly = GetPolygonMemory(ly); lht_node_t *geo; @@ -488,7 +488,7 @@ return 0; } -static int parse_pcb_text(LayerType *ly, ElementType *el, lht_node_t *obj) +static int parse_pcb_text(pcb_layer_t *ly, ElementType *el, lht_node_t *obj) { TextType *text; lht_node_t *role; @@ -534,7 +534,7 @@ lht_node_t *n, *lst; lht_dom_iterator_t it; - LayerType *ly = &dt->Layer[dt->LayerN]; + pcb_layer_t *ly = &dt->Layer[dt->LayerN]; dt->LayerN++; ly->Name = pcb_strdup(grp->name); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4756) +++ trunk/src_plugins/io_lihata/write.c (revision 4757) @@ -418,7 +418,7 @@ } -static lht_node_t *build_data_layer(pcb_data_t *data, LayerType *layer, int layer_group) +static lht_node_t *build_data_layer(pcb_data_t *data, pcb_layer_t *layer, int layer_group) { lht_node_t *obj, *grp; LineType *li; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4756) +++ trunk/src_plugins/io_pcb/file.c (revision 4757) @@ -71,7 +71,7 @@ static void WritePCBFontData(FILE *); static void WriteViaData(FILE *, pcb_data_t *); static void WritePCBRatData(FILE *); -static void WriteLayerData(FILE *, pcb_cardinal_t, LayerTypePtr); +static void WriteLayerData(FILE *, pcb_cardinal_t, pcb_layer_t *); /* --------------------------------------------------------------------------- * Flag helper functions @@ -436,7 +436,7 @@ /* --------------------------------------------------------------------------- * writes layer data */ -static void WriteLayerData(FILE * FP, pcb_cardinal_t Number, LayerTypePtr layer) +static void WriteLayerData(FILE * FP, pcb_cardinal_t Number, pcb_layer_t *layer) { gdl_iterator_t it; LineType *line; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4756) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4757) @@ -120,7 +120,7 @@ #include "compat_misc.h" #include "obj_all.h" -static LayerTypePtr Layer; +static pcb_layer_t *Layer; static PolygonTypePtr Polygon; static SymbolTypePtr Symbol; static int pin_num; @@ -2321,7 +2321,7 @@ { if ((yyvsp[-1].integer) & PCB_FLAG_ONSILK) { - LayerTypePtr lay = &yyData->Layer[yyData->LayerN + + pcb_layer_t *lay = &yyData->Layer[yyData->LayerN + (((yyvsp[-1].integer) & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)]; CreateNewText(lay ,yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), @@ -2347,7 +2347,7 @@ */ if ((yyvsp[-1].flagtype).f & PCB_FLAG_ONSILK) { - LayerTypePtr lay = &yyData->Layer[yyData->LayerN + + pcb_layer_t *lay = &yyData->Layer[yyData->LayerN + (((yyvsp[-1].flagtype).f & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)]; CreateNewText(lay, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype)); Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4756) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4757) @@ -57,7 +57,7 @@ #include "compat_misc.h" #include "obj_all.h" -static LayerTypePtr Layer; +static pcb_layer_t *Layer; static PolygonTypePtr Polygon; static SymbolTypePtr Symbol; static int pin_num; @@ -1078,7 +1078,7 @@ { if ($8 & PCB_FLAG_ONSILK) { - LayerTypePtr lay = &yyData->Layer[yyData->LayerN + + pcb_layer_t *lay = &yyData->Layer[yyData->LayerN + (($8 & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)]; CreateNewText(lay ,yyFont, OU ($3), OU ($4), $5, $6, $7, @@ -1103,7 +1103,7 @@ */ if ($8.f & PCB_FLAG_ONSILK) { - LayerTypePtr lay = &yyData->Layer[yyData->LayerN + + pcb_layer_t *lay = &yyData->Layer[yyData->LayerN + (($8.f & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)]; CreateNewText(lay, yyFont, NU ($3), NU ($4), $5, $6, $7, $8); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 4756) +++ trunk/src_plugins/jostle/jostle.c (revision 4757) @@ -269,7 +269,7 @@ /*! * Wrapper for CreateNewLineOnLayer that takes vectors and deals with Undo */ -static LineType *CreateVectorLineOnLayer(LayerType * layer, Vector a, Vector b, int thickness, int clearance, FlagType flags) +static LineType *CreateVectorLineOnLayer(pcb_layer_t * layer, Vector a, Vector b, int thickness, int clearance, FlagType flags) { LineType *line; @@ -280,7 +280,7 @@ return line; } -static LineType *MakeBypassLine(LayerType * layer, Vector a, Vector b, LineType * orig, POLYAREA ** expandp) +static LineType *MakeBypassLine(pcb_layer_t * layer, Vector a, Vector b, LineType * orig, POLYAREA ** expandp) { LineType *line; @@ -311,7 +311,7 @@ * points a, b, c, d. Finally connect the dots and remove the * old straight line. */ -static int MakeBypassingLines(POLYAREA * brush, LayerType * layer, LineType * line, int side, POLYAREA ** expandp) +static int MakeBypassingLines(POLYAREA * brush, pcb_layer_t * layer, LineType * line, int side, POLYAREA ** expandp) { Vector pA, pB, flatA, flatB, qA, qB; Vector lA, lB; @@ -349,7 +349,7 @@ struct info { BoxType box; POLYAREA *brush; - LayerType *layer; + pcb_layer_t *layer; POLYAREA *smallest; /*!< after cutting brush with line, the smallest chunk, which we * will go around on 'side'. Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4756) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4757) @@ -278,7 +278,7 @@ PLINE *pline; VNODE *node; PolygonType *Polygon;*/ - LayerType *Layer = NULL; + pcb_layer_t *Layer = NULL; poly_tree *root = NULL; poly_tree *this_node; Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 4756) +++ trunk/src_plugins/polystitch/polystitch.c (revision 4757) @@ -40,7 +40,7 @@ #include "obj_poly_draw.h" static PolygonType *inner_poly, *outer_poly; -static LayerType *poly_layer; +static pcb_layer_t *poly_layer; static double ATAN2(PointType a, PointType b) { Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4756) +++ trunk/src_plugins/propedit/propsel.c (revision 4757) @@ -89,7 +89,7 @@ free(big); } -static void map_line_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, LineType *line) +static void map_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) { map_chk_skip(ctx, line); map_add_prop(ctx, "p/trace/thickness", Coord, line->Thickness); @@ -97,7 +97,7 @@ map_attr(ctx, &line->Attributes); } -static void map_arc_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, ArcType *arc) +static void map_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) { map_chk_skip(ctx, arc); map_add_prop(ctx, "p/trace/thickness", Coord, arc->Thickness); @@ -109,7 +109,7 @@ map_attr(ctx, &arc->Attributes); } -static void map_text_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, TextType *text) +static void map_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) { map_chk_skip(ctx, text); map_add_prop(ctx, "p/text/scale", int, text->Scale); @@ -118,7 +118,7 @@ map_attr(ctx, &text->Attributes); } -static void map_poly_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, PolygonType *poly) +static void map_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly) { map_chk_skip(ctx, poly); map_attr(ctx, &poly->Attributes); @@ -216,7 +216,7 @@ #define DONE { st->set_cnt++; RestoreUndoSerialNumber(); return; } -static void set_line_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, LineType *line) +static void set_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) { set_ctx_t *st = (set_ctx_t *)ctx; const char *pn = st->name + 8; @@ -235,7 +235,7 @@ ChangeObjectClearSize(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; } -static void set_arc_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, ArcType *arc) +static void set_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) { set_ctx_t *st = (set_ctx_t *)ctx; const char *pn = st->name + 8; @@ -305,13 +305,13 @@ } } -static void set_text_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, TextType *text) +static void set_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) { set_text_cb_any(ctx, pcb, PCB_TYPE_TEXT, layer, text); } -static void set_poly_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, PolygonType *poly) +static void set_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly) { set_ctx_t *st = (set_ctx_t *)ctx; @@ -486,25 +486,25 @@ st->del_cnt++; } -static void del_line_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, LineType *line) +static void del_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) { map_chk_skip(ctx, line); del_attr(ctx, &line->Attributes); } -static void del_arc_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, ArcType *arc) +static void del_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) { map_chk_skip(ctx, arc); del_attr(ctx, &arc->Attributes); } -static void del_text_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, TextType *text) +static void del_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) { map_chk_skip(ctx, text); del_attr(ctx, &text->Attributes); } -static void del_poly_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, PolygonType *poly) +static void del_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly) { map_chk_skip(ctx, poly); del_attr(ctx, &poly->Attributes); Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4756) +++ trunk/src_plugins/puller/puller.c (revision 4757) @@ -276,7 +276,7 @@ static r_dir_t line_callback(const BoxType * b, void *cl) { - /* LayerTypePtr layer = (LayerTypePtr)cl; */ + /* pcb_layer_t *layer = (pcb_layer_t *)cl; */ LineTypePtr l = (LineTypePtr) b; double d1, d2, t; #if TRACE1 @@ -302,7 +302,7 @@ static r_dir_t arc_callback(const BoxType * b, void *cl) { - /* LayerTypePtr layer = (LayerTypePtr) cl; */ + /* pcb_layer_t *layer = (pcb_layer_t *) cl; */ ArcTypePtr a = (ArcTypePtr) b; #if TRACE1 Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4756) +++ trunk/src_plugins/query/query_access.c (revision 4757) @@ -42,7 +42,7 @@ pcb_objlist_append(lst, o); \ } while(0) -static int list_layer_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, int enter) +static int list_layer_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter) { if (enter) APPEND(ctx, PCB_OBJ_LAYER, layer, PCB_PARENT_DATA, pcb->Data); @@ -49,22 +49,22 @@ return 0; } -static void list_line_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, LineType *line) +static void list_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, LineType *line) { APPEND(ctx, PCB_OBJ_LINE, line, PCB_PARENT_LAYER, layer); } -static void list_arc_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, ArcType *arc) +static void list_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, ArcType *arc) { APPEND(ctx, PCB_OBJ_ARC, arc, PCB_PARENT_LAYER, layer); } -static void list_text_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, TextType *text) +static void list_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, TextType *text) { APPEND(ctx, PCB_OBJ_TEXT, text, PCB_PARENT_LAYER, layer); } -static void list_poly_cb(void *ctx, pcb_board_t *pcb, LayerType *layer, PolygonType *poly) +static void list_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, PolygonType *poly) { APPEND(ctx, PCB_OBJ_POLYGON, poly, PCB_PARENT_LAYER, layer); } @@ -224,7 +224,7 @@ static int field_layer(pcb_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res) { - LayerType *l = obj->data.layer; + pcb_layer_t *l = obj->data.layer; query_fields_keys_t fh1; fld2hash_req(fh1, fld, 0); @@ -249,7 +249,7 @@ PCB_QRY_RET_INV(res); } -static int field_layer_from_ptr(LayerType *l, pcb_qry_node_t *fld, pcb_qry_val_t *res) +static int field_layer_from_ptr(pcb_layer_t *l, pcb_qry_node_t *fld, pcb_qry_val_t *res) { pcb_obj_t tmp; tmp.type = PCB_OBJ_LAYER; Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4756) +++ trunk/src_plugins/report/report.c (revision 4757) @@ -221,7 +221,7 @@ LineTypePtr line; #ifndef NDEBUG if (gui->shift_is_pressed()) { - LayerTypePtr layer = (LayerTypePtr) ptr1; + pcb_layer_t *layer = (pcb_layer_t *) ptr1; __r_dump_tree(layer->line_tree->root, 0); return 0; } @@ -238,7 +238,7 @@ line->Point1.X, line->Point1.Y, line->Point1.ID, line->Point2.X, line->Point2.Y, line->Point2.ID, line->Thickness, line->Clearance / 2, - GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1), + GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), UNKNOWN(line->Number), TEST_FLAG(PCB_FLAG_LOCK, line) ? "It is LOCKED.\n" : ""); break; } @@ -268,7 +268,7 @@ BoxTypePtr box; #ifndef NDEBUG if (gui->shift_is_pressed()) { - LayerTypePtr layer = (LayerTypePtr) ptr1; + pcb_layer_t *layer = (pcb_layer_t *) ptr1; __r_dump_tree(layer->arc_tree->root, 0); return 0; } @@ -292,7 +292,7 @@ Arc->BoundingBox.X2, Arc->BoundingBox.Y2, box->X1, box->Y1, box->X2, box->Y2, - GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1), TEST_FLAG(PCB_FLAG_LOCK, Arc) ? "It is LOCKED.\n" : ""); + GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), TEST_FLAG(PCB_FLAG_LOCK, Arc) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_POLYGON: @@ -300,7 +300,7 @@ PolygonTypePtr Polygon; #ifndef NDEBUG if (gui->shift_is_pressed()) { - LayerTypePtr layer = (LayerTypePtr) ptr1; + pcb_layer_t *layer = (pcb_layer_t *) ptr1; __r_dump_tree(layer->polygon_tree->root, 0); return 0; } @@ -318,7 +318,7 @@ Polygon->BoundingBox.X2, Polygon->BoundingBox.Y2, Polygon->PointN, Polygon->PointMax - Polygon->PointN, Polygon->HoleIndexN, - GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1), TEST_FLAG(PCB_FLAG_LOCK, Polygon) ? "It is LOCKED.\n" : ""); + GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), TEST_FLAG(PCB_FLAG_LOCK, Polygon) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_PAD: @@ -405,7 +405,7 @@ case PCB_TYPE_TEXT: #ifndef NDEBUG if (gui->shift_is_pressed()) { - LayerTypePtr layer = (LayerTypePtr) ptr1; + pcb_layer_t *layer = (pcb_layer_t *) ptr1; __r_dump_tree(layer->text_tree->root, 0); return 0; } @@ -423,7 +423,7 @@ text = (TextTypePtr) ptr2; if (type == PCB_TYPE_TEXT) - sprintf(laynum, "It is on layer %d.", GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1)); + sprintf(laynum, "It is on layer %d.", GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1)); report = pcb_strdup_printf("%m+TEXT ID# %ld; Flags:%s\n" "Located at (X,Y) = %$mD.\n" "Characters are %$mS tall.\n" @@ -447,7 +447,7 @@ "Located at (X,Y) = %$mD.\n" "It belongs to a %s on layer %d.\n", USER_UNITMASK, point->ID, point->X, point->Y, - (type == PCB_TYPE_LINE_POINT) ? "line" : "polygon", GetLayerNumber(PCB->Data, (LayerTypePtr) ptr1)); + (type == PCB_TYPE_LINE_POINT) ? "line" : "polygon", GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1)); break; } case PCB_TYPE_NONE: Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 4756) +++ trunk/src_plugins/teardrops/teardrops.c (revision 4757) @@ -58,7 +58,7 @@ static r_dir_t check_line_callback(const BoxType * box, void *cl) { - LayerType *lay = &PCB->Data->Layer[layer]; + pcb_layer_t *lay = &PCB->Data->Layer[layer]; LineType *l = (LineType *) box; int x1, x2, y1, y2; double a, b, c, x, r, t; @@ -215,7 +215,7 @@ EMPTY(NAMEONPCB_NAME(element)), EMPTY(VALUE_NAME(element)), EMPTY(DESCRIPTION_NAME(element))); for (layer = 0; layer < max_copper_layer; layer++) { - LayerType *l = &(PCB->Data->Layer[layer]); + pcb_layer_t *l = &(PCB->Data->Layer[layer]); r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL); } } @@ -237,7 +237,7 @@ fprintf(stderr, "Via at %.6f, %.6f\n", PCB_COORD_TO_MM(pin->X), PCB_COORD_TO_MM(pin->Y)); for (layer = 0; layer < max_copper_layer; layer++) { - LayerType *l = &(PCB->Data->Layer[layer]); + pcb_layer_t *l = &(PCB->Data->Layer[layer]); r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL); } } @@ -273,7 +273,7 @@ /* EMPTY (DESCRIPTION_NAME (element))); */ for (layer = 0; layer < max_copper_layer; layer++) { - LayerType *l = &(PCB->Data->Layer[layer]); + pcb_layer_t *l = &(PCB->Data->Layer[layer]); r_search(l->line_tree, &(pad->BoundingBox), NULL, check_line_callback, l, NULL); } } Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4756) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4757) @@ -2055,7 +2055,7 @@ * * Inserts points and constraints into GLists */ -int read_lines(toporouter_t * r, toporouter_layer_t * l, LayerType * layer, int ln) +int read_lines(toporouter_t * r, toporouter_layer_t * l, pcb_layer_t * layer, int ln) { gdouble xs[2], ys[2];