Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4860) +++ trunk/doc-rnd/hacking/renames (revision 4861) @@ -250,3 +250,9 @@ FreeDataMemory -> pcb_data_free IsDataEmpty -> pcb_data_is_empty GetDataBoundingBox -> pcb_data_bbox +Draw -> pcb_draw +Redraw -> pcb_redraw +DrawObject -> pcb_draw_obj +DrawLayer -> pcb_draw_layer +EraseObject -> pcb_erase_obj +LightenColor -> pcb_lighten_color Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4860) +++ trunk/src/action_helper.c (revision 4861) @@ -292,7 +292,7 @@ } ENDALL_LOOP; - Draw(); + pcb_draw(); } static void click_cb(pcb_hidval_t hv) @@ -607,7 +607,7 @@ pcb_chg_obj_thermal(PCB_TYPE_VIA, via, via, via, PCB->ThermStyle); IncrementUndoSerialNumber(); DrawVia(via); - Draw(); + pcb_draw(); } break; } @@ -670,7 +670,7 @@ IncrementUndoSerialNumber(); addedLines++; DrawArc(CURRENT, arc); - Draw(); + pcb_draw(); Crosshair.AttachedBox.State = STATE_THIRD; } break; @@ -702,7 +702,7 @@ * to tell if a selected flag changed */ DrawElement(element); - Draw(); + pcb_draw(); hid_actionl("Report", "Object", NULL); } else if (type != PCB_TYPE_NONE) { @@ -712,8 +712,8 @@ && TEST_FLAG(PCB_FLAG_SELECTED, thing)) { /* this is not un-doable since LOCK isn't */ CLEAR_FLAG(PCB_FLAG_SELECTED, thing); - DrawObject(type, ptr1, ptr2); - Draw(); + pcb_draw_obj(type, ptr1, ptr2); + pcb_draw(); } hid_actionl("Report", "Object", NULL); } @@ -764,7 +764,7 @@ DrawRat(line); Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y; - Draw(); + pcb_draw(); } break; } @@ -865,7 +865,7 @@ Marked.X = Note.X; Marked.Y = Note.Y; } - Draw(); + pcb_draw(); } break; @@ -892,7 +892,7 @@ AddObjectToCreateUndoList(PCB_TYPE_POLYGON, CURRENT, polygon, polygon); IncrementUndoSerialNumber(); DrawPolygon(CURRENT, polygon); - Draw(); + pcb_draw(); } /* reset state to 'first corner' */ @@ -916,7 +916,7 @@ AddObjectToCreateUndoList(PCB_TYPE_TEXT, CURRENT, text, text); IncrementUndoSerialNumber(); DrawText(CURRENT, text); - Draw(); + pcb_draw(); } } free(string); @@ -1026,7 +1026,7 @@ Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); /* reset state of attached line */ memset(&Crosshair.AttachedPolygon, 0, sizeof(pcb_polygon_t)); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4860) +++ trunk/src/buffer.c (revision 4861) @@ -686,7 +686,7 @@ } if (changed) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4860) +++ trunk/src/change.c (revision 4861) @@ -362,7 +362,7 @@ change = SelectedOperation(&ChangeThermalFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -384,7 +384,7 @@ change = SelectedOperation(&ChangeSizeFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -409,7 +409,7 @@ else change = SelectedOperation(&ChangeClearSizeFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -431,7 +431,7 @@ change = SelectedOperation(&Change2ndSizeFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -450,7 +450,7 @@ change = SelectedOperation(&ChangeJoinFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -469,7 +469,7 @@ change = SelectedOperation(&SetJoinFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -488,7 +488,7 @@ change = SelectedOperation(&ClrJoinFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -507,7 +507,7 @@ change = SelectedOperation(&ChangeNonetlistFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -527,7 +527,7 @@ change = SelectedOperation(&SetNonetlistFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -546,7 +546,7 @@ change = SelectedOperation(&ClrNonetlistFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -566,7 +566,7 @@ change = SelectedOperation(&ChangeSquareFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -588,7 +588,7 @@ change = SelectedOperation(&ChangeAngleFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -610,7 +610,7 @@ change = SelectedOperation(&ChangeRadiusFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -630,7 +630,7 @@ change = SelectedOperation(&SetSquareFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -649,7 +649,7 @@ change = SelectedOperation(&ClrSquareFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -668,7 +668,7 @@ change = SelectedOperation(&ChangeOctagonFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -687,7 +687,7 @@ change = SelectedOperation(&SetOctagonFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -706,7 +706,7 @@ change = SelectedOperation(&ClrOctagonFunctions, &ctx, pcb_false, types); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -728,7 +728,7 @@ } END_LOOP; if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -749,7 +749,7 @@ } ENDALL_LOOP; if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -772,7 +772,7 @@ change = (ObjectOperation(&ChangeSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -794,7 +794,7 @@ change = (ObjectOperation(&Change1stSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -816,7 +816,7 @@ change = (ObjectOperation(&ChangeRadiusFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -838,7 +838,7 @@ change = (ObjectOperation(&ChangeAngleFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -864,7 +864,7 @@ else change = (ObjectOperation(&ChangeClearSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -885,7 +885,7 @@ change = (ObjectOperation(&ChangeThermalFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -907,7 +907,7 @@ change = (ObjectOperation(&Change2ndSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); if (incundo) IncrementUndoSerialNumber(); } @@ -930,7 +930,7 @@ change = (ObjectOperation(&ChangeMaskSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL); if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -952,7 +952,7 @@ ctx.chgname.new_name = Name; result = ObjectOperation(&ChangeNameFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3); - Draw(); + pcb_draw(); return (result); } @@ -972,7 +972,7 @@ ctx.chgname.new_name = Name; result = ObjectOperation(&ChangePinnumFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3); - Draw(); + pcb_draw(); return (result); } @@ -987,7 +987,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&ChangeJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1005,7 +1005,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&SetJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1023,7 +1023,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&ClrJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1041,7 +1041,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&ChangeNonetlistFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1060,7 +1060,7 @@ ctx.chgsize.absolute = style; if (ObjectOperation(&ChangeSquareFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1078,7 +1078,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&SetSquareFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1096,7 +1096,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&ClrSquareFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1114,7 +1114,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&ChangeOctagonFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1132,7 +1132,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&SetOctagonFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1150,7 +1150,7 @@ ctx.chgsize.pcb = PCB; if (ObjectOperation(&ClrOctagonFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (pcb_true); } @@ -1222,7 +1222,7 @@ AddObjectToChangeNameUndoList(Type, Ptr1, Ptr2, Ptr3, old); IncrementUndoSerialNumber(); } - Draw(); + pcb_draw(); return (Ptr3); } return (NULL); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4860) +++ trunk/src/change_act.c (revision 4861) @@ -681,7 +681,7 @@ MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line); } IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } } } @@ -1190,7 +1190,7 @@ if ((type = SearchScreen(Crosshair.X, Crosshair.Y, CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } break; case F_SelectedPins: Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4860) +++ trunk/src/crosshair.c (revision 4861) @@ -862,7 +862,7 @@ } if (redraw) { - Redraw(); + pcb_redraw(); } } Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4860) +++ trunk/src/draw.c (revision 4861) @@ -84,7 +84,7 @@ static void DrawSilk(int side, const pcb_box_t *); #warning TODO: this should be cached -void LightenColor(const char *orig, char buf[8], double factor) +void pcb_lighten_color(const char *orig, char buf[8], double factor) { unsigned int r, g, b; @@ -106,7 +106,7 @@ * initiate the actual redrawing of the updated area */ pcb_cardinal_t pcb_draw_inhibit = 0; -void Draw(void) +void pcb_draw(void) { if (pcb_draw_inhibit) return; @@ -121,7 +121,7 @@ /* ---------------------------------------------------------------------- * redraws all the data by the event handlers */ -void Redraw(void) +void pcb_redraw(void) { gui->invalidate_all(); } @@ -211,7 +211,7 @@ if (PCB->ElementOn) { r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL); r_search(PCB->Data->name_tree[NAME_INDEX()], drawn_area, NULL, draw_element_name_callback, &side, NULL); - DrawLayer(&(PCB->Data->Layer[max_copper_layer + side]), drawn_area); + pcb_draw_layer(&(PCB->Data->Layer[max_copper_layer + side]), drawn_area); } r_search(PCB->Data->pad_tree, drawn_area, NULL, draw_pad_callback, &side, NULL); gui->end_layer(); @@ -350,7 +350,7 @@ if (gui->poly_before) { gui->use_mask(HID_MASK_BEFORE); #endif - DrawLayer(LAYER_PTR(max_copper_layer + side), drawn_area); + pcb_draw_layer(LAYER_PTR(max_copper_layer + side), drawn_area); /* draw package */ r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL); r_search(PCB->Data->name_tree[NAME_INDEX()], drawn_area, NULL, draw_element_name_callback, &side, NULL); @@ -364,7 +364,7 @@ if (gui->poly_after) { gui->use_mask(HID_MASK_AFTER); - DrawLayer(LAYER_PTR(max_copper_layer + layer), drawn_area); + pcb_draw_layer(LAYER_PTR(max_copper_layer + layer), drawn_area); /* draw package */ r_search(PCB->Data->element_tree, drawn_area, NULL, draw_element_callback, &side, NULL); r_search(PCB->Data->name_tree[NAME_INDEX()], drawn_area, NULL, draw_element_name_callback, &side, NULL); @@ -431,7 +431,7 @@ gui->use_mask(HID_MASK_OFF); } -void DrawLayer(pcb_layer_t *Layer, const pcb_box_t * screen) +void pcb_draw_layer(pcb_layer_t *Layer, const pcb_box_t * screen) { struct pcb_draw_poly_info_s info; @@ -482,7 +482,7 @@ if (strcmp(Layer->Name, "outline") == 0 || strcmp(Layer->Name, "route") == 0) rv = 0; if (layernum < max_copper_layer && Layer->On) - DrawLayer(Layer, drawn_area); + pcb_draw_layer(Layer, drawn_area); } if (n_entries > 1) rv = 1; @@ -491,7 +491,7 @@ DrawPPV(group, drawn_area); } -void EraseObject(int type, void *lptr, void *ptr) +void pcb_erase_obj(int type, void *lptr, void *ptr) { switch (type) { case PCB_TYPE_VIA: @@ -526,7 +526,7 @@ } -void DrawObject(int type, void *ptr1, void *ptr2) +void pcb_draw_obj(int type, void *ptr1, void *ptr2) { switch (type) { case PCB_TYPE_VIA: Index: trunk/src/draw.h =================================================================== --- trunk/src/draw.h (revision 4860) +++ trunk/src/draw.h (revision 4861) @@ -44,8 +44,8 @@ extern pcb_output_t Output; /* Temporarily inhibid drawing if this is non-zero. A function that calls a - lot of other functions that would call Draw() a lot in turn may increase - this value before the calls, then decrease it at the end and call Draw(). + lot of other functions that would call pcb_draw() a lot in turn may increase + this value before the calls, then decrease it at the end and call pcb_draw(). This makes sure the whole block is redrawn only once at the end. */ extern pcb_cardinal_t pcb_draw_inhibit; @@ -60,7 +60,7 @@ extern pcb_box_t pcb_draw_invalidated; /* Adds the update rect to the invalidated region. This schedules the object - for redraw (by Draw()). obj is anything that can be casted to pcb_box_t */ + for redraw (by pcb_draw()). obj is anything that can be casted to pcb_box_t */ #define pcb_draw_invalidate(obj) \ do { \ pcb_box_t *box = (pcb_box_t *)obj; \ @@ -73,13 +73,13 @@ extern int pcb_draw_doing_pinout; extern pcb_bool pcb_draw_doing_assy; -void LightenColor(const char *orig, char buf[8], double factor); +void pcb_lighten_color(const char *orig, char buf[8], double factor); -void Draw(void); -void Redraw(void); -void DrawObject(int, void *, void *); -void DrawLayer(pcb_layer_t *, const pcb_box_t *); -void EraseObject(int, void *, void *); +void pcb_draw(void); +void pcb_redraw(void); +void pcb_draw_obj(int, void *, void *); +void pcb_draw_layer(pcb_layer_t *, const pcb_box_t *); +void pcb_erase_obj(int, void *, void *); #endif Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 4860) +++ trunk/src/file_act.c (revision 4861) @@ -199,7 +199,7 @@ ResetStackAndVisibility(); pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight); pcb_center_display(PCB->MaxWidth / 2, PCB->MaxHeight / 2); - Redraw(); + pcb_redraw(); if (gui != NULL) hid_action("PCBChanged"); Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 4860) +++ trunk/src/find_drc.c (revision 4861) @@ -292,7 +292,7 @@ AddObjectToFlagUndoList(PCB_TYPE_POLYGON, layer, polygon, polygon); SET_FLAG(PCB_FLAG_FOUND, polygon); DrawPolygon(layer, polygon); - DrawObject(type, ptr1, ptr2); + pcb_draw_obj(type, ptr1, ptr2); drcerr_count++; LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); @@ -342,7 +342,7 @@ if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } User = pcb_false; Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4860) +++ trunk/src/find_misc.c (revision 4861) @@ -73,7 +73,7 @@ } while (!newone && !ListsEmpty(AndRats)); if (AndDraw) - Draw(); + pcb_draw(); return (newone); } @@ -258,7 +258,7 @@ /* we are done */ if (AndDraw) - Draw(); + pcb_draw(); if (AndDraw && conf_core.editor.beep_when_finished) gui->beep(); FreeConnectionLookupMemory(); Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 4860) +++ trunk/src/find_print.c (revision 4861) @@ -235,7 +235,7 @@ FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); User = pcb_false; - Draw(); + pcb_draw(); } /* --------------------------------------------------------------------------- @@ -255,7 +255,7 @@ FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); User = pcb_false; - Draw(); + pcb_draw(); } @@ -284,5 +284,5 @@ gui->beep(); ResetConnections(pcb_false); FreeConnectionLookupMemory(); - Redraw(); + pcb_redraw(); } Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4860) +++ trunk/src/gui_act.c (revision 4861) @@ -226,7 +226,7 @@ /* redraw layout */ case F_ClearAndRedraw: case F_Redraw: - Redraw(); + pcb_redraw(); break; /* change the displayed name of elements */ @@ -269,7 +269,7 @@ DrawElementName(element); } END_LOOP; - Draw(); + pcb_draw(); break; /* toggle line-adjust flag */ @@ -339,12 +339,12 @@ case F_ToggleThindraw: conf_toggle_editor(thin_draw); - Redraw(); + pcb_redraw(); break; case F_ToggleThindrawPoly: conf_toggle_editor(thin_draw_poly); - Redraw(); + pcb_redraw(); break; case F_ToggleLockNames: @@ -359,7 +359,7 @@ case F_ToggleHideNames: conf_toggle_editor(hide_names); - Redraw(); + pcb_redraw(); break; case F_ToggleStroke: @@ -380,7 +380,7 @@ if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } if (Crosshair.AttachedLine.State != STATE_FIRST) LookupConnection(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, pcb_true, 1, PCB_FLAG_FOUND); @@ -390,7 +390,7 @@ case F_ToggleCheckPlanes: conf_toggle_editor(check_planes); - Redraw(); + pcb_redraw(); break; case F_ToggleOrthoMove: @@ -399,12 +399,12 @@ case F_ToggleName: conf_toggle_editor(show_number); - Redraw(); + pcb_redraw(); break; case F_ToggleMask: conf_toggle_editor(show_mask); - Redraw(); + pcb_redraw(); break; case F_ToggleClearLine: @@ -430,7 +430,7 @@ /* toggle displaying of the grid */ case F_Grid: conf_toggle_editor(draw_grid); - Redraw(); + pcb_redraw(); break; /* display the pinout of an element */ @@ -481,7 +481,7 @@ END_LOOP; SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); break; case PCB_TYPE_PIN: @@ -493,7 +493,7 @@ TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); break; case PCB_TYPE_PAD: @@ -505,7 +505,7 @@ TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pad_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); break; case PCB_TYPE_VIA: if (TEST_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2)) @@ -516,7 +516,7 @@ TOGGLE_FLAG(PCB_FLAG_DISPLAYNAME, (pcb_pin_t *) ptr2); SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); break; } break; @@ -532,7 +532,7 @@ PCB->GridOffsetX = GetValue(argv[1], NULL, NULL, NULL); PCB->GridOffsetY = GetValue(argv[2], NULL, NULL, NULL); if (conf_core.editor.draw_grid) - Redraw(); + pcb_redraw(); } break; @@ -922,7 +922,7 @@ EraseElementName((pcb_element_t *) ptr2); TOGGLE_FLAG(PCB_FLAG_HIDENAME, (pcb_element_t *) ptr2); DrawElementName((pcb_element_t *) ptr2); - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } break; @@ -944,7 +944,7 @@ } END_LOOP; if (changed) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } } @@ -1176,7 +1176,7 @@ } if (layer != CURRENT) { ChangeGroupVisibility(GetLayerNumber(PCB->Data, layer), pcb_true, pcb_true); - Redraw(); + pcb_redraw(); } return 0; } Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 4860) +++ trunk/src/move.c (revision 4861) @@ -122,7 +122,7 @@ IncrementUndoSerialNumber(); pcb_draw_inhibit_dec(); - Draw(); + pcb_draw(); return (ptr2); } Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4860) +++ trunk/src/obj_arc.c (revision 4861) @@ -436,7 +436,7 @@ EraseArc(Arc); MOVE_ARC_LOWLEVEL(Arc, ctx->move.dx, ctx->move.dy); DrawArc(Layer, Arc); - Draw(); + pcb_draw(); } else { MOVE_ARC_LOWLEVEL(Arc, ctx->move.dx, ctx->move.dy); @@ -472,7 +472,7 @@ } if (ctx->move.dst_layer == Layer && Layer->On) { DrawArc(Layer, Arc); - Draw(); + pcb_draw(); } if (((long int) ctx->move.dst_layer == -1) || ctx->move.dst_layer == Layer) return (Arc); @@ -484,7 +484,7 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, ctx->move.dst_layer, Arc); if (ctx->move.dst_layer->On) DrawArc(ctx->move.dst_layer, newone); - Draw(); + pcb_draw(); return (newone); } @@ -505,7 +505,7 @@ if (Layer->On) { EraseArc(Arc); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_ARC, Layer, Arc, Arc); return NULL; @@ -548,7 +548,7 @@ RotateArcLowLevel(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); DrawArc(Layer, Arc); - Draw(); + pcb_draw(); return (Arc); } @@ -585,7 +585,7 @@ if (TEST_FLAG(PCB_FLAG_ONPOINT, arc)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } gui->set_color(Output.fgGC, color); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4860) +++ trunk/src/obj_elem.c (revision 4861) @@ -474,7 +474,7 @@ } END_LOOP; if (change) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (change); @@ -1542,7 +1542,7 @@ } END_LOOP; DrawElementName(Element); - Draw(); + pcb_draw(); } else { ELEMENTTEXT_LOOP(Element); @@ -1580,7 +1580,7 @@ didDraw = pcb_true; } if (didDraw) - Draw(); + pcb_draw(); return (Element); } @@ -1623,7 +1623,7 @@ if ((PCB->ElementOn || PCB->PinOn) && (FRONT(Element) || PCB->InvisibleObjectsOn)) { EraseElement(Element); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_ELEMENT, Element, Element, Element); return NULL; @@ -1635,7 +1635,7 @@ EraseElement(Element); RotateElementLowLevel(PCB->Data, Element, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); DrawElement(Element); - Draw(); + pcb_draw(); return (Element); } @@ -1653,7 +1653,7 @@ } END_LOOP; DrawElementName(Element); - Draw(); + pcb_draw(); return (Element); } Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4860) +++ trunk/src/obj_line.c (revision 4861) @@ -402,7 +402,7 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); if (Layer->On) { DrawLine(Layer, Line); - Draw(); + pcb_draw(); } return (Line); } @@ -421,7 +421,7 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); if (Layer->On) { DrawLine(Layer, Line); - Draw(); + pcb_draw(); } return (Line); } @@ -435,7 +435,7 @@ r_insert_entry(PCB->Data->rat_tree, &Line->BoundingBox, 0); if (PCB->RatOn) { DrawRat((pcb_rat_t *) Line); - Draw(); + pcb_draw(); } return (Line); } @@ -490,7 +490,7 @@ } if (ctx->move.dst_layer == Layer && Layer->On) { DrawLine(Layer, Line); - Draw(); + pcb_draw(); } if (((long int) ctx->move.dst_layer == -1) || ctx->move.dst_layer == Layer) return (Line); @@ -504,7 +504,7 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, ctx->move.dst_layer, newone); if (ctx->move.dst_layer->On) DrawLine(ctx->move.dst_layer, newone); - Draw(); + pcb_draw(); if (!PCB->ViaOn || ctx->move.more_to_come || GetLayerGroupNumberByPointer(Layer) == GetLayerGroupNumberByPointer(ctx->move.dst_layer) || TEST_SILK_LAYER(Layer) || TEST_SILK_LAYER(ctx->move.dst_layer)) @@ -533,7 +533,7 @@ if (setjmp(info.env) == 0) r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL); } - Draw(); + pcb_draw(); return (newone); } @@ -600,7 +600,7 @@ if (Layer->On) { EraseLine(Line); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_LINE, Layer, Line, Line); return NULL; @@ -665,7 +665,7 @@ r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) Line, 0); DrawRat((pcb_rat_t *) Line); } - Draw(); + pcb_draw(); return (Line); } @@ -699,7 +699,7 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, line); /* creation call adds it to the rtree */ } - Draw(); + pcb_draw(); return (line); } @@ -733,7 +733,7 @@ if (TEST_FLAG(PCB_FLAG_ONPOINT, line)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4860) +++ trunk/src/obj_pad.c (revision 4861) @@ -148,7 +148,7 @@ AddObjectToFlagUndoList(PCB_TYPE_PAD, Pad, Pad, Pad); TOGGLE_FLAG(PCB_FLAG_NOPASTE, Pad); DrawPad(Pad); - Draw(); + pcb_draw(); return (pcb_true); } @@ -376,7 +376,7 @@ if (TEST_FLAG(PCB_FLAG_ONPOINT, pad)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 4860) +++ trunk/src/obj_pinvia.c (revision 4861) @@ -655,7 +655,7 @@ r_insert_entry(PCB->Data->via_tree, (pcb_box_t *) Via, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); DrawVia(Via); - Draw(); + pcb_draw(); return (pcb_true); } @@ -725,7 +725,7 @@ ClearFromPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via); if (PCB->ViaOn) { DrawVia(Via); - Draw(); + pcb_draw(); } return (Via); } @@ -747,7 +747,7 @@ if (PCB->ViaOn) { EraseVia(Via); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_VIA, Via, Via, Via); return NULL; @@ -772,7 +772,7 @@ if (TEST_FLAG(PCB_FLAG_ONPOINT, Pin)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } } @@ -790,7 +790,7 @@ if (TEST_FLAG(PCB_FLAG_ONPOINT, Pin)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } } @@ -923,7 +923,7 @@ if (TEST_FLAG(PCB_FLAG_ONPOINT, pv)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } gui->set_color(Output.fgGC, color); Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4860) +++ trunk/src/obj_poly.c (revision 4861) @@ -334,7 +334,7 @@ InitClip(PCB->Data, Layer, Polygon); if (ctx->insert.forcible || !RemoveExcessPolygonPoints(Layer, Polygon)) { DrawPolygon(Layer, Polygon); - Draw(); + pcb_draw(); } return (&Polygon->Points[ctx->insert.idx]); } @@ -362,7 +362,7 @@ InitClip(PCB->Data, Layer, Polygon); if (Layer->On) { DrawPolygon(Layer, Polygon); - Draw(); + pcb_draw(); } return (Polygon); } @@ -381,7 +381,7 @@ InitClip(PCB->Data, Layer, Polygon); if (Layer->On) { DrawPolygon(Layer, Polygon); - Draw(); + pcb_draw(); } return (Point); } @@ -449,7 +449,7 @@ InitClip(PCB->Data, ctx->move.dst_layer, newone); if (ctx->move.dst_layer->On) { DrawPolygon(ctx->move.dst_layer, newone); - Draw(); + pcb_draw(); } return (newone); } @@ -508,7 +508,7 @@ if (Layer->On) { ErasePolygon(Polygon); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_POLYGON, Layer, Polygon, Polygon); return NULL; @@ -538,7 +538,7 @@ if (Layer->On) { ErasePolygon(Polygon); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } /* Copy the polygon to the undo list */ @@ -563,7 +563,7 @@ if (Layer->On) { DrawPolygon(Layer, Polygon); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } return NULL; } @@ -611,7 +611,7 @@ if (Layer->On) { DrawPolygon(Layer, Polygon); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } return NULL; } @@ -652,7 +652,7 @@ color = PCB->ConnectedColor; else if (TEST_FLAG(PCB_FLAG_ONPOINT, polygon)) { assert(color != NULL); - LightenColor(color, buf, 1.75); + pcb_lighten_color(color, buf, 1.75); color = buf; } else Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4860) +++ trunk/src/obj_rat.c (revision 4861) @@ -115,7 +115,7 @@ } END_LOOP; if (changed) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (changed); @@ -166,7 +166,7 @@ DrawLine(CURRENT, newone); } MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, Rat, Rat, Rat); - Draw(); + pcb_draw(); return (newone); } @@ -192,7 +192,7 @@ EraseRat(Rat); MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, Rat, Rat, Rat); DrawLine(ctx->move.dst_layer, newone); - Draw(); + pcb_draw(); return (newone); } @@ -213,7 +213,7 @@ if (PCB->RatOn) { EraseRat(Rat); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, Rat, Rat, Rat); return NULL; Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4860) +++ trunk/src/obj_text.c (revision 4861) @@ -343,7 +343,7 @@ EraseText(Layer, Text); MOVE_TEXT_LOWLEVEL(Text, ctx->move.dx, ctx->move.dy); DrawText(Layer, Text); - Draw(); + pcb_draw(); } else MOVE_TEXT_LOWLEVEL(Text, ctx->move.dx, ctx->move.dy); @@ -391,7 +391,7 @@ if (ctx->move.dst_layer->On) DrawText(ctx->move.dst_layer, text); if (layer->On || ctx->move.dst_layer->On) - Draw(); + pcb_draw(); } return text; } @@ -415,7 +415,7 @@ EraseText(Layer, Text); r_delete_entry(Layer->text_tree, (pcb_box_t *)Text); if (!ctx->remove.bulk) - Draw(); + pcb_draw(); } MoveObjectToRemoveUndoList(PCB_TYPE_TEXT, Layer, Text, Text); return NULL; @@ -459,7 +459,7 @@ r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); DrawText(Layer, Text); - Draw(); + pcb_draw(); return (Text); } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4860) +++ trunk/src/object_act.c (revision 4861) @@ -294,7 +294,7 @@ /* done with our action so increment the undo # */ IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(pcb_true); return 0; @@ -332,7 +332,7 @@ element = (pcb_element_t *) ptrtmp; ChangeElementSide(element, 2 * Crosshair.Y - PCB->MaxHeight); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } break; case F_Selected: @@ -799,7 +799,7 @@ PCB_PASTEBUFFER->X = 0; PCB_PASTEBUFFER->Y = 0; SaveUndoSerialNumber(); - EraseObject(PCB_TYPE_ELEMENT, ptr1, ptr1); + pcb_erase_obj(PCB_TYPE_ELEMENT, ptr1, ptr1); MoveObjectToRemoveUndoList(PCB_TYPE_ELEMENT, ptr1, ptr2, ptr3); RestoreUndoSerialNumber(); pcb_buffer_copy_to_layout(0, 0); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4860) +++ trunk/src/polygon.c (revision 4861) @@ -1321,7 +1321,7 @@ } } CopyAttachedPolygonToLayer(); - Draw(); + pcb_draw(); } else Message(PCB_MSG_DEFAULT, _("A polygon has to have at least 3 points\n")); Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 4860) +++ trunk/src/polygon_act.c (revision 4861) @@ -70,7 +70,7 @@ gui->get_coords(_("Select an Object"), &x, &y); if ((type = SearchScreen(x, y, PCB_TYPE_POLYGON, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { MorphPolygon((pcb_layer_t *) ptr1, (pcb_polygon_t *) ptr3); - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } break; @@ -83,7 +83,7 @@ MorphPolygon(layer, polygon); } ENDALL_LOOP; - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); break; } Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4860) +++ trunk/src/rats.c (revision 4861) @@ -705,7 +705,7 @@ if (Warned || changed) { stub_rat_proc_shorts(); - Draw(); + pcb_draw(); } if (Warned) Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4860) +++ trunk/src/rats_act.c (revision 4861) @@ -106,7 +106,7 @@ AddObjectToFlagUndoList(PCB_TYPE_RATLINE, shorty, shorty, shorty); SET_FLAG(PCB_FLAG_SELECTED, shorty); DrawRat(shorty); - Draw(); + pcb_draw(); pcb_center_display((shorty->Point2.X + shorty->Point1.X) / 2, (shorty->Point2.Y + shorty->Point1.Y) / 2); } break; @@ -159,7 +159,7 @@ case F_ResetLinesAndPolygons: if (ResetFoundLinesAndPolygons(pcb_true)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } break; @@ -166,7 +166,7 @@ case F_ResetPinsViasAndPads: if (ResetFoundPinsViasAndPads(pcb_true)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } break; @@ -173,7 +173,7 @@ case F_Reset: if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } break; } Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 4860) +++ trunk/src/remove.c (revision 4861) @@ -93,7 +93,7 @@ if (SelectedOperation(&RemoveFunctions, &ctx, pcb_false, PCB_TYPEMASK_ALL)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); return (pcb_true); } return (pcb_false); Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 4860) +++ trunk/src/rotate.c (revision 4861) @@ -138,7 +138,7 @@ ptr2 = ObjectOperation(&RotateFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3); changed |= (ptr2 != NULL); if (changed) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } return (ptr2); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4860) +++ trunk/src/select.c (revision 4861) @@ -200,7 +200,7 @@ pcb_select_element((pcb_element_t *) ptr1, PCB_CHGFLG_TOGGLE, 1); break; } - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); return (changed); } @@ -445,7 +445,7 @@ END_LOOP; if (changed) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); } @@ -1003,7 +1003,7 @@ if (changed) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } if (pat != NULL) free(pat); Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 4860) +++ trunk/src/select_act.c (revision 4861) @@ -210,7 +210,7 @@ /* all found connections */ case F_Connection: if (SelectConnection(pcb_true)) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); SetChangedFlag(pcb_true); } @@ -362,7 +362,7 @@ /* all found connections */ case F_Connection: if (SelectConnection(pcb_false)) { - Draw(); + pcb_draw(); IncrementUndoSerialNumber(); SetChangedFlag(pcb_true); } Index: trunk/src/set.c =================================================================== --- trunk/src/set.c (revision 4860) +++ trunk/src/set.c (revision 4861) @@ -62,7 +62,7 @@ PCB->Grid = Grid; conf_set_design("editor/grid", "%$mS", Grid); if (conf_core.editor.draw_grid) - Redraw(); + pcb_redraw(); } } @@ -228,7 +228,7 @@ if (Mode == PCB_MODE_LINE && conf_core.editor.auto_drc) { if (ResetConnections(pcb_true)) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } } } Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4860) +++ trunk/src/undo.c (revision 4861) @@ -249,10 +249,10 @@ pcb_layer_t *layer; layer = LAYER_PTR(GetLayerNumber(RemoveList, (pcb_layer_t *) Ptr1)); - DrawObject(Type, (void *) layer, Ptr2); + pcb_draw_obj(Type, (void *) layer, Ptr2); } else - DrawObject(Type, Ptr1, Ptr2); + pcb_draw_obj(Type, Ptr1, Ptr2); } /* --------------------------------------------------------------------------- @@ -346,10 +346,10 @@ if (type != PCB_TYPE_NONE) { swap = ((pcb_pin_t *) ptr2)->DrillingHole; if (andDraw) - EraseObject(type, ptr1, ptr2); + pcb_erase_obj(type, ptr1, ptr2); ((pcb_pin_t *) ptr2)->DrillingHole = Entry->Data.Size; Entry->Data.Size = swap; - DrawObject(type, ptr1, ptr2); + pcb_draw_obj(type, ptr1, ptr2); return (pcb_true); } return (pcb_false); @@ -373,7 +373,7 @@ old_sa = a->StartAngle; old_da = a->Delta; if (andDraw) - EraseObject(type, Layer, a); + pcb_erase_obj(type, Layer, a); a->StartAngle = Entry->Data.AngleChange.angle[0]; a->Delta = Entry->Data.AngleChange.angle[1]; SetArcBoundingBox(a); @@ -380,7 +380,7 @@ r_insert_entry(Layer->arc_tree, (pcb_box_t *) a, 0); Entry->Data.AngleChange.angle[0] = old_sa; Entry->Data.AngleChange.angle[1] = old_da; - DrawObject(type, ptr1, a); + pcb_draw_obj(type, ptr1, a); return (pcb_true); } return (pcb_false); @@ -404,7 +404,7 @@ old_w = a->Width; old_h = a->Height; if (andDraw) - EraseObject(type, Layer, a); + pcb_erase_obj(type, Layer, a); a->Width = Entry->Data.Move.DX; a->Height = Entry->Data.Move.DY; SetArcBoundingBox(a); @@ -411,7 +411,7 @@ r_insert_entry(Layer->arc_tree, (pcb_box_t *) a, 0); Entry->Data.Move.DX = old_w; Entry->Data.Move.DY = old_h; - DrawObject(type, ptr1, a); + pcb_draw_obj(type, ptr1, a); return (pcb_true); } return (pcb_false); @@ -432,12 +432,12 @@ swap = ((pcb_pin_t *) ptr2)->Clearance; RestoreToPolygon(PCB->Data, type, ptr1, ptr2); if (andDraw) - EraseObject(type, ptr1, ptr2); + pcb_erase_obj(type, ptr1, ptr2); ((pcb_pin_t *) ptr2)->Clearance = Entry->Data.Size; ClearFromPolygon(PCB->Data, type, ptr1, ptr2); Entry->Data.Size = swap; if (andDraw) - DrawObject(type, ptr1, ptr2); + pcb_draw_obj(type, ptr1, ptr2); return (pcb_true); } return (pcb_false); @@ -457,7 +457,7 @@ if (type & (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD)) { swap = (type == PCB_TYPE_PAD ? ((pcb_pad_t *) ptr2)->Mask : ((pcb_pin_t *) ptr2)->Mask); if (andDraw) - EraseObject(type, ptr1, ptr2); + pcb_erase_obj(type, ptr1, ptr2); if (type == PCB_TYPE_PAD) ((pcb_pad_t *) ptr2)->Mask = Entry->Data.Size; else @@ -464,7 +464,7 @@ ((pcb_pin_t *) ptr2)->Mask = Entry->Data.Size; Entry->Data.Size = swap; if (andDraw) - DrawObject(type, ptr1, ptr2); + pcb_draw_obj(type, ptr1, ptr2); return (pcb_true); } return (pcb_false); @@ -493,12 +493,12 @@ swap = ((pcb_pin_t *) ptr2)->Thickness; RestoreToPolygon(PCB->Data, type, ptr1, ptr2); if ((andDraw) && (ptr1e != NULL)) - EraseObject(type, ptr1e, ptr2); + pcb_erase_obj(type, ptr1e, ptr2); ((pcb_pin_t *) ptr2)->Thickness = Entry->Data.Size; Entry->Data.Size = swap; ClearFromPolygon(PCB->Data, type, ptr1, ptr2); if (andDraw) - DrawObject(type, ptr1, ptr2); + pcb_draw_obj(type, ptr1, ptr2); return (pcb_true); } return (pcb_false); @@ -535,7 +535,7 @@ must_redraw = 1; if (andDraw && must_redraw && (ptr1e != NULL)) - EraseObject(type, ptr1e, ptr2); + pcb_erase_obj(type, ptr1e, ptr2); pin->Flags = Entry->Data.Flags; @@ -542,7 +542,7 @@ Entry->Data.Flags = swap; if (andDraw && must_redraw) - DrawObject(type, ptr1, ptr2); + pcb_draw_obj(type, ptr1, ptr2); return (pcb_true); } Message(PCB_MSG_DEFAULT, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind); @@ -589,7 +589,7 @@ if (!RemoveList) RemoveList = pcb_buffer_new(); if (andDraw) - EraseObject(type, ptr1, ptr2); + pcb_erase_obj(type, ptr1, ptr2); /* in order to make this re-doable we move it to the RemoveList */ pcb_move_obj_to_buffer(RemoveList, PCB->Data, type, ptr1, ptr2, ptr3); Entry->Type = UNDO_REMOVE; @@ -925,7 +925,7 @@ Message(PCB_MSG_DEFAULT, _("ERROR: Failed to undo some operations\n")); if (Types && andDraw) - Draw(); + pcb_draw(); /* restore the unique flag setting */ conf_force_set_bool(conf_core.editor.unique_names, unique); @@ -1103,7 +1103,7 @@ Message(PCB_MSG_DEFAULT, _("ERROR: Failed to redo some operations\n")); if (Types && andDraw) - Draw(); + pcb_draw(); return Types; } Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 4860) +++ trunk/src_plugins/autocrop/autocrop.c (revision 4861) @@ -221,7 +221,7 @@ PCB->MaxHeight = box->Y2; MoveAll(dx, dy); IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(1); return 0; } Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4860) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4861) @@ -758,7 +758,7 @@ if (changed) { DeleteRats(pcb_false); AddAllRats(pcb_false, NULL); - Redraw(); + pcb_redraw(); } FreePointerListMemory(&Selected); return (changed); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4860) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4861) @@ -3258,7 +3258,7 @@ RD_DrawLine(rd, -1, 0, 0, 0, 0, 0, NULL, pcb_false, pcb_false); if (conf_core.editor.live_routing) - Draw(); + pcb_draw(); #ifdef ROUTE_DEBUG if (ddraw != NULL) @@ -4231,7 +4231,7 @@ } END_LOOP; if (conf_core.editor.live_routing) - Draw(); + pcb_draw(); /* reset to original connectivity */ if (rip) { ras.ripped++; @@ -4713,7 +4713,7 @@ IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); } RestoreFindFlag(); #if defined (ROUTE_DEBUG) Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 4860) +++ trunk/src_plugins/distalign/distalign.c (revision 4861) @@ -439,7 +439,7 @@ END_LOOP; if (changed) { IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(1); } free_elements_by_pos(); @@ -611,7 +611,7 @@ } if (changed) { IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(1); } free_elements_by_pos(); Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 4860) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 4861) @@ -417,7 +417,7 @@ if (changed) { RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(pcb_true); } free_texts_by_pos(); @@ -608,7 +608,7 @@ if (changed) { RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(pcb_true); } free_texts_by_pos(); Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 4860) +++ trunk/src_plugins/export_gerber/gerber.c (revision 4861) @@ -772,7 +772,7 @@ if (want_outline && strcmp(name, "outline") && strcmp(name, "route")) { if (outline_layer && outline_layer != PCB->Data->Layer + idx) - DrawLayer(outline_layer, ®ion); + pcb_draw_layer(outline_layer, ®ion); else if (!outline_layer) { pcb_hid_gc_t gc = gui->make_gc(); printf("name %s idx %d\n", name, idx); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 4860) +++ trunk/src_plugins/export_ps/ps.c (revision 4861) @@ -961,7 +961,7 @@ if (global.outline && global.outline_layer != NULL && global.outline_layer != PCB->Data->Layer + idx && strcmp(name, "outline") != 0 && strcmp(name, "route") != 0) { - DrawLayer(global.outline_layer, &global.region); + pcb_draw_layer(global.outline_layer, &global.region); } return 1; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 4860) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 4861) @@ -16,7 +16,7 @@ { layer_check(layer); ChangeGroupVisibility(layer, pcb_true, pcb_true); - Redraw(); + pcb_redraw(); } int layout_get_current_layer() Index: trunk/src_plugins/hid_gtk/ghid-propedit.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4860) +++ trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4861) @@ -307,7 +307,7 @@ MakeFlags(PCB_FLAG_CLEARPOLY | PCB_FLAG_FULLPOLY)); printf("poly2=%p -----------\n", (void *)v); DrawPolygon(PCB->Data->Layer+1, v); - Draw(); + pcb_draw(); gtk_drawing_area_size(GTK_DRAWING_AREA(area), 300, 400); return; */ Index: trunk/src_plugins/hid_gtk/gui-drc-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4860) +++ trunk/src_plugins/hid_gtk/gui-drc-window.c (revision 4861) @@ -169,7 +169,7 @@ SetChangedFlag(pcb_true); if (AndDraw) { IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } } } @@ -217,11 +217,11 @@ case PCB_TYPE_POLYGON: ChangeGroupVisibility(GetLayerNumber(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true); } - DrawObject(object_type, ptr1, ptr2); + pcb_draw_obj(object_type, ptr1, ptr2); } SetChangedFlag(pcb_true); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } static void row_activated_cb(GtkTreeView * view, GtkTreePath * path, GtkTreeViewColumn * column, gpointer user_data) Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4860) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4861) @@ -204,7 +204,7 @@ AddObjectToFlagUndoList(conn.type, conn.ptr1, conn.ptr2, conn.ptr2); TOGGLE_FLAG(PCB_FLAG_SELECTED, (pcb_any_obj_t *) conn.ptr2); - DrawObject(conn.type, conn.ptr1, conn.ptr2); + pcb_draw_obj(conn.type, conn.ptr1, conn.ptr2); } @@ -511,7 +511,7 @@ ResetConnections(pcb_false); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } static void netlist_find_cb(GtkWidget * widget, gpointer data) Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 4860) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 4861) @@ -126,7 +126,7 @@ ResetConnections(pcb_false); FreeConnectionLookupMemory(); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); } static void nbcb_select(pcb_lib_menu_t *net, int pos) Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4860) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4861) @@ -334,7 +334,7 @@ PolyToPolygonsOnLayer(PCB->Data, Layer, res, string_to_pcbflags("clearpoly", NULL)); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); return 0; } Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 4860) +++ trunk/src_plugins/polystitch/polystitch.c (revision 4861) @@ -222,7 +222,7 @@ RemoveExcessPolygonPoints(poly_layer, outer_poly); InitClip(PCB->Data, poly_layer, outer_poly); DrawPolygon(poly_layer, outer_poly); - Draw(); + pcb_draw(); RemovePolygon(poly_layer, inner_poly); } Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 4860) +++ trunk/src_plugins/query/query_act.c (revision 4861) @@ -147,7 +147,7 @@ printf("Failed to run the query\n"); if (sel.cnt > 0) { SetChangedFlag(pcb_true); - Redraw(); + pcb_redraw(); } return 0; } @@ -158,7 +158,7 @@ printf("Failed to run the query\n"); if (sel.cnt > 0) { SetChangedFlag(pcb_true); - Redraw(); + pcb_redraw(); } return 0; } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4860) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4861) @@ -257,7 +257,7 @@ htpi_uninit(&visited); IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); SetChangedFlag(1); return 0; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4860) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4861) @@ -8129,7 +8129,7 @@ AddAllRats(pcb_false, NULL); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); - Redraw(); + pcb_redraw(); return 0; } @@ -8221,7 +8221,7 @@ END_LOOP; IncrementUndoSerialNumber(); - Draw(); + pcb_draw(); return 0; } Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 4860) +++ trunk/src_plugins/vendordrill/vendor.c (revision 4861) @@ -409,7 +409,7 @@ */ if (changed) { SetChangedFlag(pcb_true); - Redraw(); + pcb_redraw(); IncrementUndoSerialNumber(); } }