Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 10649) +++ trunk/doc/developer/renames (revision 10650) @@ -1718,3 +1718,17 @@ draw_pad -> pcb_pad_draw ErasePad -> pcb_pad_invalidate_erase DrawPad -> pcb_pad_invalidate_draw +draw_pin_name_callback -> pcb_pin_name_draw_callback +EraseViaName -> pcb_via_name_invalidate_erase +ErasePinName -> pcb_pin_name_invalidate_erase +DrawViaName -> pcb_via_name_invalidate_draw +DrawPinName -> pcb_pin_name_invalidate_draw +draw_pin_callback -> pcb_pin_draw_callback +clear_pin_callback -> pcb_pin_clear_callback +draw_via_callback -> pcb_via_draw_callback +draw_hole_callback -> pcb_hole_draw_callback +draw_pin -> pcb_pin_draw +EraseVia -> pcb_via_invalidate_erase +ErasePin -> pcb_pin_invalidate_erase +DrawVia -> pcb_via_invalidate_draw +DrawPin -> pcb_pin_invalidate_draw Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 10649) +++ trunk/src/action_helper.c (revision 10650) @@ -242,7 +242,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_WARN, pin)) { PCB_FLAG_CLEAR(PCB_FLAG_WARN, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } } PCB_ENDALL_LOOP; @@ -250,7 +250,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_WARN, via)) { PCB_FLAG_CLEAR(PCB_FLAG_WARN, via); - DrawVia(via); + pcb_via_invalidate_draw(via); } } PCB_END_LOOP; @@ -602,7 +602,7 @@ if (pcb_gui->shift_is_pressed()) pcb_chg_obj_thermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle); pcb_undo_inc_serial(); - DrawVia(via); + pcb_via_invalidate_draw(via); pcb_draw(); } break; @@ -798,7 +798,7 @@ } if(via) - DrawVia(via); + pcb_via_invalidate_draw(via); pcb_draw(); pcb_undo_inc_serial(); @@ -866,7 +866,7 @@ 2 * conf_core.design.clearance, 0, conf_core.design.via_drilling_hole, NULL, pcb_no_flags())) != NULL) { pcb_obj_add_attribs(via, PCB->pen_attr); pcb_undo_add_obj_to_create(PCB_TYPE_VIA, via, via, via); - DrawVia(via); + pcb_via_invalidate_draw(via); } /* copy the coordinates */ pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 10649) +++ trunk/src/draw.c (revision 10650) @@ -166,8 +166,8 @@ if (!draw_plated && draw_unplated) plated = 0; - pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, draw_hole_callback, &plated, NULL); - pcb_r_search(PCB->Data->via_tree, drawn_area, NULL, draw_hole_callback, &plated, NULL); + pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, pcb_hole_draw_callback, &plated, NULL); + pcb_r_search(PCB->Data->via_tree, drawn_area, NULL, pcb_hole_draw_callback, &plated, NULL); } static void DrawEverything_holes(const pcb_box_t * drawn_area) @@ -363,7 +363,7 @@ if (PCB->PinOn || !pcb_gui->gui) { /* draw element pins */ - pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, draw_pin_callback, NULL, NULL); + pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, pcb_pin_draw_callback, NULL, NULL); /* draw element pads */ if (gflg & PCB_LYT_TOP) { @@ -379,11 +379,11 @@ /* draw vias */ if (PCB->ViaOn || !pcb_gui->gui) { - pcb_r_search(PCB->Data->via_tree, drawn_area, NULL, draw_via_callback, NULL, NULL); - pcb_r_search(PCB->Data->via_tree, drawn_area, NULL, draw_hole_callback, NULL, NULL); + pcb_r_search(PCB->Data->via_tree, drawn_area, NULL, pcb_via_draw_callback, NULL, NULL); + pcb_r_search(PCB->Data->via_tree, drawn_area, NULL, pcb_hole_draw_callback, NULL, NULL); } if (PCB->PinOn || pcb_draw_doing_assy) - pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, draw_hole_callback, NULL, NULL); + pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, pcb_hole_draw_callback, NULL, NULL); } /* --------------------------------------------------------------------------- @@ -397,7 +397,7 @@ if (PCB->PinOn || !pcb_gui->gui) { /* draw element pins' names */ - pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, draw_pin_name_callback, NULL, NULL); + pcb_r_search(PCB->Data->pin_tree, drawn_area, NULL, pcb_pin_name_draw_callback, NULL, NULL); /* draw element pads' names */ if (gflg & PCB_LYT_TOP) { @@ -496,7 +496,7 @@ switch (type) { case PCB_TYPE_VIA: case PCB_TYPE_PIN: - ErasePin((pcb_pin_t *) ptr); + pcb_pin_invalidate_erase((pcb_pin_t *) ptr); break; case PCB_TYPE_TEXT: case PCB_TYPE_ELEMENT_NAME: @@ -534,7 +534,7 @@ switch (type) { case PCB_TYPE_VIA: if (PCB->ViaOn) - DrawVia((pcb_pin_t *) ptr2); + pcb_via_invalidate_draw((pcb_pin_t *) ptr2); break; case PCB_TYPE_LINE: if (((pcb_layer_t *) ptr1)->meta.real.vis) @@ -562,7 +562,7 @@ break; case PCB_TYPE_PIN: if (PCB->PinOn) - DrawPin((pcb_pin_t *) ptr2); + pcb_pin_invalidate_draw((pcb_pin_t *) ptr2); break; case PCB_TYPE_PAD: if (PCB->PinOn) Index: trunk/src/draw_ly_spec.c =================================================================== --- trunk/src/draw_ly_spec.c (revision 10649) +++ trunk/src/draw_ly_spec.c (revision 10650) @@ -64,8 +64,8 @@ /******** mask ********/ static void pcb_draw_mask_auto(comp_ctx_t *ctx, void *side) { - pcb_r_search(PCB->Data->pin_tree, ctx->screen, NULL, clear_pin_callback, NULL, NULL); - pcb_r_search(PCB->Data->via_tree, ctx->screen, NULL, clear_pin_callback, NULL, NULL); + pcb_r_search(PCB->Data->pin_tree, ctx->screen, NULL, pcb_pin_clear_callback, NULL, NULL); + pcb_r_search(PCB->Data->via_tree, ctx->screen, NULL, pcb_pin_clear_callback, NULL, NULL); pcb_r_search(PCB->Data->pad_tree, ctx->screen, NULL, pcb_pad_clear_callback, side, NULL); } Index: trunk/src/find_clear.c =================================================================== --- trunk/src/find_clear.c (revision 10649) +++ trunk/src/find_clear.c (revision 10650) @@ -37,7 +37,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_CLEAR(flag, via); if (AndDraw) - DrawVia(via); + pcb_via_invalidate_draw(via); change = pcb_true; } } @@ -51,7 +51,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_CLEAR(flag, pin); if (AndDraw) - DrawPin(pin); + pcb_pin_invalidate_draw(pin); change = pcb_true; } } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 10649) +++ trunk/src/find_drc.c (revision 10650) @@ -465,7 +465,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) && pin->Thickness - pin->DrillingHole < 2 * PCB->minRing) { pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_SET(TheFlag, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); drcerr_count++; SetThing(PCB_TYPE_PIN, element, pin, pin); LocateError(&x, &y); @@ -488,7 +488,7 @@ if (pin->DrillingHole < PCB->minDrill) { pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_SET(TheFlag, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); drcerr_count++; SetThing(PCB_TYPE_PIN, element, pin, pin); LocateError(&x, &y); @@ -550,7 +550,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, via) && via->Thickness - via->DrillingHole < 2 * PCB->minRing) { pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_SET(TheFlag, via); - DrawVia(via); + pcb_via_invalidate_draw(via); drcerr_count++; SetThing(PCB_TYPE_VIA, via, via, via); LocateError(&x, &y); @@ -573,7 +573,7 @@ if (via->DrillingHole < PCB->minDrill) { pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_SET(TheFlag, via); - DrawVia(via); + pcb_via_invalidate_draw(via); drcerr_count++; SetThing(PCB_TYPE_VIA, via, via, via); LocateError(&x, &y); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 10649) +++ trunk/src/find_misc.c (revision 10650) @@ -129,10 +129,10 @@ if (PCB_FLAG_TEST(PCB_FLAG_PIN, pv)) { if (PCB->PinOn) - DrawPin(pv); + pcb_pin_invalidate_draw(pv); } else if (PCB->ViaOn) - DrawVia(pv); + pcb_via_invalidate_draw(pv); PVList.DrawLocation++; } /* draw the new rat-lines */ @@ -343,7 +343,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_CLEAR(TheFlag, via); if (AndDraw) - DrawVia(via); + pcb_via_invalidate_draw(via); change = pcb_true; } } @@ -357,7 +357,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_CLEAR(TheFlag, pin); if (AndDraw) - DrawPin(pin); + pcb_pin_invalidate_draw(pin); change = pcb_true; } } Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 10649) +++ trunk/src/find_print.c (revision 10650) @@ -67,7 +67,7 @@ pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pin->Name)); fputc('\n', FP); PCB_FLAG_SET(PCB_FLAG_SELECTED, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } /* reset found objects for the next pin */ Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 10649) +++ trunk/src/gui_act.c (revision 10650) @@ -461,9 +461,9 @@ PCB_PIN_LOOP((pcb_element_t *) ptr1); { if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pin)) - ErasePinName(pin); + pcb_pin_name_invalidate_erase(pin); else - DrawPinName(pin); + pcb_pin_name_invalidate_draw(pin); pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, ptr1, pin, pin); PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, pin); } @@ -485,9 +485,9 @@ case PCB_TYPE_PIN: if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) - ErasePinName((pcb_pin_t *) ptr2); + pcb_pin_name_invalidate_erase((pcb_pin_t *) ptr2); else - DrawPinName((pcb_pin_t *) ptr2); + pcb_pin_name_invalidate_draw((pcb_pin_t *) ptr2); pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, ptr1, ptr2, ptr3); PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); pcb_board_set_changed_flag(pcb_true); @@ -508,9 +508,9 @@ break; case PCB_TYPE_VIA: if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) - EraseViaName((pcb_pin_t *) ptr2); + pcb_via_name_invalidate_erase((pcb_pin_t *) ptr2); else - DrawViaName((pcb_pin_t *) ptr2); + pcb_via_name_invalidate_draw((pcb_pin_t *) ptr2); pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, ptr1, ptr2, ptr3); PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); pcb_board_set_changed_flag(pcb_true); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 10649) +++ trunk/src/obj_elem.c (revision 10650) @@ -1343,7 +1343,7 @@ && value != pin->DrillingHole) { changed = pcb_true; pcb_undo_add_obj_to_2nd_size(PCB_TYPE_PIN, Element, pin, pin); - ErasePin(pin); + pcb_pin_invalidate_erase(pin); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, pin); pin->DrillingHole = value; if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { @@ -1351,7 +1351,7 @@ pin->Thickness = value; } pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } } PCB_END_LOOP; @@ -1375,7 +1375,7 @@ if (value <= PCB_MAX_PINORVIASIZE && value >= pin->DrillingHole + PCB_MIN_PINORVIACOPPER && value != pin->Thickness) { changed = pcb_true; pcb_undo_add_obj_to_size(PCB_TYPE_PIN, Element, pin, pin); - ErasePin(pin); + pcb_pin_invalidate_erase(pin); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, pin); pin->Thickness = value; if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { @@ -1383,7 +1383,7 @@ pin->Thickness = value; } pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } } PCB_END_LOOP; @@ -1409,7 +1409,7 @@ && value != pin->Clearance) { changed = pcb_true; pcb_undo_add_obj_to_clear_size(PCB_TYPE_PIN, Element, pin, pin); - ErasePin(pin); + pcb_pin_invalidate_erase(pin); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, pin); pin->Clearance = value; if (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin)) { @@ -1417,7 +1417,7 @@ pin->Thickness = value; } pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } } PCB_END_LOOP; @@ -1852,7 +1852,7 @@ PCB_END_LOOP; PCB_PIN_LOOP(element); { - draw_pin(pin, pcb_true); + pcb_pin_draw(pin, pcb_true); } PCB_END_LOOP; } @@ -1967,7 +1967,7 @@ { PCB_PIN_LOOP(Element); { - ErasePin(pin); + pcb_pin_invalidate_erase(pin); } PCB_END_LOOP; PCB_PAD_LOOP(Element); @@ -2023,7 +2023,7 @@ PCB_END_LOOP; PCB_PIN_LOOP(Element); { - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } PCB_END_LOOP; } Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 10649) +++ trunk/src/obj_line.c (revision 10650) @@ -570,7 +570,7 @@ pcb_via_new(PCB->Data, i->X, i->Y, conf_core.design.via_thickness, 2 * conf_core.design.clearance, PCB_FLAG_NO, conf_core.design.via_drilling_hole, NULL, pcb_no_flags())) != NULL) { pcb_undo_add_obj_to_create(PCB_TYPE_VIA, via, via, via); - DrawVia(via); + pcb_via_invalidate_draw(via); } longjmp(i->env, 1); } Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 10649) +++ trunk/src/obj_pinvia.c (revision 10650) @@ -388,7 +388,7 @@ PCB_FLAG_THERM_ASSIGN(INDEXOFCURRENT, ctx->chgtherm.style, Via); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, Via, Via, Via, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, CURRENT, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); return Via; } @@ -404,7 +404,7 @@ PCB_FLAG_THERM_ASSIGN(INDEXOFCURRENT, ctx->chgtherm.style, Pin); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, element, Pin, Pin, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, CURRENT, Pin); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return Pin; } @@ -418,7 +418,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && value <= PCB_MAX_PINORVIASIZE && value >= PCB_MIN_PINORVIASIZE && value >= Via->DrillingHole + PCB_MIN_PINORVIACOPPER && value != Via->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_VIA, Via, Via, Via); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_r_delete_entry(PCB->Data->via_tree, (pcb_box_t *) Via); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Via, Via); if (Via->Mask) { @@ -429,7 +429,7 @@ pcb_pin_bbox(Via); pcb_r_insert_entry(PCB->Data->via_tree, (pcb_box_t *) Via, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); return (Via); } return (NULL); @@ -446,7 +446,7 @@ value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) || value <= Via->Thickness - PCB_MIN_PINORVIACOPPER) && value != Via->DrillingHole) { pcb_undo_add_obj_to_2nd_size(PCB_TYPE_VIA, Via, Via, Via); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); Via->DrillingHole = value; if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via)) { @@ -454,7 +454,7 @@ Via->Thickness = value; } pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); return (Via); } return (NULL); @@ -471,7 +471,7 @@ value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) || value <= Pin->Thickness - PCB_MIN_PINORVIACOPPER) && value != Pin->DrillingHole) { pcb_undo_add_obj_to_2nd_size(PCB_TYPE_PIN, Element, Pin, Pin); - ErasePin(Pin); + pcb_pin_invalidate_erase(Pin); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); Pin->DrillingHole = value; if (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin)) { @@ -479,7 +479,7 @@ Pin->Thickness = value; } pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return (Pin); } return (NULL); @@ -504,13 +504,13 @@ return NULL; pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); pcb_undo_add_obj_to_clear_size(PCB_TYPE_VIA, Via, Via, Via); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_r_delete_entry(PCB->Data->via_tree, (pcb_box_t *) Via); Via->Clearance = value; pcb_pin_bbox(Via); pcb_r_insert_entry(PCB->Data->via_tree, (pcb_box_t *) Via, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); Via->Element = NULL; return (Via); } @@ -527,7 +527,7 @@ value >= PCB_MIN_PINORVIASIZE && value >= Pin->DrillingHole + PCB_MIN_PINORVIACOPPER && value != Pin->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_PIN, Element, Pin, Pin); pcb_undo_add_obj_to_mask_size(PCB_TYPE_PIN, Element, Pin, Pin); - ErasePin(Pin); + pcb_pin_invalidate_erase(Pin); pcb_r_delete_entry(PCB->Data->pin_tree, &Pin->BoundingBox); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); Pin->Mask += value - Pin->Thickness; @@ -535,7 +535,7 @@ /* SetElementBB updates all associated rtrees */ pcb_element_bbox(PCB->Data, Element, pcb_font(PCB, 0, 1)); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return (Pin); } return (NULL); @@ -559,13 +559,13 @@ return NULL; pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); pcb_undo_add_obj_to_clear_size(PCB_TYPE_PIN, Element, Pin, Pin); - ErasePin(Pin); + pcb_pin_invalidate_erase(Pin); pcb_r_delete_entry(PCB->Data->pin_tree, &Pin->BoundingBox); Pin->Clearance = value; /* SetElementBB updates all associated rtrees */ pcb_element_bbox(PCB->Data, Element, pcb_font(PCB, 0, 1)); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return (Pin); } @@ -575,9 +575,9 @@ char *old = Via->Name; if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) { - ErasePinName(Via); + pcb_pin_name_invalidate_erase(Via); Via->Name = ctx->chgname.new_name; - DrawPinName(Via); + pcb_pin_name_invalidate_draw(Via); } else Via->Name = ctx->chgname.new_name; @@ -591,9 +591,9 @@ Element = Element; /* get rid of 'unused...' warnings */ if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) { - ErasePinName(Pin); + pcb_pin_name_invalidate_erase(Pin); Pin->Name = ctx->chgname.new_name; - DrawPinName(Pin); + pcb_pin_name_invalidate_draw(Pin); } else Pin->Name = ctx->chgname.new_name; @@ -607,9 +607,9 @@ Element = Element; /* get rid of 'unused...' warnings */ if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) { - ErasePinName(Pin); + pcb_pin_name_invalidate_erase(Pin); Pin->Number = ctx->chgname.new_name; - DrawPinName(Pin); + pcb_pin_name_invalidate_draw(Pin); } else Pin->Number = ctx->chgname.new_name; @@ -622,7 +622,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, NULL, Via, Via, pcb_false); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, NULL, Via); pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, NULL, Via, Via); @@ -634,7 +634,7 @@ pcb_pin_bbox(Via); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, NULL, Via, Via, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, NULL, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); return (Via); } @@ -643,7 +643,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); - ErasePin(Pin); + pcb_pin_invalidate_erase(Pin); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, Element, Pin, Pin); @@ -655,7 +655,7 @@ pcb_pin_bbox(Pin); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, Element, Pin, Pin, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return (Pin); } @@ -682,7 +682,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, Via, Via, Via, pcb_false); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, Via, Via, Via); @@ -689,7 +689,7 @@ PCB_FLAG_TOGGLE(PCB_FLAG_OCTAGON, Via); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, Via, Via, Via, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); return (Via); } @@ -716,7 +716,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); - ErasePin(Pin); + pcb_pin_invalidate_erase(Pin); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, Element, Pin, Pin); @@ -723,7 +723,7 @@ PCB_FLAG_TOGGLE(PCB_FLAG_OCTAGON, Pin); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, Element, Pin, Pin, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return (Pin); } @@ -750,7 +750,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (pcb_false); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, Via, Via, Via); pcb_undo_add_obj_to_mask_size(PCB_TYPE_VIA, Via, Via, Via); pcb_r_delete_entry(PCB->Data->via_tree, (pcb_box_t *) Via); @@ -774,7 +774,7 @@ pcb_pin_bbox(Via); pcb_r_insert_entry(PCB->Data->via_tree, (pcb_box_t *) Via, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); - DrawVia(Via); + pcb_via_invalidate_draw(Via); pcb_draw(); return (pcb_true); } @@ -789,11 +789,11 @@ value = Pin->Thickness; if (value != Pin->Mask) { pcb_undo_add_obj_to_mask_size(PCB_TYPE_PIN, Element, Pin, Pin); - ErasePin(Pin); + pcb_pin_invalidate_erase(Pin); pcb_r_delete_entry(PCB->Data->pin_tree, &Pin->BoundingBox); Pin->Mask = value; pcb_element_bbox(PCB->Data, Element, pcb_font(PCB, 0, 1)); - DrawPin(Pin); + pcb_pin_invalidate_draw(Pin); return (Pin); } return (NULL); @@ -808,12 +808,12 @@ value = MAX(value, 0); if (value != Via->Mask) { pcb_undo_add_obj_to_mask_size(PCB_TYPE_VIA, Via, Via, Via); - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_r_delete_entry(PCB->Data->via_tree, &Via->BoundingBox); Via->Mask = value; pcb_pin_bbox(Via); pcb_r_insert_entry(PCB->Data->via_tree, &Via->BoundingBox, 0); - DrawVia(Via); + pcb_via_invalidate_draw(Via); return (Via); } return (NULL); @@ -828,7 +828,7 @@ Via->Thickness, Via->Clearance, Via->Mask, Via->DrillingHole, Via->Name, pcb_flag_mask(Via->Flags, PCB_FLAG_FOUND)); if (!via) return (via); - DrawVia(via); + pcb_via_invalidate_draw(via); pcb_undo_add_obj_to_create(PCB_TYPE_VIA, via, via, via); return (via); } @@ -840,11 +840,11 @@ pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); pcb_via_move(Via, ctx->move.dx, ctx->move.dy); if (PCB->ViaOn) - EraseVia(Via); + pcb_via_invalidate_erase(Via); pcb_r_insert_entry(PCB->Data->via_tree, (pcb_box_t *) Via, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via); if (PCB->ViaOn) { - DrawVia(Via); + pcb_via_invalidate_draw(Via); pcb_draw(); } return (Via); @@ -865,7 +865,7 @@ { /* erase from screen and memory */ if (PCB->ViaOn) { - EraseVia(Via); + pcb_via_invalidate_erase(Via); if (!ctx->remove.bulk) pcb_draw(); } @@ -879,7 +879,7 @@ pcb_data_t *data = via->parent.data; assert(via->parent_type == PCB_PARENT_DATA); - EraseVia(via); + pcb_via_invalidate_erase(via); if (data->via_tree != NULL) { pcb_poly_restore_to_poly(ctx->rotate.pcb->Data, PCB_TYPE_VIA, via, via); pcb_r_delete_entry(data->via_tree, (pcb_box_t *)via); @@ -890,7 +890,7 @@ pcb_r_insert_entry(data->via_tree, (pcb_box_t *)via, 0); pcb_poly_clear_from_poly(ctx->rotate.pcb->Data, PCB_TYPE_VIA, via, via); } - DrawVia(via); + pcb_via_invalidate_draw(via); return via; } @@ -1025,15 +1025,15 @@ _draw_pv_name(pv); } -void draw_pin(pcb_pin_t *pin, pcb_bool draw_hole) +void pcb_pin_draw(pcb_pin_t *pin, pcb_bool draw_hole) { SetPVColor(pin, PCB_TYPE_PIN); _draw_pv(pin, draw_hole); } -pcb_r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_pin_draw_callback(const pcb_box_t * b, void *cl) { - draw_pin((pcb_pin_t *) b, pcb_false); + pcb_pin_draw((pcb_pin_t *) b, pcb_false); return PCB_R_DIR_FOUND_CONTINUE; } @@ -1043,13 +1043,13 @@ _draw_pv_name(pin); } -pcb_r_dir_t draw_pin_name_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_pin_name_draw_callback(const pcb_box_t * b, void *cl) { draw_pin_name((pcb_pin_t *) b); return PCB_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_pin_clear_callback(const pcb_box_t * b, void *cl) { pcb_pin_t *pin = (pcb_pin_t *) b; if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) @@ -1066,7 +1066,7 @@ _draw_pv(via, draw_hole); } -pcb_r_dir_t draw_via_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_via_draw_callback(const pcb_box_t * b, void *cl) { pcb_pin_t *via = (pcb_pin_t *)b; @@ -1075,7 +1075,7 @@ return PCB_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_hole_draw_callback(const pcb_box_t * b, void *cl) { pcb_pin_t *pv = (pcb_pin_t *) b; int plated = cl ? *(int *) cl : -1; @@ -1145,53 +1145,53 @@ pcb_draw_invalidate(&box); } -void EraseVia(pcb_pin_t *Via) +void pcb_via_invalidate_erase(pcb_pin_t *Via) { pcb_draw_invalidate(Via); if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) - EraseViaName(Via); + pcb_via_name_invalidate_erase(Via); pcb_flag_erase(&Via->Flags); } -void EraseViaName(pcb_pin_t *Via) +void pcb_via_name_invalidate_erase(pcb_pin_t *Via) { GatherPVName(Via); } -void ErasePin(pcb_pin_t *Pin) +void pcb_pin_invalidate_erase(pcb_pin_t *Pin) { pcb_draw_invalidate(Pin); if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) - ErasePinName(Pin); + pcb_pin_name_invalidate_erase(Pin); pcb_flag_erase(&Pin->Flags); } -void ErasePinName(pcb_pin_t *Pin) +void pcb_pin_name_invalidate_erase(pcb_pin_t *Pin) { GatherPVName(Pin); } -void DrawVia(pcb_pin_t *Via) +void pcb_via_invalidate_draw(pcb_pin_t *Via) { pcb_draw_invalidate(Via); if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Via)) - DrawViaName(Via); + pcb_via_name_invalidate_draw(Via); } -void DrawViaName(pcb_pin_t *Via) +void pcb_via_name_invalidate_draw(pcb_pin_t *Via) { GatherPVName(Via); } -void DrawPin(pcb_pin_t *Pin) +void pcb_pin_invalidate_draw(pcb_pin_t *Pin) { pcb_draw_invalidate(Pin); if ((!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pin)) || pcb_draw_doing_pinout) - DrawPinName(Pin); + pcb_pin_name_invalidate_draw(Pin); } -void DrawPinName(pcb_pin_t *Pin) +void pcb_pin_name_invalidate_draw(pcb_pin_t *Pin) { GatherPVName(Pin); } Index: trunk/src/obj_pinvia_draw.h =================================================================== --- trunk/src/obj_pinvia_draw.h (revision 10649) +++ trunk/src/obj_pinvia_draw.h (revision 10650) @@ -28,20 +28,20 @@ /* Include rtree.h for these */ #ifdef PCB_RTREE_H -pcb_r_dir_t draw_pin_callback(const pcb_box_t * b, void *cl); -pcb_r_dir_t draw_pin_name_callback(const pcb_box_t * b, void *cl); -pcb_r_dir_t clear_pin_callback(const pcb_box_t * b, void *cl); -pcb_r_dir_t draw_via_callback(const pcb_box_t * b, void *cl); -pcb_r_dir_t draw_hole_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_pin_draw_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_pin_name_draw_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_pin_clear_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_via_draw_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_hole_draw_callback(const pcb_box_t * b, void *cl); #endif -void draw_pin(pcb_pin_t *pin, pcb_bool draw_hole); -void EraseVia(pcb_pin_t *Via); -void EraseViaName(pcb_pin_t *Via); -void ErasePin(pcb_pin_t *Pin); -void ErasePinName(pcb_pin_t *Pin); -void DrawVia(pcb_pin_t *Via); -void DrawViaName(pcb_pin_t *Via); -void DrawPin(pcb_pin_t *Pin); -void DrawPinName(pcb_pin_t *Pin); +void pcb_pin_draw(pcb_pin_t *pin, pcb_bool draw_hole); +void pcb_via_invalidate_erase(pcb_pin_t *Via); +void pcb_via_name_invalidate_erase(pcb_pin_t *Via); +void pcb_pin_invalidate_erase(pcb_pin_t *Pin); +void pcb_pin_name_invalidate_erase(pcb_pin_t *Pin); +void pcb_via_invalidate_draw(pcb_pin_t *Via); +void pcb_via_name_invalidate_draw(pcb_pin_t *Via); +void pcb_pin_invalidate_draw(pcb_pin_t *Pin); +void pcb_pin_name_invalidate_draw(pcb_pin_t *Pin); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 10649) +++ trunk/src/select.c (revision 10650) @@ -122,7 +122,7 @@ case PCB_TYPE_VIA: pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, ptr1, ptr1, ptr1); PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr1); - DrawVia((pcb_pin_t *) ptr1); + pcb_via_invalidate_draw((pcb_pin_t *) ptr1); break; case PCB_TYPE_LINE: @@ -183,7 +183,7 @@ case PCB_TYPE_PIN: pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, ptr1, ptr2, ptr2); PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pin_t *) ptr2); - DrawPin((pcb_pin_t *) ptr2); + pcb_pin_invalidate_draw((pcb_pin_t *) ptr2); break; case PCB_TYPE_PAD: @@ -418,7 +418,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin) != Flag) { append(PCB_TYPE_PIN, element, pin); if (pcb->PinOn) - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } } PCB_END_LOOP; @@ -443,7 +443,7 @@ && PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin) != Flag)) { append(PCB_TYPE_PIN, element, pin); if (pcb->PinOn) - DrawPin(pin); + pcb_pin_invalidate_draw(pin); } } PCB_END_LOOP; @@ -471,7 +471,7 @@ && PCB_FLAG_TEST(PCB_FLAG_SELECTED, via) != Flag) { append(PCB_TYPE_VIA, via, via); if (pcb->ViaOn) - DrawVia(via); + pcb_via_invalidate_draw(via); } } PCB_END_LOOP; @@ -572,7 +572,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && PCB_FLAG_TEST(PCB_FLAG_FOUND, pin)) { pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); changed = pcb_true; } } @@ -595,7 +595,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_FOUND, via) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, via)) { pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, via); - DrawVia(via); + pcb_via_invalidate_draw(via); changed = pcb_true; } } @@ -738,7 +738,7 @@ && PCB_FLAG_TEST(PCB_FLAG_SELECTED, pin) != Flag) { pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); changed = pcb_true; } } @@ -764,7 +764,7 @@ && via->Name && REGEXEC(via->Name) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, via) != Flag) { pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, via); - DrawVia(via); + pcb_via_invalidate_draw(via); changed = pcb_true; } } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 10649) +++ trunk/src_plugins/autoroute/autoroute.c (revision 10650) @@ -2877,7 +2877,7 @@ live_via = pcb_via_new(PCB->Data, X, Y, radius * 2, 2 * AutoRouteParameters.style->Clearance, 0, AutoRouteParameters.style->Hole, NULL, pcb_flag_make(0)); if (live_via != NULL) - DrawVia(live_via); + pcb_via_invalidate_draw(live_via); } /* a via cuts through every layer group */ @@ -4101,7 +4101,7 @@ rb->livedraw_obj.line = NULL; } if (rb->type == VIA && rb->livedraw_obj.via) { - EraseVia(rb->livedraw_obj.via); + pcb_via_invalidate_erase(rb->livedraw_obj.via); pcb_destroy_object(PCB->Data, PCB_TYPE_VIA, rb->livedraw_obj.via, NULL, NULL); rb->livedraw_obj.via = NULL; } Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 10649) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 10650) @@ -109,7 +109,7 @@ if (PCB_FLAG_TEST(flag, via)) { pcb_undo_add_obj_to_flag(PCB_TYPE_VIA, via, via, via); PCB_FLAG_CLEAR(flag, via); - DrawVia(via); + pcb_via_invalidate_draw(via); change = pcb_true; } } @@ -121,7 +121,7 @@ if (PCB_FLAG_TEST(flag, pin)) { pcb_undo_add_obj_to_flag(PCB_TYPE_PIN, element, pin, pin); PCB_FLAG_CLEAR(flag, pin); - DrawPin(pin); + pcb_pin_invalidate_draw(pin); change = pcb_true; } }