Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4875) +++ trunk/doc-rnd/hacking/renames (revision 4876) @@ -306,3 +306,10 @@ MaskFlags -> pcb_flag_mask EraseFlags -> pcb_flag_erase NoFlags -> pcb_no_flags +mem_any_set -> pcb_mem_any_set +SET_FLAG -> PCB_FLAG_SET +CLEAR_FLAG -> PCB_FLAG_CLEAR +TEST_FLAG -> PCB_FLAG_TEST +TOGGLE_FLAG -> PCB_FLAG_TOGGLE +ASSIGN_FLAG -> PCB_FLAG_ASSIGN +TEST_FLAGS -> PCB_FLAGS_TEST Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4875) +++ trunk/src/action_helper.c (revision 4876) @@ -245,8 +245,8 @@ conf_core.temp.rat_warn = pcb_false; ALLPIN_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_WARN, pin)) { - CLEAR_FLAG(PCB_FLAG_WARN, pin); + if (PCB_FLAG_TEST(PCB_FLAG_WARN, pin)) { + PCB_FLAG_CLEAR(PCB_FLAG_WARN, pin); DrawPin(pin); } } @@ -253,8 +253,8 @@ ENDALL_LOOP; VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_WARN, via)) { - CLEAR_FLAG(PCB_FLAG_WARN, via); + if (PCB_FLAG_TEST(PCB_FLAG_WARN, via)) { + PCB_FLAG_CLEAR(PCB_FLAG_WARN, via); DrawVia(via); } } @@ -261,8 +261,8 @@ END_LOOP; ALLPAD_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_WARN, pad)) { - CLEAR_FLAG(PCB_FLAG_WARN, pad); + if (PCB_FLAG_TEST(PCB_FLAG_WARN, pad)) { + PCB_FLAG_CLEAR(PCB_FLAG_WARN, pad); DrawPad(pad); } } @@ -269,8 +269,8 @@ ENDALL_LOOP; ALLLINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_WARN, line)) { - CLEAR_FLAG(PCB_FLAG_WARN, line); + if (PCB_FLAG_TEST(PCB_FLAG_WARN, line)) { + PCB_FLAG_CLEAR(PCB_FLAG_WARN, line); DrawLine(layer, line); } } @@ -277,8 +277,8 @@ ENDALL_LOOP; ALLARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_WARN, arc)) { - CLEAR_FLAG(PCB_FLAG_WARN, arc); + if (PCB_FLAG_TEST(PCB_FLAG_WARN, arc)) { + PCB_FLAG_CLEAR(PCB_FLAG_WARN, arc); DrawArc(layer, arc); } } @@ -285,8 +285,8 @@ ENDALL_LOOP; ALLPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_WARN, polygon)) { - CLEAR_FLAG(PCB_FLAG_WARN, polygon); + if (PCB_FLAG_TEST(PCB_FLAG_WARN, polygon)) { + PCB_FLAG_CLEAR(PCB_FLAG_WARN, polygon); DrawPolygon(layer, polygon); } } @@ -577,13 +577,13 @@ */ for (test = (SELECT_TYPES | MOVE_TYPES) & ~PCB_TYPE_RATLINE; test; test &= ~type) { type = SearchScreen(Note.X, Note.Y, test, &ptr1, &ptr2, &ptr3); - if (!Note.Hit && (type & MOVE_TYPES) && !TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) { + if (!Note.Hit && (type & MOVE_TYPES) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) { Note.Hit = type; Note.ptr1 = ptr1; Note.ptr2 = ptr2; Note.ptr3 = ptr3; } - if (!Note.Moving && (type & SELECT_TYPES) && TEST_FLAG(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2)) + if (!Note.Moving && (type & SELECT_TYPES) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2)) Note.Moving = pcb_true; if ((Note.Hit && Note.Moving) || type == PCB_TYPE_NONE) break; @@ -684,20 +684,20 @@ if (type == PCB_TYPE_ELEMENT) { pcb_element_t *element = (pcb_element_t *) ptr2; - TOGGLE_FLAG(PCB_FLAG_LOCK, element); + PCB_FLAG_TOGGLE(PCB_FLAG_LOCK, element); PIN_LOOP(element); { - TOGGLE_FLAG(PCB_FLAG_LOCK, pin); - CLEAR_FLAG(PCB_FLAG_SELECTED, pin); + PCB_FLAG_TOGGLE(PCB_FLAG_LOCK, pin); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, pin); } END_LOOP; PAD_LOOP(element); { - TOGGLE_FLAG(PCB_FLAG_LOCK, pad); - CLEAR_FLAG(PCB_FLAG_SELECTED, pad); + PCB_FLAG_TOGGLE(PCB_FLAG_LOCK, pad); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, pad); } END_LOOP; - CLEAR_FLAG(PCB_FLAG_SELECTED, element); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, element); /* always re-draw it since I'm too lazy * to tell if a selected flag changed */ @@ -707,11 +707,11 @@ } else if (type != PCB_TYPE_NONE) { pcb_text_t *thing = (pcb_text_t *) ptr3; - TOGGLE_FLAG(PCB_FLAG_LOCK, thing); - if (TEST_FLAG(PCB_FLAG_LOCK, thing) - && TEST_FLAG(PCB_FLAG_SELECTED, thing)) { + PCB_FLAG_TOGGLE(PCB_FLAG_LOCK, thing); + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, thing) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, thing)) { /* this is not un-doable since LOCK isn't */ - CLEAR_FLAG(PCB_FLAG_SELECTED, thing); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, thing); pcb_draw_obj(type, ptr1, ptr2); pcb_draw(); } @@ -722,7 +722,7 @@ case PCB_MODE_THERMAL: { if (((type = SearchScreen(Note.X, Note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - && !TEST_FLAG(PCB_FLAG_HOLE, (pcb_pin_t *) ptr3)) { + && !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_pin_t *) ptr3)) { if (gui->shift_is_pressed()) { int tstyle = GET_THERM(INDEXOFCURRENT, (pcb_pin_t *) ptr3); tstyle++; @@ -979,7 +979,7 @@ break; /* don't start doing anything if clicket out of polys */ } - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_polygon_t *) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_polygon_t *) Crosshair.AttachedObject.Ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); Crosshair.AttachedObject.Type = PCB_TYPE_NONE; @@ -1103,7 +1103,7 @@ case PCB_MODE_REMOVE: if ((type = SearchScreen(Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); break; } @@ -1117,10 +1117,10 @@ for (i = 0; i < Crosshair.AttachedObject.RubberbandN; i++) { if (PCB->RatOn) EraseRat((pcb_rat_t *) ptr->Line); - if (TEST_FLAG(PCB_FLAG_RUBBEREND, ptr->Line)) + if (PCB_FLAG_TEST(PCB_FLAG_RUBBEREND, ptr->Line)) MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line); else - TOGGLE_FLAG(PCB_FLAG_RUBBEREND, ptr->Line); /* only remove line once */ + PCB_FLAG_TOGGLE(PCB_FLAG_RUBBEREND, ptr->Line); /* only remove line once */ ptr++; } } @@ -1148,7 +1148,7 @@ SearchScreen(Note.X, Note.Y, types, &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { - if (conf_core.editor.mode == PCB_MODE_MOVE && TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) + if (conf_core.editor.mode == PCB_MODE_MOVE && PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) Crosshair.AttachedObject.Ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); Crosshair.AttachedObject.Type = PCB_TYPE_NONE; @@ -1193,7 +1193,7 @@ &Crosshair.AttachedObject.Ptr1, &Crosshair.AttachedObject.Ptr2, &Crosshair.AttachedObject.Ptr3); if (Crosshair.AttachedObject.Type != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_polygon_t *) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_polygon_t *) Crosshair.AttachedObject.Ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); Crosshair.AttachedObject.Type = PCB_TYPE_NONE; Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 4875) +++ trunk/src/board.c (revision 4876) @@ -185,7 +185,7 @@ { pcb_pin_t *pin = (pcb_pin_t *) b; HoleCountStruct *hcs = (HoleCountStruct *) cl; - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) hcs->nunplated++; else hcs->nplated++; Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4875) +++ trunk/src/buffer.c (revision 4876) @@ -523,7 +523,7 @@ r_delete_entry(layer->text_tree, (pcb_box_t *) text); text->X = PCB_SWAP_X(text->X); text->Y = PCB_SWAP_Y(text->Y); - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, text); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); SetTextBoundingBox(&PCB->Font, text); r_insert_entry(layer->text_tree, (pcb_box_t *) text, 0); } Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4875) +++ trunk/src/change.c (revision 4876) @@ -723,7 +723,7 @@ if (PCB->ViaOn) VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, via)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, via)) change |= ChangeHole(via); } END_LOOP; @@ -744,7 +744,7 @@ ALLPAD_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad)) change |= ChangePaste(pad); } ENDALL_LOOP; Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4875) +++ trunk/src/change_act.c (revision 4876) @@ -197,7 +197,7 @@ void *ptr1, *ptr2, *ptr3; if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (set_object(type, ptr1, ptr2, ptr3)) SetChangedFlag(pcb_true); @@ -409,7 +409,7 @@ case F_Object: { if (type != PCB_TYPE_NONE) - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); if (tostyle) { if (pcb_chg_obj_1st_size(type, ptr1, ptr2, ptr3, value, absolute)) @@ -1413,7 +1413,7 @@ case F_Object: { if (type != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); else { if (pcb_chg_obj_angle(type, ptr1, ptr2, ptr3, which, value, absolute)) @@ -1476,7 +1476,7 @@ case F_Object: { if (type != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); else { if (pcb_chg_obj_radius(type, ptr1, ptr2, ptr3, which, value, absolute)) Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4875) +++ trunk/src/crosshair.c (revision 4876) @@ -248,7 +248,7 @@ /* pads */ PAD_LOOP(Element); { - if (PCB->InvisibleObjectsOn || (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) != 0) == conf_core.editor.show_solder_side) { + if (PCB->InvisibleObjectsOn || (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) != 0) == conf_core.editor.show_solder_side) { /* Make a copy of the pad structure, moved to the correct position */ pcb_pad_t moved_pad = *pad; moved_pad.Point1.X += DX; @@ -459,10 +459,10 @@ while (i) { pcb_point_t *point1, *point2; - if (TEST_FLAG(PCB_FLAG_VIA, ptr->Line)) { + if (PCB_FLAG_TEST(PCB_FLAG_VIA, ptr->Line)) { /* this is a rat going to a polygon. do not draw for rubberband */ ; } - else if (TEST_FLAG(PCB_FLAG_RUBBEREND, ptr->Line)) { + else if (PCB_FLAG_TEST(PCB_FLAG_RUBBEREND, ptr->Line)) { /* 'point1' is always the fix-point */ if (ptr->MovedPoint == &ptr->Line->Point1) { point1 = &ptr->Line->Point2; @@ -726,7 +726,7 @@ op.type = PCB_TYPE_LINE; op.obj.line = line; vtop_append(&crosshair->onpoint_objs, op); - SET_FLAG(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line); + PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line); DrawLine(NULL, line); return R_DIR_FOUND_CONTINUE; } @@ -756,7 +756,7 @@ op.type = PCB_TYPE_ARC; op.obj.arc = arc; vtop_append(&crosshair->onpoint_objs, op); - SET_FLAG(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) arc); + PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) arc); DrawArc(NULL, arc); return R_DIR_FOUND_CONTINUE; } @@ -845,7 +845,7 @@ if (onpoint_find(&crosshair->onpoint_objs, op->obj.any) != NULL) continue; - CLEAR_FLAG(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) op->obj.any); + PCB_FLAG_CLEAR(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) op->obj.any); DrawLineOrArc(op->type, op->obj.any); redraw = pcb_true; } @@ -1057,7 +1057,7 @@ /* find layer groups of the component side and solder side */ SLayer = GetLayerGroupNumberByNumber(solder_silk_layer); CLayer = GetLayerGroupNumberByNumber(component_silk_layer); - desired_group = TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; + desired_group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; GROUP_LOOP(PCB->Data, desired_group); { @@ -1140,7 +1140,7 @@ ans = SearchScreenGridSlop(Crosshair.X, Crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); if (ans == PCB_TYPE_NONE) hid_action("PointCursor"); - else if (!TEST_FLAG(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) + else if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) hid_actionl("PointCursor", "True", NULL); } Index: trunk/src/find_clear.c =================================================================== --- trunk/src/find_clear.c (revision 4875) +++ trunk/src/find_clear.c (revision 4876) @@ -32,10 +32,10 @@ VIA_LOOP(PCB->Data); { - if (TEST_FLAG(flag, via)) { + if (PCB_FLAG_TEST(flag, via)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - CLEAR_FLAG(flag, via); + PCB_FLAG_CLEAR(flag, via); if (AndDraw) DrawVia(via); change = pcb_true; @@ -46,10 +46,10 @@ { PIN_LOOP(element); { - if (TEST_FLAG(flag, pin)) { + if (PCB_FLAG_TEST(flag, pin)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - CLEAR_FLAG(flag, pin); + PCB_FLAG_CLEAR(flag, pin); if (AndDraw) DrawPin(pin); change = pcb_true; @@ -58,10 +58,10 @@ END_LOOP; PAD_LOOP(element); { - if (TEST_FLAG(flag, pad)) { + if (PCB_FLAG_TEST(flag, pad)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - CLEAR_FLAG(flag, pad); + PCB_FLAG_CLEAR(flag, pad); if (AndDraw) DrawPad(pad); change = pcb_true; @@ -84,10 +84,10 @@ RAT_LOOP(PCB->Data); { - if (TEST_FLAG(flag, line)) { + if (PCB_FLAG_TEST(flag, line)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - CLEAR_FLAG(flag, line); + PCB_FLAG_CLEAR(flag, line); if (AndDraw) DrawRat(line); change = pcb_true; @@ -96,10 +96,10 @@ END_LOOP; COPPERLINE_LOOP(PCB->Data); { - if (TEST_FLAG(flag, line)) { + if (PCB_FLAG_TEST(flag, line)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); - CLEAR_FLAG(flag, line); + PCB_FLAG_CLEAR(flag, line); if (AndDraw) DrawLine(layer, line); change = pcb_true; @@ -108,10 +108,10 @@ ENDALL_LOOP; COPPERARC_LOOP(PCB->Data); { - if (TEST_FLAG(flag, arc)) { + if (PCB_FLAG_TEST(flag, arc)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); - CLEAR_FLAG(flag, arc); + PCB_FLAG_CLEAR(flag, arc); if (AndDraw) DrawArc(layer, arc); change = pcb_true; @@ -120,10 +120,10 @@ ENDALL_LOOP; COPPERPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(flag, polygon)) { + if (PCB_FLAG_TEST(flag, polygon)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); - CLEAR_FLAG(flag, polygon); + PCB_FLAG_CLEAR(flag, polygon); if (AndDraw) DrawPolygon(layer, polygon); change = pcb_true; Index: trunk/src/find_deadcode.c =================================================================== --- trunk/src/find_deadcode.c (revision 4875) +++ trunk/src/find_deadcode.c (revision 4876) @@ -34,7 +34,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, line) && pcb_intersect_line_line(&i->line, line)) + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line)) longjmp(i->env, 1); return 0; } @@ -46,7 +46,7 @@ if (!arc->Thickness) return 0; - if (!TEST_FLAG(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc)) + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc)) longjmp(i->env, 1); return 0; } @@ -56,7 +56,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) + if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && pcb_intersect_line_pad(&i->line, pad)) longjmp(i->env, 1); return 0; @@ -113,7 +113,7 @@ /* now check all polygons */ polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { - if (!TEST_FLAG(TheFlag, polygon) + if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_line_in_poly(Line, polygon)) return (pcb_true); } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4875) +++ trunk/src/find_drc.c (revision 4876) @@ -245,7 +245,7 @@ case PCB_TYPE_LINE: if (line->Clearance < 2 * PCB->Bloat) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr2); - SET_FLAG(TheFlag, line); + PCB_FLAG_SET(TheFlag, line); message = _("Line with insufficient clearance inside polygon\n"); goto doIsBad; } @@ -253,7 +253,7 @@ case PCB_TYPE_ARC: if (arc->Clearance < 2 * PCB->Bloat) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr2); - SET_FLAG(TheFlag, arc); + PCB_FLAG_SET(TheFlag, arc); message = _("Arc with insufficient clearance inside polygon\n"); goto doIsBad; } @@ -262,7 +262,7 @@ if (pad->Clearance && pad->Clearance < 2 * PCB->Bloat) if (pcb_is_pad_in_poly(pad, polygon)) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr2); - SET_FLAG(TheFlag, pad); + PCB_FLAG_SET(TheFlag, pad); message = _("Pad with insufficient clearance inside polygon\n"); goto doIsBad; } @@ -270,7 +270,7 @@ case PCB_TYPE_PIN: if (pin->Clearance && pin->Clearance < 2 * PCB->Bloat) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr2); - SET_FLAG(TheFlag, pin); + PCB_FLAG_SET(TheFlag, pin); message = _("Pin with insufficient clearance inside polygon\n"); goto doIsBad; } @@ -278,7 +278,7 @@ case PCB_TYPE_VIA: if (pin->Clearance && pin->Clearance < 2 * PCB->Bloat) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr2); - SET_FLAG(TheFlag, pin); + PCB_FLAG_SET(TheFlag, pin); message = _("Via with insufficient clearance inside polygon\n"); goto doIsBad; } @@ -290,7 +290,7 @@ doIsBad: AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); - SET_FLAG(PCB_FLAG_FOUND, polygon); + PCB_FLAG_SET(PCB_FLAG_FOUND, polygon); DrawPolygon(layer, polygon); pcb_draw_obj(type, ptr1, ptr2); drcerr_count++; @@ -351,7 +351,7 @@ { PIN_LOOP(element); { - if (!TEST_FLAG(PCB_FLAG_DRC, pin) + if (!PCB_FLAG_TEST(PCB_FLAG_DRC, pin) && DRCFind(PCB_TYPE_PIN, (void *) element, (void *) pin, (void *) pin)) { IsBad = pcb_true; break; @@ -364,10 +364,10 @@ { /* count up how many pads have no solderpaste openings */ - if (TEST_FLAG(PCB_FLAG_NOPASTE, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_NOPASTE, pad)) nopastecnt++; - if (!TEST_FLAG(PCB_FLAG_DRC, pad) + if (!PCB_FLAG_TEST(PCB_FLAG_DRC, pad) && DRCFind(PCB_TYPE_PAD, (void *) element, (void *) pad, (void *) pad)) { IsBad = pcb_true; break; @@ -381,7 +381,7 @@ if (!IsBad) VIA_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_DRC, via) + if (!PCB_FLAG_TEST(PCB_FLAG_DRC, via) && DRCFind(PCB_TYPE_VIA, (void *) via, (void *) via, (void *) via)) { IsBad = pcb_true; break; @@ -402,7 +402,7 @@ break; if (line->Thickness < PCB->minWid) { AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); - SET_FLAG(TheFlag, line); + PCB_FLAG_SET(TheFlag, line); DrawLine(layer, line); drcerr_count++; SetThing(PCB_TYPE_LINE, layer, line, line); @@ -433,7 +433,7 @@ break; if (arc->Thickness < PCB->minWid) { AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); - SET_FLAG(TheFlag, arc); + PCB_FLAG_SET(TheFlag, arc); DrawArc(layer, arc); drcerr_count++; SetThing(PCB_TYPE_ARC, layer, arc, arc); @@ -462,9 +462,9 @@ PlowsPolygon(PCB->Data, PCB_TYPE_PIN, element, pin, drc_callback); if (IsBad) break; - if (!TEST_FLAG(PCB_FLAG_HOLE, pin) && pin->Thickness - pin->DrillingHole < 2 * PCB->minRing) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) && pin->Thickness - pin->DrillingHole < 2 * PCB->minRing) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - SET_FLAG(TheFlag, pin); + PCB_FLAG_SET(TheFlag, pin); DrawPin(pin); drcerr_count++; SetThing(PCB_TYPE_PIN, element, pin, pin); @@ -487,7 +487,7 @@ } if (pin->DrillingHole < PCB->minDrill) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - SET_FLAG(TheFlag, pin); + PCB_FLAG_SET(TheFlag, pin); DrawPin(pin); drcerr_count++; SetThing(PCB_TYPE_PIN, element, pin, pin); @@ -518,7 +518,7 @@ break; if (pad->Thickness < PCB->minWid) { AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - SET_FLAG(TheFlag, pad); + PCB_FLAG_SET(TheFlag, pad); DrawPad(pad); drcerr_count++; SetThing(PCB_TYPE_PAD, element, pad, pad); @@ -547,9 +547,9 @@ PlowsPolygon(PCB->Data, PCB_TYPE_VIA, via, via, drc_callback); if (IsBad) break; - if (!TEST_FLAG(PCB_FLAG_HOLE, via) && via->Thickness - via->DrillingHole < 2 * PCB->minRing) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, via) && via->Thickness - via->DrillingHole < 2 * PCB->minRing) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - SET_FLAG(TheFlag, via); + PCB_FLAG_SET(TheFlag, via); DrawVia(via); drcerr_count++; SetThing(PCB_TYPE_VIA, via, via, via); @@ -572,7 +572,7 @@ } if (via->DrillingHole < PCB->minDrill) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - SET_FLAG(TheFlag, via); + PCB_FLAG_SET(TheFlag, via); DrawVia(via); drcerr_count++; SetThing(PCB_TYPE_VIA, via, via, via); @@ -607,7 +607,7 @@ SILKLINE_LOOP(PCB->Data); { if (line->Thickness < PCB->minSlk) { - SET_FLAG(TheFlag, line); + PCB_FLAG_SET(TheFlag, line); DrawLine(layer, line); drcerr_count++; SetThing(PCB_TYPE_LINE, layer, line, line); @@ -648,7 +648,7 @@ char *buffer; int buflen; - SET_FLAG(TheFlag, element); + PCB_FLAG_SET(TheFlag, element); DrawElement(element); drcerr_count++; SetThing(PCB_TYPE_ELEMENT, element, element, element); Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4875) +++ trunk/src/find_geo.c (revision 4876) @@ -52,7 +52,7 @@ (IsPointOnLineEnd((PV)->X,(PV)->Y, (Rat))) #define IS_PV_ON_ARC(PV, Arc) \ - (TEST_FLAG(PCB_FLAG_SQUARE, (PV)) ? \ + (PCB_FLAG_TEST(PCB_FLAG_SQUARE, (PV)) ? \ IsArcInRectangle( \ (PV)->X -MAX(((PV)->Thickness+1)/2 +Bloat,0), (PV)->Y -MAX(((PV)->Thickness+1)/2 +Bloat,0), \ (PV)->X +MAX(((PV)->Thickness+1)/2 +Bloat,0), (PV)->Y +MAX(((PV)->Thickness+1)/2 +Bloat,0), \ @@ -323,7 +323,7 @@ { double s, r; double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy; - if (TEST_FLAG(PCB_FLAG_SQUARE, Line1)) { /* pretty reckless recursion */ + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line1)) { /* pretty reckless recursion */ pcb_point_t p[4]; form_slanted_rectangle(p, Line1); return IsLineInQuadrangle(p, Line2); @@ -330,7 +330,7 @@ } /* here come only round Line1 because IsLineInQuadrangle() calls pcb_intersect_line_line() with first argument rounded */ - if (TEST_FLAG(PCB_FLAG_SQUARE, Line2)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line2)) { pcb_point_t p[4]; form_slanted_rectangle(p, Line2); return IsLineInQuadrangle(p, Line1); @@ -476,7 +476,7 @@ pcb_box_t *Box = (pcb_box_t *) Arc; /* arcs with clearance never touch polys */ - if (TEST_FLAG(PCB_FLAG_CLEARPOLY, Polygon) && TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, Polygon) && PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return pcb_false; if (!Polygon->Clipped) return pcb_false; @@ -506,11 +506,11 @@ pcb_polyarea_t *lp; /* lines with clearance never touch polygons */ - if (TEST_FLAG(PCB_FLAG_CLEARPOLY, Polygon) && TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) + if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, Polygon) && PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) return pcb_false; if (!Polygon->Clipped) return pcb_false; - if (TEST_FLAG(PCB_FLAG_SQUARE, Line) && (Line->Point1.X == Line->Point2.X || Line->Point1.Y == Line->Point2.Y)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line) && (Line->Point1.X == Line->Point2.X || Line->Point1.Y == Line->Point2.Y)) { pcb_coord_t wid = (Line->Thickness + Bloat + 1) / 2; pcb_coord_t x1, x2, y1, y2; @@ -650,7 +650,7 @@ if (IsPointOnPin(PV1->X, PV1->Y, t1, PV2) || IsPointOnPin(PV2->X, PV2->Y, t2, PV1)) return pcb_true; - if (!TEST_FLAG(PCB_FLAG_SQUARE, PV1) || !TEST_FLAG(PCB_FLAG_SQUARE, PV2)) + if (!PCB_FLAG_TEST(PCB_FLAG_SQUARE, PV1) || !PCB_FLAG_TEST(PCB_FLAG_SQUARE, PV2)) return pcb_false; /* check for square/square overlap */ b1.X1 = PV1->X - t1; @@ -667,7 +667,7 @@ pcb_bool pcb_intersect_line_pin(pcb_pin_t *PV, pcb_line_t *Line) { - if (TEST_FLAG(PCB_FLAG_SQUARE, PV)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, PV)) { int shape = GET_SQUARE(PV); if (shape <= 1) { /* the original square case */ Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4875) +++ trunk/src/find_lookup.c (revision 4876) @@ -51,7 +51,7 @@ { if (User) AddObjectToFlagUndoList(Pin->Element ? PCB_TYPE_PIN : PCB_TYPE_VIA, Pin->Element ? Pin->Element : Pin, Pin, Pin); - SET_FLAG(TheFlag, Pin); + PCB_FLAG_SET(TheFlag, Pin); make_callback(PCB_TYPE_PIN, Pin, from_type, from_ptr, type); PVLIST_ENTRY(PVList.Number) = Pin; PVList.Number++; @@ -59,7 +59,7 @@ if (PVList.Number > PVList.Size) printf("ADD_PV_TO_LIST overflow! num=%d size=%d\n", PVList.Number, PVList.Size); #endif - if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, Pin)) + if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, Pin)) return (SetThing(PCB_TYPE_PIN, Pin->Element, Pin, Pin)); return pcb_false; } @@ -69,7 +69,7 @@ /*fprintf(stderr, "ADD_PAD_TO_LIST cardinal %d %p %d\n", L, Pad, from_type);*/ if (User) AddObjectToFlagUndoList(PCB_TYPE_PAD, Pad->Element, Pad, Pad); - SET_FLAG(TheFlag, Pad); + PCB_FLAG_SET(TheFlag, Pad); make_callback(PCB_TYPE_PAD, Pad, from_type, from_ptr, type); PADLIST_ENTRY((L), PadList[(L)].Number) = Pad; PadList[(L)].Number++; @@ -77,7 +77,7 @@ if (PadList[(L)].Number > PadList[(L)].Size) printf("ADD_PAD_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, PadList[(L)].Number, PadList[(L)].Size); #endif - if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, Pad)) + if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, Pad)) return (SetThing(PCB_TYPE_PAD, Pad->Element, Pad, Pad)); return pcb_false; } @@ -86,7 +86,7 @@ { if (User) AddObjectToFlagUndoList(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr)); - SET_FLAG(TheFlag, (Ptr)); + PCB_FLAG_SET(TheFlag, (Ptr)); make_callback(PCB_TYPE_LINE, Ptr, from_type, from_ptr, type); LINELIST_ENTRY((L), LineList[(L)].Number) = (Ptr); LineList[(L)].Number++; @@ -94,7 +94,7 @@ if (LineList[(L)].Number > LineList[(L)].Size) printf("ADD_LINE_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, LineList[(L)].Number, LineList[(L)].Size); #endif - if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) + if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -103,7 +103,7 @@ { if (User) AddObjectToFlagUndoList(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr)); - SET_FLAG(TheFlag, (Ptr)); + PCB_FLAG_SET(TheFlag, (Ptr)); make_callback(PCB_TYPE_ARC, Ptr, from_type, from_ptr, type); ARCLIST_ENTRY((L), ArcList[(L)].Number) = (Ptr); ArcList[(L)].Number++; @@ -111,7 +111,7 @@ if (ArcList[(L)].Number > ArcList[(L)].Size) printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, ArcList[(L)].Number, ArcList[(L)].Size); #endif - if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) + if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -120,7 +120,7 @@ { if (User) AddObjectToFlagUndoList(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr)); - SET_FLAG(TheFlag, (Ptr)); + PCB_FLAG_SET(TheFlag, (Ptr)); make_callback(PCB_TYPE_RATLINE, Ptr, from_type, from_ptr, type); RATLIST_ENTRY(RatList.Number) = (Ptr); RatList.Number++; @@ -128,7 +128,7 @@ if (RatList.Number > RatList.Size) printf("ADD_RAT_TO_LIST overflow! num=%d size=%d\n", RatList.Number, RatList.Size); #endif - if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) + if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr))); return pcb_false; } @@ -137,7 +137,7 @@ { if (User) AddObjectToFlagUndoList(PCB_TYPE_POLYGON, LAYER_PTR(L), (Ptr), (Ptr)); - SET_FLAG(TheFlag, (Ptr)); + PCB_FLAG_SET(TheFlag, (Ptr)); make_callback(PCB_TYPE_POLYGON, Ptr, from_type, from_ptr, type); POLYGONLIST_ENTRY((L), PolygonList[(L)].Number) = (Ptr); PolygonList[(L)].Number++; @@ -145,7 +145,7 @@ if (PolygonList[(L)].Number > PolygonList[(L)].Size) printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, PolygonList[(L)].Number, PolygonList[(L)].Size); #endif - if (drc && !TEST_FLAG(PCB_FLAG_SELECTED, (Ptr))) + if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) return (SetThing(PCB_TYPE_POLYGON, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -207,7 +207,7 @@ NumberOfPads[COMPONENT_LAYER] = NumberOfPads[SOLDER_LAYER] = 0; ALLPAD_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad)) NumberOfPads[SOLDER_LAYER]++; else NumberOfPads[COMPONENT_LAYER]++; @@ -297,7 +297,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct pv_info *i = (struct pv_info *) cl; - if (!TEST_FLAG(TheFlag, line) && pcb_intersect_line_pin(&i->pv, line) && !TEST_FLAG(PCB_FLAG_HOLE, &i->pv)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_pin(&i->pv, line) && !PCB_FLAG_TEST(PCB_FLAG_HOLE, &i->pv)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) longjmp(i->env, 1); } @@ -309,7 +309,7 @@ pcb_arc_t *arc = (pcb_arc_t *) b; struct pv_info *i = (struct pv_info *) cl; - if (!TEST_FLAG(TheFlag, arc) && IS_PV_ON_ARC(&i->pv, arc) && !TEST_FLAG(PCB_FLAG_HOLE, &i->pv)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && IS_PV_ON_ARC(&i->pv, arc) && !PCB_FLAG_TEST(PCB_FLAG_HOLE, &i->pv)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) longjmp(i->env, 1); } @@ -321,9 +321,9 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct pv_info *i = (struct pv_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && IS_PV_ON_PAD(&i->pv, pad) && - !TEST_FLAG(PCB_FLAG_HOLE, &i->pv) && - ADD_PAD_TO_LIST(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) + if (!PCB_FLAG_TEST(TheFlag, pad) && IS_PV_ON_PAD(&i->pv, pad) && + !PCB_FLAG_TEST(PCB_FLAG_HOLE, &i->pv) && + ADD_PAD_TO_LIST(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) longjmp(i->env, 1); return R_DIR_NOT_FOUND; } @@ -333,7 +333,7 @@ pcb_rat_t *rat = (pcb_rat_t *) b; struct pv_info *i = (struct pv_info *) cl; - if (!TEST_FLAG(TheFlag, rat) && IS_PV_ON_RAT(&i->pv, rat) && ADD_RAT_TO_LIST(rat, PCB_TYPE_PIN, &i->pv, FCT_RAT)) + if (!PCB_FLAG_TEST(TheFlag, rat) && IS_PV_ON_RAT(&i->pv, rat) && ADD_RAT_TO_LIST(rat, PCB_TYPE_PIN, &i->pv, FCT_RAT)) longjmp(i->env, 1); return R_DIR_NOT_FOUND; } @@ -349,11 +349,11 @@ * because it might not be inside the polygon, or it could * be on an edge such that it doesn't actually touch. */ - if (!TEST_FLAG(TheFlag, polygon) && !TEST_FLAG(PCB_FLAG_HOLE, &i->pv) && - (TEST_THERM(i->layer, &i->pv) || !TEST_FLAG(PCB_FLAG_CLEARPOLY, polygon) + if (!PCB_FLAG_TEST(TheFlag, polygon) && !PCB_FLAG_TEST(PCB_FLAG_HOLE, &i->pv) && + (TEST_THERM(i->layer, &i->pv) || !PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon) || !i->pv.Clearance)) { double wide = MAX(0.5 * i->pv.Thickness + Bloat, 0); - if (TEST_FLAG(PCB_FLAG_SQUARE, &i->pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, &i->pv)) { pcb_coord_t x1 = i->pv.X - (i->pv.Thickness + 1 + Bloat) / 2; pcb_coord_t x2 = i->pv.X + (i->pv.Thickness + 1 + Bloat) / 2; pcb_coord_t y1 = i->pv.Y - (i->pv.Thickness + 1 + Bloat) / 2; @@ -362,7 +362,7 @@ && ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) longjmp(i->env, 1); } - else if (TEST_FLAG(PCB_FLAG_OCTAGON, &i->pv)) { + else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, &i->pv)) { pcb_polyarea_t *oct = OctagonPoly(i->pv.X, i->pv.Y, i->pv.Thickness / 2, GET_SQUARE(&i->pv)); if (isects(oct, polygon, pcb_true) && ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PIN, &i->pv, FCT_COPPER)) @@ -534,9 +534,9 @@ pcb_pin_t *pin = (pcb_pin_t *) b; struct pv_info *i = (struct pv_info *) cl; - if (!TEST_FLAG(TheFlag, pin) && PV_TOUCH_PV(&i->pv, pin)) { - if (TEST_FLAG(PCB_FLAG_HOLE, pin) || TEST_FLAG(PCB_FLAG_HOLE, &i->pv)) { - SET_FLAG(PCB_FLAG_WARN, pin); + if (!PCB_FLAG_TEST(TheFlag, pin) && PV_TOUCH_PV(&i->pv, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || PCB_FLAG_TEST(PCB_FLAG_HOLE, &i->pv)) { + PCB_FLAG_SET(PCB_FLAG_WARN, pin); conf_core.temp.rat_warn = pcb_true; if (pin->Element) pcb_message(PCB_MSG_DEFAULT, _("WARNING: Hole too close to pin.\n")); @@ -575,7 +575,7 @@ PIN_LOOP(e); { if ((orig_pin != pin) && (ic == GET_INTCONN(pin))) { - if (!TEST_FLAG(TheFlag, pin)) + if (!PCB_FLAG_TEST(TheFlag, pin)) ADD_PV_TO_LIST(pin, PCB_TYPE_PIN, orig_pin, FCT_INTERNAL); } } @@ -613,9 +613,9 @@ pcb_pin_t *pv = (pcb_pin_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pv) && pcb_intersect_line_pin(pv, &i->line)) { - if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { - SET_FLAG(PCB_FLAG_WARN, pv); + if (!PCB_FLAG_TEST(TheFlag, pv) && pcb_intersect_line_pin(pv, &i->line)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { + PCB_FLAG_SET(PCB_FLAG_WARN, pv); conf_core.temp.rat_warn = pcb_true; pcb_message(PCB_MSG_DEFAULT, _("WARNING: Hole too close to line.\n")); } @@ -630,9 +630,9 @@ pcb_pin_t *pv = (pcb_pin_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_PAD(pv, &i->pad)) { - if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { - SET_FLAG(PCB_FLAG_WARN, pv); + if (!PCB_FLAG_TEST(TheFlag, pv) && IS_PV_ON_PAD(pv, &i->pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { + PCB_FLAG_SET(PCB_FLAG_WARN, pv); conf_core.temp.rat_warn = pcb_true; pcb_message(PCB_MSG_DEFAULT, _("WARNING: Hole too close to pad.\n")); } @@ -647,9 +647,9 @@ pcb_pin_t *pv = (pcb_pin_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_ARC(pv, &i->arc)) { - if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { - SET_FLAG(PCB_FLAG_WARN, pv); + if (!PCB_FLAG_TEST(TheFlag, pv) && IS_PV_ON_ARC(pv, &i->arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { + PCB_FLAG_SET(PCB_FLAG_WARN, pv); conf_core.temp.rat_warn = pcb_true; pcb_message(PCB_MSG_DEFAULT, _("WARNING: Hole touches arc.\n")); } @@ -665,9 +665,9 @@ struct lo_info *i = (struct lo_info *) cl; /* note that holes in polygons are ok, so they don't generate warnings. */ - if (!TEST_FLAG(TheFlag, pv) && !TEST_FLAG(PCB_FLAG_HOLE, pv) && - (TEST_THERM(i->layer, pv) || !TEST_FLAG(PCB_FLAG_CLEARPOLY, &i->polygon) || !pv->Clearance)) { - if (TEST_FLAG(PCB_FLAG_SQUARE, pv)) { + if (!PCB_FLAG_TEST(TheFlag, pv) && !PCB_FLAG_TEST(PCB_FLAG_HOLE, pv) && + (TEST_THERM(i->layer, pv) || !PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, &i->polygon) || !pv->Clearance)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pv)) { pcb_coord_t x1, x2, y1, y2; x1 = pv->X - (PIN_SIZE(pv) + 1 + Bloat) / 2; x2 = pv->X + (PIN_SIZE(pv) + 1 + Bloat) / 2; @@ -677,7 +677,7 @@ && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) longjmp(i->env, 1); } - else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) { + else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pv)) { pcb_polyarea_t *oct = OctagonPoly(pv->X, pv->Y, PIN_SIZE(pv) / 2, GET_SQUARE(pv)); if (isects(oct, &i->polygon, pcb_true) && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) longjmp(i->env, 1); @@ -697,7 +697,7 @@ struct lo_info *i = (struct lo_info *) cl; /* rats can't cause DRC so there is no early exit */ - if (!TEST_FLAG(TheFlag, pv) && IS_PV_ON_RAT(pv, &i->rat)) + if (!PCB_FLAG_TEST(TheFlag, pv) && IS_PV_ON_RAT(pv, &i->rat)) ADD_PV_TO_LIST(pv, PCB_TYPE_RATLINE, &i->rat, FCT_RAT); return R_DIR_NOT_FOUND; } @@ -820,7 +820,7 @@ pcb_pin_t *pin = (pcb_pin_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pin) && pcb_intersect_line_pin(pin, &i->line)) + if (!PCB_FLAG_TEST(TheFlag, pin) && pcb_intersect_line_pin(pin, &i->line)) longjmp(i->env, 1); return R_DIR_NOT_FOUND; } @@ -830,7 +830,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, line) && pcb_intersect_line_arc(line, &i->arc)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_arc(line, &i->arc)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_ARC, &i->arc, FCT_COPPER)) longjmp(i->env, 1); } @@ -844,7 +844,7 @@ if (!arc->Thickness) return 0; - if (!TEST_FLAG(TheFlag, arc) && ArcArcIntersect(&i->arc, arc)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && ArcArcIntersect(&i->arc, arc)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_ARC, &i->arc, FCT_COPPER)) longjmp(i->env, 1); } @@ -856,7 +856,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) + if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && pcb_intersect_arc_pad(&i->arc, pad) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_ARC, &i->arc, FCT_COPPER)) longjmp(i->env, 1); return R_DIR_NOT_FOUND; @@ -901,7 +901,7 @@ /* now check all polygons */ polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { - if (!TEST_FLAG(TheFlag, polygon) && pcb_is_arc_in_poly(Arc, polygon) + if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_arc_in_poly(Arc, polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_ARC, Arc, FCT_COPPER)) return pcb_true; } @@ -922,7 +922,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, line) && pcb_intersect_line_line(&i->line, line)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_LINE, &i->line, FCT_COPPER)) longjmp(i->env, 1); } @@ -936,7 +936,7 @@ if (!arc->Thickness) return 0; - if (!TEST_FLAG(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_LINE, &i->line, FCT_COPPER)) longjmp(i->env, 1); } @@ -948,7 +948,7 @@ pcb_rat_t *rat = (pcb_rat_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, rat)) { + if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) && IsRatPointOnLineEnd(&rat->Point1, &i->line)) { if (ADD_RAT_TO_LIST(rat, PCB_TYPE_LINE, &i->line, FCT_RAT)) @@ -968,7 +968,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) + if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && pcb_intersect_line_pad(&i->line, pad) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_LINE, &i->line, FCT_COPPER)) longjmp(i->env, 1); return R_DIR_NOT_FOUND; @@ -1020,7 +1020,7 @@ pcb_polygon_t *polygon; polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { - if (!TEST_FLAG(TheFlag, polygon) && pcb_is_line_in_poly(Line, polygon) + if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_line_in_poly(Line, polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_LINE, Line, FCT_COPPER)) return pcb_true; } @@ -1050,7 +1050,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!TEST_FLAG(TheFlag, line) && + if (!PCB_FLAG_TEST(TheFlag, line) && ((line->Point1.X == i->Point->X && line->Point1.Y == i->Point->Y) || (line->Point2.X == i->Point->X && line->Point2.Y == i->Point->Y))) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_RATLINE, &i->Point, FCT_RAT)) @@ -1064,7 +1064,7 @@ pcb_polygon_t *polygon = (pcb_polygon_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!TEST_FLAG(TheFlag, polygon) && polygon->Clipped && + if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && (i->Point->X == polygon->Clipped->contours->head.point[0]) && (i->Point->Y == polygon->Clipped->contours->head.point[1])) { if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_RATLINE, &i->Point, FCT_RAT)) @@ -1078,8 +1078,8 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && i->layer == - (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && + if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == + (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && ((pad->Point1.X == i->Point->X && pad->Point1.Y == i->Point->Y) || (pad->Point2.X == i->Point->X && pad->Point2.Y == i->Point->Y) || ((pad->Point1.X + pad->Point2.X) / 2 == i->Point->X && @@ -1138,7 +1138,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, line) && pcb_intersect_line_pad(line, &i->pad)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_pad(line, &i->pad)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PAD, &i->pad, FCT_COPPER)) longjmp(i->env, 1); } @@ -1152,7 +1152,7 @@ if (!arc->Thickness) return 0; - if (!TEST_FLAG(TheFlag, arc) && pcb_intersect_arc_pad(arc, &i->pad)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_arc_pad(arc, &i->pad)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PAD, &i->pad, FCT_COPPER)) longjmp(i->env, 1); } @@ -1165,7 +1165,7 @@ struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, polygon) && (!TEST_FLAG(PCB_FLAG_CLEARPOLY, polygon) || !i->pad.Clearance)) { + if (!PCB_FLAG_TEST(TheFlag, polygon) && (!PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon) || !i->pad.Clearance)) { if (pcb_is_pad_in_poly(&i->pad, polygon) && ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PAD, &i->pad, FCT_COPPER)) longjmp(i->env, 1); } @@ -1177,7 +1177,7 @@ pcb_rat_t *rat = (pcb_rat_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, rat)) { + if (!PCB_FLAG_TEST(TheFlag, rat)) { if (rat->group1 == i->layer && ((rat->Point1.X == i->pad.Point1.X && rat->Point1.Y == i->pad.Point1.Y) || (rat->Point1.X == i->pad.Point2.X && rat->Point1.Y == i->pad.Point2.Y) || @@ -1203,7 +1203,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) + if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && PadPadIntersect(pad, &i->pad) && ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_PAD, &i->pad, FCT_COPPER)) longjmp(i->env, 1); return R_DIR_NOT_FOUND; @@ -1245,9 +1245,9 @@ PAD_LOOP(e); { if ((orig_pad != pad) && (ic == GET_INTCONN(pad))) { - int padlayer = TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER; -/*fprintf(stderr, "layergroup1: %d {%d %d %d} %d \n", tlayer, TEST_FLAG(PCB_FLAG_ONSOLDER, pad), SOLDER_LAYER, COMPONENT_LAYER, padlayer);*/ - if ((!TEST_FLAG(TheFlag, pad)) && (tlayer != padlayer)) { + int padlayer = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER; +/*fprintf(stderr, "layergroup1: %d {%d %d %d} %d \n", tlayer, PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad), SOLDER_LAYER, COMPONENT_LAYER, padlayer);*/ + if ((!PCB_FLAG_TEST(TheFlag, pad)) && (tlayer != padlayer)) { /*fprintf(stderr, "layergroup2\n");*/ ADD_PAD_TO_LIST(padlayer, pad, PCB_TYPE_PAD, orig_pad, FCT_INTERNAL); if (LookupLOConnectionsToPad(pad, LayerGroup)) @@ -1260,7 +1260,7 @@ } - if (!TEST_FLAG(PCB_FLAG_SQUARE, Pad)) + if (!PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) return (LookupLOConnectionsToLine((pcb_line_t *) Pad, LayerGroup, pcb_false)); info.pad = *Pad; @@ -1314,7 +1314,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, line) && pcb_is_line_in_poly(line, &i->polygon)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_is_line_in_poly(line, &i->polygon)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) longjmp(i->env, 1); } @@ -1328,7 +1328,7 @@ if (!arc->Thickness) return 0; - if (!TEST_FLAG(TheFlag, arc) && pcb_is_arc_in_poly(arc, &i->polygon)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_is_arc_in_poly(arc, &i->polygon)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) longjmp(i->env, 1); } @@ -1340,7 +1340,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, pad) && i->layer == (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) + if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER) && pcb_is_pad_in_poly(pad, &i->polygon)) { if (ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_POLYGON, &i->polygon, FCT_COPPER)) longjmp(i->env, 1); @@ -1353,7 +1353,7 @@ pcb_rat_t *rat = (pcb_rat_t *) b; struct lo_info *i = (struct lo_info *) cl; - if (!TEST_FLAG(TheFlag, rat)) { + if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->Point1.X == (i->polygon.Clipped->contours->head.point[0]) && rat->Point1.Y == (i->polygon.Clipped->contours->head.point[1]) && rat->group1 == i->layer) || @@ -1398,7 +1398,7 @@ /* check all polygons */ polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) { - if (!TEST_FLAG(TheFlag, polygon) + if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_poly_in_poly(polygon, Polygon) && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_POLYGON, Polygon, FCT_COPPER)) return pcb_true; Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4875) +++ trunk/src/find_misc.c (revision 4876) @@ -127,7 +127,7 @@ while (PVList.DrawLocation < PVList.Number) { pcb_pin_t *pv = PVLIST_ENTRY(PVList.DrawLocation); - if (TEST_FLAG(PCB_FLAG_PIN, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_PIN, pv)) { if (PCB->PinOn) DrawPin(pv); } @@ -199,7 +199,7 @@ case PCB_TYPE_PAD: { pcb_pad_t *pad = (pcb_pad_t *) ptr2; - if (ADD_PAD_TO_LIST(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, 0, NULL, FCT_START)) + if (ADD_PAD_TO_LIST(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, 0, NULL, FCT_START)) return pcb_true; break; } @@ -298,10 +298,10 @@ VIA_LOOP(PCB->Data); { - if (TEST_FLAG(TheFlag, via)) { + if (PCB_FLAG_TEST(TheFlag, via)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - CLEAR_FLAG(TheFlag, via); + PCB_FLAG_CLEAR(TheFlag, via); if (AndDraw) DrawVia(via); change = pcb_true; @@ -312,10 +312,10 @@ { PIN_LOOP(element); { - if (TEST_FLAG(TheFlag, pin)) { + if (PCB_FLAG_TEST(TheFlag, pin)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - CLEAR_FLAG(TheFlag, pin); + PCB_FLAG_CLEAR(TheFlag, pin); if (AndDraw) DrawPin(pin); change = pcb_true; @@ -324,10 +324,10 @@ END_LOOP; PAD_LOOP(element); { - if (TEST_FLAG(TheFlag, pad)) { + if (PCB_FLAG_TEST(TheFlag, pad)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - CLEAR_FLAG(TheFlag, pad); + PCB_FLAG_CLEAR(TheFlag, pad); if (AndDraw) DrawPad(pad); change = pcb_true; @@ -350,10 +350,10 @@ RAT_LOOP(PCB->Data); { - if (TEST_FLAG(TheFlag, line)) { + if (PCB_FLAG_TEST(TheFlag, line)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - CLEAR_FLAG(TheFlag, line); + PCB_FLAG_CLEAR(TheFlag, line); if (AndDraw) DrawRat(line); change = pcb_true; @@ -362,10 +362,10 @@ END_LOOP; COPPERLINE_LOOP(PCB->Data); { - if (TEST_FLAG(TheFlag, line)) { + if (PCB_FLAG_TEST(TheFlag, line)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); - CLEAR_FLAG(TheFlag, line); + PCB_FLAG_CLEAR(TheFlag, line); if (AndDraw) DrawLine(layer, line); change = pcb_true; @@ -374,10 +374,10 @@ ENDALL_LOOP; COPPERARC_LOOP(PCB->Data); { - if (TEST_FLAG(TheFlag, arc)) { + if (PCB_FLAG_TEST(TheFlag, arc)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); - CLEAR_FLAG(TheFlag, arc); + PCB_FLAG_CLEAR(TheFlag, arc); if (AndDraw) DrawArc(layer, arc); change = pcb_true; @@ -386,10 +386,10 @@ ENDALL_LOOP; COPPERPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(TheFlag, polygon)) { + if (PCB_FLAG_TEST(TheFlag, polygon)) { if (AndDraw) AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); - CLEAR_FLAG(TheFlag, polygon); + PCB_FLAG_CLEAR(TheFlag, polygon); if (AndDraw) DrawPolygon(layer, polygon); change = pcb_true; Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 4875) +++ trunk/src/find_print.c (revision 4876) @@ -41,9 +41,9 @@ PIN_LOOP(Element); { - if (!TEST_FLAG(PCB_FLAG_HOLE, pin)) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { /* pin might have bee checked before, add to list if not */ - if (!TEST_FLAG(TheFlag, pin) && FP) { + if (!PCB_FLAG_TEST(TheFlag, pin) && FP) { int i; if (ADD_PV_TO_LIST(pin, 0, NULL, 0)) return pcb_true; @@ -66,7 +66,7 @@ fputc('\t', FP); PrintQuotedString(FP, (char *) EMPTY(pin->Name)); fputc('\n', FP); - SET_FLAG(PCB_FLAG_SELECTED, pin); + PCB_FLAG_SET(PCB_FLAG_SELECTED, pin); DrawPin(pin); } @@ -83,9 +83,9 @@ { /* lookup pad in list */ /* pad might has bee checked before, add to list if not */ - if (!TEST_FLAG(TheFlag, pad) && FP) { + if (!PCB_FLAG_TEST(TheFlag, pad) && FP) { int i; - if (ADD_PAD_TO_LIST(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) + if (ADD_PAD_TO_LIST(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER, pad, 0, NULL, 0)) return pcb_true; DoIt(pcb_true, pcb_true); @@ -108,7 +108,7 @@ PrintQuotedString(FP, (char *) EMPTY(pad->Name)); fputc('\n', FP); - SET_FLAG(PCB_FLAG_SELECTED, pad); + PCB_FLAG_SET(PCB_FLAG_SELECTED, pad); DrawPad(pad); } @@ -165,7 +165,7 @@ PIN_LOOP(Element); { /* pin might have been checked before, add to list if not */ - if (TEST_FLAG(TheFlag, pin)) { + if (PCB_FLAG_TEST(TheFlag, pin)) { PrintConnectionListEntry((char *) EMPTY(pin->Name), NULL, pcb_true, FP); fputs("\t\t__CHECKED_BEFORE__\n\t}\n", FP); continue; @@ -188,12 +188,12 @@ { pcb_cardinal_t layer; /* pad might have been checked before, add to list if not */ - if (TEST_FLAG(TheFlag, pad)) { + if (PCB_FLAG_TEST(TheFlag, pad)) { PrintConnectionListEntry((char *) EMPTY(pad->Name), NULL, pcb_true, FP); fputs("\t\t__CHECKED_BEFORE__\n\t}\n", FP); continue; } - layer = TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER; + layer = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SOLDER_LAYER : COMPONENT_LAYER; if (ADD_PAD_TO_LIST(layer, pad, PCB_TYPE_ELEMENT, Element, FCT_ELEMENT)) return pcb_true; DoIt(pcb_true, AndDraw); Index: trunk/src/flag.c =================================================================== --- trunk/src/flag.c (revision 4875) +++ trunk/src/flag.c (revision 4876) @@ -68,7 +68,7 @@ return flag; } -int mem_any_set(unsigned char *ptr, int bytes) +int pcb_mem_any_set(unsigned char *ptr, int bytes) { while (bytes--) if (*ptr++) Index: trunk/src/flag.h =================================================================== --- trunk/src/flag.h (revision 4875) +++ trunk/src/flag.h (revision 4876) @@ -106,12 +106,12 @@ /* --------------------------------------------------------------------------- * some routines for flag setting, clearing, changing and testing */ -#define SET_FLAG(F,P) ((P)->Flags.f |= (F)) -#define CLEAR_FLAG(F,P) ((P)->Flags.f &= (~(F))) -#define TEST_FLAG(F,P) ((P)->Flags.f & (F) ? 1 : 0) -#define TOGGLE_FLAG(F,P) ((P)->Flags.f ^= (F)) -#define ASSIGN_FLAG(F,V,P) ((P)->Flags.f = ((P)->Flags.f & (~(F))) | ((V) ? (F) : 0)) -#define TEST_FLAGS(F,P) (((P)->Flags.f & (F)) == (F) ? 1 : 0) +#define PCB_FLAG_SET(F,P) ((P)->Flags.f |= (F)) +#define PCB_FLAG_CLEAR(F,P) ((P)->Flags.f &= (~(F))) +#define PCB_FLAG_TEST(F,P) ((P)->Flags.f & (F) ? 1 : 0) +#define PCB_FLAG_TOGGLE(F,P) ((P)->Flags.f ^= (F)) +#define PCB_FLAG_ASSIGN(F,V,P) ((P)->Flags.f = ((P)->Flags.f & (~(F))) | ((V) ? (F) : 0)) +#define PCB_FLAGS_TEST(F,P) (((P)->Flags.f & (F)) == (F) ? 1 : 0) typedef enum { PCB_CHGFLG_CLEAR, @@ -122,9 +122,9 @@ #define CHANGE_FLAG(how, F, P) \ do { \ switch(how) { \ - case PCB_CHGFLG_CLEAR: CLEAR_FLAG(F, P); break; \ - case PCB_CHGFLG_SET: SET_FLAG(F, P); break; \ - case PCB_CHGFLG_TOGGLE: TOGGLE_FLAG(F, P); break; \ + case PCB_CHGFLG_CLEAR: PCB_FLAG_CLEAR(F, P); break; \ + case PCB_CHGFLG_SET: PCB_FLAG_SET(F, P); break; \ + case PCB_CHGFLG_TOGGLE: PCB_FLAG_TOGGLE(F, P); break; \ } \ } while(0) @@ -145,7 +145,7 @@ #define GET_INTCONN(P) ((P)->Flags.int_conn_grp) -extern int mem_any_set(unsigned char *, int); -#define TEST_ANY_THERMS(P) mem_any_set((P)->Flags.t, sizeof((P)->Flags.t)) +extern int pcb_mem_any_set(unsigned char *, int); +#define TEST_ANY_THERMS(P) pcb_mem_any_set((P)->Flags.t, sizeof((P)->Flags.t)) #endif Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 4875) +++ trunk/src/flag_str.c (revision 4876) @@ -362,7 +362,7 @@ for (i = 0; i < n_flagbits; i++) if (flagbits[i].nlen == flen && memcmp(flagbits[i].name, fp, flen) == 0) { found = 1; - SET_FLAG(flagbits[i].mask, &rv); + PCB_FLAG_SET(flagbits[i].mask, &rv); break; } if (!found) { @@ -434,13 +434,13 @@ #ifndef FLAG_TEST switch (object_type) { case PCB_TYPE_VIA: - CLEAR_FLAG(PCB_FLAG_VIA, &fh); + PCB_FLAG_CLEAR(PCB_FLAG_VIA, &fh); break; case PCB_TYPE_RATLINE: - CLEAR_FLAG(PCB_FLAG_RAT, &fh); + PCB_FLAG_CLEAR(PCB_FLAG_RAT, &fh); break; case PCB_TYPE_PIN: - CLEAR_FLAG(PCB_FLAG_PIN, &fh); + PCB_FLAG_CLEAR(PCB_FLAG_PIN, &fh); break; } #endif @@ -452,10 +452,10 @@ for (i = 0; i < n_flagbits; i++) if ((flagbits[i].object_types & object_type) - && (TEST_FLAG(flagbits[i].mask, &fh))) { + && (PCB_FLAG_TEST(flagbits[i].mask, &fh))) { len += flagbits[i].nlen + 1; - CLEAR_FLAG(flagbits[i].mask, &fh); + PCB_FLAG_CLEAR(flagbits[i].mask, &fh); } if (TEST_ANY_THERMS(&fh)) { @@ -488,12 +488,12 @@ fh = savef; for (i = 0; i < n_flagbits; i++) - if (flagbits[i].object_types & object_type && (TEST_FLAG(flagbits[i].mask, &fh))) { + if (flagbits[i].object_types & object_type && (PCB_FLAG_TEST(flagbits[i].mask, &fh))) { if (bp != buf + 1) *bp++ = ','; strcpy(bp, flagbits[i].name); bp += flagbits[i].nlen; - CLEAR_FLAG(flagbits[i].mask, &fh); + PCB_FLAG_CLEAR(flagbits[i].mask, &fh); } if (TEST_ANY_THERMS(&fh)) { Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4875) +++ trunk/src/gui_act.c (revision 4876) @@ -461,22 +461,22 @@ case PCB_TYPE_ELEMENT: PIN_LOOP((pcb_element_t *) ptr1); { - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pin)) ErasePinName(pin); else DrawPinName(pin); AddObjectToFlagUndoList(PCB_TYPE_PIN, ptr1, pin, pin); - TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, pin); + PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, pin); } END_LOOP; PAD_LOOP((pcb_element_t *) ptr1); { - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pad)) ErasePadName(pad); else DrawPadName(pad); AddObjectToFlagUndoList(PCB_TYPE_PAD, ptr1, pad, pad); - TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, pad); + PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, pad); } END_LOOP; SetChangedFlag(pcb_true); @@ -485,12 +485,12 @@ break; case PCB_TYPE_PIN: - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) ErasePinName((pcb_pin_t *) ptr2); else DrawPinName((pcb_pin_t *) ptr2); AddObjectToFlagUndoList(PCB_TYPE_PIN, ptr1, ptr2, ptr3); - TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); pcb_draw(); @@ -497,23 +497,23 @@ break; case PCB_TYPE_PAD: - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2)) ErasePadName((pcb_pad_t *) ptr2); else DrawPadName((pcb_pad_t *) ptr2); AddObjectToFlagUndoList(PCB_TYPE_PAD, ptr1, ptr2, ptr3); - TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); pcb_draw(); break; case PCB_TYPE_VIA: - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) EraseViaName((pcb_pin_t *) ptr2); else DrawViaName((pcb_pin_t *) ptr2); AddObjectToFlagUndoList(PCB_TYPE_VIA, ptr1, ptr2, ptr3); - TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); pcb_draw(); @@ -920,7 +920,7 @@ if ((type = SearchScreen(x, y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { AddObjectToFlagUndoList(type, ptr1, ptr2, ptr3); EraseElementName((pcb_element_t *) ptr2); - TOGGLE_FLAG(PCB_FLAG_HIDENAME, (pcb_element_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_HIDENAME, (pcb_element_t *) ptr2); DrawElementName((pcb_element_t *) ptr2); pcb_draw(); IncrementUndoSerialNumber(); @@ -933,11 +933,11 @@ pcb_bool changed = pcb_false; ELEMENT_LOOP(PCB->Data); { - if ((TEST_FLAG(PCB_FLAG_SELECTED, element) || TEST_FLAG(PCB_FLAG_SELECTED, &NAMEONPCB_TEXT(element))) + if ((PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, &NAMEONPCB_TEXT(element))) && (FRONT(element) || PCB->InvisibleObjectsOn)) { AddObjectToFlagUndoList(PCB_TYPE_ELEMENT, element, element, element); EraseElementName(element); - TOGGLE_FLAG(PCB_FLAG_HIDENAME, element); + PCB_FLAG_TOGGLE(PCB_FLAG_HIDENAME, element); DrawElementName(element); changed = pcb_true; } Index: trunk/src/hid_draw_helpers.c =================================================================== --- trunk/src/hid_draw_helpers.c (revision 4875) +++ trunk/src/hid_draw_helpers.c (revision 4876) @@ -159,7 +159,7 @@ /* Draw other parts of the polygon if fullpoly flag is set */ /* NB: No "NoHoles" cache for these */ - if (TEST_FLAG(PCB_FLAG_FULLPOLY, poly)) { + if (PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, poly)) { pcb_polygon_t p = *poly; for (p.Clipped = poly->Clipped->f; p.Clipped != poly->Clipped; p.Clipped = p.Clipped->f) @@ -200,7 +200,7 @@ } gui->set_line_cap(gc, Round_Cap); gui->set_line_width(gc, 0); - if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad)) { /* slanted square pad */ double tx, ty, theta; @@ -250,7 +250,7 @@ : pad->Thickness; if (pad->Point1.X == pad->Point2.X && pad->Point1.Y == pad->Point2.Y) { - if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad)) { pcb_coord_t l, r, t, b; l = pad->Point1.X - w / 2; b = pad->Point1.Y - w / 2; @@ -263,7 +263,7 @@ } } else { - gui->set_line_cap(gc, TEST_FLAG(PCB_FLAG_SQUARE, pad) ? Square_Cap : Round_Cap); + gui->set_line_cap(gc, PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad) ? Square_Cap : Round_Cap); gui->set_line_width(gc, w); gui->draw_line(gc, pad->Point1.X, pad->Point1.Y, pad->Point2.X, pad->Point2.Y); @@ -347,7 +347,7 @@ pcb_coord_t w = mask ? pv->Mask : pv->Thickness; pcb_coord_t r = w / 2; - if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { if (mask) gui->fill_circle(bg_gc, pv->X, pv->Y, r); if (drawHole) { @@ -359,7 +359,7 @@ return; } - if (TEST_FLAG(PCB_FLAG_SQUARE, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pv)) { /* use the original code for now */ if ((GET_SQUARE(pv) == 0) || (GET_SQUARE(pv) == 1)) { pcb_coord_t l = pv->X - r; @@ -371,7 +371,7 @@ else draw_square_pin_poly(fg_gc, pv->X, pv->Y, w, pcb_false, GET_SQUARE(pv)); } - else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) + else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pv)) draw_octagon_poly(fg_gc, pv->X, pv->Y, w, pcb_false); else /* draw a round pin or via */ gui->fill_circle(fg_gc, pv->X, pv->Y, r); @@ -386,7 +386,7 @@ pcb_coord_t w = mask ? pv->Mask : pv->Thickness; pcb_coord_t r = w / 2; - if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { if (mask) gui->draw_arc(fg_gc, pv->X, pv->Y, r, r, 0, 360); if (drawHole) { @@ -398,7 +398,7 @@ return; } - if (TEST_FLAG(PCB_FLAG_SQUARE, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pv)) { pcb_coord_t l = pv->X - r; pcb_coord_t b = pv->Y - r; pcb_coord_t r = l + w; @@ -412,7 +412,7 @@ gui->draw_line(fg_gc, r, b, l, b); } - else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) { + else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pv)) { draw_octagon_poly(fg_gc, pv->X, pv->Y, w, pcb_true); } else { /* draw a round pin or via */ Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 4875) +++ trunk/src/layer.c (revision 4876) @@ -458,7 +458,7 @@ pcb_bool paste_empty = pcb_true; ALLPAD_LOOP(PCB->Data); { - if (ON_SIDE(pad, side) && !TEST_FLAG(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { + if (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 4875) +++ trunk/src/macro.h (revision 4876) @@ -56,7 +56,7 @@ * Determines if object is on front or back */ #define FRONT(o) \ - ((TEST_FLAG(PCB_FLAG_ONSOLDER, (o)) != 0) == SWAP_IDENT) + ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (o)) != 0) == SWAP_IDENT) /* --------------------------------------------------------------------------- * Determines if an object is on the given side. side is either SOLDER_LAYER @@ -63,7 +63,7 @@ * or COMPONENT_LAYER. */ #define ON_SIDE(element, side) \ - (TEST_FLAG (PCB_FLAG_ONSOLDER, element) == (side == SOLDER_LAYER)) + (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) == (side == SOLDER_LAYER)) /* --------------------------------------------------------------------------- * some loop shortcuts Index: trunk/src/misc_util.h =================================================================== --- trunk/src/misc_util.h (revision 4875) +++ trunk/src/misc_util.h (revision 4876) @@ -48,7 +48,7 @@ char *Concat(const char *, ...); /* end with NULL */ -int mem_any_set(unsigned char *ptr, int bytes); +int pcb_mem_any_set(unsigned char *ptr, int bytes); char *StripWhiteSpaceAndDup(const char *S); Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 4875) +++ trunk/src/move.c (revision 4876) @@ -101,7 +101,7 @@ /* first clear any marks that we made in the line flags */ for(n = 0, ptr = Crosshair.AttachedObject.Rubberband; n < Crosshair.AttachedObject.RubberbandN; n++, ptr++) - CLEAR_FLAG(PCB_FLAG_RUBBEREND, ptr->Line); + PCB_FLAG_CLEAR(PCB_FLAG_RUBBEREND, ptr->Line); return (NULL); } @@ -110,7 +110,7 @@ ptr = Crosshair.AttachedObject.Rubberband; while (Crosshair.AttachedObject.RubberbandN) { /* first clear any marks that we made in the line flags */ - CLEAR_FLAG(PCB_FLAG_RUBBEREND, ptr->Line); + PCB_FLAG_CLEAR(PCB_FLAG_RUBBEREND, ptr->Line); AddObjectToMoveUndoList(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, ptr->MovedPoint, DX, DY); MoveLinePoint(&ctx, ptr->Layer, ptr->Line, ptr->MovedPoint); Crosshair.AttachedObject.RubberbandN--; Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 4875) +++ trunk/src/netlist_act.c (revision 4876) @@ -54,7 +54,7 @@ { PIN_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin)) { int le, lp; if (next > 2) { Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4875) +++ trunk/src/obj_arc.c (revision 4876) @@ -241,7 +241,7 @@ arclist_remove(arc); arclist_append(&lay->Arc, arc); - CLEAR_FLAG(PCB_FLAG_FOUND, arc); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, arc); if (!lay->arc_tree) lay->arc_tree = r_create_tree(NULL, 0, 0); @@ -255,7 +255,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Thickness + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return (NULL); if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != Arc->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_ARC, Layer, Arc, Arc); @@ -277,7 +277,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Clearance + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return (NULL); value = MIN(MAX_LINESIZE, MAX(value, PCB->Bloat * 2 + 2)); if (value != Arc->Clearance) { @@ -287,7 +287,7 @@ RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); Arc->Clearance = value; if (Arc->Clearance == 0) { - CLEAR_FLAG(PCB_FLAG_CLEARLINE, Arc); + PCB_FLAG_CLEAR(PCB_FLAG_CLEARLINE, Arc); Arc->Clearance = PCB_MIL_TO_COORD(10); } SetArcBoundingBox(Arc); @@ -305,7 +305,7 @@ pcb_coord_t value, *dst; void *a0, *a1; - if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return (NULL); switch(ctx->chgsize.is_primary) { @@ -342,7 +342,7 @@ pcb_angle_t value, *dst; void *a0, *a1; - if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return (NULL); switch(ctx->chgangle.is_primary) { @@ -379,16 +379,16 @@ /* changes the clearance flag of an arc */ void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { - if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return (NULL); EraseArc(Arc); - if (TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); AddObjectToClearPolyUndoList(PCB_TYPE_ARC, Layer, Arc, Arc, pcb_false); } AddObjectToFlagUndoList(PCB_TYPE_ARC, Layer, Arc, Arc); - TOGGLE_FLAG(PCB_FLAG_CLEARLINE, Arc); - if (TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) { + PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Arc); + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) { ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); AddObjectToClearPolyUndoList(PCB_TYPE_ARC, Layer, Arc, Arc, pcb_true); } @@ -399,7 +399,7 @@ /* sets the clearance flag of an arc */ void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { - if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return (NULL); return ChangeArcJoin(ctx, Layer, Arc); } @@ -407,7 +407,7 @@ /* clears the clearance flag of an arc */ void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { - if (TEST_FLAG(PCB_FLAG_LOCK, Arc) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Arc)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return (NULL); return ChangeArcJoin(ctx, Layer, Arc); } @@ -466,7 +466,7 @@ { pcb_arc_t *newone; - if (TEST_FLAG(PCB_FLAG_LOCK, Arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return NULL; } @@ -572,10 +572,10 @@ const char *color; char buf[sizeof("#XXXXXX")]; - if (TEST_FLAG(PCB_FLAG_WARN, arc)) + if (PCB_FLAG_TEST(PCB_FLAG_WARN, arc)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, arc)) { - if (TEST_FLAG(PCB_FLAG_SELECTED, arc)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc)) color = layer->SelectedColor; else color = PCB->ConnectedColor; @@ -583,7 +583,7 @@ else color = layer->Color; - if (TEST_FLAG(PCB_FLAG_ONPOINT, arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, arc)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4875) +++ trunk/src/obj_elem.c (revision 4876) @@ -198,7 +198,7 @@ { pcb_flag_t f = pcb_no_flags(); pcb_flag_add(f, PCB_FLAG_VIA); - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) pcb_flag_add(f, PCB_FLAG_HOLE); CreateNewVia(Buffer->Data, pin->X, pin->Y, pin->Thickness, pin->Clearance, pin->Mask, pin->DrillingHole, pin->Number, f); @@ -211,7 +211,7 @@ PAD_LOOP(element); { pcb_line_t *line; - line = CreateNewLineOnLayer(TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? slayer : clayer, + line = CreateNewLineOnLayer(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? slayer : clayer, pad->Point1.X, pad->Point1.Y, pad->Point2.X, pad->Point2.Y, pad->Thickness, pad->Clearance, pcb_no_flags()); if (line) @@ -383,7 +383,7 @@ Element->MarkX = Buffer->X; Element->MarkY = Buffer->Y; if (SWAP_IDENT) - SET_FLAG(PCB_FLAG_ONSOLDER, Element); + PCB_FLAG_SET(PCB_FLAG_ONSOLDER, Element); SetElementBoundingBox(PCB->Data, Element, &PCB->Font); pcb_buffer_clear(Buffer); pcb_move_obj_to_buffer(Buffer->Data, PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element); @@ -450,7 +450,7 @@ /* changes the side of the board an element is on; returns pcb_true if done */ pcb_bool ChangeElementSide(pcb_element_t *Element, pcb_coord_t yoff) { - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (pcb_false); EraseElement(Element); AddObjectToMirrorUndoList(PCB_TYPE_ELEMENT, Element, Element, Element, yoff); @@ -468,7 +468,7 @@ if (PCB->PinOn && PCB->ElementOn) ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) { change |= ChangeElementSide(element, 0); } } @@ -687,7 +687,7 @@ pad->Point1.Y = PCB_SWAP_Y(pad->Point1.Y) + yoff; pad->Point2.X = PCB_SWAP_X(pad->Point2.X); pad->Point2.Y = PCB_SWAP_Y(pad->Point2.Y) + yoff; - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, pad); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, pad); } END_LOOP; ARC_LOOP(Element); @@ -702,7 +702,7 @@ { text->X = PCB_SWAP_X(text->X); text->Y = PCB_SWAP_Y(text->Y) + yoff; - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, text); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); } END_LOOP; Element->MarkX = PCB_SWAP_X(Element->MarkX); @@ -709,7 +709,7 @@ Element->MarkY = PCB_SWAP_Y(Element->MarkY) + yoff; /* now toggle the solder-side flag */ - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, Element); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, Element); /* this inserts all of the rtree data too */ SetElementBoundingBox(Data, Element, &PCB->Font); ClearFromPolygon(Data, PCB_TYPE_ELEMENT, Element, Element); @@ -813,16 +813,16 @@ if (pad->Point1.Y == pad->Point2.Y) { /* horizontal pad */ if (box->X2 - pad->Point2.X < pad->Point1.X - box->X1) - SET_FLAG(PCB_FLAG_EDGE2, pad); + PCB_FLAG_SET(PCB_FLAG_EDGE2, pad); else - CLEAR_FLAG(PCB_FLAG_EDGE2, pad); + PCB_FLAG_CLEAR(PCB_FLAG_EDGE2, pad); } else { /* vertical pad */ if (box->Y2 - pad->Point2.Y < pad->Point1.Y - box->Y1) - SET_FLAG(PCB_FLAG_EDGE2, pad); + PCB_FLAG_SET(PCB_FLAG_EDGE2, pad); else - CLEAR_FLAG(PCB_FLAG_EDGE2, pad); + PCB_FLAG_CLEAR(PCB_FLAG_EDGE2, pad); } } END_LOOP; @@ -831,7 +831,7 @@ if ((box->X2 - box->X1) > (box->Y2 - box->Y1)) { PIN_LOOP(Element); { - SET_FLAG(PCB_FLAG_EDGE2, pin); + PCB_FLAG_SET(PCB_FLAG_EDGE2, pin); } END_LOOP; } @@ -838,7 +838,7 @@ else { PIN_LOOP(Element); { - CLEAR_FLAG(PCB_FLAG_EDGE2, pin); + PCB_FLAG_CLEAR(PCB_FLAG_EDGE2, pin); } END_LOOP; } @@ -1116,21 +1116,21 @@ element = GetElementMemory(ctx->buffer.dst); CopyElementLowLevel(ctx->buffer.dst, element, Element, pcb_false, 0, 0); - CLEAR_FLAG(ctx->buffer.extraflg, element); + PCB_FLAG_CLEAR(ctx->buffer.extraflg, element); if (ctx->buffer.extraflg) { ELEMENTTEXT_LOOP(element); { - CLEAR_FLAG(ctx->buffer.extraflg, text); + PCB_FLAG_CLEAR(ctx->buffer.extraflg, text); } END_LOOP; PIN_LOOP(element); { - CLEAR_FLAG(PCB_FLAG_FOUND | ctx->buffer.extraflg, pin); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND | ctx->buffer.extraflg, pin); } END_LOOP; PAD_LOOP(element); { - CLEAR_FLAG(PCB_FLAG_FOUND | ctx->buffer.extraflg, pad); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND | ctx->buffer.extraflg, pad); } END_LOOP; } @@ -1152,13 +1152,13 @@ PIN_LOOP(element); { RestoreToPolygon(ctx->buffer.src, PCB_TYPE_PIN, element, pin); - CLEAR_FLAG(PCB_FLAG_WARN | PCB_FLAG_FOUND, pin); + PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND, pin); } END_LOOP; PAD_LOOP(element); { RestoreToPolygon(ctx->buffer.src, PCB_TYPE_PAD, element, pad); - CLEAR_FLAG(PCB_FLAG_WARN | PCB_FLAG_FOUND, pad); + PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND, pad); } END_LOOP; SetElementBoundingBox(ctx->buffer.dst, element, &PCB->Font); @@ -1186,13 +1186,13 @@ pcb_bool changed = pcb_false; pcb_coord_t value; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : pin->DrillingHole + ctx->chgsize.delta; if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (TEST_FLAG(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) + value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) && value != pin->DrillingHole) { changed = pcb_true; AddObjectTo2ndSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); @@ -1199,7 +1199,7 @@ ErasePin(pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, pin); pin->DrillingHole = value; - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { AddObjectToSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); pin->Thickness = value; } @@ -1220,7 +1220,7 @@ pcb_bool changed = pcb_false; pcb_coord_t value; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1231,7 +1231,7 @@ ErasePin(pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, pin); pin->Thickness = value; - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { AddObjectToSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); pin->Thickness = value; } @@ -1252,13 +1252,13 @@ pcb_bool changed = pcb_false; pcb_coord_t value; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : pin->Clearance + ctx->chgsize.delta; if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (TEST_FLAG(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) + value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) && value != pin->Clearance) { changed = pcb_true; AddObjectToClearSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); @@ -1265,7 +1265,7 @@ ErasePin(pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, pin); pin->Clearance = value; - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { AddObjectToSizeUndoList(PCB_TYPE_PIN, Element, pin, pin); pin->Thickness = value; } @@ -1285,7 +1285,7 @@ RestoreToPolygon(PCB->Data, PCB_TYPE_PAD, Element, pad); r_delete_entry(PCB->Data->pad_tree, &pad->BoundingBox); pad->Clearance = value; - if (TEST_FLAG(PCB_FLAG_HOLE, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pad)) { AddObjectToSizeUndoList(PCB_TYPE_PAD, Element, pad, pad); pad->Thickness = value; } @@ -1310,7 +1310,7 @@ pcb_coord_t value; pcb_bool changed = pcb_false; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); if (PCB->ElementOn) EraseElement(Element); @@ -1348,7 +1348,7 @@ int value = ctx->chgsize.absolute ? PCB_COORD_TO_MIL(ctx->chgsize.absolute) : DESCRIPTION_TEXT(Element).Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); - if (TEST_FLAG(PCB_FLAG_LOCK, &Element->Name[0])) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0])) return (NULL); if (value <= MAX_TEXTSCALE && value >= MIN_TEXTSCALE) { EraseElementName(Element); @@ -1370,7 +1370,7 @@ void *ChangeElementName(pcb_opctx_t *ctx, pcb_element_t *Element) { - if (TEST_FLAG(PCB_FLAG_LOCK, &Element->Name[0])) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0])) return (NULL); if (NAME_INDEX() == NAMEONPCB_INDEX) { if (conf_core.editor.unique_names && UniqueElementName(PCB->Data, ctx->chgname.new_name) != ctx->chgname.new_name) { @@ -1384,9 +1384,9 @@ void *ChangeElementNonetlist(pcb_opctx_t *ctx, pcb_element_t *Element) { - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); - TOGGLE_FLAG(PCB_FLAG_NONETLIST, Element); + PCB_FLAG_TOGGLE(PCB_FLAG_NONETLIST, Element); return Element; } @@ -1396,7 +1396,7 @@ { void *ans = NULL; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1416,7 +1416,7 @@ { void *ans = NULL; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1436,7 +1436,7 @@ { void *ans = NULL; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1456,7 +1456,7 @@ { void *result = NULL; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1472,7 +1472,7 @@ { void *result = NULL; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1488,7 +1488,7 @@ { void *result = NULL; - if (TEST_FLAG(PCB_FLAG_LOCK, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element)) return (NULL); PIN_LOOP(Element); { @@ -1660,15 +1660,15 @@ /*** draw ***/ void draw_element_name(pcb_element_t * element) { - if ((conf_core.editor.hide_names && gui->gui) || TEST_FLAG(PCB_FLAG_HIDENAME, element)) + if ((conf_core.editor.hide_names && gui->gui) || PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element)) return; if (pcb_draw_doing_pinout || pcb_draw_doing_assy) gui->set_color(Output.fgGC, PCB->ElementColor); - else if (TEST_FLAG(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) gui->set_color(Output.fgGC, PCB->ElementSelectedColor); else if (FRONT(element)) { #warning TODO: why do we test for Names flag here instead of elements flag? - if (TEST_FLAG(PCB_FLAG_NONETLIST, element)) + if (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, element)) gui->set_color(Output.fgGC, PCB->ElementColor_nonetlist); else gui->set_color(Output.fgGC, PCB->ElementColor); @@ -1686,7 +1686,7 @@ pcb_element_t *element = (pcb_element_t *) text->Element; int *side = cl; - if (TEST_FLAG(PCB_FLAG_HIDENAME, element)) + if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element)) return R_DIR_NOT_FOUND; if (ON_SIDE(element, *side)) @@ -1715,7 +1715,7 @@ /* set color and draw lines, arcs, text and pins */ if (pcb_draw_doing_pinout || pcb_draw_doing_assy) gui->set_color(Output.fgGC, PCB->ElementColor); - else if (TEST_FLAG(PCB_FLAG_SELECTED, element)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) gui->set_color(Output.fgGC, PCB->ElementSelectedColor); else if (FRONT(element)) gui->set_color(Output.fgGC, PCB->ElementColor); @@ -1760,7 +1760,7 @@ if (pinlist_length(&e->Pin) != 0) { pcb_pin_t *pin0 = pinlist_first(&e->Pin); - if (TEST_FLAG(PCB_FLAG_HOLE, pin0)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin0)) mark_size = MIN(mark_size, pin0->DrillingHole / 2); else mark_size = MIN(mark_size, pin0->Thickness / 2); @@ -1784,7 +1784,7 @@ * This provides a nice visual indication that it is locked that * works even for color blind users. */ - if (TEST_FLAG(PCB_FLAG_LOCK, e)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, e)) { gui->draw_line(Output.fgGC, X, Y, X + 2 * mark_size, Y); gui->draw_line(Output.fgGC, X, Y, X, Y - 4 * mark_size); } @@ -1831,7 +1831,7 @@ void EraseElementName(pcb_element_t *Element) { - if (TEST_FLAG(PCB_FLAG_HIDENAME, Element)) { + if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, Element)) { return; } DrawText(NULL, &ELEMENT_TEXT(PCB, Element)); @@ -1846,7 +1846,7 @@ void DrawElementName(pcb_element_t *Element) { - if (TEST_FLAG(PCB_FLAG_HIDENAME, Element)) + if (PCB_FLAG_TEST(PCB_FLAG_HIDENAME, Element)) return; DrawText(NULL, &ELEMENT_TEXT(PCB, Element)); } Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4875) +++ trunk/src/obj_line.c (revision 4876) @@ -99,7 +99,7 @@ /* remove unnecessary line points */ if (line->Thickness == i->Thickness /* don't merge lines if the clear flags differ */ - && TEST_FLAG(PCB_FLAG_CLEARLINE, line) == TEST_FLAG(PCB_FLAG_CLEARLINE, i)) { + && PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line) == PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, i)) { if (line->Point1.X == i->X1 && line->Point1.Y == i->Y1) { i->test.Point1.X = line->Point2.X; i->test.Point1.Y = line->Point2.Y; @@ -200,7 +200,7 @@ return (Line); Line->ID = CreateIDGet(); Line->Flags = Flags; - CLEAR_FLAG(PCB_FLAG_RAT, Line); + PCB_FLAG_CLEAR(PCB_FLAG_RAT, Line); Line->Thickness = Thickness; Line->Clearance = Clearance; Line->Point1.X = X1; @@ -268,7 +268,7 @@ linelist_remove(line); linelist_append(&(lay->Line), line); - CLEAR_FLAG(PCB_FLAG_FOUND, line); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, line); if (!lay->line_tree) lay->line_tree = r_create_tree(NULL, 0, 0); @@ -282,7 +282,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Line->Thickness + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) return (NULL); if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != Line->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_LINE, Layer, Line, Line); @@ -304,7 +304,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Line->Clearance + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Line) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) return (NULL); value = MIN(MAX_LINESIZE, MAX(value, PCB->Bloat * 2 + 2)); if (value != Line->Clearance) { @@ -314,7 +314,7 @@ r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); Line->Clearance = value; if (Line->Clearance == 0) { - CLEAR_FLAG(PCB_FLAG_CLEARLINE, Line); + PCB_FLAG_CLEAR(PCB_FLAG_CLEARLINE, Line); Line->Clearance = PCB_MIL_TO_COORD(10); } SetLineBoundingBox(Line); @@ -339,16 +339,16 @@ /* changes the clearance flag of a line */ void *ChangeLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - if (TEST_FLAG(PCB_FLAG_LOCK, Line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) return (NULL); EraseLine(Line); - if (TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) { + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) { AddObjectToClearPolyUndoList(PCB_TYPE_LINE, Layer, Line, Line, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); } AddObjectToFlagUndoList(PCB_TYPE_LINE, Layer, Line, Line); - TOGGLE_FLAG(PCB_FLAG_CLEARLINE, Line); - if (TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) { + PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Line); + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) { AddObjectToClearPolyUndoList(PCB_TYPE_LINE, Layer, Line, Line, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); } @@ -359,7 +359,7 @@ /* sets the clearance flag of a line */ void *SetLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - if (TEST_FLAG(PCB_FLAG_LOCK, Line) || TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) return (NULL); return ChangeLineJoin(ctx, Layer, Line); } @@ -367,7 +367,7 @@ /* clears the clearance flag of a line */ void *ClrLineJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { - if (TEST_FLAG(PCB_FLAG_LOCK, Line) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) return (NULL); return ChangeLineJoin(ctx, Layer, Line); } @@ -484,7 +484,7 @@ pcb_line_t *newone; void *ptr1, *ptr2, *ptr3; - if (TEST_FLAG(PCB_FLAG_LOCK, Line)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return NULL; } @@ -720,10 +720,10 @@ const char *color; char buf[sizeof("#XXXXXX")]; - if (TEST_FLAG(PCB_FLAG_WARN, line)) + if (PCB_FLAG_TEST(PCB_FLAG_WARN, line)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, line)) { - if (TEST_FLAG(PCB_FLAG_SELECTED, line)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) color = layer->SelectedColor; else color = PCB->ConnectedColor; @@ -731,7 +731,7 @@ else color = layer->Color; - if (TEST_FLAG(PCB_FLAG_ONPOINT, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, line)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 4875) +++ trunk/src/obj_line_drcenf.c (revision 4876) @@ -204,7 +204,7 @@ pcb_pin_t *via = (pcb_pin_t *) b; struct drc_info *i = (struct drc_info *) cl; - if (!TEST_FLAG(PCB_FLAG_FOUND, via) && pcb_intersect_line_pin(via, i->line)) + if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && pcb_intersect_line_pin(via, i->line)) longjmp(i->env, 1); return R_DIR_FOUND_CONTINUE; } @@ -214,7 +214,7 @@ pcb_pad_t *pad = (pcb_pad_t *) b; struct drc_info *i = (struct drc_info *) cl; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) == i->solder && !TEST_FLAG(PCB_FLAG_FOUND, pad) && pcb_intersect_line_pad(i->line, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) == i->solder && !PCB_FLAG_TEST(PCB_FLAG_FOUND, pad) && pcb_intersect_line_pad(i->line, pad)) longjmp(i->env, 1); return R_DIR_FOUND_CONTINUE; } @@ -224,7 +224,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct drc_info *i = (struct drc_info *) cl; - if (!TEST_FLAG(PCB_FLAG_FOUND, line) && pcb_intersect_line_line(line, i->line)) + if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_intersect_line_line(line, i->line)) longjmp(i->env, 1); return R_DIR_FOUND_CONTINUE; } @@ -234,7 +234,7 @@ pcb_arc_t *arc = (pcb_arc_t *) b; struct drc_info *i = (struct drc_info *) cl; - if (!TEST_FLAG(PCB_FLAG_FOUND, arc) && pcb_intersect_line_arc(i->line, arc)) + if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_intersect_line_arc(i->line, arc)) longjmp(i->env, 1); return R_DIR_FOUND_CONTINUE; } Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4875) +++ trunk/src/obj_pad.c (revision 4876) @@ -89,7 +89,7 @@ pad->Name = pcb_strdup_null(Name); pad->Number = pcb_strdup_null(Number); pad->Flags = Flags; - CLEAR_FLAG(PCB_FLAG_WARN, pad); + PCB_FLAG_CLEAR(PCB_FLAG_WARN, pad); pad->ID = CreateIDGet(); pad->Element = Element; return (pad); @@ -110,7 +110,7 @@ deltax = Pad->Point2.X - Pad->Point1.X; deltay = Pad->Point2.Y - Pad->Point1.Y; - if (TEST_FLAG(PCB_FLAG_SQUARE, Pad) && deltax != 0 && deltay != 0) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad) && deltax != 0 && deltay != 0) { /* slanted square pad */ double theta; pcb_coord_t btx, bty; @@ -142,11 +142,11 @@ /* changes the nopaste flag of a pad */ pcb_bool ChangePaste(pcb_pad_t *Pad) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (pcb_false); ErasePad(Pad); AddObjectToFlagUndoList(PCB_TYPE_PAD, Pad, Pad, Pad); - TOGGLE_FLAG(PCB_FLAG_NOPASTE, Pad); + PCB_FLAG_TOGGLE(PCB_FLAG_NOPASTE, Pad); DrawPad(Pad); pcb_draw(); return (pcb_true); @@ -159,7 +159,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pad->Thickness + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (NULL); if (value <= MAX_PADSIZE && value >= MIN_PADSIZE && value != Pad->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_PAD, Element, Pad, Pad); @@ -183,7 +183,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pad->Clearance + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (NULL); value = MIN(MAX_LINESIZE, value); if (value < 0) @@ -212,7 +212,7 @@ char *old = Pad->Name; Element = Element; /* get rid of 'unused...' warnings */ - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) { ErasePadName(Pad); Pad->Name = ctx->chgname.new_name; DrawPadName(Pad); @@ -228,7 +228,7 @@ char *old = Pad->Number; Element = Element; /* get rid of 'unused...' warnings */ - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) { ErasePadName(Pad); Pad->Number = ctx->chgname.new_name; DrawPadName(Pad); @@ -241,13 +241,13 @@ /* changes the square flag of a pad */ void *ChangePadSquare(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pad_t *Pad) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (NULL); ErasePad(Pad); AddObjectToClearPolyUndoList(PCB_TYPE_PAD, Element, Pad, Pad, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_PAD, Element, Pad); AddObjectToFlagUndoList(PCB_TYPE_PAD, Element, Pad, Pad); - TOGGLE_FLAG(PCB_FLAG_SQUARE, Pad); + PCB_FLAG_TOGGLE(PCB_FLAG_SQUARE, Pad); AddObjectToClearPolyUndoList(PCB_TYPE_PAD, Element, Pad, Pad, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_PAD, Element, Pad); DrawPad(Pad); @@ -258,7 +258,7 @@ void *SetPadSquare(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pad_t *Pad) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pad) || TEST_FLAG(PCB_FLAG_SQUARE, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad) || PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) return (NULL); return (ChangePadSquare(ctx, Element, Pad)); @@ -269,7 +269,7 @@ void *ClrPadSquare(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pad_t *Pad) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pad) || !TEST_FLAG(PCB_FLAG_SQUARE, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad) || !PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) return (NULL); return (ChangePadSquare(ctx, Element, Pad)); @@ -361,10 +361,10 @@ if (pcb_draw_doing_pinout) gui->set_color(Output.fgGC, PCB->PinColor); - else if (TEST_FLAG(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, pad)) { - if (TEST_FLAG(PCB_FLAG_WARN, pad)) + else if (PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_WARN, pad)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED, pad)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad)) color = PCB->PinSelectedColor; else color = PCB->ConnectedColor; @@ -374,7 +374,7 @@ else color = PCB->InvisibleObjectsColor; - if (TEST_FLAG(PCB_FLAG_ONPOINT, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, pad)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; @@ -385,7 +385,7 @@ _draw_pad(Output.fgGC, pad, pcb_false, pcb_false); - if (pcb_draw_doing_pinout || TEST_FLAG(PCB_FLAG_DISPLAYNAME, pad)) + if (pcb_draw_doing_pinout || PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pad)) draw_pad_name(pad); } @@ -414,7 +414,7 @@ gui->set_color(Output.fgGC, PCB->ElementColor); ALLPAD_LOOP(PCB->Data); { - if (ON_SIDE(pad, side) && !TEST_FLAG(PCB_FLAG_NOPASTE, pad) && pad->Mask > 0) { + if (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 @@ -456,7 +456,7 @@ void ErasePad(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) ErasePadName(Pad); pcb_flag_erase(&Pad->Flags); } @@ -469,7 +469,7 @@ void DrawPad(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); - if (pcb_draw_doing_pinout || TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pad)) + if (pcb_draw_doing_pinout || PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) DrawPadName(Pad); } Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 4875) +++ trunk/src/obj_pinvia.c (revision 4876) @@ -119,8 +119,8 @@ Via->Name = pcb_strdup_null(Name); Via->Flags = Flags; - CLEAR_FLAG(PCB_FLAG_WARN, Via); - SET_FLAG(PCB_FLAG_VIA, Via); + PCB_FLAG_CLEAR(PCB_FLAG_WARN, Via); + PCB_FLAG_SET(PCB_FLAG_VIA, Via); Via->ID = CreateIDGet(); /* @@ -127,7 +127,7 @@ * don't complain about MIN_PINORVIACOPPER on a mounting hole (pure * hole) */ - if (!TEST_FLAG(PCB_FLAG_HOLE, Via) && (Via->Thickness < Via->DrillingHole + MIN_PINORVIACOPPER)) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && (Via->Thickness < Via->DrillingHole + MIN_PINORVIACOPPER)) { Via->Thickness = Via->DrillingHole + MIN_PINORVIACOPPER; pcb_message(PCB_MSG_DEFAULT, _("%m+Increased via thickness to %$mS to allow enough copper" " at %$mD.\n"), conf_core.editor.grid_unit->allow, Via->Thickness, Via->X, Via->Y); @@ -151,8 +151,8 @@ pin->Name = pcb_strdup_null(Name); pin->Number = pcb_strdup_null(Number); pin->Flags = Flags; - CLEAR_FLAG(PCB_FLAG_WARN, pin); - SET_FLAG(PCB_FLAG_PIN, pin); + PCB_FLAG_CLEAR(PCB_FLAG_WARN, pin); + PCB_FLAG_SET(PCB_FLAG_PIN, pin); pin->ID = CreateIDGet(); pin->Element = Element; @@ -174,7 +174,7 @@ conf_core.editor.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; } - else if (!TEST_FLAG(PCB_FLAG_HOLE, pin) + else if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) && (pin->DrillingHole > pin->Thickness - MIN_PINORVIACOPPER)) { pcb_message(PCB_MSG_DEFAULT, _("%m+Did not map pin #%s (%s) drill hole because %$mS does not leave enough copper\n"), conf_core.editor.grid_unit->allow, UNKNOWN(Number), UNKNOWN(Name), pin->DrillingHole); @@ -208,7 +208,7 @@ { pcb_coord_t width; - if ((GET_SQUARE(Pin) > 1) && (TEST_FLAG(PCB_FLAG_SQUARE, Pin))) { + if ((GET_SQUARE(Pin) > 1) && (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pin))) { pcb_polyarea_t *p = PinPoly(Pin, PIN_SIZE(Pin), Pin->Clearance); poly_bbox(p, &Pin->BoundingBox); poly_Free(&p); @@ -247,7 +247,7 @@ pinlist_remove(via); pinlist_append(&ctx->buffer.dst->Via, via); - CLEAR_FLAG(PCB_FLAG_WARN | PCB_FLAG_FOUND, via); + PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND, via); if (!ctx->buffer.dst->via_tree) ctx->buffer.dst->via_tree = r_create_tree(NULL, 0, 0); @@ -293,9 +293,9 @@ { pcb_coord_t value = ctx->chgsize.absolute ? ctx->chgsize.absolute : Via->Thickness + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); - if (!TEST_FLAG(PCB_FLAG_HOLE, Via) && value <= MAX_PINORVIASIZE && + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && value <= MAX_PINORVIASIZE && value >= MIN_PINORVIASIZE && value >= Via->DrillingHole + MIN_PINORVIACOPPER && value != Via->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_VIA, Via, Via, Via); EraseVia(Via); @@ -320,16 +320,16 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Via->DrillingHole + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (TEST_FLAG(PCB_FLAG_HOLE, Via) || value <= Via->Thickness - MIN_PINORVIACOPPER) + value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) || value <= Via->Thickness - MIN_PINORVIACOPPER) && value != Via->DrillingHole) { AddObjectTo2ndSizeUndoList(PCB_TYPE_VIA, Via, Via, Via); EraseVia(Via); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); Via->DrillingHole = value; - if (TEST_FLAG(PCB_FLAG_HOLE, Via)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via)) { AddObjectToSizeUndoList(PCB_TYPE_VIA, Via, Via, Via); Via->Thickness = value; } @@ -345,16 +345,16 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pin->DrillingHole + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (TEST_FLAG(PCB_FLAG_HOLE, Pin) || value <= Pin->Thickness - MIN_PINORVIACOPPER) + value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) || value <= Pin->Thickness - MIN_PINORVIACOPPER) && value != Pin->DrillingHole) { AddObjectTo2ndSizeUndoList(PCB_TYPE_PIN, Element, Pin, Pin); ErasePin(Pin); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); Pin->DrillingHole = value; - if (TEST_FLAG(PCB_FLAG_HOLE, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin)) { AddObjectToSizeUndoList(PCB_TYPE_PIN, Element, Pin, Pin); Pin->Thickness = value; } @@ -371,7 +371,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Via->Clearance + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); value = MIN(MAX_LINESIZE, value); if (value < 0) @@ -401,9 +401,9 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pin->Thickness + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); - if (!TEST_FLAG(PCB_FLAG_HOLE, Pin) && value <= MAX_PINORVIASIZE && + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && value <= MAX_PINORVIASIZE && value >= MIN_PINORVIASIZE && value >= Pin->DrillingHole + MIN_PINORVIACOPPER && value != Pin->Thickness) { AddObjectToSizeUndoList(PCB_TYPE_PIN, Element, Pin, Pin); AddObjectToMaskSizeUndoList(PCB_TYPE_PIN, Element, Pin, Pin); @@ -426,7 +426,7 @@ { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Pin->Clearance + ctx->chgsize.delta; - if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); value = MIN(MAX_LINESIZE, value); if (value < 0) @@ -454,7 +454,7 @@ { char *old = Via->Name; - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Via)) { + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) { ErasePinName(Via); Via->Name = ctx->chgname.new_name; DrawPinName(Via); @@ -470,7 +470,7 @@ char *old = Pin->Name; Element = Element; /* get rid of 'unused...' warnings */ - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) { ErasePinName(Pin); Pin->Name = ctx->chgname.new_name; DrawPinName(Pin); @@ -486,7 +486,7 @@ char *old = Pin->Number; Element = Element; /* get rid of 'unused...' warnings */ - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) { ErasePinName(Pin); Pin->Number = ctx->chgname.new_name; DrawPinName(Pin); @@ -500,7 +500,7 @@ /* changes the square flag of a via */ void *ChangeViaSquare(pcb_opctx_t *ctx, pcb_pin_t *Via) { - if (TEST_FLAG(PCB_FLAG_LOCK, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); EraseVia(Via); AddObjectToClearPolyUndoList(PCB_TYPE_VIA, NULL, Via, Via, pcb_false); @@ -508,9 +508,9 @@ AddObjectToFlagUndoList(PCB_TYPE_VIA, NULL, Via, Via); ASSIGN_SQUARE(ctx->chgsize.absolute, Via); if (ctx->chgsize.absolute == 0) - CLEAR_FLAG(PCB_FLAG_SQUARE, Via); + PCB_FLAG_CLEAR(PCB_FLAG_SQUARE, Via); else - SET_FLAG(PCB_FLAG_SQUARE, Via); + PCB_FLAG_SET(PCB_FLAG_SQUARE, Via); SetPinBoundingBox(Via); AddObjectToClearPolyUndoList(PCB_TYPE_VIA, NULL, Via, Via, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, NULL, Via); @@ -521,7 +521,7 @@ /* changes the square flag of a pin */ void *ChangePinSquare(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); ErasePin(Pin); AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false); @@ -529,9 +529,9 @@ AddObjectToFlagUndoList(PCB_TYPE_PIN, Element, Pin, Pin); ASSIGN_SQUARE(ctx->chgsize.absolute, Pin); if (ctx->chgsize.absolute == 0) - CLEAR_FLAG(PCB_FLAG_SQUARE, Pin); + PCB_FLAG_CLEAR(PCB_FLAG_SQUARE, Pin); else - SET_FLAG(PCB_FLAG_SQUARE, Pin); + PCB_FLAG_SET(PCB_FLAG_SQUARE, Pin); SetPinBoundingBox(Pin); AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); @@ -542,7 +542,7 @@ /* sets the square flag of a pin */ void *SetPinSquare(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pin) || TEST_FLAG(PCB_FLAG_SQUARE, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pin)) return (NULL); return (ChangePinSquare(ctx, Element, Pin)); @@ -551,7 +551,7 @@ /* clears the square flag of a pin */ void *ClrPinSquare(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pin) || !TEST_FLAG(PCB_FLAG_SQUARE, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || !PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pin)) return (NULL); return (ChangePinSquare(ctx, Element, Pin)); @@ -560,13 +560,13 @@ /* changes the octagon flag of a via */ void *ChangeViaOctagon(pcb_opctx_t *ctx, pcb_pin_t *Via) { - if (TEST_FLAG(PCB_FLAG_LOCK, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); EraseVia(Via); AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); AddObjectToFlagUndoList(PCB_TYPE_VIA, Via, Via, Via); - TOGGLE_FLAG(PCB_FLAG_OCTAGON, Via); + PCB_FLAG_TOGGLE(PCB_FLAG_OCTAGON, Via); AddObjectToClearPolyUndoList(PCB_TYPE_VIA, Via, Via, Via, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); DrawVia(Via); @@ -576,7 +576,7 @@ /* sets the octagon flag of a via */ void *SetViaOctagon(pcb_opctx_t *ctx, pcb_pin_t *Via) { - if (TEST_FLAG(PCB_FLAG_LOCK, Via) || TEST_FLAG(PCB_FLAG_OCTAGON, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Via)) return (NULL); return (ChangeViaOctagon(ctx, Via)); @@ -585,7 +585,7 @@ /* clears the octagon flag of a via */ void *ClrViaOctagon(pcb_opctx_t *ctx, pcb_pin_t *Via) { - if (TEST_FLAG(PCB_FLAG_LOCK, Via) || !TEST_FLAG(PCB_FLAG_OCTAGON, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via) || !PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Via)) return (NULL); return (ChangeViaOctagon(ctx, Via)); @@ -594,13 +594,13 @@ /* changes the octagon flag of a pin */ void *ChangePinOctagon(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); ErasePin(Pin); AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); AddObjectToFlagUndoList(PCB_TYPE_PIN, Element, Pin, Pin); - TOGGLE_FLAG(PCB_FLAG_OCTAGON, Pin); + PCB_FLAG_TOGGLE(PCB_FLAG_OCTAGON, Pin); AddObjectToClearPolyUndoList(PCB_TYPE_PIN, Element, Pin, Pin, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); DrawPin(Pin); @@ -610,7 +610,7 @@ /* sets the octagon flag of a pin */ void *SetPinOctagon(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pin) || TEST_FLAG(PCB_FLAG_OCTAGON, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Pin)) return (NULL); return (ChangePinOctagon(ctx, Element, Pin)); @@ -619,7 +619,7 @@ /* clears the octagon flag of a pin */ void *ClrPinOctagon(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin) { - if (TEST_FLAG(PCB_FLAG_LOCK, Pin) || !TEST_FLAG(PCB_FLAG_OCTAGON, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || !PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Pin)) return (NULL); return (ChangePinOctagon(ctx, Element, Pin)); @@ -628,7 +628,7 @@ /* changes the hole flag of a via */ pcb_bool ChangeHole(pcb_pin_t *Via) { - if (TEST_FLAG(PCB_FLAG_LOCK, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (pcb_false); EraseVia(Via); AddObjectToFlagUndoList(PCB_TYPE_VIA, Via, Via, Via); @@ -635,9 +635,9 @@ AddObjectToMaskSizeUndoList(PCB_TYPE_VIA, Via, Via, Via); r_delete_entry(PCB->Data->via_tree, (pcb_box_t *) Via); RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); - TOGGLE_FLAG(PCB_FLAG_HOLE, Via); + PCB_FLAG_TOGGLE(PCB_FLAG_HOLE, Via); - if (TEST_FLAG(PCB_FLAG_HOLE, Via)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via)) { /* A tented via becomes an minimally untented hole. An untented via retains its mask clearance. */ if (Via->Mask > Via->Thickness) { @@ -762,15 +762,15 @@ char buf[sizeof("#XXXXXX")]; if (Type == PCB_TYPE_VIA) { - if (!pcb_draw_doing_pinout && TEST_FLAG(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, Pin)) { - if (TEST_FLAG(PCB_FLAG_WARN, Pin)) + if (!pcb_draw_doing_pinout && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_WARN, Pin)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED, Pin)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, Pin)) color = PCB->ViaSelectedColor; else color = PCB->ConnectedColor; - if (TEST_FLAG(PCB_FLAG_ONPOINT, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, Pin)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; @@ -780,15 +780,15 @@ color = PCB->ViaColor; } else { - if (!pcb_draw_doing_pinout && TEST_FLAG(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, Pin)) { - if (TEST_FLAG(PCB_FLAG_WARN, Pin)) + if (!pcb_draw_doing_pinout && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_WARN, Pin)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED, Pin)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, Pin)) color = PCB->PinSelectedColor; else color = PCB->ConnectedColor; - if (TEST_FLAG(PCB_FLAG_ONPOINT, Pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, Pin)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; @@ -820,7 +820,7 @@ strcpy(buff, pn); text.TextString = buff; - vert = TEST_FLAG(PCB_FLAG_EDGE2, pv); + vert = PCB_FLAG_TEST(PCB_FLAG_EDGE2, pv); if (vert) { box.X1 = pv->X - pv->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; @@ -854,7 +854,7 @@ else gui->fill_pcb_pv(Output.fgGC, Output.bgGC, pv, draw_hole, pcb_false); - if (!TEST_FLAG(PCB_FLAG_HOLE, pv) && TEST_FLAG(PCB_FLAG_DISPLAYNAME, pv)) + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pv) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pv)) _draw_pv_name(pv); } @@ -900,11 +900,11 @@ const char *color; char buf[sizeof("#XXXXXX")]; - if ((plated == 0 && !TEST_FLAG(PCB_FLAG_HOLE, pv)) || (plated == 1 && TEST_FLAG(PCB_FLAG_HOLE, pv))) + if ((plated == 0 && !PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) || (plated == 1 && PCB_FLAG_TEST(PCB_FLAG_HOLE, pv))) return R_DIR_FOUND_CONTINUE; if (conf_core.editor.thin_draw) { - if (!TEST_FLAG(PCB_FLAG_HOLE, pv)) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { gui->set_line_cap(Output.fgGC, Round_Cap); gui->set_line_width(Output.fgGC, 0); gui->draw_arc(Output.fgGC, pv->X, pv->Y, pv->DrillingHole / 2, pv->DrillingHole / 2, 0, 360); @@ -913,15 +913,15 @@ else gui->fill_circle(Output.bgGC, pv->X, pv->Y, pv->DrillingHole / 2); - if (TEST_FLAG(PCB_FLAG_HOLE, pv)) { - if (TEST_FLAG(PCB_FLAG_WARN, pv)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_WARN, pv)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED, pv)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pv)) color = PCB->ViaSelectedColor; else color = conf_core.appearance.color.black; - if (TEST_FLAG(PCB_FLAG_ONPOINT, pv)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, pv)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; @@ -938,7 +938,7 @@ static void GatherPVName(pcb_pin_t *Ptr) { pcb_box_t box; - pcb_bool vert = TEST_FLAG(PCB_FLAG_EDGE2, Ptr); + pcb_bool vert = PCB_FLAG_TEST(PCB_FLAG_EDGE2, Ptr); if (vert) { box.X1 = Ptr->X - Ptr->Thickness / 2 + conf_core.appearance.pinout.text_offset_y; @@ -963,7 +963,7 @@ void EraseVia(pcb_pin_t *Via) { pcb_draw_invalidate(Via); - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Via)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) EraseViaName(Via); pcb_flag_erase(&Via->Flags); } @@ -976,7 +976,7 @@ void ErasePin(pcb_pin_t *Pin) { pcb_draw_invalidate(Pin); - if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) ErasePinName(Pin); pcb_flag_erase(&Pin->Flags); } @@ -989,7 +989,7 @@ void DrawVia(pcb_pin_t *Via) { pcb_draw_invalidate(Via); - if (!TEST_FLAG(PCB_FLAG_HOLE, Via) && TEST_FLAG(PCB_FLAG_DISPLAYNAME, Via)) + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) DrawViaName(Via); } @@ -1001,7 +1001,7 @@ void DrawPin(pcb_pin_t *Pin) { pcb_draw_invalidate(Pin); - if ((!TEST_FLAG(PCB_FLAG_HOLE, Pin) && TEST_FLAG(PCB_FLAG_DISPLAYNAME, Pin)) + if ((!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) || pcb_draw_doing_pinout) DrawPinName(Pin); } Index: trunk/src/obj_pinvia.h =================================================================== --- trunk/src/obj_pinvia.h (revision 4875) +++ trunk/src/obj_pinvia.h (revision 4876) @@ -56,7 +56,7 @@ /* This is the extents of a Pin or Via, depending on whether it's a hole or not. */ #define PIN_SIZE(pinptr) \ - (TEST_FLAG(PCB_FLAG_HOLE, (pinptr)) \ + (PCB_FLAG_TEST(PCB_FLAG_HOLE, (pinptr)) \ ? (pinptr)->DrillingHole \ : (pinptr)->Thickness) Index: trunk/src/obj_pinvia_therm.c =================================================================== --- trunk/src/obj_pinvia_therm.c (revision 4875) +++ trunk/src/obj_pinvia_therm.c (revision 4876) @@ -362,9 +362,9 @@ if (style == 3) return NULL; /* solid connection no clearance */ pcb = p; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) return square_therm(pin, style); - if (TEST_FLAG(PCB_FLAG_OCTAGON, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pin)) return oct_therm(pin, style); /* must be circular */ switch (style) { Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4875) +++ trunk/src/obj_poly.c (revision 4876) @@ -220,7 +220,7 @@ } SetPolygonBoundingBox(Dest); Dest->Flags = Src->Flags; - CLEAR_FLAG(PCB_FLAG_FOUND, Dest); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, Dest); return (Dest); } @@ -243,7 +243,7 @@ layer->polygon_tree = r_create_tree(NULL, 0, 0); r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon, 0); - CLEAR_FLAG(PCB_FLAG_FOUND | ctx->buffer.extraflg, polygon); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND | ctx->buffer.extraflg, polygon); return (polygon); } @@ -258,7 +258,7 @@ polylist_remove(polygon); polylist_append(&lay->Polygon, polygon); - CLEAR_FLAG(PCB_FLAG_FOUND, polygon); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, polygon); if (!lay->polygon_tree) lay->polygon_tree = r_create_tree(NULL, 0, 0); @@ -284,11 +284,11 @@ /* changes the CLEARPOLY flag of a polygon */ void *ChangePolyClear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { - if (TEST_FLAG(PCB_FLAG_LOCK, Polygon)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) return (NULL); AddObjectToClearPolyUndoList(PCB_TYPE_POLYGON, Layer, Polygon, Polygon, pcb_true); AddObjectToFlagUndoList(PCB_TYPE_POLYGON, Layer, Polygon, Polygon); - TOGGLE_FLAG(PCB_FLAG_CLEARPOLY, Polygon); + PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLY, Polygon); InitClip(PCB->Data, Layer, Polygon); DrawPolygon(Layer, Polygon); return (Polygon); @@ -428,7 +428,7 @@ pcb_polygon_t *newone; struct mptlc d; - if (TEST_FLAG(PCB_FLAG_LOCK, Polygon)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return NULL; } @@ -644,13 +644,13 @@ if (!polygon->Clipped) return R_DIR_NOT_FOUND; - if (TEST_FLAG(PCB_FLAG_WARN, polygon)) + if (PCB_FLAG_TEST(PCB_FLAG_WARN, polygon)) color = PCB->WarnColor; - else if (TEST_FLAG(PCB_FLAG_SELECTED, polygon)) + else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) color = i->layer->SelectedColor; - else if (TEST_FLAG(PCB_FLAG_FOUND, polygon)) + else if (PCB_FLAG_TEST(PCB_FLAG_FOUND, polygon)) color = PCB->ConnectedColor; - else if (TEST_FLAG(PCB_FLAG_ONPOINT, polygon)) { + else if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, polygon)) { assert(color != NULL); pcb_lighten_color(color, buf, 1.75); color = buf; @@ -665,7 +665,7 @@ gui->fill_pcb_polygon(Output.fgGC, polygon, i->drawn_area); /* If checking planes, thin-draw any pieces which have been clipped away */ - if (gui->thindraw_pcb_polygon != NULL && conf_core.editor.check_planes && !TEST_FLAG(PCB_FLAG_FULLPOLY, polygon)) { + if (gui->thindraw_pcb_polygon != NULL && conf_core.editor.check_planes && !PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, polygon)) { pcb_polygon_t poly = *polygon; for (poly.Clipped = polygon->Clipped->f; poly.Clipped != polygon->Clipped; poly.Clipped = poly.Clipped->f) Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4875) +++ trunk/src/obj_rat.c (revision 4876) @@ -78,7 +78,7 @@ Line->ID = CreateIDGet(); Line->Flags = Flags; - SET_FLAG(PCB_FLAG_RAT, Line); + PCB_FLAG_SET(PCB_FLAG_RAT, Line); Line->Thickness = Thickness; Line->Point1.X = X1; Line->Point1.Y = Y1; @@ -108,7 +108,7 @@ RAT_LOOP(PCB->Data); { - if ((!selected) || TEST_FLAG(PCB_FLAG_SELECTED, line)) { + if ((!selected) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { changed = pcb_true; RemoveRat(&ctx, line); } @@ -139,7 +139,7 @@ ratlist_remove(rat); ratlist_append(&ctx->buffer.dst->Rat, rat); - CLEAR_FLAG(PCB_FLAG_FOUND, rat); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, rat); if (!ctx->buffer.dst->rat_tree) ctx->buffer.dst->rat_tree = r_create_tree(NULL, 0, 0); @@ -224,8 +224,8 @@ { pcb_rat_t *rat = (pcb_rat_t *) b; - if (TEST_FLAG(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) { - if (TEST_FLAG(PCB_FLAG_SELECTED, rat)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, rat)) gui->set_color(Output.fgGC, PCB->RatSelectedColor); else gui->set_color(Output.fgGC, PCB->ConnectedColor); @@ -236,7 +236,7 @@ if (conf_core.appearance.rat_thickness < 20) rat->Thickness = pixel_slop * conf_core.appearance.rat_thickness; /* rats.c set PCB_FLAG_VIA if this rat goes to a containing poly: draw a donut */ - if (TEST_FLAG(PCB_FLAG_VIA, rat)) { + if (PCB_FLAG_TEST(PCB_FLAG_VIA, rat)) { int w = rat->Thickness; if (conf_core.editor.thin_draw) @@ -252,7 +252,7 @@ void EraseRat(pcb_rat_t *Rat) { - if (TEST_FLAG(PCB_FLAG_VIA, Rat)) { + if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) { pcb_coord_t w = Rat->Thickness; pcb_box_t b; @@ -273,7 +273,7 @@ if (conf_core.appearance.rat_thickness < 20) Rat->Thickness = pixel_slop * conf_core.appearance.rat_thickness; /* rats.c set PCB_FLAG_VIA if this rat goes to a containing poly: draw a donut */ - if (TEST_FLAG(PCB_FLAG_VIA, Rat)) { + if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) { pcb_coord_t w = Rat->Thickness; pcb_box_t b; Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4875) +++ trunk/src/obj_text.c (revision 4876) @@ -188,7 +188,7 @@ * and rotate box */ - if (TEST_FLAG(PCB_FLAG_ONSOLDER, Text)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text)) { Text->BoundingBox.X1 = Text->X + minx; Text->BoundingBox.Y1 = Text->Y - miny; Text->BoundingBox.X2 = Text->X + maxx; @@ -248,7 +248,7 @@ int value = ctx->chgsize.absolute ? PCB_COORD_TO_MIL(ctx->chgsize.absolute) : Text->Scale + PCB_COORD_TO_MIL(ctx->chgsize.delta); - if (TEST_FLAG(PCB_FLAG_LOCK, Text)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return (NULL); if (value <= MAX_TEXTSCALE && value >= MIN_TEXTSCALE && value != Text->Scale) { AddObjectToSizeUndoList(PCB_TYPE_TEXT, Layer, Text, Text); @@ -271,7 +271,7 @@ { char *old = Text->TextString; - if (TEST_FLAG(PCB_FLAG_LOCK, Text)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return (NULL); EraseText(Layer, Text); r_delete_entry(Layer->text_tree, (pcb_box_t *)Text); @@ -289,16 +289,16 @@ /* changes the clearance flag of a text */ void *ChangeTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { - if (TEST_FLAG(PCB_FLAG_LOCK, Text)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return (NULL); EraseText(Layer, Text); - if (TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) { + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) { AddObjectToClearPolyUndoList(PCB_TYPE_TEXT, Layer, Text, Text, pcb_false); RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); } AddObjectToFlagUndoList(PCB_TYPE_TEXT, Layer, Text, Text); - TOGGLE_FLAG(PCB_FLAG_CLEARLINE, Text); - if (TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) { + PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Text); + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) { AddObjectToClearPolyUndoList(PCB_TYPE_TEXT, Layer, Text, Text, pcb_true); ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); } @@ -309,7 +309,7 @@ /* sets the clearance flag of a text */ void *SetTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { - if (TEST_FLAG(PCB_FLAG_LOCK, Text) || TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) return (NULL); return ChangeTextJoin(ctx, Layer, Text); } @@ -317,7 +317,7 @@ /* clears the clearance flag of a text */ void *ClrTextJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { - if (TEST_FLAG(PCB_FLAG_LOCK, Text) || !TEST_FLAG(PCB_FLAG_CLEARLINE, Text)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) return (NULL); return ChangeTextJoin(ctx, Layer, Text); } @@ -362,9 +362,9 @@ textlist_append(&Destination->Text, text); if (GetLayerGroupNumberByNumber(solder_silk_layer) == GetLayerGroupNumberByPointer(Destination)) - SET_FLAG(PCB_FLAG_ONSOLDER, text); + PCB_FLAG_SET(PCB_FLAG_ONSOLDER, text); else - CLEAR_FLAG(PCB_FLAG_ONSOLDER, text); + PCB_FLAG_CLEAR(PCB_FLAG_ONSOLDER, text); /* re-calculate the bounding box (it could be mirrored now) */ SetTextBoundingBox(&PCB->Font, text); @@ -379,7 +379,7 @@ /* moves a text object between layers */ void *MoveTextToLayer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text) { - if (TEST_FLAG(PCB_FLAG_LOCK, text)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, text)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return NULL; } @@ -438,7 +438,7 @@ { pcb_uint8_t number; - number = TEST_FLAG(PCB_FLAG_ONSOLDER, Text) ? (4 - Number) & 3 : Number; + number = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text) ? (4 - Number) & 3 : Number; RotateBoxLowLevel(&Text->BoundingBox, X, Y, Number); ROTATE(Text->X, Text->Y, X, Y, Number); @@ -497,7 +497,7 @@ /* the labels of SMD objects on the bottom * side haven't been swapped yet, only their offset */ - if (TEST_FLAG(PCB_FLAG_ONSOLDER, Text)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text)) { newline.Point1.X = SWAP_SIGN_X(newline.Point1.X); newline.Point1.Y = SWAP_SIGN_Y(newline.Point1.Y); newline.Point2.X = SWAP_SIGN_X(newline.Point2.X); @@ -547,7 +547,7 @@ pcb_text_t *text = (pcb_text_t *) b; int min_silk_line; - if (TEST_FLAG(PCB_FLAG_SELECTED, text)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) gui->set_color(Output.fgGC, layer->SelectedColor); else gui->set_color(Output.fgGC, layer->Color); Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4875) +++ trunk/src/object_act.c (revision 4876) @@ -149,7 +149,7 @@ pcb_element_t *e = NULL; ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) { e = element; n_found++; } @@ -245,7 +245,7 @@ * going to be used either with a brand new design or a scratch * design holding some new components */ - if (!TEST_FLAG(PCB_FLAG_LOCK, element) && (all || TEST_FLAG(PCB_FLAG_SELECTED, element))) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && (all || PCB_FLAG_TEST(PCB_FLAG_SELECTED, element))) { /* figure out how much to move the element */ dx = minx - element->BoundingBox.X1; @@ -493,7 +493,7 @@ if (strcasecmp(function, "start") == 0) { ELEMENT_LOOP(PCB->Data); { - CLEAR_FLAG(PCB_FLAG_FOUND, element); + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, element); } END_LOOP; element_cache = NULL; @@ -504,12 +504,12 @@ if (strcasecmp(function, "done") == 0) { ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, element)) { - CLEAR_FLAG(PCB_FLAG_FOUND, element); + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, element)) { + PCB_FLAG_CLEAR(PCB_FLAG_FOUND, element); } else if (!EMPTY_STRING_P(NAMEONPCB_NAME(element))) { /* Unnamed elements should remain untouched */ - SET_FLAG(PCB_FLAG_SELECTED, element); + PCB_FLAG_SET(PCB_FLAG_SELECTED, element); } } END_LOOP; @@ -632,7 +632,7 @@ if (old) free(old); - SET_FLAG(PCB_FLAG_FOUND, e); + PCB_FLAG_SET(PCB_FLAG_FOUND, e); #ifdef DEBUG printf(" ... Leaving ActionElementList.\n"); @@ -733,7 +733,7 @@ case F_All: ALLLINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_AUTO, line) && !TEST_FLAG(PCB_FLAG_LOCK, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_AUTO, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) { RemoveObject(PCB_TYPE_LINE, layer, line, line); changed = pcb_true; } @@ -741,7 +741,7 @@ ENDALL_LOOP; ALLARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_AUTO, arc) && !TEST_FLAG(PCB_FLAG_LOCK, arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_AUTO, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) { RemoveObject(PCB_TYPE_ARC, layer, arc, arc); changed = pcb_true; } @@ -749,7 +749,7 @@ ENDALL_LOOP; VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_AUTO, via) && !TEST_FLAG(PCB_FLAG_LOCK, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_AUTO, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) { RemoveObject(PCB_TYPE_VIA, via, via, via); changed = pcb_true; } @@ -764,8 +764,8 @@ case F_Selected: VISIBLELINE_LOOP(PCB->Data); { - if (TEST_FLAGS(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line) - && !TEST_FLAG(PCB_FLAG_LOCK, line)) { + if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line) + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) { RemoveObject(PCB_TYPE_LINE, layer, line, line); changed = pcb_true; } @@ -774,8 +774,8 @@ if (PCB->ViaOn) VIA_LOOP(PCB->Data); { - if (TEST_FLAGS(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, via) - && !TEST_FLAG(PCB_FLAG_LOCK, via)) { + if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, via) + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) { RemoveObject(PCB_TYPE_VIA, via, via, via); changed = pcb_true; } @@ -852,7 +852,7 @@ { PIN_LOOP(element); { - if (!TEST_FLAGS(flags, pin)) + if (!PCB_FLAGS_TEST(flags, pin)) continue; if (pin->Mask < pin->Thickness + value) { pcb_chg_obj_mask_size(PCB_TYPE_PIN, element, pin, 0, pin->Thickness + value, 1); @@ -862,7 +862,7 @@ END_LOOP; PAD_LOOP(element); { - if (!TEST_FLAGS(flags, pad)) + if (!PCB_FLAGS_TEST(flags, pad)) continue; if (pad->Mask < pad->Thickness + value) { pcb_chg_obj_mask_size(PCB_TYPE_PAD, element, pad, 0, pad->Thickness + value, 1); @@ -874,7 +874,7 @@ END_LOOP; VIA_LOOP(PCB->Data); { - if (!TEST_FLAGS(flags, via)) + if (!PCB_FLAGS_TEST(flags, via)) continue; if (via->Mask && via->Mask < via->Thickness + value) { pcb_chg_obj_mask_size(PCB_TYPE_VIA, via, 0, 0, via->Thickness + value, 1); @@ -926,7 +926,7 @@ { PIN_LOOP(element); { - if (!TEST_FLAGS(flags, pin)) + if (!PCB_FLAGS_TEST(flags, pin)) continue; if (pin->Clearance < value) { pcb_chg_obj_clear_size(PCB_TYPE_PIN, element, pin, 0, value, 1); @@ -936,7 +936,7 @@ END_LOOP; PAD_LOOP(element); { - if (!TEST_FLAGS(flags, pad)) + if (!PCB_FLAGS_TEST(flags, pad)) continue; if (pad->Clearance < value) { pcb_chg_obj_clear_size(PCB_TYPE_PAD, element, pad, 0, value, 1); @@ -948,7 +948,7 @@ END_LOOP; VIA_LOOP(PCB->Data); { - if (!TEST_FLAGS(flags, via)) + if (!PCB_FLAGS_TEST(flags, via)) continue; if (via->Clearance < value) { pcb_chg_obj_clear_size(PCB_TYPE_VIA, via, 0, 0, value, 1); @@ -958,7 +958,7 @@ END_LOOP; ALLLINE_LOOP(PCB->Data); { - if (!TEST_FLAGS(flags, line)) + if (!PCB_FLAGS_TEST(flags, line)) continue; if (line->Clearance < value) { pcb_chg_obj_clear_size(PCB_TYPE_LINE, layer, line, 0, value, 1); @@ -968,7 +968,7 @@ ENDALL_LOOP; ALLARC_LOOP(PCB->Data); { - if (!TEST_FLAGS(flags, arc)) + if (!PCB_FLAGS_TEST(flags, arc)) continue; if (arc->Clearance < value) { pcb_chg_obj_clear_size(PCB_TYPE_ARC, layer, arc, 0, value, 1); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4875) +++ trunk/src/polygon.c (revision 4876) @@ -580,7 +580,7 @@ return NULL; half = (thick + 1) / 2; d = sqrt(SQUARE(l->Point1.X - l->Point2.X) + SQUARE(l->Point1.Y - l->Point2.Y)); - if (!TEST_FLAG(PCB_FLAG_SQUARE, l)) + if (!PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) if (d == 0) /* line is a point */ return CirclePoly(l->Point1.X, l->Point1.Y, half); if (d != 0) { @@ -592,7 +592,7 @@ dx = half; dy = 0; } - if (TEST_FLAG(PCB_FLAG_SQUARE, l)) { /* take into account the ends */ + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) { /* take into account the ends */ l->Point1.X -= dy; l->Point1.Y += dx; l->Point2.X += dy; @@ -604,7 +604,7 @@ return 0; v[0] = l->Point2.X - dx; v[1] = l->Point2.Y - dy; - if (TEST_FLAG(PCB_FLAG_SQUARE, l)) + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) poly_InclVertex(contour->head.prev, poly_CreateNode(v)); else frac_circle(contour, l->Point2.X, l->Point2.Y, v, 2); @@ -613,7 +613,7 @@ poly_InclVertex(contour->head.prev, poly_CreateNode(v)); v[0] = l->Point1.X + dx; v[1] = l->Point1.Y + dy; - if (TEST_FLAG(PCB_FLAG_SQUARE, l)) + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) poly_InclVertex(contour->head.prev, poly_CreateNode(v)); else frac_circle(contour, l->Point1.X, l->Point1.Y, v, 2); @@ -737,7 +737,7 @@ { int size; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { if (GET_SQUARE(pin) <= 1) { size = (thick + 1) / 2; return RoundRect(pin->X - size, pin->X + size, pin->Y - size, pin->Y + size, (clear + 1) / 2); @@ -750,7 +750,7 @@ } else { size = (thick + clear + 1) / 2; - if (TEST_FLAG(PCB_FLAG_OCTAGON, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pin)) { return OctagonPoly(pin->X, pin->Y, size + size, GET_SQUARE(pin)); } } @@ -800,7 +800,7 @@ { pcb_polyarea_t *np; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, line)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line)) return 0; if (!(np = LinePoly(line, line->Thickness + line->Clearance))) return -1; @@ -811,7 +811,7 @@ { pcb_polyarea_t *np; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, arc)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, arc)) return 0; if (!(np = ArcPoly(arc, arc->Thickness + arc->Clearance))) return -1; @@ -823,7 +823,7 @@ pcb_polyarea_t *np; const pcb_box_t *b = &text->BoundingBox; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text)) return 0; if (!(np = RoundRect(b->X1 + PCB->Bloat, b->X2 - PCB->Bloat, b->Y1 + PCB->Bloat, b->Y2 - PCB->Bloat, PCB->Bloat))) return -1; @@ -836,7 +836,7 @@ if (pad->Clearance == 0) return 0; - if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad)) { if (!(np = SquarePadPoly(pad, pad->Thickness + pad->Clearance))) return -1; } @@ -915,7 +915,7 @@ /* don't subtract the object that was put back! */ if (b == info->other) return R_DIR_NOT_FOUND; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, arc)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, arc)) return R_DIR_NOT_FOUND; polygon = info->polygon; if (SubtractArc(arc, polygon) < 0) @@ -935,7 +935,7 @@ if (pad->Clearance == 0) return R_DIR_NOT_FOUND; polygon = info->polygon; - if (XOR(TEST_FLAG(PCB_FLAG_ONSOLDER, pad), !info->solder)) { + if (XOR(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad), !info->solder)) { if (SubtractPad(pad, polygon) < 0) longjmp(info->env, 1); return R_DIR_FOUND_CONTINUE; @@ -954,7 +954,7 @@ /* don't subtract the object that was put back! */ if (b == info->other) return R_DIR_NOT_FOUND; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, line)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line)) return R_DIR_NOT_FOUND; polygon = info->polygon; @@ -980,7 +980,7 @@ /* don't subtract the object that was put back! */ if (b == info->other) return R_DIR_NOT_FOUND; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text)) return R_DIR_NOT_FOUND; polygon = info->polygon; if (SubtractText(text, polygon) < 0) @@ -1005,7 +1005,7 @@ struct cpInfo info; pcb_cardinal_t group; - if (!TEST_FLAG(PCB_FLAG_CLEARPOLY, polygon) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon) || GetLayerNumber(Data, Layer) >= max_copper_layer) return 0; group = Group(Data, GetLayerNumber(Data, Layer)); @@ -1104,7 +1104,7 @@ { pcb_polyarea_t *np; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, arc)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, arc)) return 0; /* overlap a bit to prevent gaps from rounding errors */ @@ -1122,7 +1122,7 @@ { pcb_polyarea_t *np; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, line)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line)) return 0; /* overlap a bit to prevent notches from rounding errors */ @@ -1140,7 +1140,7 @@ { pcb_polyarea_t *np; - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text)) return 0; /* overlap a bit to prevent notches from rounding errors */ @@ -1182,7 +1182,7 @@ if (!p->Clipped) return 0; assert(poly_Valid(p->Clipped)); - if (TEST_FLAG(PCB_FLAG_CLEARPOLY, p)) + if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, p)) clearPoly(Data, layer, p, NULL, 0); else p->NoHolesValid = 0; @@ -1340,9 +1340,9 @@ saveID = polygon->ID; *polygon = Crosshair.AttachedPolygon; polygon->ID = saveID; - SET_FLAG(PCB_FLAG_CLEARPOLY, polygon); + PCB_FLAG_SET(PCB_FLAG_CLEARPOLY, polygon); if (conf_core.editor.full_poly) - SET_FLAG(PCB_FLAG_FULLPOLY, polygon); + PCB_FLAG_SET(PCB_FLAG_FULLPOLY, polygon); memset(&Crosshair.AttachedPolygon, 0, sizeof(pcb_polygon_t)); SetPolygonBoundingBox(polygon); if (!CURRENT->polygon_tree) @@ -1451,7 +1451,7 @@ struct plow_info *plow = (struct plow_info *) cl; pcb_polygon_t *polygon = (pcb_polygon_t *) b; - if (TEST_FLAG(PCB_FLAG_CLEARPOLY, polygon)) + if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon)) return plow->callback(plow->data, plow->layer, polygon, plow->type, plow->ptr1, plow->ptr2); return R_DIR_NOT_FOUND; } @@ -1495,7 +1495,7 @@ case PCB_TYPE_ARC: case PCB_TYPE_TEXT: /* the cast works equally well for lines and arcs */ - if (!TEST_FLAG(PCB_FLAG_CLEARLINE, (pcb_line_t *) ptr2)) + if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (pcb_line_t *) ptr2)) return 0; /* silk doesn't plow */ if (GetLayerNumber(Data, (pcb_layer_t *) ptr1) >= max_copper_layer) @@ -1510,7 +1510,7 @@ break; case PCB_TYPE_PAD: { - pcb_cardinal_t group = GetLayerGroupNumberByNumber(TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? + pcb_cardinal_t group = GetLayerGroupNumberByNumber(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? solder_silk_layer : component_silk_layer); GROUP_LOOP(Data, group); { @@ -1578,7 +1578,7 @@ if (poly_CheckInside(p->Clipped, v)) return pcb_true; - if (TEST_FLAG(PCB_FLAG_FULLPOLY, p)) { + if (PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, p)) { pcb_polygon_t tmp = *p; /* Check all clipped-away regions that are now drawn because of full-poly */ @@ -1691,7 +1691,7 @@ pcb_bool many = pcb_false; pcb_flag_t flags; - if (!poly->Clipped || TEST_FLAG(PCB_FLAG_LOCK, poly)) + if (!poly->Clipped || PCB_FLAG_TEST(PCB_FLAG_LOCK, poly)) return pcb_false; if (poly->Clipped->f == poly->Clipped) return pcb_false; Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 4875) +++ trunk/src/polygon_act.c (revision 4876) @@ -79,7 +79,7 @@ case F_SelectedObjects: ALLPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, polygon)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) MorphPolygon(layer, polygon); } ENDALL_LOOP; Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4875) +++ trunk/src/rats.c (revision 4876) @@ -116,13 +116,13 @@ return pcb_false; padlist_foreach(&element->Pad, &it, pad) { - if (NSTRCMP(PinNum, pad->Number) == 0 && (!Same || !TEST_FLAG(PCB_FLAG_DRC, pad))) { + if (NSTRCMP(PinNum, pad->Number) == 0 && (!Same || !PCB_FLAG_TEST(PCB_FLAG_DRC, pad))) { conn->type = PCB_TYPE_PAD; conn->ptr1 = element; conn->ptr2 = pad; - conn->group = TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; + conn->group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; - if (TEST_FLAG(PCB_FLAG_EDGE2, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_EDGE2, pad)) { conn->X = pad->Point2.X; conn->Y = pad->Point2.Y; } @@ -135,7 +135,7 @@ } padlist_foreach(&element->Pin, &it, pin) { - if (!TEST_FLAG(PCB_FLAG_HOLE, pin) && pin->Number && NSTRCMP(PinNum, pin->Number) == 0 && (!Same || !TEST_FLAG(PCB_FLAG_DRC, pin))) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) && pin->Number && NSTRCMP(PinNum, pin->Number) == 0 && (!Same || !PCB_FLAG_TEST(PCB_FLAG_DRC, pin))) { conn->type = PCB_TYPE_PIN; conn->ptr1 = element; conn->ptr2 = pin; @@ -206,13 +206,13 @@ ALLPIN_LOOP(PCB->Data); { pin->Spare = NULL; - CLEAR_FLAG(PCB_FLAG_DRC, pin); + PCB_FLAG_CLEAR(PCB_FLAG_DRC, pin); } ENDALL_LOOP; ALLPAD_LOOP(PCB->Data); { pad->Spare = NULL; - CLEAR_FLAG(PCB_FLAG_DRC, pad); + PCB_FLAG_CLEAR(PCB_FLAG_DRC, pad); } ENDALL_LOOP; MENU_LOOP(net_menu); @@ -232,7 +232,7 @@ ENTRY_LOOP(menu); { if (SeekPad(entry, &LastPoint, pcb_false)) { - if (TEST_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2)) + if (PCB_FLAG_TEST(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2)) pcb_message(PCB_MSG_DEFAULT, _ ("Error! Element %s pin %s appears multiple times in the netlist file.\n"), NAMEONPCB_NAME((pcb_element_t *) LastPoint.ptr1), @@ -244,7 +244,7 @@ /* indicate expect net */ connection->menu = menu; /* mark as visited */ - SET_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2); + PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2); if (LastPoint.type == PCB_TYPE_PIN) ((pcb_pin_t *) LastPoint.ptr2)->Spare = (void *) menu; else @@ -260,7 +260,7 @@ /* indicate expect net */ connection->menu = menu; /* mark as visited */ - SET_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2); + PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.ptr2); if (LastPoint.type == PCB_TYPE_PIN) ((pcb_pin_t *) LastPoint.ptr2)->Spare = (void *) menu; else @@ -274,12 +274,12 @@ /* clear all visit marks */ ALLPIN_LOOP(PCB->Data); { - CLEAR_FLAG(PCB_FLAG_DRC, pin); + PCB_FLAG_CLEAR(PCB_FLAG_DRC, pin); } ENDALL_LOOP; ALLPAD_LOOP(PCB->Data); { - CLEAR_FLAG(PCB_FLAG_DRC, pad); + PCB_FLAG_CLEAR(PCB_FLAG_DRC, pad); } ENDALL_LOOP; return (Wantlist); @@ -322,8 +322,8 @@ ALLPIN_LOOP(PCB->Data); { pcb_element_t *e = pin->Element; -/* TODO: should be: !TEST_FLAG(PCB_FLAG_NONETLIST, (pcb_element_t *)pin->Element)*/ - if ((TEST_FLAG(PCB_FLAG_DRC, pin)) && (!(e->Flags.f & PCB_FLAG_NONETLIST))) { +/* TODO: should be: !PCB_FLAG_TEST(PCB_FLAG_NONETLIST, (pcb_element_t *)pin->Element)*/ + if ((PCB_FLAG_TEST(PCB_FLAG_DRC, pin)) && (!(e->Flags.f & PCB_FLAG_NONETLIST))) { warn = pcb_true; if (!pin->Spare) { pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pin %s\n"), @@ -353,8 +353,8 @@ ALLPAD_LOOP(PCB->Data); { pcb_element_t *e = pad->Element; -/* TODO: should be: !TEST_FLAG(PCB_FLAG_NONETLIST, (pcb_element_t *)pad->Element)*/ - if ((TEST_FLAG(PCB_FLAG_DRC, pad)) && (!(e->Flags.f & PCB_FLAG_NONETLIST)) && (!(e->Name->Flags.f & PCB_FLAG_NONETLIST))) { +/* TODO: should be: !PCB_FLAG_TEST(PCB_FLAG_NONETLIST, (pcb_element_t *)pad->Element)*/ + if ((PCB_FLAG_TEST(PCB_FLAG_DRC, pad)) && (!(e->Flags.f & PCB_FLAG_NONETLIST)) && (!(e->Name->Flags.f & PCB_FLAG_NONETLIST))) { warn = pcb_true; if (!pad->Spare) { pcb_message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to %s pad %s\n"), @@ -406,12 +406,12 @@ pcb_rat_find_hook(a->Connection[0].type, a->Connection[0].ptr1, a->Connection[0].ptr2, a->Connection[0].ptr2, pcb_false, AndRats); /* now anybody connected to the first point has PCB_FLAG_DRC set */ /* so move those to this subnet */ - CLEAR_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) a->Connection[0].ptr2); + PCB_FLAG_CLEAR(PCB_FLAG_DRC, (pcb_pin_t *) a->Connection[0].ptr2); for (n = m + 1; n < Netl->NetN; n++) { b = &Netl->Net[n]; /* There can be only one connection in net b */ - if (TEST_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) b->Connection[0].ptr2)) { - CLEAR_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) b->Connection[0].ptr2); + if (PCB_FLAG_TEST(PCB_FLAG_DRC, (pcb_pin_t *) b->Connection[0].ptr2)) { + PCB_FLAG_CLEAR(PCB_FLAG_DRC, (pcb_pin_t *) b->Connection[0].ptr2); TransferNet(Netl, b, a); /* back up since new subnet is now at old index */ n--; @@ -422,7 +422,7 @@ /* don't add non-manhattan lines, the auto-router can't route to them */ ALLLINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_DRC, line) + if (PCB_FLAG_TEST(PCB_FLAG_DRC, line) && ((line->Point1.X == line->Point2.X) || (line->Point1.Y == line->Point2.Y))) { conn = GetConnectionMemory(a); @@ -447,7 +447,7 @@ /* add polygons so the auto-router can see them as targets */ ALLPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_DRC, polygon)) { + if (PCB_FLAG_TEST(PCB_FLAG_DRC, polygon)) { conn = GetConnectionMemory(a); /* make point on a vertex */ conn->X = polygon->Clipped->contours->head.point[0]; @@ -462,7 +462,7 @@ ENDALL_LOOP; VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_DRC, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_DRC, via)) { conn = GetConnectionMemory(a); conn->X = via->X; conn->Y = via->Y; @@ -614,7 +614,7 @@ secondpoint->X, secondpoint->Y, firstpoint->group, secondpoint->group, conf_core.appearance.rat_thickness, pcb_no_flags())) != NULL) { if (distance == 0) - SET_FLAG(PCB_FLAG_VIA, line); + PCB_FLAG_SET(PCB_FLAG_VIA, line); AddObjectToCreateUndoList(PCB_TYPE_RATLINE, line, line, line); DrawRat(line); changed = pcb_true; @@ -683,7 +683,7 @@ { CONNECTION_LOOP(net); { - if (!SelectedOnly || TEST_FLAG(PCB_FLAG_SELECTED, (pcb_pin_t *) connection->ptr2)) { + if (!SelectedOnly || PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) connection->ptr2)) { lonesome = GetNetMemory(Nets); onepin = GetConnectionMemory(lonesome); *onepin = *connection; @@ -768,7 +768,7 @@ Nets = GetNetListMemory(&result); CONNECTION_LOOP(net); { - if (!SelectedOnly || TEST_FLAG(PCB_FLAG_SELECTED, (pcb_pin_t *) connection->ptr2)) { + if (!SelectedOnly || PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_pin_t *) connection->ptr2)) { lonesome = GetNetMemory(Nets); onepin = GetConnectionMemory(lonesome); *onepin = *connection; @@ -834,7 +834,7 @@ } /* will work for pins to since the FLAG is common */ - group1 = (TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? + group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); strcpy(name1, ConnectionName(found, ptr1, ptr2)); found = SearchObjectByLocation(PCB_TYPE_PAD | PCB_TYPE_PIN, &ptr1, &ptr2, &ptr3, @@ -847,7 +847,7 @@ pcb_message(PCB_MSG_DEFAULT, _("You must name the ending element first\n")); return (NULL); } - group2 = (TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? + group2 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? GetLayerGroupNumberByNumber(solder_silk_layer) : GetLayerGroupNumberByNumber(component_silk_layer)); name2 = ConnectionName(found, ptr1, ptr2); Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4875) +++ trunk/src/rats_act.c (revision 4876) @@ -93,7 +93,7 @@ shorty = NULL; RAT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, line)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) continue; len = SQUARE(line->Point1.X - line->Point2.X) + SQUARE(line->Point1.Y - line->Point2.Y); if (len < small) { @@ -104,7 +104,7 @@ END_LOOP; if (shorty) { AddObjectToFlagUndoList(PCB_TYPE_RATLINE, shorty, shorty, shorty); - SET_FLAG(PCB_FLAG_SELECTED, shorty); + PCB_FLAG_SET(PCB_FLAG_SELECTED, shorty); DrawRat(shorty); pcb_draw(); pcb_center_display((shorty->Point2.X + shorty->Point1.X) / 2, (shorty->Point2.Y + shorty->Point1.Y) / 2); Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 4875) +++ trunk/src/rats_patch.c (revision 4876) @@ -390,7 +390,7 @@ /* check if we have elements selected and quit if not */ ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) { found = 1; break; } @@ -425,7 +425,7 @@ /* action: replace selected elements */ ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) { a[0] = fpname; a[1] = element->Name[1].TextString; a[2] = element->Name[2].TextString; Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 4875) +++ trunk/src/rotate.c (revision 4876) @@ -111,7 +111,7 @@ ptr = Crosshair.AttachedObject.Rubberband; while (Crosshair.AttachedObject.RubberbandN) { changed = pcb_true; - CLEAR_FLAG(PCB_FLAG_RUBBEREND, ptr->Line); + PCB_FLAG_CLEAR(PCB_FLAG_RUBBEREND, ptr->Line); AddObjectToRotateUndoList(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, ptr->MovedPoint, ctx.rotate.center_x, ctx.rotate.center_y, Steps); EraseLine(ptr->Line); if (ptr->Layer) { @@ -149,7 +149,7 @@ int type; void *ptr1, *ptr2, *ptr3; if ((type = SearchScreen(X, Y, ROTATE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { - if (TEST_FLAG(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { pcb_message(PCB_MSG_DEFAULT, _("Sorry, the object is locked\n")); return; } Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 4875) +++ trunk/src/rubberband.c (revision 4876) @@ -67,7 +67,7 @@ t = line->Thickness / 2; - if (TEST_FLAG(PCB_FLAG_LOCK, line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) return R_DIR_NOT_FOUND; if (line == i->line) return R_DIR_NOT_FOUND; @@ -187,7 +187,7 @@ info.box.Y2 = MAX(Pad->Point1.Y, Pad->Point2.Y) + half; info.radius = 0; info.line = NULL; - i = TEST_FLAG(PCB_FLAG_ONSOLDER, Pad) ? solder_silk_layer : component_silk_layer; + i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? solder_silk_layer : component_silk_layer; group = GetLayerGroupNumberByNumber(i); /* check all visible layers in the same group */ @@ -257,7 +257,7 @@ struct rinfo info; pcb_cardinal_t i; - i = TEST_FLAG(PCB_FLAG_ONSOLDER, Pad) ? solder_silk_layer : component_silk_layer; + i = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? solder_silk_layer : component_silk_layer; info.group = GetLayerGroupNumberByNumber(i); info.pad = Pad; info.type = PCB_TYPE_PAD; @@ -303,7 +303,7 @@ info.box.Y1 = Pin->Y - t; info.box.Y2 = Pin->Y + t; info.line = NULL; - if (TEST_FLAG(PCB_FLAG_SQUARE, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pin)) info.radius = 0; else { info.radius = t; @@ -370,9 +370,9 @@ */ LINE_LOOP(layer); { - if (TEST_FLAG(PCB_FLAG_LOCK, line)) + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) continue; - if (TEST_FLAG(PCB_FLAG_CLEARLINE, line)) + if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line)) continue; thick = (line->Thickness + 1) / 2; if (IsPointInPolygon(line->Point1.X, line->Point1.Y, thick, Polygon)) @@ -515,7 +515,7 @@ /* we toggle the PCB_FLAG_RUBBEREND of the line to determine if */ /* both points are being moved. */ - TOGGLE_FLAG(PCB_FLAG_RUBBEREND, Line); + PCB_FLAG_TOGGLE(PCB_FLAG_RUBBEREND, Line); ptr->Layer = Layer; ptr->Line = Line; ptr->MovedPoint = MovedPoint; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4875) +++ trunk/src/search.c (revision 4876) @@ -82,7 +82,7 @@ pcb_pin_t *pin = (pcb_pin_t *) box; pcb_any_obj_t *ptr1 = pin->Element ? pin->Element : pin; - if (TEST_FLAG(i->locked, ptr1)) + if (PCB_FLAG_TEST(i->locked, ptr1)) return R_DIR_NOT_FOUND; if (!IsPointOnPin(PosX, PosY, SearchRadius, pin)) @@ -137,7 +137,7 @@ struct ans_info *i = (struct ans_info *) cl; pcb_any_obj_t *ptr1 = pad->Element; - if (TEST_FLAG(i->locked, ptr1)) + if (PCB_FLAG_TEST(i->locked, ptr1)) return R_DIR_NOT_FOUND; if (FRONT(pad) || i->BackToo) { @@ -187,7 +187,7 @@ struct line_info *i = (struct line_info *) cl; pcb_line_t *l = (pcb_line_t *) box; - if (TEST_FLAG(i->locked, l)) + if (PCB_FLAG_TEST(i->locked, l)) return R_DIR_NOT_FOUND; if (!IsPointInPad(PosX, PosY, SearchRadius, (pcb_pad_t *) l)) @@ -219,10 +219,10 @@ pcb_line_t *line = (pcb_line_t *) box; struct ans_info *i = (struct ans_info *) cl; - if (TEST_FLAG(i->locked, line)) + if (PCB_FLAG_TEST(i->locked, line)) return R_DIR_NOT_FOUND; - if (TEST_FLAG(PCB_FLAG_VIA, line) ? + if (PCB_FLAG_TEST(PCB_FLAG_VIA, line) ? (Distance(line->Point1.X, line->Point1.Y, PosX, PosY) <= line->Thickness * 2 + SearchRadius) : IsPointOnLine(PosX, PosY, SearchRadius, line)) { *i->ptr1 = *i->ptr2 = *i->ptr3 = line; @@ -261,7 +261,7 @@ struct arc_info *i = (struct arc_info *) cl; pcb_arc_t *a = (pcb_arc_t *) box; - if (TEST_FLAG(i->locked, a)) + if (PCB_FLAG_TEST(i->locked, a)) return R_DIR_NOT_FOUND; if (!IsPointOnArc(PosX, PosY, SearchRadius, a)) @@ -291,7 +291,7 @@ pcb_text_t *text = (pcb_text_t *) box; struct ans_info *i = (struct ans_info *) cl; - if (TEST_FLAG(i->locked, text)) + if (PCB_FLAG_TEST(i->locked, text)) return R_DIR_NOT_FOUND; if (POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { @@ -323,7 +323,7 @@ pcb_polygon_t *polygon = (pcb_polygon_t *) box; struct ans_info *i = (struct ans_info *) cl; - if (TEST_FLAG(i->locked, polygon)) + if (PCB_FLAG_TEST(i->locked, polygon)) return R_DIR_NOT_FOUND; if (IsPointInPolygon(PosX, PosY, SearchRadius, polygon)) { @@ -358,7 +358,7 @@ pcb_r_dir_t ret_val = R_DIR_NOT_FOUND; double d; - if (TEST_FLAG(i->locked, line)) + if (PCB_FLAG_TEST(i->locked, line)) return R_DIR_NOT_FOUND; /* some stupid code to check both points */ @@ -435,10 +435,10 @@ pcb_element_t *element = (pcb_element_t *) text->Element; double newarea; - if (TEST_FLAG(i->locked, text)) + if (PCB_FLAG_TEST(i->locked, text)) return R_DIR_NOT_FOUND; - if ((FRONT(element) || i->BackToo) && !TEST_FLAG(PCB_FLAG_HIDENAME, element) && POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) { + if ((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) { @@ -480,7 +480,7 @@ struct ans_info *i = (struct ans_info *) cl; double newarea; - if (TEST_FLAG(i->locked, element)) + if (PCB_FLAG_TEST(i->locked, element)) return R_DIR_NOT_FOUND; if ((FRONT(element) || i->BackToo) && POINT_IN_BOX(PosX, PosY, &element->VBox)) { @@ -525,7 +525,7 @@ pcb_bool IsPointOnPin(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_pin_t *pin) { pcb_coord_t t = PIN_SIZE(pin) / 2; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { pcb_box_t b; b.X1 = pin->X - t; @@ -821,7 +821,7 @@ /* now pad.Point2.X = r; pad.Point2.Y = 0; */ /* take into account the ends */ - if (TEST_FLAG(PCB_FLAG_SQUARE, Pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) { r += Pad->Thickness; X += t2; } @@ -828,7 +828,7 @@ if (Y < 0) Y = -Y; /* range value is evident now */ - if (TEST_FLAG(PCB_FLAG_SQUARE, Pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) { if (X <= 0) { if (Y <= t2) range = -X; Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4875) +++ trunk/src/select.c (revision 4876) @@ -78,7 +78,7 @@ CHANGE_FLAG(how, PCB_FLAG_SELECTED, element); if (redraw) { - if (PCB->ElementOn && ((TEST_FLAG(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn)) + if (PCB->ElementOn && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn)) if (PCB->ElementOn) { DrawElementName(element); DrawElementPackage(element); @@ -116,12 +116,12 @@ pcb_bool changed = pcb_true; type = SearchScreen(Crosshair.X, Crosshair.Y, SELECT_TYPES, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_NONE || TEST_FLAG(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) + if (type == PCB_TYPE_NONE || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2)) return (pcb_false); switch (type) { case PCB_TYPE_VIA: AddObjectToFlagUndoList(PCB_TYPE_VIA, ptr1, ptr1, ptr1); - TOGGLE_FLAG(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr1); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr1); DrawVia((pcb_pin_t *) ptr1); break; @@ -131,7 +131,7 @@ layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_LINE, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, line); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, line); DrawLine(layer, line); break; } @@ -141,7 +141,7 @@ pcb_rat_t *rat = (pcb_rat_t *) ptr2; AddObjectToFlagUndoList(PCB_TYPE_RATLINE, ptr1, ptr1, ptr1); - TOGGLE_FLAG(PCB_FLAG_SELECTED, rat); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, rat); DrawRat(rat); break; } @@ -152,7 +152,7 @@ layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_ARC, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, arc); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, arc); DrawArc(layer, arc); break; } @@ -163,7 +163,7 @@ layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_TEXT, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, text); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, text); DrawText(layer, text); break; } @@ -174,7 +174,7 @@ layer = (pcb_layer_t *) ptr1; AddObjectToFlagUndoList(PCB_TYPE_POLYGON, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, poly); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, poly); DrawPolygon(layer, poly); /* changing memory order no longer effects draw order */ break; @@ -182,13 +182,13 @@ case PCB_TYPE_PIN: AddObjectToFlagUndoList(PCB_TYPE_PIN, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2); DrawPin((pcb_pin_t *) ptr2); break; case PCB_TYPE_PAD: AddObjectToFlagUndoList(PCB_TYPE_PAD, ptr1, ptr2, ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, (pcb_pad_t *) ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pad_t *) ptr2); DrawPad((pcb_pad_t *) ptr2); break; @@ -265,7 +265,7 @@ do { \ if (len == NULL) { \ AddObjectToFlagUndoList (undo_type, p1, obj, obj); \ - ASSIGN_FLAG (PCB_FLAG_SELECTED, Flag, obj); \ + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, obj); \ } \ else { \ if (used >= alloced) { \ @@ -287,7 +287,7 @@ if (PCB->RatOn || !Flag) RAT_LOOP(PCB->Data); { - if (LINE_NEAR_BOX((pcb_line_t *) line, Box) && !TEST_FLAG(PCB_FLAG_LOCK, line) && TEST_FLAG(PCB_FLAG_SELECTED, line) != Flag) { + if (LINE_NEAR_BOX((pcb_line_t *) line, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) { append(PCB_TYPE_RATLINE, line, line); if (PCB->RatOn) DrawRat(line); @@ -312,8 +312,8 @@ LINE_LOOP(layer); { if (LINE_NEAR_BOX(line, Box) - && !TEST_FLAG(PCB_FLAG_LOCK, line) - && TEST_FLAG(PCB_FLAG_SELECTED, line) != Flag) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) { append(PCB_TYPE_LINE, layer, line); if (layer->On) DrawLine(layer, line); @@ -323,8 +323,8 @@ ARC_LOOP(layer); { if (ARC_NEAR_BOX(arc, Box) - && !TEST_FLAG(PCB_FLAG_LOCK, arc) - && TEST_FLAG(PCB_FLAG_SELECTED, arc) != Flag) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc) != Flag) { append(PCB_TYPE_ARC, layer, arc); if (layer->On) DrawArc(layer, arc); @@ -335,8 +335,8 @@ { if (!Flag || TEXT_IS_VISIBLE(PCB, layer, text)) { if (TEXT_NEAR_BOX(text, Box) - && !TEST_FLAG(PCB_FLAG_LOCK, text) - && TEST_FLAG(PCB_FLAG_SELECTED, text) != Flag) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, text) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) { append(PCB_TYPE_TEXT, layer, text); if (TEXT_IS_VISIBLE(PCB, layer, text)) DrawText(layer, text); @@ -347,8 +347,8 @@ POLYGON_LOOP(layer); { if (POLYGON_NEAR_BOX(polygon, Box) - && !TEST_FLAG(PCB_FLAG_LOCK, polygon) - && TEST_FLAG(PCB_FLAG_SELECTED, polygon) != Flag) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, polygon) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon) != Flag) { append(PCB_TYPE_POLYGON, layer, polygon); if (layer->On) DrawPolygon(layer, polygon); @@ -364,11 +364,11 @@ { pcb_bool gotElement = pcb_false; if ((PCB->ElementOn || !Flag) - && !TEST_FLAG(PCB_FLAG_LOCK, element) - && ((TEST_FLAG(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn)) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, element) + && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn)) { if (BOX_NEAR_BOX(&ELEMENT_TEXT(PCB, element).BoundingBox, Box) - && !TEST_FLAG(PCB_FLAG_LOCK, &ELEMENT_TEXT(PCB, element)) - && TEST_FLAG(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)) != Flag) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, &ELEMENT_TEXT(PCB, element)) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)) != Flag) { /* select all names of element */ ELEMENTTEXT_LOOP(element); { @@ -379,11 +379,11 @@ DrawElementName(element); } if ((PCB->PinOn || !Flag) && ELEMENT_NEAR_BOX(element, Box)) - if (TEST_FLAG(PCB_FLAG_SELECTED, element) != Flag) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) != Flag) { append(PCB_TYPE_ELEMENT, element, element); PIN_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pin) != Flag) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin) != Flag) { append(PCB_TYPE_PIN, element, pin); if (PCB->PinOn) DrawPin(pin); @@ -392,7 +392,7 @@ END_LOOP; PAD_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pad) != Flag) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad) != Flag) { append(PCB_TYPE_PAD, element, pad); if (PCB->PinOn) DrawPad(pad); @@ -404,11 +404,11 @@ gotElement = pcb_true; } } - if ((PCB->PinOn || !Flag) && !TEST_FLAG(PCB_FLAG_LOCK, element) && !gotElement) { + if ((PCB->PinOn || !Flag) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && !gotElement) { PIN_LOOP(element); { if ((VIA_OR_PIN_NEAR_BOX(pin, Box) - && TEST_FLAG(PCB_FLAG_SELECTED, pin) != Flag)) { + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin) != Flag)) { append(PCB_TYPE_PIN, element, pin); if (PCB->PinOn) DrawPin(pin); @@ -418,8 +418,8 @@ PAD_LOOP(element); { if (PAD_NEAR_BOX(pad, Box) - && TEST_FLAG(PCB_FLAG_SELECTED, pad) != Flag - && (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) == SWAP_IDENT || PCB->InvisibleObjectsOn || !Flag)) { + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad) != Flag + && (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) == SWAP_IDENT || PCB->InvisibleObjectsOn || !Flag)) { append(PCB_TYPE_PAD, element, pad); if (PCB->PinOn) DrawPad(pad); @@ -435,8 +435,8 @@ VIA_LOOP(PCB->Data); { if (VIA_OR_PIN_NEAR_BOX(via, Box) - && !TEST_FLAG(PCB_FLAG_LOCK, via) - && TEST_FLAG(PCB_FLAG_SELECTED, via) != Flag) { + && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, via) != Flag) { append(PCB_TYPE_VIA, via, via); if (PCB->ViaOn) DrawVia(via); @@ -564,10 +564,10 @@ if (type & PCB_TYPE_LINE && F->Line) VISIBLELINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); - CLEAR_FLAG(PCB_FLAG_SELECTED, line); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, line); } F->Line(ctx, layer, line); changed = pcb_true; @@ -579,10 +579,10 @@ if (type & PCB_TYPE_ARC && F->Arc) VISIBLEARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); - CLEAR_FLAG(PCB_FLAG_SELECTED, arc); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, arc); } F->Arc(ctx, layer, arc); changed = pcb_true; @@ -594,10 +594,10 @@ if (type & PCB_TYPE_TEXT && F->Text) ALLTEXT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, text) && TEXT_IS_VISIBLE(PCB, layer, text)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) && TEXT_IS_VISIBLE(PCB, layer, text)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_TEXT, layer, text, text); - CLEAR_FLAG(PCB_FLAG_SELECTED, text); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, text); } F->Text(ctx, layer, text); changed = pcb_true; @@ -609,10 +609,10 @@ if (type & PCB_TYPE_POLYGON && F->Polygon) VISIBLEPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, polygon)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); - CLEAR_FLAG(PCB_FLAG_SELECTED, polygon); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, polygon); } F->Polygon(ctx, layer, polygon); changed = pcb_true; @@ -624,10 +624,10 @@ if (type & PCB_TYPE_ELEMENT && PCB->ElementOn && F->Element) ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_ELEMENT, element, element, element); - CLEAR_FLAG(PCB_FLAG_SELECTED, element); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, element); } F->Element(ctx, element); changed = pcb_true; @@ -637,10 +637,10 @@ if (type & PCB_TYPE_ELEMENT_NAME && PCB->ElementOn && F->ElementName) ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_ELEMENT_NAME, element, &ELEMENT_TEXT(PCB, element), &ELEMENT_TEXT(PCB, element)); - CLEAR_FLAG(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)); } F->ElementName(ctx, element); changed = pcb_true; @@ -653,10 +653,10 @@ { PIN_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - CLEAR_FLAG(PCB_FLAG_SELECTED, pin); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, pin); } F->Pin(ctx, element, pin); changed = pcb_true; @@ -671,10 +671,10 @@ { PAD_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - CLEAR_FLAG(PCB_FLAG_SELECTED, pad); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, pad); } F->Pad(ctx, element, pad); changed = pcb_true; @@ -688,10 +688,10 @@ if (type & PCB_TYPE_VIA && PCB->ViaOn && F->Via) VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, via)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - CLEAR_FLAG(PCB_FLAG_SELECTED, via); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, via); } F->Via(ctx, via); changed = pcb_true; @@ -702,10 +702,10 @@ if (type & PCB_TYPE_RATLINE && PCB->RatOn && F->Rat) RAT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { if (Reset) { AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - CLEAR_FLAG(PCB_FLAG_SELECTED, line); + PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, line); } F->Rat(ctx, line); changed = pcb_true; @@ -731,9 +731,9 @@ if (PCB->RatOn) RAT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line)) { AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, line); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, line); DrawRat(line); changed = pcb_true; } @@ -742,9 +742,9 @@ VISIBLELINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, line) && !TEST_FLAG(PCB_FLAG_LOCK, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) { AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, line); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, line); DrawLine(layer, line); changed = pcb_true; } @@ -752,9 +752,9 @@ ENDALL_LOOP; VISIBLEARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, arc) && !TEST_FLAG(PCB_FLAG_LOCK, arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) { AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, arc); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, arc); DrawArc(layer, arc); changed = pcb_true; } @@ -762,9 +762,9 @@ ENDALL_LOOP; VISIBLEPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, polygon) && !TEST_FLAG(PCB_FLAG_LOCK, polygon)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, polygon) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, polygon)) { AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, polygon); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, polygon); DrawPolygon(layer, polygon); changed = pcb_true; } @@ -774,9 +774,9 @@ if (PCB->PinOn && PCB->ElementOn) { ALLPIN_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, element) && TEST_FLAG(PCB_FLAG_FOUND, pin)) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pin); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pin); DrawPin(pin); changed = pcb_true; } @@ -784,9 +784,9 @@ ENDALL_LOOP; ALLPAD_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, element) && TEST_FLAG(PCB_FLAG_FOUND, pad)) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) { AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pad); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad); DrawPad(pad); changed = pcb_true; } @@ -797,9 +797,9 @@ if (PCB->ViaOn) VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, via) && !TEST_FLAG(PCB_FLAG_LOCK, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, via); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, via); DrawVia(via); changed = pcb_true; } @@ -888,12 +888,12 @@ if (Type & PCB_TYPE_TEXT) ALLTEXT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, text) + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, text) && TEXT_IS_VISIBLE(PCB, layer, text) && text->TextString && REGEXEC(text->TextString) - && TEST_FLAG(PCB_FLAG_SELECTED, text) != Flag) { + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) { AddObjectToFlagUndoList(PCB_TYPE_TEXT, layer, text, text); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, text); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, text); DrawText(layer, text); changed = pcb_true; } @@ -903,29 +903,29 @@ if (PCB->ElementOn && (Type & PCB_TYPE_ELEMENT)) ELEMENT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, element) - && ((TEST_FLAG(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn) - && TEST_FLAG(PCB_FLAG_SELECTED, element) != Flag) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) + && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) != Flag) { const char* name = ELEMENT_NAME(PCB, element); if (name && REGEXEC(name)) { AddObjectToFlagUndoList(PCB_TYPE_ELEMENT, element, element, element); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, element); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, element); PIN_LOOP(element); { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pin); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pin); } END_LOOP; PAD_LOOP(element); { AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pad); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad); } END_LOOP; ELEMENTTEXT_LOOP(element); { AddObjectToFlagUndoList(PCB_TYPE_ELEMENT_NAME, element, text, text); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, text); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, text); } END_LOOP; DrawElementName(element); @@ -938,11 +938,11 @@ if (PCB->PinOn && (Type & PCB_TYPE_PIN)) ALLPIN_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, element) + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && pin->Name && REGEXEC(pin->Name) - && TEST_FLAG(PCB_FLAG_SELECTED, pin) != Flag) { + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin) != Flag) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pin); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pin); DrawPin(pin); changed = pcb_true; } @@ -951,12 +951,12 @@ if (PCB->PinOn && (Type & PCB_TYPE_PAD)) ALLPAD_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, element) - && ((TEST_FLAG(PCB_FLAG_ONSOLDER, pad) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn) - && TEST_FLAG(PCB_FLAG_SELECTED, pad) != Flag) + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) + && ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn) + && PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad) != Flag) if (pad->Name && REGEXEC(pad->Name)) { AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, pad); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad); DrawPad(pad); changed = pcb_true; } @@ -965,10 +965,10 @@ if (PCB->ViaOn && (Type & PCB_TYPE_VIA)) VIA_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_LOCK, via) - && via->Name && REGEXEC(via->Name) && TEST_FLAG(PCB_FLAG_SELECTED, via) != Flag) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, via) + && via->Name && REGEXEC(via->Name) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, via) != Flag) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - ASSIGN_FLAG(PCB_FLAG_SELECTED, Flag, via); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, via); DrawVia(via); changed = pcb_true; } Index: trunk/src/stub_mincut.c =================================================================== --- trunk/src/stub_mincut.c (revision 4875) +++ trunk/src/stub_mincut.c (revision 4876) @@ -34,9 +34,9 @@ { /* original behavior: just warn at random pins/pads */ if (pin != NULL) - SET_FLAG(PCB_FLAG_WARN, pin); + PCB_FLAG_SET(PCB_FLAG_WARN, pin); if (pad != NULL) - SET_FLAG(PCB_FLAG_WARN, pad); + PCB_FLAG_SET(PCB_FLAG_WARN, pad); stub_rat_proc_shorts_dummy(); } Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 4875) +++ trunk/src/undo_act.c (revision 4876) @@ -184,7 +184,7 @@ ptr2 = (pcb_line_t *) ptrtmp; if (conf_core.editor.auto_drc) { /* undo loses PCB_FLAG_FOUND */ - SET_FLAG(PCB_FLAG_FOUND, ptr2); + PCB_FLAG_SET(PCB_FLAG_FOUND, ptr2); DrawLine(CURRENT, ptr2); } Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = ptr2->Point2.X; Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4875) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4876) @@ -153,7 +153,7 @@ pcb_connection_t *c = &(Nets->Net[i].Connection[j]); switch (c->type) { case PCB_TYPE_PAD: - c->group = TEST_FLAG(PCB_FLAG_ONSOLDER, (pcb_element_t *) c->ptr1) + c->group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_element_t *) c->ptr1) ? SLayer : CLayer; c->X = ((pcb_pad_t *) c->ptr2)->Point1.X; c->Y = ((pcb_pad_t *) c->ptr2)->Point1.Y; @@ -179,7 +179,7 @@ PointerListType list = { 0, 0, NULL }; ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) { pcb_element_t **epp = (pcb_element_t **) GetPointerMemory(&list); *epp = element; } @@ -364,7 +364,7 @@ pcb_box_t *lastbox = NULL; pcb_coord_t thickness; pcb_coord_t clearance; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element)) { thisside = &solderside; otherside = &componentside; } @@ -469,7 +469,7 @@ ELEMENT_LOOP(PCB->Data); { boxpp = (struct ebox **) - GetPointerMemory(TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? &seboxes : &ceboxes); + GetPointerMemory(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? &seboxes : &ceboxes); *boxpp = (struct ebox *) malloc(sizeof(**boxpp)); if (*boxpp == NULL) { fprintf(stderr, "malloc() failed in ComputeCost\n"); @@ -490,7 +490,7 @@ ELEMENT_LOOP(PCB->Data); { boxp = (struct ebox *) - r_find_neighbor(TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? rt_s : rt_c, &element->VBox, dir[i]); + r_find_neighbor(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? rt_s : rt_c, &element->VBox, dir[i]); /* score bounding box alignments */ if (!boxp) continue; @@ -595,8 +595,8 @@ /* don't allow exchanging a solderside-side SMD component * with a non-SMD component. */ if ((pinlist_length(&(pt.element->Pin)) != 0 /* non-SMD */ && - TEST_FLAG(PCB_FLAG_ONSOLDER, pt.other)) || (pinlist_length(&pt.other->Pin) != 0 /* non-SMD */ && - TEST_FLAG(PCB_FLAG_ONSOLDER, pt.element))) + PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pt.other)) || (pinlist_length(&pt.other->Pin) != 0 /* non-SMD */ && + PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pt.element))) return createPerturbation(selected, T); break; } @@ -650,7 +650,7 @@ MoveElementLowLevel(PCB->Data, pt->element, x2 - x1, y2 - y1); MoveElementLowLevel(PCB->Data, pt->other, x1 - x2, y1 - y2); /* then flip both elements if they are on opposite sides */ - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pt->element) != TEST_FLAG(PCB_FLAG_ONSOLDER, pt->other)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pt->element) != PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pt->other)) { PerturbationType mypt; mypt.element = pt->element; mypt.which = ROTATE; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4875) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4876) @@ -612,7 +612,7 @@ (*rbpp)->flags.fixed = 1; (*rbpp)->came_from = ALL; (*rbpp)->style = style; - (*rbpp)->flags.circular = !TEST_FLAG(PCB_FLAG_SQUARE, pin); + (*rbpp)->flags.circular = !PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin); /* circular lists */ InitLists(*rbpp); /* link together */ @@ -630,7 +630,7 @@ { pcb_coord_t halfthick; routebox_t **rbpp; - int layergroup = (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? back : front); + int layergroup = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? back : front); assert(0 <= layergroup && layergroup < max_group); assert(PCB->LayerGroups.Number[layergroup] > 0); rbpp = (routebox_t **) GetPointerMemory(&layergroupboxes[layergroup]); @@ -750,7 +750,7 @@ rb->flags.nonstraight = is_not_rectangle; rb->layer = layer; rb->came_from = ALL; - if (TEST_FLAG(PCB_FLAG_CLEARPOLY, polygon)) { + if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon)) { rb->flags.clear_poly = 1; if (!is_not_rectangle) rb->type = PLANE; @@ -953,7 +953,7 @@ CONNECTION_LOOP(net); { routebox_t *rb = NULL; - SET_FLAG(PCB_FLAG_DRC, (pcb_pin_t *) connection->ptr2); + PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pin_t *) connection->ptr2); if (connection->type == PCB_TYPE_LINE) { pcb_line_t *line = (pcb_line_t *) connection->ptr2; @@ -1043,8 +1043,8 @@ /* add pins and pads of elements */ ALLPIN_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_DRC, pin)) - CLEAR_FLAG(PCB_FLAG_DRC, pin); + if (PCB_FLAG_TEST(PCB_FLAG_DRC, pin)) + PCB_FLAG_CLEAR(PCB_FLAG_DRC, pin); else AddPin(layergroupboxes, pin, pcb_false, rd->styles[rd->max_styles]); } @@ -1051,8 +1051,8 @@ ENDALL_LOOP; ALLPAD_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_DRC, pad)) - CLEAR_FLAG(PCB_FLAG_DRC, pad); + if (PCB_FLAG_TEST(PCB_FLAG_DRC, pad)) + PCB_FLAG_CLEAR(PCB_FLAG_DRC, pad); else AddPad(layergroupboxes, element, pad, rd->styles[rd->max_styles]); } @@ -1060,8 +1060,8 @@ /* add all vias */ VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_DRC, via)) - CLEAR_FLAG(PCB_FLAG_DRC, via); + if (PCB_FLAG_TEST(PCB_FLAG_DRC, via)) + PCB_FLAG_CLEAR(PCB_FLAG_DRC, via); else AddPin(layergroupboxes, via, pcb_true, rd->styles[rd->max_styles]); } @@ -1072,8 +1072,8 @@ /* add all (non-rat) lines */ LINE_LOOP(LAYER_PTR(i)); { - if (TEST_FLAG(PCB_FLAG_DRC, line)) { - CLEAR_FLAG(PCB_FLAG_DRC, line); + if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)) { + PCB_FLAG_CLEAR(PCB_FLAG_DRC, line); continue; } /* dice up non-straight lines into many tiny obstacles */ @@ -1105,8 +1105,8 @@ /* add all polygons */ POLYGON_LOOP(LAYER_PTR(i)); { - if (TEST_FLAG(PCB_FLAG_DRC, polygon)) - CLEAR_FLAG(PCB_FLAG_DRC, polygon); + if (PCB_FLAG_TEST(PCB_FLAG_DRC, polygon)) + PCB_FLAG_CLEAR(PCB_FLAG_DRC, polygon); else AddPolygon(layergroupboxes, i, polygon, rd->styles[rd->max_styles]); } @@ -4570,7 +4570,7 @@ /* count number of rats selected */ RAT_LOOP(PCB->Data); { - if (!selected || TEST_FLAG(PCB_FLAG_SELECTED, line)) + if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) i++; } END_LOOP; @@ -4582,7 +4582,7 @@ /* if only one rat selected, do things the quick way. =) */ if (i == 1) { RAT_LOOP(PCB->Data); - if (!selected || TEST_FLAG(PCB_FLAG_SELECTED, line)) { + if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { /* look up the end points of this rat line */ routebox_t *a; routebox_t *b; @@ -4638,7 +4638,7 @@ /* now merge only those subnets connected by a rat line */ RAT_LOOP(PCB->Data); - if (!selected || TEST_FLAG(PCB_FLAG_SELECTED, line)) { + if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { /* look up the end points of this rat line */ routebox_t *a; routebox_t *b; @@ -4647,7 +4647,7 @@ if (!a || !b) { #ifdef DEBUG_STALE_RATS AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - ASSIGN_FLAG(PCB_FLAG_SELECTED, pcb_true, line); + PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, pcb_true, line); DrawRat(line, 0); #endif /* DEBUG_STALE_RATS */ pcb_message(PCB_MSG_DEFAULT, "The rats nest is stale! Aborting autoroute...\n"); Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 4875) +++ trunk/src_plugins/boardflip/boardflip.c (revision 4876) @@ -77,7 +77,7 @@ TEXT_LOOP(layer); { FLIP(text->Y); - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, text); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); } END_LOOP; POLYGON_LOOP(layer); @@ -118,11 +118,11 @@ { FLIP(element->MarkY); if (sides) - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, element); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, element); ELEMENTTEXT_LOOP(element); { FLIP(text->Y); - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, text); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); } END_LOOP; ELEMENTLINE_LOOP(element); @@ -148,7 +148,7 @@ FLIP(pad->Point1.Y); FLIP(pad->Point2.Y); if (sides) - TOGGLE_FLAG(PCB_FLAG_ONSOLDER, pad); + PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, pad); } END_LOOP; } Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 4875) +++ trunk/src_plugins/distalign/distalign.c (revision 4876) @@ -246,7 +246,7 @@ dir = dir == K_X ? K_Y : K_X; /* see above */ ELEMENT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, element)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) continue; nsel++; } @@ -258,7 +258,7 @@ nsel = 0; ELEMENT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, element)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) continue; elements_by_pos[nsel].element = element; elements_by_pos[nsel++].pos = coord(element, dir, point); @@ -299,7 +299,7 @@ q = 0; ELEMENT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, element)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) continue; q += coord(element, dir, point); nsel++; @@ -415,7 +415,7 @@ { pcb_coord_t p, dp, dx, dy; - if (!TEST_FLAG(PCB_FLAG_SELECTED, element)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) continue; /* find delta from reference point to reference point */ p = coord(element, dir, point); Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 4875) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 4876) @@ -171,7 +171,7 @@ { pcb_text_t *text; text = &(element)->Name[NAME_INDEX()]; - if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) continue; nsel++; } @@ -178,7 +178,7 @@ END_LOOP; ALLTEXT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) continue; nsel++; } @@ -192,7 +192,7 @@ { pcb_text_t *text; text = &(element)->Name[NAME_INDEX()]; - if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) continue; texts_by_pos[nsel].text = text; texts_by_pos[nsel].type = PCB_TYPE_ELEMENT_NAME; @@ -201,7 +201,7 @@ END_LOOP; ALLTEXT_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) continue; texts_by_pos[nsel].text = text; texts_by_pos[nsel].type = PCB_TYPE_TEXT; @@ -363,7 +363,7 @@ { pcb_text_t *text; text = &(element)->Name[NAME_INDEX()]; - if (!TEST_FLAG(PCB_FLAG_SELECTED, text)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) continue; /* find delta from reference point to reference point */ p = coord(text, dir, point); @@ -390,7 +390,7 @@ /* Selected bare text objects */ ALLTEXT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, text)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) { /* find delta from reference point to reference point */ p = coord(text, dir, point); dp = q - p; Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4875) +++ trunk/src_plugins/djopt/djopt.c (revision 4876) @@ -58,8 +58,8 @@ #define dprintf if(0)pcb_printf -#define selected(x) TEST_FLAG (PCB_FLAG_SELECTED, (x)) -#define autorouted(x) TEST_FLAG (PCB_FLAG_AUTO, (x)) +#define selected(x) PCB_FLAG_TEST(PCB_FLAG_SELECTED, (x)) +#define autorouted(x) PCB_FLAG_TEST(PCB_FLAG_AUTO, (x)) #define SB (PCB->Bloat+1) @@ -1009,9 +1009,9 @@ if (o == line_orient(c->lines[1], c2) && o != DIAGONAL) { dprintf("straight %#mD to %#mD to %#mD\n", c0->x, c0->y, c->x, c->y, c2->x, c2->y); if (selected(c->lines[0]->line)) - SET_FLAG(PCB_FLAG_SELECTED, c->lines[1]->line); + PCB_FLAG_SET(PCB_FLAG_SELECTED, c->lines[1]->line); if (selected(c->lines[1]->line)) - SET_FLAG(PCB_FLAG_SELECTED, c->lines[0]->line); + PCB_FLAG_SET(PCB_FLAG_SELECTED, c->lines[0]->line); move_corner(c, c2->x, c2->y); } } @@ -2435,7 +2435,7 @@ ALLPAD_LOOP(PCB->Data); { - int layerflag = TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? LT_SOLDER : LT_COMPONENT; + int layerflag = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? LT_SOLDER : LT_COMPONENT; if (layer_type[l->layer] != layerflag) continue; @@ -2572,7 +2572,7 @@ END_LOOP; PAD_LOOP(element); { - int layern = TEST_FLAG(PCB_FLAG_ONSOLDER, pad) ? solder_layer : component_layer; + int layern = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? solder_layer : component_layer; line_s *ls = (line_s *) malloc(sizeof(line_s)); ls->next = lines; lines = ls; @@ -2592,7 +2592,7 @@ VIA_LOOP(PCB->Data); /* hace don't mess with vias that have thermals */ /* but then again don't bump into them - if (!TEST_FLAG(ALLTHERMFLAGS, via)) + if (!PCB_FLAG_TEST(ALLTHERMFLAGS, via)) */ { c = find_corner(via->X, via->Y, -1); @@ -2618,7 +2618,7 @@ continue; /* don't mess with thermals */ - if (TEST_FLAG(PCB_FLAG_USETHERMAL, line)) + if (PCB_FLAG_TEST(PCB_FLAG_USETHERMAL, line)) continue; if (line->Point1.X == line->Point2.X && line->Point1.Y == line->Point2.Y) { Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 4875) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 4876) @@ -198,7 +198,7 @@ unplated_sym = --ds; gui->set_color(gc, PCB->PinColor); for (i = 0; i < drill->PinN; i++) - drill_sym(gc, TEST_FLAG(PCB_FLAG_HOLE, drill->Pin[i]) ? unplated_sym : plated_sym, drill->Pin[i]->X, drill->Pin[i]->Y); + drill_sym(gc, PCB_FLAG_TEST(PCB_FLAG_HOLE, drill->Pin[i]) ? unplated_sym : plated_sym, drill->Pin[i]->X, drill->Pin[i]->Y); if (plated_sym != -1) { drill_sym(gc, plated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4); text_at(gc, PCB_MIL_TO_COORD(1350), yoff, PCB_MIL_TO_COORD(2), "YES"); Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 4875) +++ trunk/src_plugins/export_bboard/bboard.c (revision 4876) @@ -478,7 +478,7 @@ cairo_translate(bboard_cairo_ctx, ex, ey); - if (TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) { cairo_scale(bboard_cairo_ctx, 1, -1); } cairo_rotate(bboard_cairo_ctx, -tmp_angle * M_PI / 180.); @@ -533,7 +533,7 @@ /* write out components on solder side */ ELEMENT_LOOP(PCB->Data); - if (TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) { bboard_export_element_cairo(element, 1); } END_LOOP; @@ -540,7 +540,7 @@ /* write out components on component side */ ELEMENT_LOOP(PCB->Data); - if (!TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) { + if (!PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) { bboard_export_element_cairo(element, 0); } END_LOOP; Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 4875) +++ trunk/src_plugins/export_dsn/dsn.c (revision 4876) @@ -255,7 +255,7 @@ { char *ename; pcb_point_t ecentroid = get_centroid(element); - char *side = TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? "back" : "front"; + char *side = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? "back" : "front"; ename = NAMEONPCB_NAME(element); if (ename != NULL) ename = pcb_strdup(ename); @@ -285,8 +285,8 @@ fprintf(fp, " (library\n"); ELEMENT_LOOP(PCB->Data); { - int partside = TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? g_list_length(layerlist) - 1 : 0; - int partsidesign = TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? -1 : 1; + int partside = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? g_list_length(layerlist) - 1 : 0; + int partsidesign = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? -1 : 1; pcb_point_t centroid = get_centroid(element); fprintf(fp, " (image %ld\n", element->ID); /* map every element by ID */ /* loop thru pins and pads to add to image */ @@ -297,7 +297,7 @@ pcb_coord_t lx, ly; /* hold local pin coordinates */ ty = PCB->MaxHeight - pin->Y; pinthickness = pin->Thickness; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) padstack = pcb_strdup_printf("Th_square_%mI", pinthickness); else padstack = pcb_strdup_printf("Th_round_%mI", pinthickness); Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4875) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4876) @@ -177,13 +177,13 @@ ELEMENT_LOOP(PCB->Data); PAD_LOOP(element); - if (TEST_FLAG(PCB_FLAG_FOUND, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) { fprintf(fd, "327%-17.14s", net); /* Net Name. */ fprintf(fd, "%-6.6s", element->Name[1].TextString); /* Refdes. */ fprintf(fd, "-%-4.4s", pad->Number); /* pin number. */ fprintf(fd, " "); /*! \todo Midpoint indicator (M). */ fprintf(fd, " "); /* Drilled hole Id (blank for pads). */ - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) == pcb_true) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) == pcb_true) { fprintf(fd, "A02"); /*! \todo Put actual layer # for bottom side. */ } else { @@ -220,7 +220,7 @@ fprintf(fd, "R000"); /* Rotation (0 degrees). */ fprintf(fd, " "); /* Column 72 should be left blank. */ if (pad->Mask > 0) { - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad) == pcb_true) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) == pcb_true) { fprintf(fd, "S2"); /* Soldermask on bottom side. */ } else { @@ -232,13 +232,13 @@ } fprintf(fd, " "); /* Padding. */ fprintf(fd, "\n"); - SET_FLAG(PCB_FLAG_VISIT, pad); + PCB_FLAG_SET(PCB_FLAG_VISIT, pad); } END_LOOP; /* Pad. */ PIN_LOOP(element); - if (TEST_FLAG(PCB_FLAG_FOUND, pin)) { - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) { /* Non plated? */ + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { /* Non plated? */ fprintf(fd, "367%-17.14s", net); /* Net Name. */ } else { @@ -255,7 +255,7 @@ tmp = tmp / 1000; /* 0.001 mm. */ } - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { fprintf(fd, "D%-4.4dU", tmp); /* Unplated Drilled hole Id. */ } else { @@ -287,7 +287,7 @@ } fprintf(fd, "X%4.4d", padx); /* Pad dimension X. */ - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { fprintf(fd, "Y%4.4d", padx); /* Pad dimension Y. */ } else { @@ -305,7 +305,7 @@ fprintf(fd, "\n"); - SET_FLAG(PCB_FLAG_VISIT, pin); + PCB_FLAG_SET(PCB_FLAG_VISIT, pin); } @@ -313,8 +313,8 @@ END_LOOP; /* Element */ VIA_LOOP(PCB->Data); - if (TEST_FLAG(PCB_FLAG_FOUND, via)) { - if (TEST_FLAG(PCB_FLAG_HOLE, via)) { /* Non plated ? */ + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, via)) { /* Non plated ? */ fprintf(fd, "367%-17.14s", net); /* Net Name. */ } else { @@ -331,7 +331,7 @@ tmp = tmp / 1000; /* 0.001 mm. */ } - if (TEST_FLAG(PCB_FLAG_HOLE, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, via)) { fprintf(fd, "D%-4.4dU", tmp); /* Unplated Drilled hole Id. */ } else { @@ -374,7 +374,7 @@ } fprintf(fd, " "); /* Padding. */ fprintf(fd, "\n"); - SET_FLAG(PCB_FLAG_VISIT, via); + PCB_FLAG_SET(PCB_FLAG_VISIT, via); } END_LOOP; /* Via. */ @@ -427,7 +427,7 @@ ELEMENT_LOOP(PCB->Data); PIN_LOOP(element); - if (!TEST_FLAG(PCB_FLAG_VISIT, pin)) { + if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, pin)) { pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND); pcb_clear_flag_on_pins_vias_pads(pcb_true, PCB_FLAG_FOUND); pcb_lookup_conn_by_pin(PCB_TYPE_PIN, pin); @@ -445,7 +445,7 @@ } END_LOOP; /* Pin. */ PAD_LOOP(element); - if (!TEST_FLAG(PCB_FLAG_VISIT, pad)) { + if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, pad)) { pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND); pcb_clear_flag_on_pins_vias_pads(pcb_true, PCB_FLAG_FOUND); pcb_lookup_conn_by_pin(PCB_TYPE_PAD, pad); @@ -466,7 +466,7 @@ END_LOOP; /* Element. */ VIA_LOOP(PCB->Data); - if (!TEST_FLAG(PCB_FLAG_VISIT, via)) { + if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, via)) { pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND); pcb_clear_flag_on_pins_vias_pads(pcb_true, PCB_FLAG_FOUND); pcb_lookup_conn_by_pin(PCB_TYPE_PIN, via); @@ -492,14 +492,14 @@ void ResetVisitPinsViasAndPads() { VIA_LOOP(PCB->Data); - CLEAR_FLAG(PCB_FLAG_VISIT, via); + PCB_FLAG_CLEAR(PCB_FLAG_VISIT, via); END_LOOP; /* Via. */ ELEMENT_LOOP(PCB->Data); PIN_LOOP(element); - CLEAR_FLAG(PCB_FLAG_VISIT, pin); + PCB_FLAG_CLEAR(PCB_FLAG_VISIT, pin); END_LOOP; /* Pin. */ PAD_LOOP(element); - CLEAR_FLAG(PCB_FLAG_VISIT, pad); + PCB_FLAG_CLEAR(PCB_FLAG_VISIT, pad); END_LOOP; /* Pad. */ END_LOOP; /* Element. */ } Index: trunk/src_plugins/export_openscad/scadcomp.c =================================================================== --- trunk/src_plugins/export_openscad/scadcomp.c (revision 4875) +++ trunk/src_plugins/export_openscad/scadcomp.c (revision 4876) @@ -313,13 +313,13 @@ fprintf(scad_output, "translate ([%f, %f, %f]) ", scad_scale_coord((float) x), -scad_scale_coord((float) y), - ((TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) ? -1. : 1.) * (BOARD_THICKNESS / 2. + OUTER_COPPER_THICKNESS)); + ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) ? -1. : 1.) * (BOARD_THICKNESS / 2. + OUTER_COPPER_THICKNESS)); /* rotate order: angle onsolder user-defined */ if (tmp_angle != 0.) - fprintf(scad_output, "rotate ([0, 0, %f]) ", (TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) ? -tmp_angle : tmp_angle); + fprintf(scad_output, "rotate ([0, 0, %f]) ", (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) ? -tmp_angle : tmp_angle); - if (TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) fprintf(scad_output, "rotate([180.,0,0]) "); if (model_rotation && scad_parse_float_triplet(model_rotation, &fx, &fy, &fz)) @@ -431,11 +431,11 @@ fprintf(scad_output, "translate ([%f, %f, %f]) ", scad_scale_coord((float) x), -scad_scale_coord((float) y), - ((TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) ? -1. : 1.) * (BOARD_THICKNESS / 2. + OUTER_COPPER_THICKNESS)); + ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) ? -1. : 1.) * (BOARD_THICKNESS / 2. + OUTER_COPPER_THICKNESS)); if (tmp_angle != 0.) - fprintf(scad_output, "rotate ([0, 0, %f]) ", (TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) ? -tmp_angle : tmp_angle); - if (TEST_FLAG(PCB_FLAG_ONSOLDER, (element))) + fprintf(scad_output, "rotate ([0, 0, %f]) ", (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) ? -tmp_angle : tmp_angle); + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) fprintf(scad_output, "rotate([180.,0,0]) "); fprintf(scad_output, "{\n"); 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 4875) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 4876) @@ -111,7 +111,7 @@ { select_t *ctx = ud; pcb_any_obj_t *obj = obj_; - if (TEST_FLAG(ctx->flag, obj)) + if (PCB_FLAG_TEST(ctx->flag, obj)) search_append(ctx->search, obj); } Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 4875) +++ trunk/src_plugins/hid_gtk/gtkhid-gl.c (revision 4876) @@ -130,7 +130,7 @@ return PCB->InvisibleObjectsOn; case SL_MASK: if (SL_MYSIDE(idx)) - return TEST_FLAG(SHOWMASKFLAG, PCB); + return PCB_FLAG_TEST(SHOWMASKFLAG, PCB); return 0; case SL_SILK: priv->trans_lines = pcb_true; Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4875) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4876) @@ -93,9 +93,9 @@ VIA_LOOP(PCB->Data); { - if (TEST_FLAG(flag, via)) { + if (PCB_FLAG_TEST(flag, via)) { AddObjectToFlagUndoList(PCB_TYPE_VIA, via, via, via); - CLEAR_FLAG(flag, via); + PCB_FLAG_CLEAR(flag, via); DrawVia(via); change = pcb_true; } @@ -105,9 +105,9 @@ { PIN_LOOP(element); { - if (TEST_FLAG(flag, pin)) { + if (PCB_FLAG_TEST(flag, pin)) { AddObjectToFlagUndoList(PCB_TYPE_PIN, element, pin, pin); - CLEAR_FLAG(flag, pin); + PCB_FLAG_CLEAR(flag, pin); DrawPin(pin); change = pcb_true; } @@ -115,9 +115,9 @@ END_LOOP; PAD_LOOP(element); { - if (TEST_FLAG(flag, pad)) { + if (PCB_FLAG_TEST(flag, pad)) { AddObjectToFlagUndoList(PCB_TYPE_PAD, element, pad, pad); - CLEAR_FLAG(flag, pad); + PCB_FLAG_CLEAR(flag, pad); DrawPad(pad); change = pcb_true; } @@ -127,9 +127,9 @@ END_LOOP; RAT_LOOP(PCB->Data); { - if (TEST_FLAG(flag, line)) { + if (PCB_FLAG_TEST(flag, line)) { AddObjectToFlagUndoList(PCB_TYPE_RATLINE, line, line, line); - CLEAR_FLAG(flag, line); + PCB_FLAG_CLEAR(flag, line); DrawRat(line); change = pcb_true; } @@ -137,9 +137,9 @@ END_LOOP; COPPERLINE_LOOP(PCB->Data); { - if (TEST_FLAG(flag, line)) { + if (PCB_FLAG_TEST(flag, line)) { AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line); - CLEAR_FLAG(flag, line); + PCB_FLAG_CLEAR(flag, line); DrawLine(layer, line); change = pcb_true; } @@ -147,9 +147,9 @@ ENDALL_LOOP; COPPERARC_LOOP(PCB->Data); { - if (TEST_FLAG(flag, arc)) { + if (PCB_FLAG_TEST(flag, arc)) { AddObjectToFlagUndoList(PCB_TYPE_ARC, layer, arc, arc); - CLEAR_FLAG(flag, arc); + PCB_FLAG_CLEAR(flag, arc); DrawArc(layer, arc); change = pcb_true; } @@ -157,9 +157,9 @@ ENDALL_LOOP; COPPERPOLYGON_LOOP(PCB->Data); { - if (TEST_FLAG(flag, polygon)) { + if (PCB_FLAG_TEST(flag, polygon)) { AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); - CLEAR_FLAG(flag, polygon); + PCB_FLAG_CLEAR(flag, polygon); DrawPolygon(layer, polygon); change = pcb_true; } @@ -210,7 +210,7 @@ continue; } AddObjectToFlagUndoList(object_type, ptr1, ptr2, ptr3); - SET_FLAG(PCB_FLAG_FOUND, (pcb_any_obj_t *) ptr2); + PCB_FLAG_SET(PCB_FLAG_FOUND, (pcb_any_obj_t *) ptr2); switch (violation->object_type_list[i]) { case PCB_TYPE_LINE: case PCB_TYPE_ARC: Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4875) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4876) @@ -203,7 +203,7 @@ return; AddObjectToFlagUndoList(conn.type, conn.ptr1, conn.ptr2, conn.ptr2); - TOGGLE_FLAG(PCB_FLAG_SELECTED, (pcb_any_obj_t *) conn.ptr2); + PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_any_obj_t *) conn.ptr2); pcb_draw_obj(conn.type, conn.ptr1, conn.ptr2); } @@ -535,7 +535,7 @@ VISIBLELINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, line) && !TEST_FLAG(PCB_FLAG_LOCK, line)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) RemoveObject(PCB_TYPE_LINE, layer, line, line); } ENDALL_LOOP; @@ -542,7 +542,7 @@ VISIBLEARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, arc) && !TEST_FLAG(PCB_FLAG_LOCK, arc)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) RemoveObject(PCB_TYPE_ARC, layer, arc, arc); } ENDALL_LOOP; @@ -550,7 +550,7 @@ if (PCB->ViaOn) VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, via) && !TEST_FLAG(PCB_FLAG_LOCK, via)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) RemoveObject(PCB_TYPE_VIA, via, via, via); } END_LOOP; Index: trunk/src_plugins/hid_gtk/gui-pinout-preview.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-pinout-preview.c (revision 4875) +++ trunk/src_plugins/hid_gtk/gui-pinout-preview.c (revision 4876) @@ -71,13 +71,13 @@ CopyElementLowLevel(NULL, &pinout->element, element, FALSE, 0, 0); PIN_LOOP(&pinout->element); { - SET_FLAG(PCB_FLAG_DISPLAYNAME, pin); + PCB_FLAG_SET(PCB_FLAG_DISPLAYNAME, pin); } END_LOOP; PAD_LOOP(&pinout->element); { - SET_FLAG(PCB_FLAG_DISPLAYNAME, pad); + PCB_FLAG_SET(PCB_FLAG_DISPLAYNAME, pad); } END_LOOP; Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 4875) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 4876) @@ -175,7 +175,7 @@ VISIBLELINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, line) && !TEST_FLAG(PCB_FLAG_LOCK, line)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) RemoveObject(PCB_TYPE_LINE, layer, line, line); } ENDALL_LOOP; @@ -182,7 +182,7 @@ VISIBLEARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, arc) && !TEST_FLAG(PCB_FLAG_LOCK, arc)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) RemoveObject(PCB_TYPE_ARC, layer, arc, arc); } ENDALL_LOOP; @@ -190,7 +190,7 @@ if (PCB->ViaOn) VIA_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, via) && !TEST_FLAG(PCB_FLAG_LOCK, via)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) RemoveObject(PCB_TYPE_VIA, via, via, via); } END_LOOP; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4875) +++ trunk/src_plugins/io_kicad/write.c (revision 4876) @@ -919,7 +919,7 @@ fputs("Sh ",FP); /* pin shape descriptor */ PrintQuotedString(FP, (char *) EMPTY(pin->Number)); - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { fputs(" R ",FP); /* square */ } else { fputs(" C ",FP); /* circular */ @@ -1077,7 +1077,7 @@ xPos = element->MarkX + xOffset; yPos = element->MarkY + yOffset; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element)) { silkLayer = 20; copperLayer = 0; } else { @@ -1162,7 +1162,7 @@ fprintf(FP, "%*s", indentation + 2, ""); fputs("(pad ", FP); PrintQuotedString(FP, (char *) EMPTY(pin->Number)); - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { fputs(" thru_hole rect ",FP); /* square */ } else { fputs(" thru_hole circle ",FP); /* circular */ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4875) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4876) @@ -879,7 +879,7 @@ fputs("Sh ",FP); /* pin shape descriptor */ PrintQuotedString(FP, (char *) EMPTY(pin->Number)); - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { fputs(" R ",FP); /* square */ } else { fputs(" C ",FP); /* circular */ @@ -1029,7 +1029,7 @@ xPos = element->MarkX + xOffset; yPos = element->MarkY + yOffset; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element)) { silkLayer = 20; copperLayer = 0; } else { @@ -1057,7 +1057,7 @@ fputs("Sh ",FP); /* pin shape descriptor */ PrintQuotedString(FP, (char *) EMPTY(pin->Number)); - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { fputs(" R ",FP); /* square */ } else { fputs(" C ",FP); /* circular */ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4875) +++ trunk/src_plugins/io_lihata/read.c (revision 4876) @@ -314,7 +314,7 @@ if (pcb_object_flagbits[n].object_types & object_type) { pcb_bool b; if ((parse_bool(&b, lht_dom_hash_get(fn, pcb_object_flagbits[n].name)) == 0) && b) - SET_FLAG(pcb_object_flagbits[n].mask, &fh); + PCB_FLAG_SET(pcb_object_flagbits[n].mask, &fh); } } @@ -661,7 +661,7 @@ parse_coord(&elem->MarkX, lht_dom_hash_get(obj, "x")); parse_coord(&elem->MarkY, lht_dom_hash_get(obj, "y")); - onsld = TEST_FLAG(PCB_FLAG_ONSOLDER, elem); + onsld = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, elem); lst = lht_dom_hash_get(obj, "objects"); if (lst->type == LHT_LIST) { @@ -684,7 +684,7 @@ if (onsld) { int n; for(n = 0; n < MAX_ELEMENTNAMES; n++) - SET_FLAG(PCB_FLAG_ONSOLDER, &elem->Name[n]); + PCB_FLAG_SET(PCB_FLAG_ONSOLDER, &elem->Name[n]); } /* Make sure we use some sort of font */ Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4875) +++ trunk/src_plugins/io_lihata/write.c (revision 4876) @@ -161,9 +161,9 @@ /* create normal flag nodes */ for (n = 0; n < pcb_object_flagbits_len; n++) { - if ((pcb_object_flagbits[n].object_types & object_type) && (TEST_FLAG(pcb_object_flagbits[n].mask, &fh))) { + if ((pcb_object_flagbits[n].object_types & object_type) && (PCB_FLAG_TEST(pcb_object_flagbits[n].mask, &fh))) { lht_dom_hash_put(hsh, build_text(pcb_object_flagbits[n].name, "1")); - CLEAR_FLAG(pcb_object_flagbits[n].mask, &fh); + PCB_FLAG_CLEAR(pcb_object_flagbits[n].mask, &fh); added++; } } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4875) +++ trunk/src_plugins/io_pcb/file.c (revision 4876) @@ -176,9 +176,9 @@ } *tmp = (void *)dest; if ((n == NULL) || (n->type != CFN_BOOLEAN) || (n->used < 0) || (!n->val.boolean[0])) - CLEAR_FLAG(binflag, tmp); + PCB_FLAG_CLEAR(binflag, tmp); else - SET_FLAG(binflag, tmp); + PCB_FLAG_SET(binflag, tmp); } /* --------------------------------------------------------------------------- @@ -208,7 +208,7 @@ io_pcb_attrib_c2a(PCB); /* set binary flags from conf hash; these flags used to be checked - with TEST_FLAG() but got moved to the conf system */ + with PCB_FLAG_TEST() but got moved to the conf system */ conf_update_pcb_flag(&pcb_flags, "plugins/mincut/enable", ENABLEPCB_FLAG_MINCUT); conf_update_pcb_flag(&pcb_flags, "editor/show_number", SHOWNUMBERFLAG); conf_update_pcb_flag(&pcb_flags, "editor/show_drc", SHOWPCB_FLAG_DRC); Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 4875) +++ trunk/src_plugins/jostle/jostle.c (revision 4876) @@ -318,7 +318,7 @@ pcb_vector_t a, b, c, d, junk; int hits; - SET_FLAG(PCB_FLAG_DRC, line); /* will cause sublines to inherit */ + PCB_FLAG_SET(PCB_FLAG_DRC, line); /* will cause sublines to inherit */ lA[0] = line->Point1.X; lA[1] = line->Point1.Y; lB[0] = line->Point2.X; @@ -376,7 +376,7 @@ double small, big; int nocentroid = 0; - if (TEST_FLAG(PCB_FLAG_DRC, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)) { return 0; } fprintf(stderr, "hit! %p\n", (void *)line); @@ -519,7 +519,7 @@ info.layer = CURRENT; LINE_LOOP(info.layer); { - CLEAR_FLAG(PCB_FLAG_DRC, line); + PCB_FLAG_CLEAR(PCB_FLAG_DRC, line); } END_LOOP; do { Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 4875) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 4876) @@ -118,14 +118,14 @@ if (pin != NULL) { debprintf("short on pin!\n"); - SET_FLAG(PCB_FLAG_WARN, pin); + PCB_FLAG_SET(PCB_FLAG_WARN, pin); x = pin->X; y = pin->Y; } else if (pad != NULL) { debprintf("short on pad!\n"); - SET_FLAG(PCB_FLAG_WARN, pad); - if (TEST_FLAG(PCB_FLAG_EDGE2, pad)) { + PCB_FLAG_SET(PCB_FLAG_WARN, pad); + if (PCB_FLAG_TEST(PCB_FLAG_EDGE2, pad)) { x = pad->Point2.X; y = pad->Point2.Y; } @@ -305,7 +305,7 @@ s = lut_by_gid[solution[i]]; debprintf("%d %p", solution[i], (void *)s); if (s != NULL) { - SET_FLAG(PCB_FLAG_WARN, s->to); + PCB_FLAG_SET(PCB_FLAG_WARN, s->to); debprintf(" -> %d", s->to->ID); } debprintf("\n"); @@ -366,9 +366,9 @@ next = n->next; if (n->pin != NULL) - SET_FLAG(PCB_FLAG_WARN, n->pin); + PCB_FLAG_SET(PCB_FLAG_WARN, n->pin); if (n->pad != NULL) - SET_FLAG(PCB_FLAG_WARN, n->pad); + PCB_FLAG_SET(PCB_FLAG_WARN, n->pad); /* run only if net is not ignored */ Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4875) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4876) @@ -285,7 +285,7 @@ /* First pass to combine the forward and backward contours */ VISIBLEPOLYGON_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, polygon)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) continue; /* Pick the layer of the first polygon we find selected */ @@ -319,7 +319,7 @@ /* Second pass to remove the input polygons */ VISIBLEPOLYGON_LOOP(PCB->Data); { - if (!TEST_FLAG(PCB_FLAG_SELECTED, polygon)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) continue; /* Only combine polygons on the same layer */ Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4875) +++ trunk/src_plugins/propedit/propsel.c (revision 4876) @@ -38,7 +38,7 @@ } map_ctx_t; #define map_chk_skip(ctx, obj) \ - if (!TEST_FLAG(PCB_FLAG_SELECTED, obj)) return; + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj)) return; #define type2field_String string #define type2field_pcb_coord_t coord @@ -212,7 +212,7 @@ } #define set_chk_skip(ctx, obj) \ - if (!TEST_FLAG(PCB_FLAG_SELECTED, obj)) return; + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj)) return; #define DONE { st->set_cnt++; RestoreUndoSerialNumber(); return; } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4875) +++ trunk/src_plugins/puller/puller.c (revision 4876) @@ -734,7 +734,7 @@ { int inside_p; int t = (pin->Thickness + 1) / 2; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) inside_p = (x >= pin->X - t && x <= pin->X + t && y >= pin->Y - t && y <= pin->Y + t); else inside_p = (Distance(pin->X, pin->Y, x, y) <= t); @@ -801,7 +801,7 @@ pcb_printf("pad %#mD - %#mD t %#mS vs %#mD\n", pad->Point1.X, pad->Point1.Y, pad->Point2.X, pad->Point2.Y, pad->Thickness, x, y); t = (pad->Thickness + 1) / 2; - if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad)) { inside_p = (x >= MIN(pad->Point1.X - t, pad->Point2.X - t) && x <= MAX(pad->Point1.X + t, pad->Point2.X + t) && y >= MIN(pad->Point1.Y - t, pad->Point2.Y - t) @@ -847,7 +847,7 @@ int intersect; double p1_d, p2_d; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad)) { if (!current_is_solder) return R_DIR_NOT_FOUND; } @@ -902,7 +902,7 @@ Extra *e = ARC2EXTRA(arc); int hits; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad)) { if (!current_is_solder) return R_DIR_NOT_FOUND; } @@ -1561,7 +1561,7 @@ /* FIXME: we lump octagonal pins in with square; safe, but not optimal. */ - if (TEST_FLAG(PCB_FLAG_SQUARE, p) || TEST_FLAG(PCB_FLAG_OCTAGON, p)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, p) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, p)) { gp_point(p->X - t2, p->Y - t2, 0, 0); gp_point(p->X - t2, p->Y + t2, 0, 0); gp_point(p->X + t2, p->Y + t2, 0, 0); @@ -1581,7 +1581,7 @@ if (p == start_pinpad || p == end_pinpad) return R_DIR_NOT_FOUND; - if (TEST_FLAG(PCB_FLAG_ONSOLDER, p)) { + if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, p)) { if (!current_is_solder) return R_DIR_NOT_FOUND; } @@ -1592,7 +1592,7 @@ /* FIXME: we lump octagonal pads in with square; safe, but not optimal. I don't think we even support octagonal pads. */ - if (TEST_FLAG(PCB_FLAG_SQUARE, p) || TEST_FLAG(PCB_FLAG_OCTAGON, p)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, p) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, p)) { if (p->Point1.X == p->Point2.X) { int y1 = MIN(p->Point1.Y, p->Point2.Y) - t2; int y2 = MAX(p->Point1.Y, p->Point2.Y) + t2; @@ -1944,7 +1944,7 @@ #if 0 if (fa > M_PI / 2 || fa < -M_PI / 2) { - SET_FLAG(PCB_FLAG_FOUND, line); + PCB_FLAG_SET(PCB_FLAG_FOUND, line); longjmp(abort_buf, 1); } #endif @@ -2239,7 +2239,7 @@ static void mark_ends_pending(pcb_line_t * line, Extra * extra, void *userdata) { int *select_flags = userdata; - if (TEST_FLAGS(*select_flags, line)) { + if (PCB_FLAGS_TEST(*select_flags, line)) { extra->start.pending = 1; extra->end.pending = 1; } Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4875) +++ trunk/src_plugins/query/query_access.c (revision 4876) @@ -499,7 +499,7 @@ } if (fh1 == query_fields_layer) - return layer_of_obj(fld->next, res, PCB_LYT_SILK | (TEST_FLAG(PCB_FLAG_ONSOLDER, p) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); + return layer_of_obj(fld->next, res, PCB_LYT_SILK | (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, p) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); if (fld->next != NULL) PCB_QRY_RET_INV(res); @@ -568,7 +568,7 @@ fld2hash_req(fh1, fld, 0); switch(fh1) { - case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_SILK | (TEST_FLAG(PCB_FLAG_ONSOLDER, l) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); + case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_SILK | (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, l) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); case query_fields_element: return field_element_obj(obj, fld->next, res); default:; } @@ -584,7 +584,7 @@ fld2hash_req(fh1, fld, 0); switch(fh1) { - case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_SILK | (TEST_FLAG(PCB_FLAG_ONSOLDER, a) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); + case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_SILK | (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, a) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); case query_fields_element: return field_element_obj(obj, fld->next, res); default:; } @@ -600,7 +600,7 @@ fld2hash_req(fh1, fld, 0); switch(fh1) { - case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_SILK | (TEST_FLAG(PCB_FLAG_ONSOLDER, t) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); + case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_SILK | (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, t) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); case query_fields_element: return field_element_obj(obj, fld->next, res); default:; } @@ -636,7 +636,7 @@ fld2str_req(s2, fld, 1); PCB_QRY_RET_STR(res, pcb_attribute_get(&p->Attributes, s2)); } - case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_COPPER | (TEST_FLAG(PCB_FLAG_ONSOLDER, p) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); + case query_fields_layer: return layer_of_obj(fld->next, res, PCB_LYT_COPPER | (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, p) ? PCB_LYT_BOTTOM : PCB_LYT_TOP)); case query_fields_element: return field_element_obj(obj, fld->next, res); default:; } Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 4875) +++ trunk/src_plugins/query/query_act.c (revision 4876) @@ -75,7 +75,7 @@ return; if (PCB_OBJ_IS_CLASS(current->type, PCB_OBJ_CLASS_OBJ)) { int state_wanted = (sel->how == PCB_CHGFLG_SET); - int state_is = TEST_FLAG(PCB_FLAG_SELECTED, current->data.anyobj); + int state_is = PCB_FLAG_TEST(PCB_FLAG_SELECTED, current->data.anyobj); if (state_wanted != state_is) { if (current->type == PCB_OBJ_ELEMENT) pcb_select_element(current->data.element, sel->how, 0); Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 4875) +++ trunk/src_plugins/renumber/renumber.c (revision 4876) @@ -144,7 +144,7 @@ lock_cnt = 0; ELEMENT_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_LOCK, element->Name) || TEST_FLAG(PCB_FLAG_LOCK, element)) { + if (PCB_FLAG_TEST(PCB_FLAG_LOCK, element->Name) || PCB_FLAG_TEST(PCB_FLAG_LOCK, element)) { /* * add to the list of locked elements which we won't try to * renumber and whose reference designators are now reserved. Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 4875) +++ trunk/src_plugins/renumber/renumberblock.c (revision 4876) @@ -55,7 +55,7 @@ char *old_ref, *new_ref; int num; - if (!TEST_FLAG(PCB_FLAG_SELECTED, element)) + if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) continue; old_ref = element->Name[1].TextString; Index: trunk/src_plugins/report/drill.c =================================================================== --- trunk/src_plugins/report/drill.c (revision 4875) +++ trunk/src_plugins/report/drill.c (revision 4876) @@ -63,7 +63,7 @@ } else Drill->ViaCount++; - if (TEST_FLAG(PCB_FLAG_HOLE, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin)) Drill->UnplatedCount++; } @@ -90,7 +90,7 @@ } else drill->ViaCount = 1; - if (TEST_FLAG(PCB_FLAG_HOLE, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) drill->UnplatedCount = 1; } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4875) +++ trunk/src_plugins/report/report.c (revision 4876) @@ -143,13 +143,13 @@ } #endif via = (pcb_pin_t *) ptr2; - if (TEST_FLAG(PCB_FLAG_HOLE, via)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, via)) report = pcb_strdup_printf("%m+VIA ID# %ld; Flags:%s\n" "(X,Y) = %$mD.\n" "It is a pure hole of diameter %$mS.\n" "Name = \"%s\"." "%s", USER_UNITMASK, via->ID, flags_to_string(via->Flags, PCB_TYPE_VIA), - via->X, via->Y, via->DrillingHole, EMPTY(via->Name), TEST_FLAG(PCB_FLAG_LOCK, via) ? "It is LOCKED.\n" : ""); + via->X, via->Y, via->DrillingHole, EMPTY(via->Name), PCB_FLAG_TEST(PCB_FLAG_LOCK, via) ? "It is LOCKED.\n" : ""); else report = pcb_strdup_printf("%m+VIA ID# %ld; Flags:%s\n" "(X,Y) = %$mD.\n" @@ -165,7 +165,7 @@ via->Clearance / 2, (via->Thickness - via->DrillingHole) / 2, via->Mask, - (via->Mask - via->Thickness) / 2, EMPTY(via->Name), TEST_FLAG(PCB_FLAG_LOCK, via) ? "It is LOCKED.\n" : ""); + (via->Mask - via->Thickness) / 2, EMPTY(via->Name), PCB_FLAG_TEST(PCB_FLAG_LOCK, via) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_PIN: @@ -187,7 +187,7 @@ break; } END_LOOP; - if (TEST_FLAG(PCB_FLAG_HOLE, Pin)) + if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin)) report = pcb_strdup_printf("%m+PIN ID# %ld; Flags:%s\n" "(X,Y) = %$mD.\n" "It is a mounting hole. Drill width = %$mS.\n" @@ -194,7 +194,7 @@ "It is owned by element %$mS.\n" "%s", USER_UNITMASK, Pin->ID, flags_to_string(Pin->Flags, PCB_TYPE_PIN), Pin->X, Pin->Y, Pin->DrillingHole, - EMPTY(element->Name[1].TextString), TEST_FLAG(PCB_FLAG_LOCK, Pin) ? "It is LOCKED.\n" : ""); + EMPTY(element->Name[1].TextString), PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) ? "It is LOCKED.\n" : ""); else report = pcb_strdup_printf( "%m+PIN ID# %ld; Flags:%s\n" "(X,Y) = %$mD.\n" @@ -213,7 +213,7 @@ Pin->Mask, (Pin->Mask - Pin->Thickness) / 2, EMPTY(Pin->Name), - EMPTY(element->Name[1].TextString), EMPTY(Pin->Number), TEST_FLAG(PCB_FLAG_LOCK, Pin) ? "It is LOCKED.\n" : ""); + EMPTY(element->Name[1].TextString), EMPTY(Pin->Number), PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_LINE: @@ -239,7 +239,7 @@ line->Point2.X, line->Point2.Y, line->Point2.ID, line->Thickness, line->Clearance / 2, GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), - UNKNOWN(line->Number), TEST_FLAG(PCB_FLAG_LOCK, line) ? "It is LOCKED.\n" : ""); + UNKNOWN(line->Number), PCB_FLAG_TEST(PCB_FLAG_LOCK, line) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_RATLINE: @@ -292,7 +292,7 @@ Arc->BoundingBox.X2, Arc->BoundingBox.Y2, box->X1, box->Y1, box->X2, box->Y2, - GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), TEST_FLAG(PCB_FLAG_LOCK, Arc) ? "It is LOCKED.\n" : ""); + GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_POLYGON: @@ -318,7 +318,7 @@ Polygon->BoundingBox.X2, Polygon->BoundingBox.Y2, Polygon->PointN, Polygon->PointMax - Polygon->PointN, Polygon->HoleIndexN, - GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), TEST_FLAG(PCB_FLAG_LOCK, Polygon) ? "It is LOCKED.\n" : ""); + GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_PAD: @@ -365,8 +365,8 @@ EMPTY(Pad->Name), EMPTY(element->Name[1].TextString), EMPTY(Pad->Number), - TEST_FLAG(PCB_FLAG_ONSOLDER, - Pad) ? "solder (bottom)" : "component", TEST_FLAG(PCB_FLAG_LOCK, Pad) ? "It is LOCKED.\n" : ""); + PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, + Pad) ? "solder (bottom)" : "component", PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_ELEMENT: @@ -396,10 +396,10 @@ EMPTY(element->Name[2].TextString), PCB_SCALE_TEXT(FONT_CAPHEIGHT, element->Name[1].Scale), element->Name[1].X, element->Name[1].Y, - TEST_FLAG(PCB_FLAG_HIDENAME, element) ? ",\n but it's hidden" : "", + PCB_FLAG_TEST(PCB_FLAG_HIDENAME, element) ? ",\n but it's hidden" : "", element->MarkX, element->MarkY, - TEST_FLAG(PCB_FLAG_ONSOLDER, element) ? "solder (bottom)" : "component", - TEST_FLAG(PCB_FLAG_LOCK, element) ? "It is LOCKED.\n" : ""); + PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? "solder (bottom)" : "component", + PCB_FLAG_TEST(PCB_FLAG_LOCK, element) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_TEXT: @@ -436,7 +436,7 @@ text->TextString, text->Direction, text->BoundingBox.X1, text->BoundingBox.Y1, text->BoundingBox.X2, text->BoundingBox.Y2, - (type == PCB_TYPE_TEXT) ? laynum : "It is an element name.", TEST_FLAG(PCB_FLAG_LOCK, text) ? "It is LOCKED.\n" : ""); + (type == PCB_TYPE_TEXT) ? laynum : "It is an element name.", PCB_FLAG_TEST(PCB_FLAG_LOCK, text) ? "It is LOCKED.\n" : ""); break; } case PCB_TYPE_LINE_POINT: @@ -483,13 +483,13 @@ { PIN_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_FOUND, pin)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) pcb_append_printf(&list, "%s-%s,%c", NAMEONPCB_NAME(element), pin->Number, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); } END_LOOP; PAD_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_FOUND, pad)) + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) pcb_append_printf(&list, "%s-%s,%c", NAMEONPCB_NAME(element), pad->Number, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' '); } END_LOOP; @@ -519,7 +519,7 @@ ALLLINE_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, line)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line)) { double l; int dx, dy; dx = line->Point1.X - line->Point2.X; @@ -533,7 +533,7 @@ ALLARC_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_FOUND, arc)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc)) { double l; /* FIXME: we assume width==height here */ l = M_PI * 2 * arc->Width * fabs(arc->Delta) / 360.0; @@ -660,7 +660,7 @@ { PIN_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_FOUND, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) { int ni, nei; char *ename = element->Name[NAMEONPCB_INDEX].TextString; char *pname = pin->Number; @@ -681,7 +681,7 @@ END_LOOP; PAD_LOOP(element); { - if (TEST_FLAG(PCB_FLAG_FOUND, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) { int ni, nei; char *ename = element->Name[NAMEONPCB_INDEX].TextString; char *pname = pad->Number; Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4875) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4876) @@ -171,7 +171,7 @@ /* if we're not doing all, mark the unselected elements as "visited" */ ELEMENT_LOOP(PCB->Data); { - if (!(all || TEST_FLAG(PCB_FLAG_SELECTED, element))) { + if (!(all || PCB_FLAG_TEST(PCB_FLAG_SELECTED, element))) { set_visited(element); } } Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4875) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4876) @@ -598,7 +598,7 @@ else { if (box->type == PIN || box->type == VIA) { pcb_pin_t *pin = (pcb_pin_t *) box->data; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin) || TEST_FLAG(PCB_FLAG_OCTAGON, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pin)) { return 0.; } /* return ((pcb_pin_t *)box->data)->Thickness + 1.;*/ @@ -606,7 +606,7 @@ } else if (box->type == PAD) { pcb_pad_t *pad = (pcb_pad_t *) box->data; - if (pad->Point1.X == pad->Point2.X && pad->Point1.Y == pad->Point2.Y && !TEST_FLAG(PCB_FLAG_SQUARE, pad)) { + if (pad->Point1.X == pad->Point2.X && pad->Point1.Y == pad->Point2.Y && !PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad)) { return pad->Thickness; } return 0.; @@ -1818,7 +1818,7 @@ { PAD_LOOP(element); { - if ((l - r->layers == back && TEST_FLAG(PCB_FLAG_ONSOLDER, pad)) || (l - r->layers == front && !TEST_FLAG(PCB_FLAG_ONSOLDER, pad))) { + if ((l - r->layers == back && PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad)) || (l - r->layers == front && !PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad))) { t = (gdouble) pad->Thickness / 2.0f; x[0] = pad->Point1.X; @@ -1827,7 +1827,7 @@ y[1] = pad->Point2.Y; - if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pad)) { /* Square or oblong pad. Four points and four constraint edges are * used */ @@ -1986,7 +1986,7 @@ x = pin->X; y = pin->Y; - if (TEST_FLAG(PCB_FLAG_SQUARE, pin)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, pin)) { vlist = rect_with_attachments(pin_rad(pin), x - t, y - t, x - t, y + t, x + t, y + t, x + t, y - t, l - r->layers); bbox = toporouter_bbox_create(l - r->layers, vlist, PIN, pin); @@ -1996,7 +1996,7 @@ bbox->point = GTS_POINT(insert_vertex(r, l, x, y, bbox)); } - else if (TEST_FLAG(PCB_FLAG_OCTAGON, pin)) { + else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pin)) { /* TODO: Handle octagon pins */ fprintf(stderr, "No support for octagon pins yet\n"); } @@ -2019,7 +2019,7 @@ x = via->X; y = via->Y; - if (TEST_FLAG(PCB_FLAG_SQUARE, via)) { + if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, via)) { vlist = rect_with_attachments(pin_rad((pcb_pin_t *) via), x - t, y - t, x - t, y + t, x + t, y + t, x + t, y - t, l - r->layers); @@ -2030,7 +2030,7 @@ bbox->point = GTS_POINT(insert_vertex(r, l, x, y, bbox)); } - else if (TEST_FLAG(PCB_FLAG_OCTAGON, via)) { + else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, via)) { /* TODO: Handle octagon vias */ fprintf(stderr, "No support for octagon vias yet\n"); } @@ -5532,7 +5532,7 @@ gdouble d = 0.; pcb_line_t *line; line = CreateDrawnLineOnLayer(LAYER_PTR(layer), x0, y0, x1, y1, - thickness, clearance, pcb_flag_make(PCB_FLAG_AUTO | (TEST_FLAG(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); + thickness, clearance, pcb_flag_make(PCB_FLAG_AUTO | (PCB_FLAG_TEST(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); if (line) { AddObjectToCreateUndoList(PCB_TYPE_LINE, LAYER_PTR(layer), line, line); @@ -5581,7 +5581,7 @@ arc = CreateNewArcOnLayer(LAYER_PTR(layer), vx(a->centre), vy(a->centre), a->r, a->r, sa, da, thickness, clearance, - pcb_flag_make(PCB_FLAG_AUTO | (TEST_FLAG(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); + pcb_flag_make(PCB_FLAG_AUTO | (PCB_FLAG_TEST(CLEARNEWFLAG, PCB) ? PCB_FLAG_CLEARLINE : 0))); if (arc) { AddObjectToCreateUndoList(PCB_TYPE_ARC, LAYER_PTR(layer), arc, arc); @@ -8065,7 +8065,7 @@ void acquire_twonets(toporouter_t * r) { RAT_LOOP(PCB->Data); - if (TEST_FLAG(PCB_FLAG_SELECTED, line)) + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) import_route(r, line); END_LOOP; @@ -8147,7 +8147,7 @@ ALLPAD_LOOP(PCB->Data); { - if (TEST_FLAG(PCB_FLAG_SELECTED, pad)) { + if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad)) { pcb_pin_t *via; pcb_line_t *line; Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 4875) +++ trunk/src_plugins/vendordrill/vendor.c (revision 4876) @@ -321,7 +321,7 @@ tot++; if (via->DrillingHole != vendorDrillMap(via->DrillingHole)) { /* only change unlocked vias */ - if (!TEST_FLAG(PCB_FLAG_LOCK, via)) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) { if (pcb_chg_obj_2nd_size(PCB_TYPE_VIA, via, NULL, NULL, vendorDrillMap(via->DrillingHole), pcb_true, pcb_false)) changed++; else { @@ -351,7 +351,7 @@ { tot++; if (pin->DrillingHole != vendorDrillMap(pin->DrillingHole)) { - if (!TEST_FLAG(PCB_FLAG_LOCK, pin)) { + if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, pin)) { if (pcb_chg_obj_2nd_size(PCB_TYPE_PIN, element, pin, NULL, vendorDrillMap(pin->DrillingHole), pcb_true, pcb_false)) changed++; else { @@ -605,7 +605,7 @@ } } - if (noskip && TEST_FLAG(PCB_FLAG_LOCK, element)) { + if (noskip && PCB_FLAG_TEST(PCB_FLAG_LOCK, element)) { pcb_message(PCB_MSG_DEFAULT, _("Vendor mapping skipped because element %s is locked\n"), UNKNOWN(NAMEONPCB_NAME(element))); noskip = 0; } Index: trunk/tests/strflags/tester.c =================================================================== --- trunk/tests/strflags/tester.c (revision 4875) +++ trunk/tests/strflags/tester.c (revision 4876) @@ -45,7 +45,7 @@ } -int mem_any_set(unsigned char *ptr, int bytes) +int pcb_mem_any_set(unsigned char *ptr, int bytes) { while (bytes--) if (*ptr++) @@ -88,7 +88,7 @@ otype = PCB_TYPEMASK_ALL; fh.Flags = empty_flags; for (i = 0; i < ENTRIES(object_flagbits); i++) { - if (TEST_FLAG(object_flagbits[i].mask, &fh)) + if (PCB_FLAG_TEST(object_flagbits[i].mask, &fh)) continue; if ((otype & object_flagbits[i].object_types) == 0) continue; @@ -96,7 +96,7 @@ continue; otype &= object_flagbits[i].object_types; - SET_FLAG(object_flagbits[i].mask, &fh); + PCB_FLAG_SET(object_flagbits[i].mask, &fh); } if (otype & PCB_TYPEMASK_PIN) @@ -128,13 +128,13 @@ otype = PCB_TYPEMASK_ALL; fh.Flags = empty_flags; for (i = 0; i < ENTRIES(pcb_flagbits); i++) { - if (TEST_FLAG(pcb_flagbits[i].mask, &fh)) + if (PCB_FLAG_TEST(pcb_flagbits[i].mask, &fh)) continue; if ((random() & 4) == 0) continue; otype &= pcb_flagbits[i].object_types; - SET_FLAG(pcb_flagbits[i].mask, &fh); + PCB_FLAG_SET(pcb_flagbits[i].mask, &fh); } str = pcbflags_to_string(fh.Flags);