Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4907) +++ trunk/doc-rnd/hacking/renames (revision 4908) @@ -448,3 +448,6 @@ EMPTY_STRING_P -> PCB_EMPTY_STRING_P XOR -> PCB_XOR SQUARE -> PCB_SQUARE +OBJECT_ID -> PCB_OBJECT_ID +FRONT -> PCB_FRONT +ON_SIDE -> PCB_ON_SIDE Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4907) +++ trunk/src/buffer.c (revision 4908) @@ -667,7 +667,7 @@ #ifdef DEBUG printf("In CopyPastebufferToLayout, pasting element %s\n", element->Name[1].TextString); #endif - if (FRONT(element) || PCB->InvisibleObjectsOn) { + if (PCB_FRONT(element) || PCB->InvisibleObjectsOn) { CopyElement(&ctx, element); changed = pcb_true; } Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4907) +++ trunk/src/crosshair.c (revision 4908) @@ -323,7 +323,7 @@ if (PCB->PinOn && PCB->ElementOn) ELEMENT_LOOP(Buffer->Data); { - if (FRONT(element) || PCB->InvisibleObjectsOn) + if (PCB_FRONT(element) || PCB->InvisibleObjectsOn) XORDrawElement(element, x, y); } END_LOOP; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4907) +++ trunk/src/draw.c (revision 4908) @@ -550,7 +550,7 @@ DrawPolygon((pcb_layer_t *) ptr1, (pcb_polygon_t *) ptr2); break; case PCB_TYPE_ELEMENT: - if (PCB->ElementOn && (FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn)) + if (PCB->ElementOn && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn)) DrawElement((pcb_element_t *) ptr2); break; case PCB_TYPE_RATLINE: @@ -566,7 +566,7 @@ DrawPad((pcb_pad_t *) ptr2); break; case PCB_TYPE_ELEMENT_NAME: - if (PCB->ElementOn && (FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn)) + if (PCB->ElementOn && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn)) DrawElementName((pcb_element_t *) ptr1); break; } Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4907) +++ trunk/src/gui_act.c (revision 4908) @@ -934,7 +934,7 @@ ELEMENT_LOOP(PCB->Data); { if ((PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, &NAMEONPCB_TEXT(element))) - && (FRONT(element) || PCB->InvisibleObjectsOn)) { + && (PCB_FRONT(element) || PCB->InvisibleObjectsOn)) { AddObjectToFlagUndoList(PCB_TYPE_ELEMENT, element, element, element); EraseElementName(element); PCB_FLAG_TOGGLE(PCB_FLAG_HIDENAME, element); Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 4907) +++ trunk/src/layer.c (revision 4908) @@ -458,7 +458,7 @@ pcb_bool paste_empty = pcb_true; ALLPAD_LOOP(PCB->Data); { - if (ON_SIDE(pad, side) && !PCB_FLAG_TEST(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { + if (PCB_ON_SIDE(pad, side) && !PCB_FLAG_TEST(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { paste_empty = pcb_false; break; } Index: trunk/src/macro.h =================================================================== --- trunk/src/macro.h (revision 4907) +++ trunk/src/macro.h (revision 4908) @@ -50,12 +50,12 @@ /* --------------------------------------------------------------------------- * returns the object ID */ -#define OBJECT_ID(p) (((pcb_any_obj_t *) p)->ID) +#define PCB_OBJECT_ID(p) (((pcb_any_obj_t *) p)->ID) /* --------------------------------------------------------------------------- * Determines if object is on front or back */ -#define FRONT(o) \ +#define PCB_FRONT(o) \ ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (o)) != 0) == SWAP_IDENT) /* --------------------------------------------------------------------------- @@ -62,7 +62,7 @@ * Determines if an object is on the given side. side is either SOLDER_LAYER * or COMPONENT_LAYER. */ -#define ON_SIDE(element, side) \ +#define PCB_ON_SIDE(element, side) \ (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) == (side == SOLDER_LAYER)) /* --------------------------------------------------------------------------- Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4907) +++ trunk/src/obj_elem.c (revision 4908) @@ -1514,7 +1514,7 @@ /* this call clears the polygons */ AddObjectToCreateUndoList(PCB_TYPE_ELEMENT, element, element, element); - if (PCB->ElementOn && (FRONT(element) || PCB->InvisibleObjectsOn)) { + if (PCB->ElementOn && (PCB_FRONT(element) || PCB->InvisibleObjectsOn)) { DrawElementName(element); DrawElementPackage(element); } @@ -1530,7 +1530,7 @@ /* moves all names of an element to a new position */ void *MoveElementName(pcb_opctx_t *ctx, pcb_element_t *Element) { - if (PCB->ElementOn && (FRONT(Element) || PCB->InvisibleObjectsOn)) { + if (PCB->ElementOn && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) { EraseElementName(Element); ELEMENTTEXT_LOOP(Element); { @@ -1563,7 +1563,7 @@ { pcb_bool didDraw = pcb_false; - if (PCB->ElementOn && (FRONT(Element) || PCB->InvisibleObjectsOn)) { + if (PCB->ElementOn && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) { EraseElement(Element); MoveElementLowLevel(PCB->Data, Element, ctx->move.dx, ctx->move.dy); DrawElementName(Element); @@ -1620,7 +1620,7 @@ void *RemoveElement_op(pcb_opctx_t *ctx, pcb_element_t *Element) { /* erase from screen */ - if ((PCB->ElementOn || PCB->PinOn) && (FRONT(Element) || PCB->InvisibleObjectsOn)) { + if ((PCB->ElementOn || PCB->PinOn) && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) { EraseElement(Element); if (!ctx->remove.bulk) pcb_draw(); @@ -1666,7 +1666,7 @@ gui->set_color(Output.fgGC, PCB->ElementColor); else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) gui->set_color(Output.fgGC, PCB->ElementSelectedColor); - else if (FRONT(element)) { + else if (PCB_FRONT(element)) { #warning TODO: why do we test for Names flag here instead of elements flag? if (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, element)) gui->set_color(Output.fgGC, PCB->ElementColor_nonetlist); @@ -1689,7 +1689,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element)) return R_DIR_NOT_FOUND; - if (ON_SIDE(element, *side)) + if (PCB_ON_SIDE(element, *side)) draw_element_name(element); return R_DIR_NOT_FOUND; } @@ -1698,7 +1698,7 @@ { PAD_LOOP(element); { - if (pcb_draw_doing_pinout || pcb_draw_doing_assy || FRONT(pad) || PCB->InvisibleObjectsOn) + if (pcb_draw_doing_pinout || pcb_draw_doing_assy || PCB_FRONT(pad) || PCB->InvisibleObjectsOn) draw_pad(pad); } END_LOOP; @@ -1717,7 +1717,7 @@ gui->set_color(Output.fgGC, PCB->ElementColor); else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) gui->set_color(Output.fgGC, PCB->ElementSelectedColor); - else if (FRONT(element)) + else if (PCB_FRONT(element)) gui->set_color(Output.fgGC, PCB->ElementColor); else gui->set_color(Output.fgGC, PCB->InvisibleObjectsColor); @@ -1747,7 +1747,7 @@ pcb_element_t *element = (pcb_element_t *) b; int *side = cl; - if (ON_SIDE(element, *side)) + if (PCB_ON_SIDE(element, *side)) draw_element_package(element); return R_DIR_FOUND_CONTINUE; } @@ -1794,7 +1794,7 @@ { pcb_element_t *element = (pcb_element_t *) b; - DrawEMark(element, element->MarkX, element->MarkY, !FRONT(element)); + DrawEMark(element, element->MarkX, element->MarkY, !PCB_FRONT(element)); return R_DIR_FOUND_CONTINUE; } @@ -1869,7 +1869,7 @@ { PAD_LOOP(Element); { - if (pcb_draw_doing_pinout || pcb_draw_doing_assy || FRONT(pad) || PCB->InvisibleObjectsOn) + if (pcb_draw_doing_pinout || pcb_draw_doing_assy || PCB_FRONT(pad) || PCB->InvisibleObjectsOn) DrawPad(pad); } END_LOOP; Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4907) +++ trunk/src/obj_pad.c (revision 4908) @@ -369,7 +369,7 @@ else color = PCB->ConnectedColor; } - else if (FRONT(pad)) + else if (PCB_FRONT(pad)) color = PCB->PinColor; else color = PCB->InvisibleObjectsColor; @@ -394,7 +394,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; - if (ON_SIDE(pad, *side)) + if (PCB_ON_SIDE(pad, *side)) draw_pad(pad); return R_DIR_FOUND_CONTINUE; } @@ -403,7 +403,7 @@ { pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; - if (ON_SIDE(pad, *side) && pad->Mask) + if (PCB_ON_SIDE(pad, *side) && pad->Mask) _draw_pad(Output.pmGC, pad, pcb_true, pcb_true); return R_DIR_FOUND_CONTINUE; } @@ -414,7 +414,7 @@ gui->set_color(Output.fgGC, PCB->ElementColor); ALLPAD_LOOP(PCB->Data); { - if (ON_SIDE(pad, side) && !PCB_FLAG_TEST(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { + if (PCB_ON_SIDE(pad, side) && !PCB_FLAG_TEST(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { if (pad->Mask < pad->Thickness) _draw_pad(Output.fgGC, pad, pcb_true, pcb_true); else Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4907) +++ trunk/src/object_act.c (revision 4908) @@ -598,7 +598,7 @@ er = ElementOrientation(e); pe = elementlist_first(&(PCB_PASTEBUFFER->Data->Element)); - if (!FRONT(e)) + if (!PCB_FRONT(e)) MirrorElementCoordinates(PCB_PASTEBUFFER->Data, pe, pe->MarkY * 2 - PCB->MaxHeight); pr = ElementOrientation(pe); Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4907) +++ trunk/src/search.c (revision 4908) @@ -140,7 +140,7 @@ if (PCB_FLAG_TEST(i->locked, ptr1)) return R_DIR_NOT_FOUND; - if (FRONT(pad) || i->BackToo) { + if (PCB_FRONT(pad) || i->BackToo) { if (IsPointInPad(PosX, PosY, SearchRadius, pad)) { *i->ptr1 = ptr1; *i->ptr2 = *i->ptr3 = pad; @@ -438,7 +438,7 @@ if (PCB_FLAG_TEST(i->locked, text)) return R_DIR_NOT_FOUND; - if ((FRONT(element) || i->BackToo) && !PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element) && POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { + if ((PCB_FRONT(element) || i->BackToo) && !PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element) && POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { /* use the text with the smallest bounding box */ newarea = (text->BoundingBox.X2 - text->BoundingBox.X1) * (double) (text->BoundingBox.Y2 - text->BoundingBox.Y1); if (newarea < i->area) { @@ -483,7 +483,7 @@ if (PCB_FLAG_TEST(i->locked, element)) return R_DIR_NOT_FOUND; - if ((FRONT(element) || i->BackToo) && POINT_IN_BOX(PosX, PosY, &element->VBox)) { + if ((PCB_FRONT(element) || i->BackToo) && POINT_IN_BOX(PosX, PosY, &element->VBox)) { /* use the element with the smallest bounding box */ newarea = (element->VBox.X2 - element->VBox.X1) * (double) (element->VBox.Y2 - element->VBox.Y1); if (newarea < i->area) { Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4907) +++ trunk/src/undo.c (revision 4908) @@ -1185,7 +1185,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CLEAR, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_CLEAR, PCB_OBJECT_ID(Ptr3), Type); undo->Data.ClearPoly.Clear = clear; undo->Data.ClearPoly.Layer = (pcb_layer_t *) Ptr1; } @@ -1199,7 +1199,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_MIRROR, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_MIRROR, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Move.DY = yoff; } } @@ -1212,7 +1212,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_ROTATE, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_ROTATE, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Rotate.CenterX = CenterX; undo->Data.Rotate.CenterY = CenterY; undo->Data.Rotate.Steps = Steps; @@ -1231,7 +1231,7 @@ if (!RemoveList) RemoveList = pcb_buffer_new(); - GetUndoSlot(UNDO_REMOVE, OBJECT_ID(Ptr3), Type); + GetUndoSlot(UNDO_REMOVE, PCB_OBJECT_ID(Ptr3), Type); pcb_move_obj_to_buffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); } @@ -1252,7 +1252,7 @@ /* save the ID of the parent object; else it will be * impossible to recover the point */ - undo = GetUndoSlot(UNDO_REMOVE_POINT, OBJECT_ID(polygon), PCB_TYPE_POLYGON); + undo = GetUndoSlot(UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_TYPE_POLYGON); undo->Data.RemovedPoint.X = polygon->Points[index].X; undo->Data.RemovedPoint.Y = polygon->Points[index].Y; undo->Data.RemovedPoint.ID = polygon->Points[index].ID; @@ -1280,7 +1280,7 @@ void AddObjectToInsertPointUndoList(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (!Locked) - GetUndoSlot(UNDO_INSERT_POINT, OBJECT_ID(Ptr3), Type); + GetUndoSlot(UNDO_INSERT_POINT, PCB_OBJECT_ID(Ptr3), Type); } static void CopyObjectToUndoList(int undo_type, int Type, void *Ptr1, void *Ptr2, void *Ptr3) @@ -1294,7 +1294,7 @@ if (!RemoveList) RemoveList = pcb_buffer_new(); - undo = GetUndoSlot(undo_type, OBJECT_ID(Ptr2), Type); + undo = GetUndoSlot(undo_type, PCB_OBJECT_ID(Ptr2), Type); copy = (pcb_any_obj_t *) pcb_copy_obj_to_buffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); undo->Data.CopyID = copy->ID; } @@ -1325,7 +1325,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_MOVE, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_MOVE, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Move.DX = DX; undo->Data.Move.DY = DY; } @@ -1339,7 +1339,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGENAME, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_CHANGENAME, PCB_OBJECT_ID(Ptr3), Type); undo->Data.ChangeName.Name = OldName; } } @@ -1352,7 +1352,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGEPINNUM, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_CHANGEPINNUM, PCB_OBJECT_ID(Ptr3), Type); undo->Data.ChangeName.Name = OldName; } } @@ -1365,7 +1365,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_MOVETOLAYER, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_MOVETOLAYER, PCB_OBJECT_ID(Ptr3), Type); undo->Data.MoveToLayer.OriginalLayer = GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1); } } @@ -1376,7 +1376,7 @@ void AddObjectToCreateUndoList(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (!Locked) - GetUndoSlot(UNDO_CREATE, OBJECT_ID(Ptr3), Type); + GetUndoSlot(UNDO_CREATE, PCB_OBJECT_ID(Ptr3), Type); ClearFromPolygon(PCB->Data, Type, Ptr1, Ptr2); } @@ -1388,7 +1388,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_FLAG, OBJECT_ID(Ptr2), Type); + undo = GetUndoSlot(UNDO_FLAG, PCB_OBJECT_ID(Ptr2), Type); undo->Data.Flags = ((pcb_pin_t *) Ptr2)->Flags; } } @@ -1401,7 +1401,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGESIZE, OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(UNDO_CHANGESIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { case PCB_TYPE_PIN: case PCB_TYPE_VIA: @@ -1434,7 +1434,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGECLEARSIZE, OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(UNDO_CHANGECLEARSIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { case PCB_TYPE_PIN: case PCB_TYPE_VIA: @@ -1461,7 +1461,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGEMASKSIZE, OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(UNDO_CHANGEMASKSIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { case PCB_TYPE_PIN: case PCB_TYPE_VIA: @@ -1482,7 +1482,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGE2NDSIZE, OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(UNDO_CHANGE2NDSIZE, PCB_OBJECT_ID(ptr2), Type); if (Type == PCB_TYPE_PIN || Type == PCB_TYPE_VIA) undo->Data.Size = ((pcb_pin_t *) ptr2)->DrillingHole; } @@ -1498,7 +1498,7 @@ pcb_arc_t *a = (pcb_arc_t *) Ptr3; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGEANGLES, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_CHANGEANGLES, PCB_OBJECT_ID(Ptr3), Type); undo->Data.AngleChange.angle[0] = a->StartAngle; undo->Data.AngleChange.angle[1] = a->Delta; } @@ -1514,7 +1514,7 @@ pcb_arc_t *a = (pcb_arc_t *) Ptr3; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGERADII, OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(UNDO_CHANGERADII, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Move.DX = a->Width; undo->Data.Move.DY = a->Height; } Index: trunk/src_plugins/export_openscad/scadcomp.c =================================================================== --- trunk/src_plugins/export_openscad/scadcomp.c (revision 4907) +++ trunk/src_plugins/export_openscad/scadcomp.c (revision 4908) @@ -362,7 +362,7 @@ -- Copy AddElementToBuffer (pcb_element_t *Element) - if (ON_SIDE(Element,(Settings.ShowBottomSide)?BOTTOM_SIDE:TOP_SIDE)) + if (PCB_ON_SIDE(Element,(Settings.ShowBottomSide)?BOTTOM_SIDE:TOP_SIDE)) MirrorElementCoordinates (element_buffer.Data, element, 0); pcb_buffer_clear(&element_buffer); Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 4907) +++ trunk/src_plugins/export_test/export_test.c (revision 4908) @@ -256,7 +256,7 @@ y = PCB->MaxHeight - y; pcb_fprintf(fp, "%m+%s,\"%s\",\"%s\",%mS,%.2mS,%g,%s\n", - xy_unit->allow, name, descr, value, x, y, theta, FRONT(element) == 1 ? "top" : "bottom"); + xy_unit->allow, name, descr, value, x, y, theta, PCB_FRONT(element) == 1 ? "top" : "bottom"); free(name); free(descr); free(value); Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 4907) +++ trunk/src_plugins/export_xy/xy.c (revision 4908) @@ -276,7 +276,7 @@ pin1y = piny[rpindex] - y; /* flip x, to reverse rotation for elements on back */ - if (FRONT(element) != 1) + if (PCB_FRONT(element) != 1) pin1x = -pin1x; /* if only 1 pin, use pin 1's angle */ @@ -313,7 +313,7 @@ y = PCB->MaxHeight - y; pcb_fprintf(fp, "%m+%s,\"%s\",\"%s\",%mS,%.2mS,%g,%s\n", - xy_unit->allow, name, descr, value, x, y, theta, FRONT(element) == 1 ? "top" : "bottom"); + xy_unit->allow, name, descr, value, x, y, theta, PCB_FRONT(element) == 1 ? "top" : "bottom"); free(name); free(descr); free(value);