Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4843) +++ trunk/doc-rnd/hacking/renames (revision 4844) @@ -162,3 +162,20 @@ GetBoxMemory -> pcb_box_new FreeBoxListMemory -> pcb_box_free SetPointBoundingBox -> pcb_set_point_bounding_box +SwapBuffer -> pcb_swap_buffer +SetBufferBoundingBox -> pcb_set_buffer_bbox +ClearBuffer -> pcb_buffer_clear +pcb_swap_buffer -> pcb_buffer_swap +pcb_buffer_set_bbox -> +AddSelectedToBuffer -> pcb_buffer_add_selected +LoadLayoutToBuffer -> pcb_buffer_load_layout +RotateBuffer -> pcb_buffer_rotate +SelectPasteBuffer -> pcb_buffer_select_paste +MirrorBuffer -> pcb_buffer_mirror +InitBuffers -> pcb_init_buffers +UninitBuffers -> pcb_uninit_buffers +MoveObjectToBuffer -> pcb_move_obj_to_buffer +CopyObjectToBuffer -> pcb_copy_obj_to_buffer +LoadFootprint -> pcb_load_footprint +CreateNewBuffer -> pcb_buffer_new +PASTEBUFFER -> PCB_PASTEBUFFER Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4843) +++ trunk/src/action_helper.c (revision 4844) @@ -303,8 +303,8 @@ if (Note.Moving && !gui->shift_is_pressed()) { Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); - ClearBuffer(PASTEBUFFER); - AddSelectedToBuffer(PASTEBUFFER, Note.X, Note.Y, pcb_true); + pcb_buffer_clear(PCB_PASTEBUFFER); + pcb_buffer_add_selected(PCB_PASTEBUFFER, Note.X, Note.Y, pcb_true); SaveUndoSerialNumber(); RemoveSelected(); SaveMode(); @@ -394,7 +394,7 @@ else if (Note.Moving) { RestoreUndoSerialNumber(); pcb_notify_mode(); - ClearBuffer(PASTEBUFFER); + pcb_buffer_clear(PCB_PASTEBUFFER); SetBufferNumber(Note.Buffer); Note.Moving = pcb_false; Note.Hit = 0; Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 4843) +++ trunk/src/board.c (revision 4844) @@ -67,7 +67,7 @@ /* allocate memory, switch all layers on and copy resources */ ptr = calloc(1, sizeof(pcb_board_t)); - ptr->Data = CreateNewBuffer(); + ptr->Data = pcb_buffer_new(); ptr->Data->pcb = ptr; ptr->ThermStyle = 4; Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4843) +++ trunk/src/buffer.c (revision 4844) @@ -81,7 +81,7 @@ /* --------------------------------------------------------------------------- * calculates the bounding box of the buffer */ -void SetBufferBoundingBox(pcb_buffer_t *Buffer) +void pcb_set_buffer_bbox(pcb_buffer_t *Buffer) { pcb_box_t *box = GetDataBoundingBox(Buffer->Data); @@ -92,7 +92,7 @@ /* --------------------------------------------------------------------------- * clears the contents of the paste buffer */ -void ClearBuffer(pcb_buffer_t *Buffer) +void pcb_buffer_clear(pcb_buffer_t *Buffer) { if (Buffer && Buffer->Data) { FreeDataMemory(Buffer->Data); @@ -104,7 +104,7 @@ * copies all selected and visible objects to the paste buffer * returns true if any objects have been removed */ -void AddSelectedToBuffer(pcb_buffer_t *Buffer, pcb_coord_t X, pcb_coord_t Y, pcb_bool LeaveSelected) +void pcb_buffer_add_selected(pcb_buffer_t *Buffer, pcb_coord_t X, pcb_coord_t Y, pcb_bool LeaveSelected) { pcb_opctx_t ctx; @@ -137,7 +137,7 @@ /*---------------------------------------------------------------------------*/ -static const char loadfootprint_syntax[] = "LoadFootprint(filename[,refdes,value])"; +static const char loadfootprint_syntax[] = "pcb_load_footprint(filename[,refdes,value])"; static const char loadfootprint_help[] = "Loads a single footprint by name."; @@ -149,7 +149,7 @@ %end-doc */ -int LoadFootprint(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) +int pcb_load_footprint(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { const char *name = PCB_ACTION_ARG(0); const char *refdes = PCB_ACTION_ARG(1); @@ -159,19 +159,19 @@ if (!name) PCB_AFAIL(loadfootprint); - if (LoadFootprintByName(PASTEBUFFER, name)) + if (LoadFootprintByName(PCB_PASTEBUFFER, name)) return 1; - if (elementlist_length(&PASTEBUFFER->Data->Element) == 0) { + if (elementlist_length(&PCB_PASTEBUFFER->Data->Element) == 0) { Message(PCB_MSG_DEFAULT, "Footprint %s contains no elements", name); return 1; } - if (elementlist_length(&PASTEBUFFER->Data->Element) > 1) { + if (elementlist_length(&PCB_PASTEBUFFER->Data->Element) > 1) { Message(PCB_MSG_DEFAULT, "Footprint %s contains multiple elements", name); return 1; } - e = elementlist_first(&PASTEBUFFER->Data->Element); + e = elementlist_first(&PCB_PASTEBUFFER->Data->Element); if (e->Name[0].TextString) free(e->Name[0].TextString); @@ -193,7 +193,7 @@ * parse the file with enabled 'PCB mode' (see parser) * if successful, update some other stuff */ -pcb_bool LoadLayoutToBuffer(pcb_buffer_t *Buffer, const char *Filename, const char *fmt) +pcb_bool pcb_buffer_load_layout(pcb_buffer_t *Buffer, const char *Filename, const char *fmt) { pcb_board_t *newPCB = pcb_board_new(); @@ -200,7 +200,7 @@ /* new data isn't added to the undo list */ if (!ParsePCB(newPCB, Filename, fmt, CFR_invalid)) { /* clear data area and replace pointer */ - ClearBuffer(Buffer); + pcb_buffer_clear(Buffer); free(Buffer->Data); Buffer->Data = newPCB->Data; newPCB->Data = NULL; @@ -220,7 +220,7 @@ /* --------------------------------------------------------------------------- * rotates the contents of the pastebuffer */ -void RotateBuffer(pcb_buffer_t *Buffer, pcb_uint8_t Number) +void pcb_buffer_rotate(pcb_buffer_t *Buffer, pcb_uint8_t Number) { /* rotate vias */ VIA_LOOP(Buffer->Data); @@ -274,7 +274,7 @@ RotateBoxLowLevel(&Buffer->BoundingBox, Buffer->X, Buffer->Y, Number); } -void FreeRotateBuffer(pcb_buffer_t *Buffer, pcb_angle_t angle) +void Freepcb_buffer_rotate(pcb_buffer_t *Buffer, pcb_angle_t angle) { double cosa, sina; @@ -330,13 +330,13 @@ } ENDALL_LOOP; - SetBufferBoundingBox(Buffer); + pcb_set_buffer_bbox(Buffer); } /* --------------------------------------------------------------------------- * creates a new paste buffer */ -pcb_data_t *CreateNewBuffer(void) +pcb_data_t *pcb_buffer_new(void) { pcb_data_t *data; data = (pcb_data_t *) calloc(1, sizeof(pcb_data_t)); @@ -347,7 +347,7 @@ /* -------------------------------------------------------------------------- */ -static const char freerotatebuffer_syntax[] = "FreeRotateBuffer([Angle])"; +static const char freerotatebuffer_syntax[] = "Freepcb_buffer_rotate([Angle])"; static const char freerotatebuffer_help[] = "Rotates the current paste buffer contents by the specified angle. The\n" @@ -370,7 +370,7 @@ angle_s = argv[0]; notify_crosshair_change(pcb_false); - FreeRotateBuffer(PASTEBUFFER, strtod(angle_s, 0)); + Freepcb_buffer_rotate(PCB_PASTEBUFFER, strtod(angle_s, 0)); notify_crosshair_change(pcb_true); return 0; } @@ -378,26 +378,26 @@ /* --------------------------------------------------------------------------- * initializes the buffers by allocating memory */ -void InitBuffers(void) +void pcb_init_buffers(void) { int i; for (i = 0; i < MAX_BUFFER; i++) - Buffers[i].Data = CreateNewBuffer(); + Buffers[i].Data = pcb_buffer_new(); } -void UninitBuffers(void) +void pcb_uninit_buffers(void) { int i; for (i = 0; i < MAX_BUFFER; i++) { - ClearBuffer(Buffers+i); + pcb_buffer_clear(Buffers+i); free(Buffers[i].Data); } } -void MirrorBuffer(pcb_buffer_t *Buffer) +void pcb_buffer_mirror(pcb_buffer_t *Buffer) { int i; @@ -449,7 +449,7 @@ SetPolygonBoundingBox(polygon); } ENDALL_LOOP; - SetBufferBoundingBox(Buffer); + pcb_set_buffer_bbox(Buffer); } @@ -456,7 +456,7 @@ /* --------------------------------------------------------------------------- * flip components/tracks from one side to the other */ -void SwapBuffer(pcb_buffer_t *Buffer) +void pcb_buffer_swap(pcb_buffer_t *Buffer) { int j, k; pcb_cardinal_t sgroup, cgroup; @@ -570,7 +570,7 @@ END_LOOP; } } - SetBufferBoundingBox(Buffer); + pcb_set_buffer_bbox(Buffer); } void pcb_swap_buffers(void) @@ -578,7 +578,7 @@ int i; for (i = 0; i < MAX_BUFFER; i++) - SwapBuffer(&Buffers[i]); + pcb_buffer_swap(&Buffers[i]); SetCrosshairRangeToBuffer(); } @@ -586,7 +586,7 @@ * moves the passed object to the passed buffer and removes it * from its original place */ -void *MoveObjectToBuffer(pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3) +void *pcb_move_obj_to_buffer(pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -600,7 +600,7 @@ /* ---------------------------------------------------------------------- * Adds the passed object to the passed buffer */ -void *CopyObjectToBuffer(pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3) +void *pcb_copy_obj_to_buffer(pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3) { pcb_opctx_t ctx; @@ -687,38 +687,38 @@ switch (funchash_get(function, NULL)) { /* clear contents of paste buffer */ case F_Clear: - ClearBuffer(PASTEBUFFER); + pcb_buffer_clear(PCB_PASTEBUFFER); break; /* copies objects to paste buffer */ case F_AddSelected: - AddSelectedToBuffer(PASTEBUFFER, 0, 0, pcb_false); + pcb_buffer_add_selected(PCB_PASTEBUFFER, 0, 0, pcb_false); break; /* converts buffer contents into an element */ case F_Convert: - ConvertBufferToElement(PASTEBUFFER); + ConvertBufferToElement(PCB_PASTEBUFFER); break; /* break up element for editing */ case F_Restore: - SmashBufferElement(PASTEBUFFER); + SmashBufferElement(PCB_PASTEBUFFER); break; /* Mirror buffer */ case F_Mirror: - MirrorBuffer(PASTEBUFFER); + pcb_buffer_mirror(PCB_PASTEBUFFER); break; case F_Rotate: if (sbufnum) { - RotateBuffer(PASTEBUFFER, (pcb_uint8_t) atoi(sbufnum)); + pcb_buffer_rotate(PCB_PASTEBUFFER, (pcb_uint8_t) atoi(sbufnum)); SetCrosshairRangeToBuffer(); } break; case F_Save: - if (elementlist_length(&PASTEBUFFER->Data->Element) == 0) { + if (elementlist_length(&PCB_PASTEBUFFER->Data->Element) == 0) { Message(PCB_MSG_DEFAULT, _("Buffer has no elements!\n")); break; } @@ -808,7 +808,7 @@ {"FreeRotateBuffer", 0, ActionFreeRotateBuffer, freerotatebuffer_help, freerotatebuffer_syntax} , - {"LoadFootprint", 0, LoadFootprint, + {"LoadFootprint", 0, pcb_load_footprint, loadfootprint_help, loadfootprint_syntax} , {"PasteBuffer", 0, ActionPasteBuffer, Index: trunk/src/buffer.h =================================================================== --- trunk/src/buffer.h (revision 4843) +++ trunk/src/buffer.h (revision 4844) @@ -41,29 +41,29 @@ /* --------------------------------------------------------------------------- * prototypes */ -void SwapBuffer(pcb_buffer_t *Buffer); -void SetBufferBoundingBox(pcb_buffer_t *); -void ClearBuffer(pcb_buffer_t *); -void AddSelectedToBuffer(pcb_buffer_t *, pcb_coord_t, pcb_coord_t, pcb_bool); -pcb_bool LoadLayoutToBuffer(pcb_buffer_t *Buffer, const char *Filename, const char *fmt); -void RotateBuffer(pcb_buffer_t *, pcb_uint8_t); -void SelectPasteBuffer(int); +void pcb_buffer_swap(pcb_buffer_t *Buffer); +void pcb_set_buffer_bbox(pcb_buffer_t *); +void pcb_buffer_clear(pcb_buffer_t *); +void pcb_buffer_add_selected(pcb_buffer_t *, pcb_coord_t, pcb_coord_t, pcb_bool); +pcb_bool pcb_buffer_load_layout(pcb_buffer_t *Buffer, const char *Filename, const char *fmt); +void pcb_buffer_rotate(pcb_buffer_t *, pcb_uint8_t); +void pcb_buffer_select_paste(int); void pcb_swap_buffers(void); -void MirrorBuffer(pcb_buffer_t *); -void InitBuffers(void); -void UninitBuffers(void); -void *MoveObjectToBuffer(pcb_data_t *, pcb_data_t *, int, void *, void *, void *); -void *CopyObjectToBuffer(pcb_data_t *, pcb_data_t *, int, void *, void *, void *); +void pcb_buffer_mirror(pcb_buffer_t *); +void pcb_init_buffers(void); +void pcb_uninit_buffers(void); +void *pcb_move_obj_to_buffer(pcb_data_t *, pcb_data_t *, int, void *, void *, void *); +void *pcb_copy_obj_to_buffer(pcb_data_t *, pcb_data_t *, int, void *, void *, void *); /* This action is called from ActionElementAddIf() */ -int LoadFootprint(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y); +int pcb_load_footprint(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y); -pcb_data_t *CreateNewBuffer(void); +pcb_data_t *pcb_buffer_new(void); /* --------------------------------------------------------------------------- * access macro for current buffer */ -#define PASTEBUFFER (&Buffers[conf_core.editor.buffer_number]) +#define PCB_PASTEBUFFER (&Buffers[conf_core.editor.buffer_number]) #endif Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 4843) +++ trunk/src/change.c (revision 4844) @@ -1266,11 +1266,11 @@ * is enabled */ if (conf_core.editor.mode == PCB_MODE_PASTE_BUFFER) - SetCrosshairRange(PASTEBUFFER->X - PASTEBUFFER->BoundingBox.X1, - PASTEBUFFER->Y - PASTEBUFFER->BoundingBox.Y1, + SetCrosshairRange(PCB_PASTEBUFFER->X - PCB_PASTEBUFFER->BoundingBox.X1, + PCB_PASTEBUFFER->Y - PCB_PASTEBUFFER->BoundingBox.Y1, MAX(0, - Width - (PASTEBUFFER->BoundingBox.X2 - - PASTEBUFFER->X)), MAX(0, Height - (PASTEBUFFER->BoundingBox.Y2 - PASTEBUFFER->Y))); + Width - (PCB_PASTEBUFFER->BoundingBox.X2 - + PCB_PASTEBUFFER->X)), MAX(0, Height - (PCB_PASTEBUFFER->BoundingBox.Y2 - PCB_PASTEBUFFER->Y))); else SetCrosshairRange(0, 0, Width, Height); Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 4843) +++ trunk/src/copy.c (revision 4844) @@ -73,12 +73,12 @@ /* set movement vector */ ctx.copy.pcb = PCB; - ctx.copy.DeltaX = X - PASTEBUFFER->X; - ctx.copy.DeltaY = Y - PASTEBUFFER->Y; + ctx.copy.DeltaX = X - PCB_PASTEBUFFER->X; + ctx.copy.DeltaY = Y - PCB_PASTEBUFFER->Y; /* paste all layers */ for (i = 0; i < max_copper_layer + 2; i++) { - pcb_layer_t *sourcelayer = &PASTEBUFFER->Data->Layer[i], *destlayer = LAYER_PTR(i); + pcb_layer_t *sourcelayer = &PCB_PASTEBUFFER->Data->Layer[i], *destlayer = LAYER_PTR(i); if (destlayer->On) { changed = changed || (!LAYER_IS_EMPTY(sourcelayer)); @@ -107,7 +107,7 @@ /* paste elements */ if (PCB->PinOn && PCB->ElementOn) { - ELEMENT_LOOP(PASTEBUFFER->Data); + ELEMENT_LOOP(PCB_PASTEBUFFER->Data); { #ifdef DEBUG printf("In CopyPastebufferToLayout, pasting element %s\n", element->Name[1].TextString); @@ -122,8 +122,8 @@ /* finally the vias */ if (PCB->ViaOn) { - changed |= (pinlist_length(&(PASTEBUFFER->Data->Via)) != 0); - VIA_LOOP(PASTEBUFFER->Data); + changed |= (pinlist_length(&(PCB_PASTEBUFFER->Data->Via)) != 0); + VIA_LOOP(PCB_PASTEBUFFER->Data); { CopyVia(&ctx, via); } Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4843) +++ trunk/src/crosshair.c (revision 4844) @@ -568,7 +568,7 @@ break; case PCB_MODE_PASTE_BUFFER: - XORDrawBuffer(PASTEBUFFER); + XORDrawBuffer(PCB_PASTEBUFFER); break; case PCB_MODE_COPY: Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 4843) +++ trunk/src/file_act.c (revision 4844) @@ -119,7 +119,7 @@ if (strcasecmp(function, "ElementToBuffer") == 0) { notify_crosshair_change(pcb_false); - if (LoadElementToBuffer(PASTEBUFFER, name)) + if (LoadElementToBuffer(PCB_PASTEBUFFER, name)) SetMode(PCB_MODE_PASTE_BUFFER); notify_crosshair_change(pcb_true); } @@ -126,7 +126,7 @@ else if (strcasecmp(function, "LayoutToBuffer") == 0) { notify_crosshair_change(pcb_false); - if (LoadLayoutToBuffer(PASTEBUFFER, name, format)) + if (pcb_buffer_load_layout(PCB_PASTEBUFFER, name, format)) SetMode(PCB_MODE_PASTE_BUFFER); notify_crosshair_change(pcb_true); } Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 4843) +++ trunk/src/main.c (revision 4844) @@ -217,7 +217,7 @@ if (conf_isdirty(CFR_USER)) conf_save_file(NULL, NULL, CFR_USER, NULL); - UninitBuffers(); + pcb_uninit_buffers(); /* Free up memory allocated to the PCB. Why bother when we're about to exit ? * Because it removes some false positives from heap bug detectors such as @@ -453,7 +453,7 @@ if (gui->gui) InitCrosshair(); InitHandler(); - InitBuffers(); + pcb_init_buffers(); SetMode(PCB_MODE_ARROW); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4843) +++ trunk/src/obj_elem.c (revision 4844) @@ -126,11 +126,11 @@ { pcb_element_t *element; - ClearBuffer(Buffer); + pcb_buffer_clear(Buffer); if (!ParseElement(Buffer->Data, Name)) { if (conf_core.editor.show_solder_side) - SwapBuffer(Buffer); - SetBufferBoundingBox(Buffer); + pcb_buffer_swap(Buffer); + pcb_set_buffer_bbox(Buffer); if (elementlist_length(&Buffer->Data->Element)) { element = elementlist_first(&Buffer->Data->Element); Buffer->X = element->MarkX; @@ -144,7 +144,7 @@ } /* release memory which might have been acquired */ - ClearBuffer(Buffer); + pcb_buffer_clear(Buffer); return (pcb_false); } @@ -179,7 +179,7 @@ */ element = elementlist_first(&Buffer->Data->Element); elementlist_remove(element); - ClearBuffer(Buffer); + pcb_buffer_clear(Buffer); ELEMENTLINE_LOOP(element); { CreateNewLineOnLayer(&Buffer->Data->SILKLAYER, @@ -266,8 +266,8 @@ Buffer->Data->pcb = PCB; Element = CreateNewElement(PCB->Data, NULL, &PCB->Font, NoFlags(), - NULL, NULL, NULL, PASTEBUFFER->X, - PASTEBUFFER->Y, 0, 100, MakeFlags(SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), pcb_false); + NULL, NULL, NULL, PCB_PASTEBUFFER->X, + PCB_PASTEBUFFER->Y, 0, 100, MakeFlags(SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), pcb_false); if (!Element) return (pcb_false); VIA_LOOP(Buffer->Data); @@ -385,9 +385,9 @@ if (SWAP_IDENT) SET_FLAG(PCB_FLAG_ONSOLDER, Element); SetElementBoundingBox(PCB->Data, Element, &PCB->Font); - ClearBuffer(Buffer); - MoveObjectToBuffer(Buffer->Data, PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element); - SetBufferBoundingBox(Buffer); + pcb_buffer_clear(Buffer); + pcb_move_obj_to_buffer(Buffer->Data, PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element); + pcb_set_buffer_bbox(Buffer); return (pcb_true); } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4843) +++ trunk/src/object_act.c (revision 4844) @@ -550,7 +550,7 @@ printf(" ... Footprint not on board, need to add it.\n"); #endif /* Not on board, need to add it. */ - if (LoadFootprint(argc, args, x, y)) { + if (pcb_load_footprint(argc, args, x, y)) { number_of_footprints_not_found++; return 1; } @@ -591,15 +591,15 @@ pcb_element_t *pe; /* Different footprint, we need to swap them out. */ - if (LoadFootprint(argc, args, x, y)) { + if (pcb_load_footprint(argc, args, x, y)) { number_of_footprints_not_found++; return 1; } er = ElementOrientation(e); - pe = elementlist_first(&(PASTEBUFFER->Data->Element)); + pe = elementlist_first(&(PCB_PASTEBUFFER->Data->Element)); if (!FRONT(e)) - MirrorElementCoordinates(PASTEBUFFER->Data, pe, pe->MarkY * 2 - PCB->MaxHeight); + MirrorElementCoordinates(PCB_PASTEBUFFER->Data, pe, pe->MarkY * 2 - PCB->MaxHeight); pr = ElementOrientation(pe); mx = e->MarkX; @@ -606,7 +606,7 @@ my = e->MarkY; if (er != pr) - RotateElementLowLevel(PASTEBUFFER->Data, pe, pe->MarkX, pe->MarkY, (er - pr + 4) % 4); + RotateElementLowLevel(PCB_PASTEBUFFER->Data, pe, pe->MarkX, pe->MarkY, (er - pr + 4) % 4); for (i = 0; i < MAX_ELEMENTNAMES; i++) { pe->Name[i].X = e->Name[i].X - mx + pe->MarkX; @@ -793,11 +793,11 @@ if (SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3) != PCB_TYPE_NONE) { Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); - ClearBuffer(PASTEBUFFER); - CopyObjectToBuffer(PASTEBUFFER->Data, PCB->Data, PCB_TYPE_ELEMENT, ptr1, ptr2, ptr3); - SmashBufferElement(PASTEBUFFER); - PASTEBUFFER->X = 0; - PASTEBUFFER->Y = 0; + pcb_buffer_clear(PCB_PASTEBUFFER); + pcb_copy_obj_to_buffer(PCB_PASTEBUFFER->Data, PCB->Data, PCB_TYPE_ELEMENT, ptr1, ptr2, ptr3); + SmashBufferElement(PCB_PASTEBUFFER); + PCB_PASTEBUFFER->X = 0; + PCB_PASTEBUFFER->Y = 0; SaveUndoSerialNumber(); EraseObject(PCB_TYPE_ELEMENT, ptr1, ptr1); MoveObjectToRemoveUndoList(PCB_TYPE_ELEMENT, ptr1, ptr2, ptr3); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4843) +++ trunk/src/plug_io.c (revision 4844) @@ -750,7 +750,7 @@ return WriteElementData(fp, PCB->Data, fmt); return pcb_write_pcb(fp, old_path, new_path, fmt, emergency); } - return WriteBuffer(fp, PASTEBUFFER, fmt); + return WriteBuffer(fp, PCB_PASTEBUFFER, fmt); } /* --------------------------------------------------------------------------- Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 4843) +++ trunk/src/rats_patch.c (revision 4844) @@ -416,7 +416,7 @@ /* check if the footprint is available */ a[0] = fpname; a[1] = NULL; - if (LoadFootprint(1, a, x, y) != 0) { + if (pcb_load_footprint(1, a, x, y) != 0) { Message(PCB_MSG_DEFAULT, "Can't load footprint %s\n", fpname); return 1; } @@ -430,7 +430,7 @@ a[1] = element->Name[1].TextString; a[2] = element->Name[2].TextString; a[3] = NULL; - LoadFootprint(3, a, element->MarkX, element->MarkY); + pcb_load_footprint(3, a, element->MarkX, element->MarkY); CopyPastebufferToLayout(element->MarkX, element->MarkY); rats_patch_append_optimize(PCB, RATP_CHANGE_ATTRIB, a[1], "footprint", fpname); RemoveElement(element); Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 4843) +++ trunk/src/select_act.c (revision 4844) @@ -221,14 +221,14 @@ pcb_coord_t x, y; Note.Buffer = conf_core.editor.buffer_number; SetBufferNumber(MAX_BUFFER - 1); - ClearBuffer(PASTEBUFFER); + pcb_buffer_clear(PCB_PASTEBUFFER); gui->get_coords(_("Select the Element's Mark Location"), &x, &y); x = GridFit(x, PCB->Grid, PCB->GridOffsetX); y = GridFit(y, PCB->Grid, PCB->GridOffsetY); - AddSelectedToBuffer(PASTEBUFFER, x, y, pcb_true); + pcb_buffer_add_selected(PCB_PASTEBUFFER, x, y, pcb_true); SaveUndoSerialNumber(); RemoveSelected(); - ConvertBufferToElement(PASTEBUFFER); + ConvertBufferToElement(PCB_PASTEBUFFER); RestoreUndoSerialNumber(); CopyPastebufferToLayout(x, y); SetBufferNumber(Note.Buffer); Index: trunk/src/set.c =================================================================== --- trunk/src/set.c (revision 4843) +++ trunk/src/set.c (revision 4844) @@ -135,12 +135,12 @@ void SetCrosshairRangeToBuffer(void) { if (conf_core.editor.mode == PCB_MODE_PASTE_BUFFER) { - SetBufferBoundingBox(PASTEBUFFER); - SetCrosshairRange(PASTEBUFFER->X - PASTEBUFFER->BoundingBox.X1, - PASTEBUFFER->Y - PASTEBUFFER->BoundingBox.Y1, + pcb_set_buffer_bbox(PCB_PASTEBUFFER); + SetCrosshairRange(PCB_PASTEBUFFER->X - PCB_PASTEBUFFER->BoundingBox.X1, + PCB_PASTEBUFFER->Y - PCB_PASTEBUFFER->BoundingBox.Y1, PCB->MaxWidth - - (PASTEBUFFER->BoundingBox.X2 - PASTEBUFFER->X), - PCB->MaxHeight - (PASTEBUFFER->BoundingBox.Y2 - PASTEBUFFER->Y)); + (PCB_PASTEBUFFER->BoundingBox.X2 - PCB_PASTEBUFFER->X), + PCB->MaxHeight - (PCB_PASTEBUFFER->BoundingBox.Y2 - PCB_PASTEBUFFER->Y)); } } Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4843) +++ trunk/src/undo.c (revision 4844) @@ -587,11 +587,11 @@ type = SearchObjectByID(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); if (type != PCB_TYPE_NONE) { if (!RemoveList) - RemoveList = CreateNewBuffer(); + RemoveList = pcb_buffer_new(); if (andDraw) EraseObject(type, ptr1, ptr2); /* in order to make this re-doable we move it to the RemoveList */ - MoveObjectToBuffer(RemoveList, PCB->Data, type, ptr1, ptr2, ptr3); + pcb_move_obj_to_buffer(RemoveList, PCB->Data, type, ptr1, ptr2, ptr3); Entry->Type = UNDO_REMOVE; return (pcb_true); } @@ -632,7 +632,7 @@ if (type != PCB_TYPE_NONE) { if (andDraw) DrawRecoveredObject(type, ptr1, ptr2, ptr3); - MoveObjectToBuffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); + pcb_move_obj_to_buffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); Entry->Type = UNDO_CREATE; return (pcb_true); } @@ -775,12 +775,12 @@ obj->ID = obj2->ID; obj2->ID = swap_id; - MoveObjectToBuffer(RemoveList, PCB->Data, type, ptr1b, ptr2b, ptr3b); + pcb_move_obj_to_buffer(RemoveList, PCB->Data, type, ptr1b, ptr2b, ptr3b); if (andDraw) DrawRecoveredObject(Entry->Kind, ptr1, ptr2, ptr3); - obj = (pcb_any_obj_t *) MoveObjectToBuffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); + obj = (pcb_any_obj_t *) pcb_move_obj_to_buffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); if (Entry->Kind == PCB_TYPE_POLYGON) InitClip(PCB->Data, (pcb_layer_t *) ptr1b, (pcb_polygon_t *) obj); return (pcb_true); @@ -1229,10 +1229,10 @@ return; if (!RemoveList) - RemoveList = CreateNewBuffer(); + RemoveList = pcb_buffer_new(); GetUndoSlot(UNDO_REMOVE, OBJECT_ID(Ptr3), Type); - MoveObjectToBuffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); + pcb_move_obj_to_buffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); } /* --------------------------------------------------------------------------- @@ -1292,10 +1292,10 @@ return; if (!RemoveList) - RemoveList = CreateNewBuffer(); + RemoveList = pcb_buffer_new(); undo = GetUndoSlot(undo_type, OBJECT_ID(Ptr2), Type); - copy = (pcb_any_obj_t *) CopyObjectToBuffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); + copy = (pcb_any_obj_t *) pcb_copy_obj_to_buffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); undo->Data.CopyID = copy->ID; } Index: trunk/src_plugins/export_openscad/scadcomp.c =================================================================== --- trunk/src_plugins/export_openscad/scadcomp.c (revision 4843) +++ trunk/src_plugins/export_openscad/scadcomp.c (revision 4844) @@ -347,7 +347,7 @@ -extern void FreeRotateBuffer(pcb_buffer_t * Buffer, pcb_angle_t angle); +extern void Freepcb_buffer_rotate(pcb_buffer_t * Buffer, pcb_angle_t angle); static int scad_calculate_bbox(pcb_element_t * element, pcb_angle_t angle, float *w, float *h, float *ox, float *oy) { @@ -358,7 +358,7 @@ pcb_buffer_t element_buffer; - element_buffer.Data = CreateNewBuffer (); + element_buffer.Data = pcb_buffer_new(); -- Copy AddElementToBuffer (pcb_element_t *Element) @@ -365,7 +365,7 @@ if (ON_SIDE(Element,(Settings.ShowBottomSide)?BOTTOM_SIDE:TOP_SIDE)) MirrorElementCoordinates (element_buffer.Data, element, 0); - ClearBuffer (&element_buffer); + pcb_buffer_clear(&element_buffer); */ } Index: trunk/src_plugins/hid_gtk/ghid-propedit.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4843) +++ trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4844) @@ -313,7 +313,7 @@ */ memset(&preview_pcb, 0, sizeof(preview_pcb)); - preview_pcb.Data = CreateNewBuffer(); + preview_pcb.Data = pcb_buffer_new(); preview_pcb.MaxWidth = preview_pcb.MaxHeight = PCB_MIL_TO_COORD(2000); pcb_colors_from_settings(&preview_pcb); CreateDefaultFont(&preview_pcb); Index: trunk/src_plugins/hid_gtk/gui-library-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-library-window.c (revision 4843) +++ trunk/src_plugins/hid_gtk/gui-library-window.c (revision 4844) @@ -394,12 +394,12 @@ fullp = entry->data.fp.loc_info; } SetMode(PCB_MODE_ARROW); - if (LoadElementToBuffer(PASTEBUFFER, name == NULL ? fullp : name)) + if (LoadElementToBuffer(PCB_PASTEBUFFER, name == NULL ? fullp : name)) SetMode(PCB_MODE_PASTE_BUFFER); /* update the preview with new symbol data */ - if ((PASTEBUFFER->Data != NULL) && (elementlist_length(&PASTEBUFFER->Data->Element) != 0)) - g_object_set(library_window->preview, "element-data", elementlist_first(&PASTEBUFFER->Data->Element), NULL); + if ((PCB_PASTEBUFFER->Data != NULL) && (elementlist_length(&PCB_PASTEBUFFER->Data->Element) != 0)) + g_object_set(library_window->preview, "element-data", elementlist_first(&PCB_PASTEBUFFER->Data->Element), NULL); else { g_object_set(library_window->preview, "element-data", NULL, NULL); } Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 4843) +++ trunk/src_plugins/hid_lesstif/library.c (revision 4844) @@ -64,7 +64,7 @@ { pcb_fplibrary_t *e = picks.array[last_pick]; e = &e->data.dir.children.array[cbs->item_position - 1]; - if (LoadElementToBuffer(PASTEBUFFER, e->data.fp.loc_info)) + if (LoadElementToBuffer(PCB_PASTEBUFFER, e->data.fp.loc_info)) SetMode(PCB_MODE_PASTE_BUFFER); } Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 4843) +++ trunk/src_plugins/renumber/renumberblock.c (revision 4844) @@ -94,7 +94,7 @@ conf_set_editor(name_on_pcb, 1); - ELEMENT_LOOP(PASTEBUFFER->Data); + ELEMENT_LOOP(PCB_PASTEBUFFER->Data); { char *refdes_split, *cp; char *old_ref, *new_ref; Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 4843) +++ trunk/src_plugins/shand_cmd/command.c (revision 4844) @@ -153,7 +153,7 @@ switch (argc) { case 1: /* filename is passed in commandline */ filename = argv[0]; - if (filename && LoadElementToBuffer(PASTEBUFFER, filename)) + if (filename && LoadElementToBuffer(PCB_PASTEBUFFER, filename)) SetMode(PCB_MODE_PASTE_BUFFER); break; @@ -189,7 +189,7 @@ format = argv[1]; case 1: /* filename is passed in commandline */ filename = argv[0]; - if (filename && LoadLayoutToBuffer(PASTEBUFFER, filename, format)) + if (filename && pcb_buffer_load_layout(PCB_PASTEBUFFER, filename, format)) SetMode(PCB_MODE_PASTE_BUFFER); break;