Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 10643) +++ trunk/doc/developer/renames (revision 10644) @@ -1692,3 +1692,8 @@ DrawArc -> pcb_arc_invalidate_draw _draw_arc -> pcb_arc_draw_ draw_arc -> pcb_arc_draw +draw_line_callback -> pcb_line_draw_callback +_draw_line -> pcb_line_draw_ +draw_line -> pcb_line_draw +EraseLine -> pcb_line_invalidate_erase +DrawLine -> pcb_line_invalidate_draw Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 10643) +++ trunk/src/action_helper.c (revision 10644) @@ -266,7 +266,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_WARN, line)) { PCB_FLAG_CLEAR(PCB_FLAG_WARN, line); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); } } PCB_ENDALL_LOOP; @@ -846,7 +846,7 @@ pcb_added_lines++; pcb_obj_add_attribs(line, PCB->pen_attr); pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); - DrawLine(CURRENT, line); + pcb_line_invalidate_draw(CURRENT, line); /* place a via if vias are visible, the layer is in a new group since the last line and there isn't a pin already here */ @@ -888,7 +888,7 @@ pcb_obj_add_attribs(line, PCB->pen_attr); pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); pcb_undo_inc_serial(); - DrawLine(CURRENT, line); + pcb_line_invalidate_draw(CURRENT, line); /* move to new start point */ pcb_crosshair.AttachedLine.Point1.X = Note.X; pcb_crosshair.AttachedLine.Point1.Y = Note.Y; Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 10643) +++ trunk/src/crosshair.c (revision 10644) @@ -967,7 +967,7 @@ op.obj.line = line; vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line); - DrawLine(NULL, line); + pcb_line_invalidate_draw(NULL, line); return PCB_R_DIR_FOUND_CONTINUE; } else { @@ -1010,11 +1010,11 @@ switch (type) { case PCB_TYPE_LINE_POINT: /* Attention: We can use a NULL pointer here for the layer, - * because it is not used in the DrawLine() function anyways. - * ATM DrawLine() only calls AddPart() internally, which invalidates + * because it is not used in the pcb_line_invalidate_draw() function anyways. + * ATM pcb_line_invalidate_draw() only calls AddPart() internally, which invalidates * the area specified by the line's bounding box. */ - DrawLine(NULL, (pcb_line_t *) obj); + pcb_line_invalidate_draw(NULL, (pcb_line_t *) obj); break; case PCB_TYPE_ARC_POINT: /* See comment above */ Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 10643) +++ trunk/src/draw.c (revision 10644) @@ -441,7 +441,7 @@ return; /* draw all visible lines this layer */ - pcb_r_search(Layer->line_tree, screen, NULL, draw_line_callback, Layer, NULL); + pcb_r_search(Layer->line_tree, screen, NULL, pcb_line_draw_callback, Layer, NULL); /* draw the layer arcs on screen */ pcb_r_search(Layer->arc_tree, screen, NULL, draw_arc_callback, Layer, NULL); @@ -514,7 +514,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ELEMENT_LINE: case PCB_TYPE_RATLINE: - EraseLine((pcb_line_t *) ptr); + pcb_line_invalidate_erase((pcb_line_t *) ptr); break; case PCB_TYPE_PAD: ErasePad((pcb_pad_t *) ptr); @@ -538,7 +538,7 @@ break; case PCB_TYPE_LINE: if (((pcb_layer_t *) ptr1)->meta.real.vis) - DrawLine((pcb_layer_t *) ptr1, (pcb_line_t *) ptr2); + pcb_line_invalidate_draw((pcb_layer_t *) ptr1, (pcb_line_t *) ptr2); break; case PCB_TYPE_ARC: if (((pcb_layer_t *) ptr1)->meta.real.vis) Index: trunk/src/find_clear.c =================================================================== --- trunk/src/find_clear.c (revision 10643) +++ trunk/src/find_clear.c (revision 10644) @@ -102,7 +102,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_LINE, layer, line, line); PCB_FLAG_CLEAR(flag, line); if (AndDraw) - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); change = pcb_true; } } Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 10643) +++ trunk/src/find_drc.c (revision 10644) @@ -403,7 +403,7 @@ if (line->Thickness < PCB->minWid) { pcb_undo_add_obj_to_flag(PCB_TYPE_LINE, layer, line, line); PCB_FLAG_SET(TheFlag, line); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); drcerr_count++; SetThing(PCB_TYPE_LINE, layer, line, line); LocateError(&x, &y); @@ -608,7 +608,7 @@ { if (line->Thickness < PCB->minSlk) { PCB_FLAG_SET(TheFlag, line); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); drcerr_count++; SetThing(PCB_TYPE_LINE, layer, line, line); LocateError(&x, &y); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 10643) +++ trunk/src/find_misc.c (revision 10644) @@ -94,7 +94,7 @@ /* draw all new lines */ position = LineList[layer].DrawLocation; for (; position < LineList[layer].Number; position++) - DrawLine(LAYER_PTR(layer), LINELIST_ENTRY(layer, position)); + pcb_line_invalidate_draw(LAYER_PTR(layer), LINELIST_ENTRY(layer, position)); LineList[layer].DrawLocation = LineList[layer].Number; /* draw all new arcs */ @@ -414,7 +414,7 @@ pcb_undo_add_obj_to_flag(PCB_TYPE_LINE, layer, line, line); PCB_FLAG_CLEAR(TheFlag, line); if (AndDraw) - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); change = pcb_true; } } Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 10643) +++ trunk/src/obj_elem.c (revision 10644) @@ -1873,7 +1873,7 @@ /* draw lines, arcs, text and pins */ PCB_ELEMENT_PCB_LINE_LOOP(element); { - _draw_line(line); + pcb_line_draw_(line); } PCB_END_LOOP; PCB_ARC_LOOP(element); @@ -1950,7 +1950,7 @@ { PCB_ELEMENT_PCB_LINE_LOOP(Element); { - EraseLine(line); + pcb_line_invalidate_erase(line); } PCB_END_LOOP; PCB_ARC_LOOP(Element); @@ -2003,7 +2003,7 @@ { PCB_ELEMENT_PCB_LINE_LOOP(Element); { - DrawLine(NULL, line); + pcb_line_invalidate_draw(NULL, line); } PCB_END_LOOP; PCB_ARC_LOOP(Element); Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 10643) +++ trunk/src/obj_line.c (revision 10644) @@ -344,7 +344,7 @@ return (NULL); if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Line->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_LINE, Layer, Line, Line); - EraseLine(Line); + pcb_line_invalidate_erase(Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); Line->Thickness = value; @@ -351,7 +351,7 @@ pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); return (Line); } return (NULL); @@ -370,7 +370,7 @@ if (value != Line->Clearance) { pcb_undo_add_obj_to_clear_size(PCB_TYPE_LINE, Layer, Line, Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); - EraseLine(Line); + pcb_line_invalidate_erase(Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); Line->Clearance = value; if (Line->Clearance == 0) { @@ -380,7 +380,7 @@ pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); return (Line); } return (NULL); @@ -401,7 +401,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) return (NULL); - EraseLine(Line); + pcb_line_invalidate_erase(Line); if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) { pcb_undo_add_obj_to_clear_poly(PCB_TYPE_LINE, Layer, Line, Line, pcb_false); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); @@ -412,7 +412,7 @@ pcb_undo_add_obj_to_clear_poly(PCB_TYPE_LINE, Layer, Line, Line, pcb_true); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); } - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); return (Line); } @@ -444,7 +444,7 @@ if (!line) return (line); pcb_line_copy_meta(line, Line); - DrawLine(Layer, line); + pcb_line_invalidate_draw(Layer, line); pcb_undo_add_obj_to_create(PCB_TYPE_LINE, Layer, line, line); return (line); } @@ -453,7 +453,7 @@ void *pcb_lineop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { if (Layer->meta.real.vis) - EraseLine(Line); + pcb_line_invalidate_erase(Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); pcb_line_move(Line, ctx->move.dx, ctx->move.dy); @@ -460,7 +460,7 @@ pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); if (Layer->meta.real.vis) { - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); pcb_draw(); } return (Line); @@ -471,7 +471,7 @@ { if (Layer) { if (Layer->meta.real.vis) - EraseLine(Line); + pcb_line_invalidate_erase(Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); pcb_r_delete_entry(Layer->line_tree, &Line->BoundingBox); PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); @@ -479,7 +479,7 @@ pcb_r_insert_entry(Layer->line_tree, &Line->BoundingBox, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); if (Layer->meta.real.vis) { - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); pcb_draw(); } return (Line); @@ -587,7 +587,7 @@ return NULL; } if (ctx->move.dst_layer == Layer && Layer->meta.real.vis) { - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); pcb_draw(); } if (((long int) ctx->move.dst_layer == -1) || ctx->move.dst_layer == Layer) @@ -595,13 +595,13 @@ pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_LINE, Layer, Line, Line); if (Layer->meta.real.vis) - EraseLine(Line); + pcb_line_invalidate_erase(Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); newone = (pcb_line_t *) pcb_lineop_move_to_layer_low(ctx, Layer, Line, ctx->move.dst_layer); Line = NULL; pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, ctx->move.dst_layer, newone); if (ctx->move.dst_layer->meta.real.vis) - DrawLine(ctx->move.dst_layer, newone); + pcb_line_invalidate_draw(ctx->move.dst_layer, newone); pcb_draw(); if (!PCB->ViaOn || ctx->move.more_to_come || pcb_layer_get_group_(Layer) == @@ -696,7 +696,7 @@ { /* erase from screen */ if (Layer->meta.real.vis) { - EraseLine(Line); + pcb_line_invalidate_erase(Line); if (!ctx->remove.bulk) pcb_draw(); } @@ -777,7 +777,7 @@ static void rotate_line1(pcb_layer_t *Layer, pcb_line_t *Line) { - EraseLine(Line); + pcb_line_invalidate_erase(Line); if (Layer) { if (PCB_LAYER_IS_REAL(Layer)) pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); @@ -796,7 +796,7 @@ pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); if (PCB_LAYER_IS_REAL(Layer)) pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); } else { pcb_r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) Line, 0); @@ -845,7 +845,7 @@ X = Line->Point2.X; Y = Line->Point2.Y; pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, Layer, Line, &Line->Point2, ctx->insert.x - X, ctx->insert.y - Y); - EraseLine(Line); + pcb_line_invalidate_erase(Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); Line->Point2.X = ctx->insert.x; @@ -853,7 +853,7 @@ pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); - DrawLine(Layer, Line); + pcb_line_invalidate_draw(Layer, Line); /* we must create after playing with Line since creation may * invalidate the line pointer */ @@ -860,7 +860,7 @@ if ((line = pcb_line_new_merge(Layer, ctx->insert.x, ctx->insert.y, X, Y, Line->Thickness, Line->Clearance, Line->Flags))) { pcb_line_copy_meta(line, Line); pcb_undo_add_obj_to_create(PCB_TYPE_LINE, Layer, line, line); - DrawLine(Layer, line); + pcb_line_invalidate_draw(Layer, line); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, line); /* creation call adds it to the rtree */ } @@ -880,7 +880,7 @@ /*** draw ***/ -void _draw_line(pcb_line_t * line) +void pcb_line_draw_(pcb_line_t * line) { PCB_DRAW_BBOX(line); pcb_gui->set_line_cap(Output.fgGC, Trace_Cap); @@ -892,7 +892,7 @@ pcb_gui->draw_line(Output.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); } -void draw_line(pcb_layer_t * layer, pcb_line_t * line) +void pcb_line_draw(pcb_layer_t * layer, pcb_line_t * line) { const char *color; char buf[sizeof("#XXXXXX")]; @@ -915,10 +915,10 @@ } pcb_gui->set_color(Output.fgGC, color); - _draw_line(line); + pcb_line_draw_(line); } -pcb_r_dir_t draw_line_callback(const pcb_box_t * b, void *cl) +pcb_r_dir_t pcb_line_draw_callback(const pcb_box_t * b, void *cl) { pcb_line_t *line = (pcb_line_t *)b; @@ -925,18 +925,18 @@ if (!PCB->SubcPartsOn && pcb_is_lobj_in_subc(line->parent_type, &line->parent)) return PCB_R_DIR_NOT_FOUND; - draw_line((pcb_layer_t *)cl, line); + pcb_line_draw((pcb_layer_t *)cl, line); return PCB_R_DIR_FOUND_CONTINUE; } /* erases a line on a layer */ -void EraseLine(pcb_line_t *Line) +void pcb_line_invalidate_erase(pcb_line_t *Line) { pcb_draw_invalidate(Line); pcb_flag_erase(&Line->Flags); } -void DrawLine(pcb_layer_t *Layer, pcb_line_t *Line) +void pcb_line_invalidate_draw(pcb_layer_t *Layer, pcb_line_t *Line) { pcb_draw_invalidate(Line); } Index: trunk/src/obj_line_draw.h =================================================================== --- trunk/src/obj_line_draw.h (revision 10643) +++ trunk/src/obj_line_draw.h (revision 10644) @@ -28,10 +28,10 @@ /* Include rtree.h for this */ #ifdef PCB_RTREE_H -pcb_r_dir_t draw_line_callback(const pcb_box_t * b, void *cl); +pcb_r_dir_t pcb_line_draw_callback(const pcb_box_t * b, void *cl); #endif -void _draw_line(pcb_line_t * line); -void draw_line(pcb_layer_t * layer, pcb_line_t * line); -void EraseLine(pcb_line_t *Line); -void DrawLine(pcb_layer_t *Layer, pcb_line_t *Line); +void pcb_line_draw_(pcb_line_t * line); +void pcb_line_draw(pcb_layer_t * layer, pcb_line_t * line); +void pcb_line_invalidate_erase(pcb_line_t *Line); +void pcb_line_invalidate_draw(pcb_layer_t *Layer, pcb_line_t *Line); Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 10643) +++ trunk/src/obj_rat.c (revision 10644) @@ -164,12 +164,12 @@ return newone; pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, newone, newone); EraseRat(Rat); - DrawLine(CURRENT, newone); + pcb_line_invalidate_draw(CURRENT, newone); newone = pcb_line_new_merge(CURRENT, Rat->Point2.X, Rat->Point2.Y, ctx->insert.x, ctx->insert.y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags); if (newone) { pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, newone, newone); - DrawLine(CURRENT, newone); + pcb_line_invalidate_draw(CURRENT, newone); } pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, Rat, Rat, Rat); pcb_draw(); @@ -197,7 +197,7 @@ if (PCB->RatOn) EraseRat(Rat); pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, Rat, Rat, Rat); - DrawLine(ctx->move.dst_layer, newone); + pcb_line_invalidate_draw(ctx->move.dst_layer, newone); pcb_draw(); return (newone); } @@ -253,7 +253,7 @@ pcb_gui->draw_arc(Output.fgGC, rat->Point1.X, rat->Point1.Y, w * 2, w * 2, 0, 360); } else - _draw_line((pcb_line_t *) rat); + pcb_line_draw_((pcb_line_t *) rat); return PCB_R_DIR_FOUND_CONTINUE; } @@ -271,7 +271,7 @@ pcb_draw_invalidate(&b); } else - EraseLine((pcb_line_t *) Rat); + pcb_line_invalidate_erase((pcb_line_t *) Rat); pcb_flag_erase(&Rat->Flags); } @@ -292,5 +292,5 @@ pcb_draw_invalidate(&b); } else - DrawLine(NULL, (pcb_line_t *) Rat); + pcb_line_invalidate_draw(NULL, (pcb_line_t *) Rat); } Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 10643) +++ trunk/src/obj_text.c (revision 10644) @@ -653,7 +653,7 @@ if (xordraw) pcb_gui->draw_line(pcb_crosshair.GC, xordx + newline.Point1.X, xordy + newline.Point1.Y, xordx + newline.Point2.X, xordy + newline.Point2.Y); else - _draw_line(&newline); + pcb_line_draw_(&newline); } /* draw the arcs */ Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 10643) +++ trunk/src/route.c (revision 10644) @@ -473,7 +473,7 @@ p_obj->point2.Y - apply_to_line->Point2.Y ); /* Move the existing line point/s */ - EraseLine(apply_to_line); + pcb_line_invalidate_erase(apply_to_line); pcb_r_delete_entry(apply_to_line_layer->line_tree, (pcb_box_t *) apply_to_line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, apply_to_line_layer, apply_to_line); apply_to_line->Point1.X = p_obj->point1.X; @@ -483,7 +483,7 @@ pcb_line_bbox(apply_to_line); pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) apply_to_line, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, layer, apply_to_line); - DrawLine(layer, apply_to_line); + pcb_line_invalidate_draw(layer, apply_to_line); apply_to_line_layer = layer; /* The existing line has been used so forget about it. */ @@ -505,7 +505,7 @@ line->Number = pcb_strdup(number); pcb_added_lines++; pcb_obj_add_attribs(line, PCB->pen_attr); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); pcb_undo_add_obj_to_create(PCB_TYPE_LINE, layer, line, line); applied = 1; } Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 10643) +++ trunk/src/select.c (revision 10644) @@ -132,7 +132,7 @@ layer = (pcb_layer_t *) ptr1; pcb_undo_add_obj_to_flag(PCB_TYPE_LINE, ptr1, ptr2, ptr2); PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, line); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); break; } @@ -323,7 +323,7 @@ && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) { append(PCB_TYPE_LINE, layer, line); if (layer->meta.real.vis) - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); } } PCB_END_LOOP; @@ -540,7 +540,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) { pcb_undo_add_obj_to_flag(PCB_TYPE_LINE, layer, line, line); PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, line); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); changed = pcb_true; } } Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 10643) +++ trunk/src/undo_act.c (revision 10644) @@ -185,7 +185,7 @@ if (conf_core.editor.auto_drc) { /* undo loses PCB_FLAG_FOUND */ PCB_FLAG_SET(PCB_FLAG_FOUND, ptr2); - DrawLine(CURRENT, ptr2); + pcb_line_invalidate_draw(CURRENT, ptr2); } pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = ptr2->Point2.X; pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = ptr2->Point2.Y; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 10643) +++ trunk/src_plugins/autoroute/autoroute.c (revision 10644) @@ -3006,7 +3006,7 @@ 2 * qhthick, 0, pcb_flag_make(0)); rb->livedraw_obj.line = line; if (line != NULL) - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); } /* and to the via space structures */ @@ -4096,7 +4096,7 @@ { if (rb->type == LINE && rb->livedraw_obj.line) { pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.grp[rb->group].lid[0]); - EraseLine(rb->livedraw_obj.line); + pcb_line_invalidate_erase(rb->livedraw_obj.line); pcb_destroy_object(PCB->Data, PCB_TYPE_LINE, layer, rb->livedraw_obj.line, NULL); rb->livedraw_obj.line = NULL; } Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 10643) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 10644) @@ -122,7 +122,7 @@ l.Thickness = PCB_MM_TO_COORD(thick); if (l.Thickness == 0) l.Thickness = 1; - _draw_line(&l); + pcb_line_draw_(&l); } /* draw a line of a specific thickness */ @@ -136,7 +136,7 @@ l.Thickness = PCB_MM_TO_COORD(thick); if (l.Thickness == 0) l.Thickness = 1; - _draw_line(&l); + pcb_line_draw_(&l); } Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 10643) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 10644) @@ -71,7 +71,7 @@ l.Point2.X = PCB_MM_TO_COORD(x2); l.Point2.Y = PCB_MM_TO_COORD(y2); l.Thickness = PCB_MM_TO_COORD(thick); - _draw_line(&l); + pcb_line_draw_(&l); } static void dchkbox(pcb_hid_gc_t gc, int x0, int y0, int checked) Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 10643) +++ trunk/src_plugins/export_svg/svg.c (revision 10644) @@ -545,7 +545,7 @@ draw_fill_rect(gc, x1, y1, x2-x1, y2-y1); } -static void draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2) +static void pcb_line_draw(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2) { if ((photo_mode) && (!gc->erase) && (mask_mode == HID_MASK_OFF)) { pcb_coord_t photo_offs = photo_palette[photo_color].offs; @@ -571,7 +571,7 @@ static void svg_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2) { TRX(x1); TRY(y1); TRX(x2); TRY(y2); - draw_line(gc, x1, y1, x2, y2); + pcb_line_draw(gc, x1, y1, x2, y2); } static void pcb_arc_draw(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t r, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t stroke, int large, int sweep) @@ -604,7 +604,7 @@ /* degenerate case: r=0 means a single dot */ if ((width == 0) && (height == 0)) { - draw_line(gc, cx, cy, cx, cy); + pcb_line_draw(gc, cx, cy, cx, cy); return; } Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/draw.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/draw.c (revision 10643) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/draw.c (revision 10644) @@ -37,7 +37,7 @@ hid->set_draw_faded(gc, faded); } -void draw_line(dctx_t *ctx, int x1, int y1, int x2, int y2) +void pcb_line_draw(dctx_t *ctx, int x1, int y1, int x2, int y2) { setup("draw_line"); hid->draw_line(gc, x1, y1, x2, y2); Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 10643) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h (revision 10644) @@ -286,7 +286,7 @@ void draw_set_draw_faded(dctx_t *ctx, int faded); /* Debug draw: draw a line using the current style settings */ -void draw_line(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_); +void pcb_line_draw(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_); /* void pcb_arc_draw(dctx_t *ctx, int cx_, int cy_, int xradius_, int yradius_, double start_angle_, double delta_angle_); Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 10643) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 10644) @@ -153,7 +153,7 @@ if (PCB_FLAG_TEST(flag, line)) { pcb_undo_add_obj_to_flag(PCB_TYPE_LINE, layer, line, line); PCB_FLAG_CLEAR(flag, line); - DrawLine(layer, line); + pcb_line_invalidate_draw(layer, line); change = pcb_true; } } Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 10643) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 10644) @@ -1081,7 +1081,7 @@ *changed = 1; PCB_FLAG_CLEAR(PCB_FLAG_RUBBEREND, ptr->Line); pcb_undo_add_obj_to_rotate(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, ptr->MovedPoint, cx, cy, steps); - EraseLine(ptr->Line); + pcb_line_invalidate_erase(ptr->Line); if (ptr->Layer) { pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, ptr->Layer, ptr->Line); pcb_r_delete_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line); @@ -1093,7 +1093,7 @@ if (ptr->Layer) { pcb_r_insert_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line, 0); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, ptr->Layer, ptr->Line); - DrawLine(ptr->Layer, ptr->Line); + pcb_line_invalidate_draw(ptr->Layer, ptr->Line); } else { pcb_r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) ptr->Line, 0);