Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 10648) +++ trunk/doc/developer/renames (revision 10649) @@ -1709,3 +1709,12 @@ EraseText -> pcb_text_invalidate_erase DrawText -> pcb_text_invalidate_draw draw_arc_callback -> pcb_arc_draw_callback +draw_pad_name_callback -> pcb_pad_name_draw_callback +pcb_draw_paste_auto -> pcb_pad_paste_draw +ErasePadName -> pcb_pad_name_invalidate_erase +DrawPadName -> pcb_pad_name_invalidate_draw +draw_pad_callback -> pcb_pad_draw_callback +clear_pad_callback -> pcb_pad_clear_callback +draw_pad -> pcb_pad_draw +ErasePad -> pcb_pad_invalidate_erase +DrawPad -> pcb_pad_invalidate_draw Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 10648) +++ trunk/src/action_helper.c (revision 10649) @@ -258,7 +258,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_WARN, pad)) { PCB_FLAG_CLEAR(PCB_FLAG_WARN, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); } } PCB_ENDALL_LOOP; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 10648) +++ trunk/src/draw.c (revision 10649) @@ -232,7 +232,7 @@ if (!conf_core.editor.check_planes && pcb_layer_gui_set_vlayer(PCB_VLY_INVISIBLE, 0)) { side = PCB_SWAP_IDENT ? PCB_COMPONENT_SIDE : PCB_SOLDER_SIDE; pcb_draw_silk(PCB_LYT_INVISIBLE_SIDE(), drawn_area); - pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_callback, &side, NULL); + pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, pcb_pad_draw_callback, &side, NULL); pcb_gui->end_layer(); } @@ -368,12 +368,12 @@ /* draw element pads */ if (gflg & PCB_LYT_TOP) { side = PCB_COMPONENT_SIDE; - pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_callback, &side, NULL); + pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, pcb_pad_draw_callback, &side, NULL); } if (gflg & PCB_LYT_BOTTOM) { side = PCB_SOLDER_SIDE; - pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_callback, &side, NULL); + pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, pcb_pad_draw_callback, &side, NULL); } } @@ -402,12 +402,12 @@ /* draw element pads' names */ if (gflg & PCB_LYT_TOP) { side = PCB_COMPONENT_SIDE; - pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_name_callback, &side, NULL); + pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, pcb_pad_name_draw_callback, &side, NULL); } if (gflg & PCB_LYT_BOTTOM) { side = PCB_SOLDER_SIDE; - pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_name_callback, &side, NULL); + pcb_r_search(PCB->Data->pad_tree, drawn_area, NULL, pcb_pad_name_draw_callback, &side, NULL); } } } @@ -517,7 +517,7 @@ pcb_line_invalidate_erase((pcb_line_t *) ptr); break; case PCB_TYPE_PAD: - ErasePad((pcb_pad_t *) ptr); + pcb_pad_invalidate_erase((pcb_pad_t *) ptr); break; case PCB_TYPE_ARC: case PCB_TYPE_ELEMENT_ARC: @@ -566,7 +566,7 @@ break; case PCB_TYPE_PAD: if (PCB->PinOn) - DrawPad((pcb_pad_t *) ptr2); + pcb_pad_invalidate_draw((pcb_pad_t *) ptr2); break; case PCB_TYPE_ELEMENT_NAME: if (pcb_silk_on(PCB) && (PCB_FRONT((pcb_element_t *) ptr2) || PCB->InvisibleObjectsOn)) Index: trunk/src/draw_ly_spec.c =================================================================== --- trunk/src/draw_ly_spec.c (revision 10648) +++ trunk/src/draw_ly_spec.c (revision 10649) @@ -32,7 +32,7 @@ static void pcb_draw_paste_auto_(comp_ctx_t *ctx, void *side) { - pcb_draw_paste_auto(*(int *)side, ctx->screen); + pcb_pad_paste_draw(*(int *)side, ctx->screen); } static void pcb_draw_paste(int side, const pcb_box_t *drawn_area) @@ -54,7 +54,7 @@ if ((cctx.grp == NULL) || (cctx.grp->len == 0)) /* fallback: no layers -> original code: draw a single auto-add */ - pcb_draw_paste_auto(side, drawn_area); + pcb_pad_paste_draw(side, drawn_area); else { comp_draw_layer(&cctx, pcb_draw_paste_auto_, &side); comp_finish(&cctx); @@ -66,7 +66,7 @@ { 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->pad_tree, ctx->screen, NULL, clear_pad_callback, side, NULL); + pcb_r_search(PCB->Data->pad_tree, ctx->screen, NULL, pcb_pad_clear_callback, side, NULL); } static void pcb_draw_mask(int side, const pcb_box_t *screen) Index: trunk/src/find_clear.c =================================================================== --- trunk/src/find_clear.c (revision 10648) +++ trunk/src/find_clear.c (revision 10649) @@ -63,7 +63,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, element, pad, pad); PCB_FLAG_CLEAR(flag, pad); if (AndDraw) - DrawPad(pad); + pcb_pad_invalidate_draw(pad); change = pcb_true; } } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 10648) +++ trunk/src/find_drc.c (revision 10649) @@ -519,7 +519,7 @@ if (pad->Thickness < PCB->minWid) { pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, element, pad, pad); PCB_FLAG_SET(TheFlag, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); drcerr_count++; SetThing(PCB_TYPE_PAD, element, pad, pad); LocateError(&x, &y); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 10648) +++ trunk/src/find_misc.c (revision 10649) @@ -117,7 +117,7 @@ position = PadList[i].DrawLocation; for (; position < PadList[i].Number; position++) - DrawPad(PADLIST_ENTRY(i, position)); + pcb_pad_invalidate_draw(PADLIST_ENTRY(i, position)); PadList[i].DrawLocation = PadList[i].Number; } @@ -369,7 +369,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, element, pad, pad); PCB_FLAG_CLEAR(TheFlag, pad); if (AndDraw) - DrawPad(pad); + pcb_pad_invalidate_draw(pad); change = pcb_true; } } Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 10648) +++ trunk/src/find_print.c (revision 10649) @@ -109,7 +109,7 @@ fputc('\n', FP); PCB_FLAG_SET(PCB_FLAG_SELECTED, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); } /* reset found objects for the next pin */ Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 10648) +++ trunk/src/gui_act.c (revision 10649) @@ -471,9 +471,9 @@ PCB_PAD_LOOP((pcb_element_t *) ptr1); { if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, pad)) - ErasePadName(pad); + pcb_pad_name_invalidate_erase(pad); else - DrawPadName(pad); + pcb_pad_name_invalidate_draw(pad); pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, ptr1, pad, pad); PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, pad); } @@ -497,9 +497,9 @@ case PCB_TYPE_PAD: if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2)) - ErasePadName((pcb_pad_t *) ptr2); + pcb_pad_name_invalidate_erase((pcb_pad_t *) ptr2); else - DrawPadName((pcb_pad_t *) ptr2); + pcb_pad_name_invalidate_draw((pcb_pad_t *) ptr2); pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, ptr1, ptr2, ptr3); PCB_FLAG_TOGGLE(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2); pcb_board_set_changed_flag(pcb_true); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 10648) +++ trunk/src/obj_elem.c (revision 10649) @@ -1428,7 +1428,7 @@ if (value <= PCB_MAX_PINORVIASIZE && value >= PCB_MIN_PINORVIAHOLE && value != pad->Clearance) { changed = pcb_true; pcb_undo_add_obj_to_clear_size(PCB_TYPE_PAD, Element, pad, pad); - ErasePad(pad); + pcb_pad_invalidate_erase(pad); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PAD, Element, pad); pcb_r_delete_entry(PCB->Data->pad_tree, &pad->BoundingBox); pad->Clearance = value; @@ -1440,7 +1440,7 @@ pcb_element_bbox(PCB->Data, Element, pcb_font(PCB, 0, 1)); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PAD, Element, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); } } PCB_END_LOOP; @@ -1847,7 +1847,7 @@ PCB_PAD_LOOP(element); { if (pcb_draw_doing_pinout || pcb_draw_doing_assy || PCB_FRONT(pad) || PCB->InvisibleObjectsOn) - draw_pad(pad); + pcb_pad_draw(pad); } PCB_END_LOOP; PCB_PIN_LOOP(element); @@ -1972,7 +1972,7 @@ PCB_END_LOOP; PCB_PAD_LOOP(Element); { - ErasePad(pad); + pcb_pad_invalidate_erase(pad); } PCB_END_LOOP; } @@ -2018,7 +2018,7 @@ PCB_PAD_LOOP(Element); { if (pcb_draw_doing_pinout || pcb_draw_doing_assy || PCB_FRONT(pad) || PCB->InvisibleObjectsOn) - DrawPad(pad); + pcb_pad_invalidate_draw(pad); } PCB_END_LOOP; PCB_PIN_LOOP(Element); Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 10648) +++ trunk/src/obj_pad.c (revision 10649) @@ -208,10 +208,10 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (pcb_false); - ErasePad(Pad); + pcb_pad_invalidate_erase(Pad); pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, Pad, Pad, Pad); PCB_FLAG_TOGGLE(PCB_FLAG_NOPASTE, Pad); - DrawPad(Pad); + pcb_pad_invalidate_draw(Pad); pcb_draw(); return (pcb_true); } @@ -269,7 +269,7 @@ pcb_undo_add_obj_to_size(PCB_TYPE_PAD, Element, Pad, Pad); pcb_undo_add_obj_to_mask_size(PCB_TYPE_PAD, Element, Pad, Pad); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PAD, Element, Pad); - ErasePad(Pad); + pcb_pad_invalidate_erase(Pad); pcb_r_delete_entry(PCB->Data->pad_tree, &Pad->BoundingBox); Pad->Mask += value - Pad->Thickness; Pad->Thickness = value; @@ -276,7 +276,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_PAD, Element, Pad); - DrawPad(Pad); + pcb_pad_invalidate_draw(Pad); return (Pad); } return (NULL); @@ -301,13 +301,13 @@ return NULL; pcb_undo_add_obj_to_clear_size(PCB_TYPE_PAD, Element, Pad, Pad); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PAD, Element, Pad); - ErasePad(Pad); + pcb_pad_invalidate_erase(Pad); pcb_r_delete_entry(PCB->Data->pad_tree, &Pad->BoundingBox); Pad->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_PAD, Element, Pad); - DrawPad(Pad); + pcb_pad_invalidate_draw(Pad); return Pad; } @@ -318,9 +318,9 @@ Element = Element; /* get rid of 'unused...' warnings */ if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) { - ErasePadName(Pad); + pcb_pad_name_invalidate_erase(Pad); Pad->Name = ctx->chgname.new_name; - DrawPadName(Pad); + pcb_pad_name_invalidate_draw(Pad); } else Pad->Name = ctx->chgname.new_name; @@ -334,9 +334,9 @@ Element = Element; /* get rid of 'unused...' warnings */ if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) { - ErasePadName(Pad); + pcb_pad_name_invalidate_erase(Pad); Pad->Number = ctx->chgname.new_name; - DrawPadName(Pad); + pcb_pad_name_invalidate_draw(Pad); } else Pad->Number = ctx->chgname.new_name; @@ -348,7 +348,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (NULL); - ErasePad(Pad); + pcb_pad_invalidate_erase(Pad); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PAD, Element, Pad, Pad, pcb_false); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PAD, Element, Pad); pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, Element, Pad, Pad); @@ -355,7 +355,7 @@ PCB_FLAG_TOGGLE(PCB_FLAG_SQUARE, Pad); pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PAD, Element, Pad, Pad, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PAD, Element, Pad); - DrawPad(Pad); + pcb_pad_invalidate_draw(Pad); return (Pad); } @@ -390,11 +390,11 @@ value = Pad->Thickness; if (value != Pad->Mask) { pcb_undo_add_obj_to_mask_size(PCB_TYPE_PAD, Element, Pad, Pad); - ErasePad(Pad); + pcb_pad_invalidate_erase(Pad); pcb_r_delete_entry(PCB->Data->pad_tree, &Pad->BoundingBox); Pad->Mask = value; pcb_element_bbox(PCB->Data, Element, pcb_font(PCB, 0, 1)); - DrawPad(Pad); + pcb_pad_invalidate_draw(Pad); return (Pad); } return (NULL); @@ -478,7 +478,7 @@ pcb_gui->fill_pcb_pad(gc, pad, clear, mask); } -void draw_pad(pcb_pad_t * pad) +void pcb_pad_draw(pcb_pad_t * pad) { const char *color = NULL; char buf[sizeof("#XXXXXX")]; @@ -513,17 +513,17 @@ draw_pad_name(pad); } -pcb_r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_pad_draw_callback(const pcb_box_t * b, void *cl) { pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; if (PCB_ON_SIDE(pad, *side)) - draw_pad(pad); + pcb_pad_draw(pad); return PCB_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t draw_pad_name_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_pad_name_draw_callback(const pcb_box_t * b, void *cl) { pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; @@ -535,7 +535,7 @@ return PCB_R_DIR_FOUND_CONTINUE; } -pcb_r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_pad_clear_callback(const pcb_box_t * b, void *cl) { pcb_pad_t *pad = (pcb_pad_t *) b; int *side = cl; @@ -545,7 +545,7 @@ } /* draws solder paste layer for a given side of the board - only pads get paste */ -void pcb_draw_paste_auto(int side, const pcb_box_t * drawn_area) +void pcb_pad_paste_draw(int side, const pcb_box_t * drawn_area) { pcb_gui->set_color(Output.fgGC, conf_core.appearance.color.paste); PCB_PAD_ALL_LOOP(PCB->Data); @@ -593,27 +593,27 @@ return; } -void ErasePad(pcb_pad_t *Pad) +void pcb_pad_invalidate_erase(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); if (PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) - ErasePadName(Pad); + pcb_pad_name_invalidate_erase(Pad); pcb_flag_erase(&Pad->Flags); } -void ErasePadName(pcb_pad_t *Pad) +void pcb_pad_name_invalidate_erase(pcb_pad_t *Pad) { GatherPadName(Pad); } -void DrawPad(pcb_pad_t *Pad) +void pcb_pad_invalidate_draw(pcb_pad_t *Pad) { pcb_draw_invalidate(Pad); if (pcb_draw_doing_pinout || PCB_FLAG_TEST(PCB_FLAG_DISPLAYNAME, Pad)) - DrawPadName(Pad); + pcb_pad_name_invalidate_draw(Pad); } -void DrawPadName(pcb_pad_t *Pad) +void pcb_pad_name_invalidate_draw(pcb_pad_t *Pad) { GatherPadName(Pad); } Index: trunk/src/obj_pad_draw.h =================================================================== --- trunk/src/obj_pad_draw.h (revision 10648) +++ trunk/src/obj_pad_draw.h (revision 10649) @@ -29,14 +29,14 @@ /* Include rtree.h for these */ #ifdef PCB_RTREE_H -pcb_r_dir_t draw_pad_callback(const pcb_box_t * b, void *cl); -pcb_r_dir_t draw_pad_name_callback(const pcb_box_t * b, void *cl); -pcb_r_dir_t clear_pad_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_pad_draw_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_pad_name_draw_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_pad_clear_callback(const pcb_box_t * b, void *cl); #endif -void draw_pad(pcb_pad_t * pad); -void pcb_draw_paste_auto(int side, const pcb_box_t * drawn_area); -void ErasePad(pcb_pad_t *Pad); -void ErasePadName(pcb_pad_t *Pad); -void DrawPad(pcb_pad_t *Pad); -void DrawPadName(pcb_pad_t *Pad); +void pcb_pad_draw(pcb_pad_t * pad); +void pcb_pad_paste_draw(int side, const pcb_box_t * drawn_area); +void pcb_pad_invalidate_erase(pcb_pad_t *Pad); +void pcb_pad_name_invalidate_erase(pcb_pad_t *Pad); +void pcb_pad_invalidate_draw(pcb_pad_t *Pad); +void pcb_pad_name_invalidate_draw(pcb_pad_t *Pad); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 10648) +++ trunk/src/select.c (revision 10649) @@ -189,7 +189,7 @@ case PCB_TYPE_PAD: pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, ptr1, ptr2, ptr2); PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pad_t *) ptr2); - DrawPad((pcb_pad_t *) ptr2); + pcb_pad_invalidate_draw((pcb_pad_t *) ptr2); break; case PCB_TYPE_ELEMENT_NAME: @@ -427,7 +427,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, pad) != Flag) { append(PCB_TYPE_PAD, element, pad); if (pcb->PinOn) - DrawPad(pad); + pcb_pad_invalidate_draw(pad); } } PCB_END_LOOP; @@ -454,7 +454,7 @@ && (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) == PCB_SWAP_IDENT || pcb->InvisibleObjectsOn || !Flag)) { append(PCB_TYPE_PAD, element, pad); if (pcb->PinOn) - DrawPad(pad); + pcb_pad_invalidate_draw(pad); } } PCB_END_LOOP; @@ -582,7 +582,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element) && PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) { pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, element, pad, pad); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); changed = pcb_true; } } @@ -752,7 +752,7 @@ if (pad->Name && REGEXEC(pad->Name)) { pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, element, pad, pad); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); changed = pcb_true; } } Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 10648) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 10649) @@ -131,7 +131,7 @@ if (PCB_FLAG_TEST(flag, pad)) { pcb_undo_add_obj_to_flag(PCB_TYPE_PAD, element, pad, pad); PCB_FLAG_CLEAR(flag, pad); - DrawPad(pad); + pcb_pad_invalidate_draw(pad); change = pcb_true; } }