Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 15868) +++ trunk/doc/developer/renames (revision 15869) @@ -1750,3 +1750,9 @@ pcb_polygon_s -> pcb_poly_s pcb_add_polygon_on_layer -> pcb_add_poly_on_layer GetObjectBoundingBox -> pcb_obj_get_bbox +PCB_TYPE_ -> PCB_OBJ_ +PCB_OBJ_NONE -> PCB_OBJ_VOID +pcb_obj_tpye_t -> pcb_objtype_t +PCB_TYPEMASK_ALL -> PCB_OBJ_ANY +PCB_OBJ_RATLINE -> PCB_OBJ_RAT +PCB_OBJ_SUBC_FLOATER -> PCB_OBJ_FLOATER Index: trunk/src/board.h =================================================================== --- trunk/src/board.h (revision 15868) +++ trunk/src/board.h (revision 15869) @@ -137,7 +137,7 @@ #define PCB_CSWAP_Y(y, h, cond) ((cond) ? (h+PCB_SWAP_SIGN_Y(y)) : (y)) /* Conditionally allow subc parts to be reached directly in search masks */ -#define PCB_LOOSE_SUBC (PCB->loose_subc ? PCB_TYPE_SUBC_PART : 0) +#define PCB_LOOSE_SUBC (PCB->loose_subc ? PCB_OBJ_SUBC_PART : 0) /* changes the name of a layout; Name is allocated by the caller (no strdup() is made) */ Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 15868) +++ trunk/src/buffer.c (revision 15869) @@ -135,7 +135,7 @@ pcb_notify_crosshair_change(pcb_false); ctx.buffer.src = pcb->Data; ctx.buffer.dst = Buffer->Data; - pcb_selected_operation(pcb, pcb->Data, fnc, &ctx, pcb_false, PCB_TYPEMASK_ALL); + pcb_selected_operation(pcb, pcb->Data, fnc, &ctx, pcb_false, PCB_OBJ_ANY); /* set origin to passed or current position */ if (X || Y) { @@ -248,7 +248,7 @@ PCB_SUBC_LOOP(Buffer->Data); { - pcb_obj_rotate90(PCB_TYPE_SUBC, subc, subc, subc, Buffer->X, Buffer->Y, Number); + pcb_obj_rotate90(PCB_OBJ_SUBC, subc, subc, subc, Buffer->X, Buffer->Y, Number); } PCB_END_LOOP; Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 15868) +++ trunk/src/change.c (revision 15869) @@ -756,15 +756,15 @@ } switch (Type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: name = pcb_gui->prompt_for(_("Linename:"), PCB_EMPTY(((pcb_line_t *) Ptr2)->Number)); break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: name = pcb_gui->prompt_for(_("Enter text:"), PCB_EMPTY(((pcb_text_t *) Ptr2)->TextString)); break; - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: name = pcb_gui->prompt_for(_("Subcircuit refdes:"), PCB_EMPTY(((pcb_subc_t *)Ptr2)->refdes)); break; } Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 15868) +++ trunk/src/change.h (revision 15869) @@ -38,35 +38,35 @@ #include "unit.h" #define PCB_CHANGENAME_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_LINE | \ - PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC) + (PCB_OBJ_PSTK | PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_LINE | \ + PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC) #define PCB_CHANGESIZE_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_POLY | PCB_TYPE_LINE | PCB_TYPE_ARC | \ - PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART) + (PCB_OBJ_PSTK | PCB_OBJ_POLY | PCB_OBJ_LINE | PCB_OBJ_ARC | \ + PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART) #define PCB_CHANGE2NDSIZE_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART) + (PCB_OBJ_PSTK | PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART) /* We include polygons here only to inform the user not to do it that way. */ #define PCB_CHANGECLEARSIZE_TYPES \ - (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC | \ - PCB_TYPE_SUBC_PART) + (PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | \ + PCB_OBJ_SUBC_PART) #define PCB_CHANGENONETLIST_TYPES \ - (PCB_TYPE_SUBC) + (PCB_OBJ_SUBC) #define PCB_CHANGESQUARE_TYPES \ - (PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART) + (PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART) #define PCB_CHANGEOCTAGON_TYPES \ - (PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART) + (PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART) #define PCB_CHANGEJOIN_TYPES \ - (PCB_TYPE_ARC | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY) + (PCB_OBJ_ARC | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY) #define PCB_CHANGETHERMAL_TYPES \ - (PCB_TYPE_SUBC_PART) + (PCB_OBJ_SUBC_PART) pcb_bool pcb_chg_selected_size(int, pcb_coord_t, pcb_bool); pcb_bool pcb_chg_selected_clear_size(int, pcb_coord_t, pcb_bool); Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 15868) +++ trunk/src/change_act.c (revision 15869) @@ -82,7 +82,7 @@ const char *units = PCB_ACTION_ARG(2); pcb_bool absolute; pcb_coord_t value; - int type = PCB_TYPE_NONE; + int type = PCB_OBJ_VOID; void *ptr1, *ptr2, *ptr3; if (function && delta) { @@ -94,7 +94,7 @@ } if (strcmp(argv[1], "style") == 0) { - if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLY)) /* workaround: pcb_search_screen(PCB_CHANGECLEARSIZE_TYPES) wouldn't return elements */ + if ((type == PCB_OBJ_VOID) || (type == PCB_OBJ_POLY)) /* workaround: pcb_search_screen(PCB_CHANGECLEARSIZE_TYPES) wouldn't return elements */ type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); if (pcb_get_style_size(funcid, &value, type, 2) != 0) return 1; @@ -106,7 +106,7 @@ switch (pcb_funchash_get(function, NULL)) { case F_Object: { - if (type != PCB_TYPE_NONE) + if (type != PCB_OBJ_VOID) if (pcb_chg_obj_clear_size(type, ptr1, ptr2, ptr3, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; @@ -114,15 +114,15 @@ case F_SelectedVias: case F_SelectedPads: case F_SelectedPins: - if (pcb_chg_selected_clear_size(PCB_TYPE_PSTK, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_OBJ_PSTK, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedLines: - if (pcb_chg_selected_clear_size(PCB_TYPE_LINE, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_OBJ_LINE, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedArcs: - if (pcb_chg_selected_clear_size(PCB_TYPE_ARC, value, absolute)) + if (pcb_chg_selected_clear_size(PCB_OBJ_ARC, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; case F_Selected: @@ -193,7 +193,7 @@ pcb_gui->get_coords("Click on object to change", &x, &y); - if ((type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); if (set_object(type, ptr1, ptr2, ptr3)) @@ -204,17 +204,17 @@ case F_SelectedVias: case F_SelectedPins: case F_SelectedPads: - if (set_selected(PCB_TYPE_PSTK)) + if (set_selected(PCB_OBJ_PSTK)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedLines: - if (set_selected(PCB_TYPE_LINE)) + if (set_selected(PCB_OBJ_LINE)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedTexts: - if (set_selected(PCB_TYPE_TEXT)) + if (set_selected(PCB_OBJ_TEXT)) pcb_board_set_changed_flag(pcb_true); break; @@ -305,7 +305,7 @@ const char *units = PCB_ACTION_ARG(2); pcb_bool absolute; /* indicates if absolute size is given */ pcb_coord_t value; - int type = PCB_TYPE_NONE, tostyle = 0; + int type = PCB_OBJ_VOID, tostyle = 0; void *ptr1, *ptr2, *ptr3; @@ -329,7 +329,7 @@ switch (funcid) { case F_Object: { - if (type != PCB_TYPE_NONE) + if (type != PCB_OBJ_VOID) if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); if (tostyle) { @@ -345,22 +345,22 @@ case F_SelectedVias: case F_SelectedPins: case F_SelectedPads: - if (pcb_chg_selected_size(PCB_TYPE_PSTK, value, absolute)) + if (pcb_chg_selected_size(PCB_OBJ_PSTK, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedArcs: - if (pcb_chg_selected_size(PCB_TYPE_ARC, value, absolute)) + if (pcb_chg_selected_size(PCB_OBJ_ARC, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedLines: - if (pcb_chg_selected_size(PCB_TYPE_LINE, value, absolute)) + if (pcb_chg_selected_size(PCB_OBJ_LINE, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedTexts: - if (pcb_chg_selected_size(PCB_TYPE_TEXT, value, absolute)) + if (pcb_chg_selected_size(PCB_OBJ_TEXT, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; @@ -395,7 +395,7 @@ const char *function = PCB_ACTION_ARG(0); const char *delta = PCB_ACTION_ARG(1); const char *units = PCB_ACTION_ARG(2); - int type = PCB_TYPE_NONE; + int type = PCB_OBJ_VOID; void *ptr1, *ptr2, *ptr3; pcb_bool absolute; @@ -421,7 +421,7 @@ case F_Object: { - if (type != PCB_TYPE_NONE) + if (type != PCB_OBJ_VOID) if (pcb_chg_obj_2nd_size(type, ptr1, ptr2, ptr3, value, absolute, pcb_true)) pcb_board_set_changed_flag(pcb_true); break; @@ -430,7 +430,7 @@ case F_SelectedPadstacks: case F_SelectedVias: case F_SelectedPins: - if (pcb_chg_selected_2nd_size(PCB_TYPE_PSTK, value, absolute)) + if (pcb_chg_selected_2nd_size(PCB_OBJ_PSTK, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; @@ -548,7 +548,7 @@ void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_undo_save_serial(); pinnum = 0; if (pcb_chg_obj_name_query(type, ptr1, ptr2, ptr3)) { @@ -610,7 +610,7 @@ void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) if (pcb_chg_obj_join(type, ptr1, ptr2, ptr3)) pcb_board_set_changed_flag(pcb_true); break; @@ -617,12 +617,12 @@ } case F_SelectedLines: - if (pcb_chg_selected_join(PCB_TYPE_LINE)) + if (pcb_chg_selected_join(PCB_OBJ_LINE)) pcb_board_set_changed_flag(pcb_true); break; case F_SelectedArcs: - if (pcb_chg_selected_join(PCB_TYPE_ARC)) + if (pcb_chg_selected_join(PCB_OBJ_ARC)) pcb_board_set_changed_flag(pcb_true); break; @@ -671,7 +671,7 @@ case F_SelectedElements: case F_Selected: case F_SelectedObjects: - if (pcb_chg_selected_nonetlist(PCB_TYPE_SUBC)) + if (pcb_chg_selected_nonetlist(PCB_OBJ_SUBC)) pcb_board_set_changed_flag(pcb_true); break; } @@ -774,7 +774,7 @@ switch (pcb_funchash_get(function, NULL)) { case F_Object: pcb_gui->get_coords("Click on object for SetThermal", &gx, &gy); - if ((type = pcb_search_screen(gx, gy, PCB_CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(gx, gy, PCB_CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind, INDEXOFCURRENT); pcb_undo_inc_serial(); pcb_draw(); @@ -782,7 +782,7 @@ break; case F_SelectedPins: case F_SelectedVias: - pcb_chg_selected_thermals(PCB_TYPE_PSTK, kind, INDEXOFCURRENT); + pcb_chg_selected_thermals(PCB_OBJ_PSTK, kind, INDEXOFCURRENT); break; case F_Selected: case F_SelectedElements: @@ -966,7 +966,7 @@ const char *delta = PCB_ACTION_ARG(2); pcb_bool absolute; /* indicates if absolute size is given */ double value; - int type = PCB_TYPE_NONE, which; + int type = PCB_OBJ_VOID, which; void *ptr1, *ptr2, *ptr3; if (pcb_strcasecmp(prim, "start") == 0) which = 0; @@ -1000,7 +1000,7 @@ switch (funcid) { case F_Object: { - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); else { @@ -1012,7 +1012,7 @@ } case F_SelectedArcs: - if (pcb_chg_selected_angle(PCB_TYPE_ARC, which, value, absolute)) + if (pcb_chg_selected_angle(PCB_OBJ_ARC, which, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; @@ -1041,7 +1041,7 @@ const char *units = PCB_ACTION_ARG(3); pcb_bool absolute; /* indicates if absolute size is given */ double value; - int type = PCB_TYPE_NONE, which; + int type = PCB_OBJ_VOID, which; void *ptr1, *ptr2, *ptr3; if ((pcb_strcasecmp(prim, "width") == 0) || (pcb_strcasecmp(prim, "x") == 0)) which = 0; @@ -1066,7 +1066,7 @@ switch (funcid) { case F_Object: { - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); else { @@ -1078,7 +1078,7 @@ } case F_SelectedArcs: - if (pcb_chg_selected_radius(PCB_TYPE_ARC, which, value, absolute)) + if (pcb_chg_selected_radius(PCB_OBJ_ARC, which, value, absolute)) pcb_board_set_changed_flag(pcb_true); break; Index: trunk/src/const.h =================================================================== --- trunk/src/const.h (revision 15868) +++ trunk/src/const.h (revision 15869) @@ -1,68 +1,2 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * (this file is based on PCB, interactive printed circuit board design) - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact: - * Project page: http://repo.hu/projects/pcb-rnd - * lead developer: email to pcb-rnd (at) igor2.repo.hu - * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") - * - */ +#include "obj_common.h" -/* global source constants */ - -#ifndef PCB_CONST_H -#define PCB_CONST_H - -/* --------------------------------------------------------------------------- - * object types (bitfield) - */ -typedef enum { - PCB_TYPE_NONE = 0x00000, /* special: no object */ - - - PCB_TYPE_ARC = 0x04000, - PCB_TYPE_ARC_POINT = 0x80000, - PCB_TYPE_LINE = 0x00004, - PCB_TYPE_LINE_POINT = 0x01000, - PCB_TYPE_POLY = 0x00008, - PCB_TYPE_POLY_POINT = 0x00800, - PCB_TYPE_TEXT = 0x00010, - PCB_TYPE_RATLINE = 0x00020, - PCB_TYPE_SUBC = 0x00040, /* TODO: should be 0x00002 once PCB_TYPE_ELEMENT is removed */ - PCB_TYPE_PSTK = 0x100000, - - - - PCB_TYPE_LOCKED = 0x10000, /* used to tell search to include locked items. */ - PCB_TYPE_SUBC_PART = 0x20000, /* used to tell search to include objects that are part of a subcircuit */ - PCB_TYPE_NET = 0x40000, /* used to select whole net. */ - - PCB_TYPE_SUBC_FLOATER = 0x200000, /* prefer subc floaters in search by location; TODO: should be 2 slots up */ - - /* groups/properties */ - PCB_TYPEMASK_PIN = (PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART), - PCB_TYPEMASK_TERM = (PCB_TYPEMASK_PIN | PCB_TYPE_SUBC_PART | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_TEXT), - PCB_TYPEMASK_LOCK = (PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC | PCB_TYPE_TEXT | PCB_TYPE_LOCKED), - - PCB_TYPEMASK_ALL = (~0) /* all bits set */ -} pcb_obj_type_t; - -#endif Index: trunk/src/copy.h =================================================================== --- trunk/src/copy.h (revision 15868) +++ trunk/src/copy.h (revision 15869) @@ -32,8 +32,8 @@ #include "config.h" #define PCB_COPY_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | \ - PCB_TYPE_SUBC | PCB_TYPE_POLY | PCB_TYPE_ARC) + (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_TEXT | \ + PCB_OBJ_SUBC | PCB_OBJ_POLY | PCB_OBJ_ARC) /* Undoably copies (duplicates) an object; the new objects is moved by DX,DY (operation wrapper) */ Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 15868) +++ trunk/src/crosshair.c (revision 15869) @@ -232,7 +232,7 @@ pcb_line_t *line = (pcb_line_t *) pcb_crosshair.AttachedObject.Ptr2; pcb_point_t *point = (pcb_point_t *) pcb_crosshair.AttachedObject.Ptr3; - if (pcb_crosshair.AttachedObject.Type != PCB_TYPE_NONE) { + if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { pcb_gui->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point1.X, line->Point1.Y); pcb_gui->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point2.X, line->Point2.Y); } @@ -249,7 +249,7 @@ switch (pcb_crosshair.AttachedObject.Type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: { pcb_pstk_t *ps = (pcb_pstk_t *) pcb_crosshair.AttachedObject.Ptr1; thindraw_moved_ps(ps, dx, dy); @@ -256,7 +256,7 @@ break; } - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { /* We move a local copy of the line -the real line hasn't moved, * only the preview. @@ -296,7 +296,7 @@ break; } - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: { /* Make a temporary arc and move it by dx,dy */ pcb_arc_t arc = *((pcb_arc_t *) pcb_crosshair.AttachedObject.Ptr2); @@ -318,7 +318,7 @@ break; } - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: { pcb_poly_t *polygon = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2; @@ -329,7 +329,7 @@ break; } - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_LINE_POINT: { pcb_line_t *line; pcb_point_t *point,*point1,point2; @@ -374,7 +374,7 @@ break; } - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: { pcb_arc_t arc = *((pcb_arc_t *)pcb_crosshair.AttachedObject.Ptr2); pcb_coord_t ox1,ox2,oy1,oy2; @@ -417,7 +417,7 @@ break; } - case PCB_TYPE_POLY_POINT: + case PCB_OBJ_POLY_POINT: { pcb_poly_t *polygon; pcb_point_t *point; @@ -437,7 +437,7 @@ break; } - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: XORDrawSubc((pcb_subc_t *) pcb_crosshair.AttachedObject.Ptr2, dx, dy, 0); break; } @@ -584,7 +584,7 @@ #endif if ((line->Point1.X == info->X && line->Point1.Y == info->Y) || (line->Point2.X == info->X && line->Point2.Y == info->Y)) { pcb_onpoint_t op; - op.type = PCB_TYPE_LINE; + op.type = PCB_OBJ_LINE; op.obj.line = line; vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line); @@ -614,7 +614,7 @@ if ((close_enough(p1x, info->X) && close_enough(p1y, info->Y)) || (close_enough(p2x, info->X) && close_enough(p2y, info->Y))) { pcb_onpoint_t op; - op.type = PCB_TYPE_ARC; + op.type = PCB_OBJ_ARC; op.obj.arc = arc; vtop_append(&crosshair->onpoint_objs, op); PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) arc); @@ -629,7 +629,7 @@ void DrawLineOrArc(int type, void *obj) { switch (type) { - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_LINE_POINT: /* Attention: We can use a NULL pointer here for the layer, * because it is not used in the pcb_line_invalidate_draw() function anyways. * ATM pcb_line_invalidate_draw() only calls AddPart() internally, which invalidates @@ -637,7 +637,7 @@ */ pcb_line_invalidate_draw(NULL, (pcb_line_t *) obj); break; - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: /* See comment above */ pcb_arc_invalidate_draw(NULL, (pcb_arc_t *) obj); break; @@ -780,9 +780,9 @@ /* Pick the nearest grid-point in the x or y direction * to align with, then adjust until we hit the line */ - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_LINE, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE, &ptr1, &ptr2, &ptr3); - if (ans == PCB_TYPE_NONE) + if (ans == PCB_OBJ_VOID) return; line = (pcb_line_t *) ptr2; @@ -794,7 +794,7 @@ if ((conf_core.editor.mode != PCB_MODE_LINE || CURRENT != ptr1) && (conf_core.editor.mode != PCB_MODE_MOVE || pcb_crosshair.AttachedObject.Ptr1 != ptr1 || - pcb_crosshair.AttachedObject.Type != PCB_TYPE_LINE_POINT + pcb_crosshair.AttachedObject.Type != PCB_OBJ_LINE_POINT || pcb_crosshair.AttachedObject.Ptr2 == line)) return; @@ -883,11 +883,11 @@ snap_data.x = nearest_grid_x; snap_data.y = nearest_grid_y; - ans = PCB_TYPE_NONE; + ans = PCB_OBJ_VOID; if (!PCB->RatDraw) - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_SUBC, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3); - if (ans & PCB_TYPE_SUBC) { + if (ans & PCB_OBJ_SUBC) { pcb_subc_t *sc = (pcb_subc_t *) ptr1; pcb_coord_t ox, oy; if (pcb_subc_get_origin(sc, &ox, &oy) == 0) @@ -895,15 +895,15 @@ } /*** padstack center ***/ - ans = PCB_TYPE_NONE; + ans = PCB_OBJ_VOID; if (conf_core.editor.snap_pin) - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3); /* Avoid snapping padstack to any other padstack */ - if (conf_core.editor.mode == PCB_MODE_MOVE && pcb_crosshair.AttachedObject.Type == PCB_TYPE_PSTK && (ans & PCB_TYPE_PSTK)) - ans = PCB_TYPE_NONE; + if (conf_core.editor.mode == PCB_MODE_MOVE && pcb_crosshair.AttachedObject.Type == PCB_OBJ_PSTK && (ans & PCB_OBJ_PSTK)) + ans = PCB_OBJ_VOID; - if (ans != PCB_TYPE_NONE) { + if (ans != PCB_OBJ_VOID) { pcb_pstk_t *ps = (pcb_pstk_t *) ptr2; check_snap_object(&snap_data, ps->x, ps->y, pcb_true); pcb_crosshair.snapped_pstk = ps; @@ -910,27 +910,27 @@ } /*** arc ***/ - ans = PCB_TYPE_NONE; + ans = PCB_OBJ_VOID; if (conf_core.editor.snap_pin) - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_LINE_POINT | PCB_TYPE_ARC_POINT | PCB_TYPE_SUBC_PART, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE_POINT | PCB_OBJ_ARC_POINT | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3); - if (ans == PCB_TYPE_ARC_POINT) { + if (ans == PCB_OBJ_ARC_POINT) { /* Arc point needs special handling as it's not a real point but has to be calculated */ pcb_coord_t ex, ey; pcb_arc_get_end((pcb_arc_t *)ptr2, (ptr3 != pcb_arc_start_ptr), &ex, &ey); check_snap_object(&snap_data, ex, ey, pcb_true); } - else if (ans != PCB_TYPE_NONE) { + else if (ans != PCB_OBJ_VOID) { pcb_point_t *pnt = (pcb_point_t *) ptr3; check_snap_object(&snap_data, pnt->X, pnt->Y, pcb_true); } /*** polygon terminal: center ***/ - ans = PCB_TYPE_NONE; + ans = PCB_OBJ_VOID; if (conf_core.editor.snap_pin) - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_POLY | PCB_TYPE_SUBC_PART, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_POLY | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3); - if (ans == PCB_TYPE_POLY) { + if (ans == PCB_OBJ_POLY) { pcb_poly_t *p = ptr2; if (p->term != NULL) { pcb_coord_t cx, cy; @@ -947,11 +947,11 @@ if (conf_core.editor.snap_offgrid_line) check_snap_offgrid_line(&snap_data, nearest_grid_x, nearest_grid_y); - ans = PCB_TYPE_NONE; + ans = PCB_OBJ_VOID; if (conf_core.editor.snap_pin) - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_POLY_POINT, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_POLY_POINT, &ptr1, &ptr2, &ptr3); - if (ans != PCB_TYPE_NONE) { + if (ans != PCB_OBJ_VOID) { pcb_point_t *pnt = (pcb_point_t *) ptr3; check_snap_object(&snap_data, pnt->X, pnt->Y, pcb_true); } @@ -965,8 +965,8 @@ onpoint_work(&pcb_crosshair, pcb_crosshair.X, pcb_crosshair.Y); if (conf_core.editor.mode == PCB_MODE_ARROW) { - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_LINE_POINT, &ptr1, &ptr2, &ptr3); - if (ans == PCB_TYPE_NONE) { + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE_POINT, &ptr1, &ptr2, &ptr3); + if (ans == PCB_OBJ_VOID) { if ((pcb_gui != NULL) && (pcb_gui->point_cursor != NULL)) pcb_gui->point_cursor(pcb_false); } @@ -1139,7 +1139,7 @@ pcb_notify_crosshair_change(pcb_false); pcb_added_lines = 0; pcb_route_reset(&pcb_crosshair.Route); - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedPolygon.PointN = 0; if (PCB->RatDraw) { Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 15868) +++ trunk/src/data.c (revision 15869) @@ -415,32 +415,32 @@ PCB_PADSTACK_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_PSTK, padstack, padstack, padstack); + pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_PSTK, padstack, padstack, padstack); } PCB_END_LOOP; PCB_SUBC_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_SUBC, subc, subc, subc); + pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_SUBC, subc, subc, subc); } PCB_END_LOOP; PCB_LINE_ALL_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_LINE, layer, line, line); + pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_LINE, layer, line, line); } PCB_ENDALL_LOOP; PCB_ARC_ALL_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_ARC, layer, arc, arc); + pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_ARC, layer, arc, arc); } PCB_ENDALL_LOOP; PCB_TEXT_ALL_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_TEXT, layer, text, text); + pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_TEXT, layer, text, text); } PCB_ENDALL_LOOP; PCB_POLY_ALL_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_POLY, layer, polygon, polygon); + pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_POLY, layer, polygon, polygon); } PCB_ENDALL_LOOP; } @@ -606,7 +606,7 @@ } -void pcb_data_flag_change(pcb_data_t *data, pcb_obj_type_t mask, int how, unsigned long flags) +void pcb_data_flag_change(pcb_data_t *data, pcb_objtype_t mask, int how, unsigned long flags) { pcb_any_obj_t *o; pcb_data_it_t it; Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 15868) +++ trunk/src/data.h (revision 15869) @@ -190,6 +190,6 @@ /* Recursively change flags of data; how is one of pcb_change_flag_t */ -void pcb_data_flag_change(pcb_data_t *data, pcb_obj_type_t mask, int how, unsigned long flags); +void pcb_data_flag_change(pcb_data_t *data, pcb_objtype_t mask, int how, unsigned long flags); #endif Index: trunk/src/data_it.h =================================================================== --- trunk/src/data_it.h (revision 15868) +++ trunk/src/data_it.h (revision 15869) @@ -35,11 +35,11 @@ typedef struct pcb_data_it_s { /* config */ pcb_data_t *data; - pcb_obj_type_t mask; /* caller wants to see these types */ + pcb_objtype_t mask; /* caller wants to see these types */ /* current state */ - pcb_obj_type_t remaining; - pcb_obj_type_t type; + pcb_objtype_t remaining; + pcb_objtype_t type; pcb_cardinal_t ln; pcb_any_obj_t *last; } pcb_data_it_t; @@ -50,7 +50,7 @@ /* Start an iteration on data, looking for any object type listed in mask; returns NULL if nothing is found. The iteration is non-recursive to subcircuits */ -PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_obj_type_t mask); +PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask); /* Return the next object or NULL on end of iteration */ PCB_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it); @@ -129,7 +129,7 @@ goto retry; /* ... on the new layer */ } -PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_obj_type_t mask) +PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask) { it->data = data; it->mask = it->remaining = mask & PCB_DATA_IT_TYPES; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 15868) +++ trunk/src/draw.c (revision 15869) @@ -647,24 +647,24 @@ return; switch (type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: pcb_pstk_invalidate_erase((pcb_pstk_t *) ptr); break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: pcb_text_invalidate_erase((pcb_layer_t *) lptr, (pcb_text_t *) ptr); break; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: pcb_poly_invalidate_erase((pcb_poly_t *) ptr); break; - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: EraseSubc((pcb_subc_t *)ptr); break; - case PCB_TYPE_LINE: - case PCB_TYPE_RATLINE: + case PCB_OBJ_LINE: + case PCB_OBJ_RAT: pcb_line_invalidate_erase((pcb_line_t *) ptr); break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: pcb_arc_invalidate_erase((pcb_arc_t *) ptr); break; default: Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 15868) +++ trunk/src/file_act.c (revision 15869) @@ -324,7 +324,7 @@ pcb_coord_t x, y; pcb_gui->get_coords("Click on an element", &x, &y); - if ((pcb_search_screen(x, y, PCB_TYPE_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { + if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) { pcb_subc_t *subc = (pcb_subc_t *) ptrtmp; if ((fp = pcb_check_and_open_file(name, pcb_true, pcb_false, &result, NULL)) != NULL) { pcb_lookup_subc_conns(subc, fp); Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 15868) +++ trunk/src/find.h (revision 15869) @@ -54,11 +54,11 @@ extern pcb_find_callback_t pcb_find_callback; #define PCB_LOOKUP_FIRST \ - (PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART) + (PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART) #define PCB_LOOKUP_MORE \ - (PCB_TYPE_LINE | PCB_TYPE_RATLINE | PCB_TYPE_POLY | PCB_TYPE_ARC | PCB_TYPE_SUBC_PART) + (PCB_OBJ_LINE | PCB_OBJ_RAT | PCB_OBJ_POLY | PCB_OBJ_ARC | PCB_OBJ_SUBC_PART) #define PCB_SILK_TYPE \ - (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY) + (PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY) pcb_bool pcb_intersect_line_line(pcb_line_t *, pcb_line_t *); pcb_bool pcb_intersect_line_arc(pcb_line_t *, pcb_arc_t *); Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 15868) +++ trunk/src/find_drc.c (revision 15869) @@ -103,11 +103,11 @@ *object_type_list = NULL; switch (thing_type) { - case PCB_TYPE_LINE: - case PCB_TYPE_ARC: - case PCB_TYPE_POLY: - case PCB_TYPE_PSTK: - case PCB_TYPE_RATLINE: + case PCB_OBJ_LINE: + case PCB_OBJ_ARC: + case PCB_OBJ_POLY: + case PCB_OBJ_PSTK: + case PCB_OBJ_RAT: *object_count = 1; *object_id_list = (long int *) malloc(sizeof(long int)); *object_type_list = (int *) malloc(sizeof(int)); @@ -128,7 +128,7 @@ static void LocateError(pcb_coord_t * x, pcb_coord_t * y) { switch (thing_type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { pcb_line_t *line = (pcb_line_t *) thing_ptr3; *x = (line->Point1.X + line->Point2.X) / 2; @@ -135,7 +135,7 @@ *y = (line->Point1.Y + line->Point2.Y) / 2; break; } - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: { pcb_arc_t *arc = (pcb_arc_t *) thing_ptr3; *x = arc->X; @@ -142,7 +142,7 @@ *y = arc->Y; break; } - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: { pcb_poly_t *polygon = (pcb_poly_t *) thing_ptr3; *x = (polygon->Clipped->contours->xmin + polygon->Clipped->contours->xmax) / 2; @@ -149,7 +149,7 @@ *y = (polygon->Clipped->contours->ymin + polygon->Clipped->contours->ymax) / 2; break; } - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: { pcb_pstk_t *ps = (pcb_pstk_t *) thing_ptr3; *x = ps->x; @@ -224,7 +224,7 @@ thing_ptr2 = ptr2; thing_ptr3 = ptr2; switch (type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: if (line->Clearance < 2 * PCB->Bloat) { pcb_undo_add_obj_to_flag(ptr2); PCB_FLAG_SET(TheFlag, line); @@ -232,7 +232,7 @@ goto doIsBad; } break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: if (arc->Clearance < 2 * PCB->Bloat) { pcb_undo_add_obj_to_flag(ptr2); PCB_FLAG_SET(TheFlag, arc); @@ -240,7 +240,7 @@ goto doIsBad; } break; - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: if (pcb_pstk_drc_check_clearance(ps, polygon, 2 * PCB->Bloat) != 0) { pcb_undo_add_obj_to_flag(ptr2); PCB_FLAG_SET(TheFlag, ps); @@ -335,7 +335,7 @@ PCB_PADSTACK_LOOP(PCB->Data); { if (!PCB_FLAG_TEST(PCB_FLAG_DRC, padstack) - && DRCFind(PCB_TYPE_PSTK, (void *) padstack, (void *) padstack, (void *) padstack)) { + && DRCFind(PCB_OBJ_PSTK, (void *) padstack, (void *) padstack, (void *) padstack)) { IsBad = pcb_true; break; } @@ -350,7 +350,7 @@ PCB_LINE_COPPER_LOOP(PCB->Data); { /* check line clearances in polygons */ - pcb_poly_plows(PCB->Data, PCB_TYPE_LINE, layer, line, drc_callback); + pcb_poly_plows(PCB->Data, PCB_OBJ_LINE, layer, line, drc_callback); if (IsBad) break; if (line->Thickness < PCB->minWid) { @@ -358,7 +358,7 @@ PCB_FLAG_SET(TheFlag, line); pcb_line_invalidate_draw(layer, line); drcerr_count++; - SetThing(PCB_TYPE_LINE, layer, line, line); + SetThing(PCB_OBJ_LINE, layer, line, line); LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); violation = pcb_drc_violation_new(_("Line width is too thin"), _("Process specifications dictate a minimum feature-width\n" "that can reliably be reproduced"), x, y, 0, /* ANGLE OF ERROR UNKNOWN */ @@ -381,7 +381,7 @@ if (!IsBad) { PCB_ARC_COPPER_LOOP(PCB->Data); { - pcb_poly_plows(PCB->Data, PCB_TYPE_ARC, layer, arc, drc_callback); + pcb_poly_plows(PCB->Data, PCB_OBJ_ARC, layer, arc, drc_callback); if (IsBad) break; if (arc->Thickness < PCB->minWid) { @@ -389,7 +389,7 @@ PCB_FLAG_SET(TheFlag, arc); pcb_arc_invalidate_draw(layer, arc); drcerr_count++; - SetThing(PCB_TYPE_ARC, layer, arc, arc); + SetThing(PCB_OBJ_ARC, layer, arc, arc); LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); violation = pcb_drc_violation_new(_("Arc width is too thin"), _("Process specifications dictate a minimum feature-width\n" "that can reliably be reproduced"), x, y, 0, /* ANGLE OF ERROR UNKNOWN */ @@ -414,7 +414,7 @@ PCB_PADSTACK_LOOP(PCB->Data); { pcb_coord_t ring = 0, hole = 0; - pcb_poly_plows(PCB->Data, PCB_TYPE_PSTK, padstack, padstack, drc_callback); + pcb_poly_plows(PCB->Data, PCB_OBJ_PSTK, padstack, padstack, drc_callback); if (IsBad) break; pcb_pstk_drc_check_and_warn(padstack, &ring, &hole); @@ -424,7 +424,7 @@ pcb_pstk_invalidate_draw(padstack); if (ring) { drcerr_count++; - SetThing(PCB_TYPE_PSTK, padstack, padstack, padstack); + SetThing(PCB_OBJ_PSTK, padstack, padstack, padstack); LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); violation = pcb_drc_violation_new(_("padstack annular ring too small"), _("Annular rings that are too small may erode during etching,\n" "resulting in a broken connection"), x, y, 0, /* ANGLE OF ERROR UNKNOWN */ @@ -436,7 +436,7 @@ } if (hole > 0) { drcerr_count++; - SetThing(PCB_TYPE_PSTK, padstack, padstack, padstack); + SetThing(PCB_OBJ_PSTK, padstack, padstack, padstack); LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); violation = pcb_drc_violation_new(_("Padstack drill size is too small"), _("Process rules dictate the minimum drill size which can be used"), x, y, 0, /* ANGLE OF ERROR UNKNOWN */ @@ -470,7 +470,7 @@ PCB_FLAG_SET(TheFlag, line); pcb_line_invalidate_draw(layer, line); drcerr_count++; - SetThing(PCB_TYPE_LINE, layer, line, line); + SetThing(PCB_OBJ_LINE, layer, line, line); LocateError(&x, &y); BuildObjectList(&object_count, &object_id_list, &object_type_list); violation = pcb_drc_violation_new(_("Silk line is too thin"), _("Process specifications dictate a minimum silkscreen feature-width\n" "that can reliably be reproduced"), x, y, 0, /* ANGLE OF ERROR UNKNOWN */ @@ -636,9 +636,9 @@ LocateError(&X, &Y); switch (thing_type) { - case PCB_TYPE_LINE: - case PCB_TYPE_ARC: - case PCB_TYPE_POLY: + case PCB_OBJ_LINE: + case PCB_OBJ_ARC: + case PCB_OBJ_POLY: pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) thing_ptr1), pcb_true, pcb_true); } pcb_center_display(X, Y); Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 15868) +++ trunk/src/find_lookup.c (revision 15869) @@ -55,7 +55,7 @@ if (User) pcb_undo_add_obj_to_flag(ps); PCB_FLAG_SET(TheFlag, ps); - make_callback(PCB_TYPE_PSTK, ps, from_type, from_ptr, type); + make_callback(PCB_OBJ_PSTK, ps, from_type, from_ptr, type); PADSTACKLIST_ENTRY(PadstackList.Number) = ps; PadstackList.Number++; #ifdef DEBUG @@ -63,7 +63,7 @@ printf("ADD_PS_TO_LIST overflow! num=%d size=%d\n", PadstackList.Number, PadstackList.Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps)) - return (SetThing(PCB_TYPE_PSTK, pcb_obj_parent_subc(ps), ps, ps)); + return (SetThing(PCB_OBJ_PSTK, pcb_obj_parent_subc(ps), ps, ps)); return pcb_false; } @@ -72,7 +72,7 @@ if (User) pcb_undo_add_obj_to_flag(ps); PCB_FLAG_SET(TheFlag, ps); - make_callback(PCB_TYPE_PSTK, ps, from_type, from_ptr, type); + make_callback(PCB_OBJ_PSTK, ps, from_type, from_ptr, type); PADSTACKLIST_ENTRY(PadstackList.Number) = ps; PadstackList.Number++; #ifdef DEBUG @@ -80,7 +80,7 @@ printf("ADD_PADSTACK_TO_LIST overflow! num=%d size=%d\n", PVList.Number, PVList.Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) && (ps->parent.data->parent_type == PCB_PARENT_SUBC)) - return (SetThing(PCB_TYPE_PSTK, ps->parent.data->parent.subc, ps, ps)); + return (SetThing(PCB_OBJ_PSTK, ps->parent.data->parent.subc, ps, ps)); return pcb_false; } @@ -91,7 +91,7 @@ if (User) pcb_undo_add_obj_to_flag(Ptr); PCB_FLAG_SET(TheFlag, (Ptr)); - make_callback(PCB_TYPE_LINE, Ptr, from_type, from_ptr, type); + make_callback(PCB_OBJ_LINE, Ptr, from_type, from_ptr, type); LINELIST_ENTRY((L), LineList[(L)].Number) = (Ptr); LineList[(L)].Number++; #ifdef DEBUG @@ -99,7 +99,7 @@ printf("ADD_LINE_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, LineList[(L)].Number, LineList[(L)].Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) - return (SetThing(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr))); + return (SetThing(PCB_OBJ_LINE, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -111,7 +111,7 @@ if (User) pcb_undo_add_obj_to_flag(Ptr); PCB_FLAG_SET(TheFlag, (Ptr)); - make_callback(PCB_TYPE_ARC, Ptr, from_type, from_ptr, type); + make_callback(PCB_OBJ_ARC, Ptr, from_type, from_ptr, type); ARCLIST_ENTRY((L), ArcList[(L)].Number) = (Ptr); ArcList[(L)].Number++; #ifdef DEBUG @@ -119,7 +119,7 @@ printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, ArcList[(L)].Number, ArcList[(L)].Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) - return (SetThing(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr))); + return (SetThing(PCB_OBJ_ARC, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -128,7 +128,7 @@ if (User) pcb_undo_add_obj_to_flag(Ptr); PCB_FLAG_SET(TheFlag, (Ptr)); - make_callback(PCB_TYPE_RATLINE, Ptr, from_type, from_ptr, type); + make_callback(PCB_OBJ_RAT, Ptr, from_type, from_ptr, type); RATLIST_ENTRY(RatList.Number) = (Ptr); RatList.Number++; #ifdef DEBUG @@ -136,7 +136,7 @@ printf("ADD_RAT_TO_LIST overflow! num=%d size=%d\n", RatList.Number, RatList.Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) - return (SetThing(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr))); + return (SetThing(PCB_OBJ_RAT, (Ptr), (Ptr), (Ptr))); return pcb_false; } @@ -148,7 +148,7 @@ if (User) pcb_undo_add_obj_to_flag(Ptr); PCB_FLAG_SET(TheFlag, (Ptr)); - make_callback(PCB_TYPE_POLY, Ptr, from_type, from_ptr, type); + make_callback(PCB_OBJ_POLY, Ptr, from_type, from_ptr, type); POLYGONLIST_ENTRY((L), PolygonList[(L)].Number) = (Ptr); PolygonList[(L)].Number++; #ifdef DEBUG @@ -156,7 +156,7 @@ printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, PolygonList[(L)].Number, PolygonList[(L)].Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) - return (SetThing(PCB_TYPE_POLY, LAYER_PTR(L), (Ptr), (Ptr))); + return (SetThing(PCB_OBJ_POLY, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -270,7 +270,7 @@ struct ps_info *i = (struct ps_info *) cl; if (!PCB_FLAG_TEST(TheFlag, line) && pcb_pstk_intersect_line(&i->ps, line) && !INOCN(&i->ps, line)) { - if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER)) + if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -282,7 +282,7 @@ struct ps_info *i = (struct ps_info *) cl; if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_pstk_intersect_arc(&i->ps, arc) && !INOCN(&i->ps, arc)) { - if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER)) + if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -293,7 +293,7 @@ pcb_rat_t *rat = (pcb_rat_t *) b; struct ps_info *i = (struct ps_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, rat) && pcb_pstk_intersect_rat(&i->ps, rat) && ADD_RAT_TO_LIST(rat, PCB_TYPE_PSTK, &i->ps, PCB_FCT_RAT)) + if (!PCB_FLAG_TEST(TheFlag, rat) && pcb_pstk_intersect_rat(&i->ps, rat) && ADD_RAT_TO_LIST(rat, PCB_OBJ_PSTK, &i->ps, PCB_FCT_RAT)) longjmp(i->env, 1); return PCB_R_DIR_NOT_FOUND; } @@ -304,7 +304,7 @@ struct ps_info *i = (struct ps_info *) cl; if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_pstk_intersect_poly(&i->ps, polygon) && !INOCN(&i->ps, polygon)) { - if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER)) + if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER)) longjmp(i->env, 1); } @@ -317,7 +317,7 @@ struct ps_info *i = (struct ps_info *)cl; if (!PCB_FLAG_TEST(TheFlag, ps2) && pcb_pstk_intersect_pstk(&i->ps, ps2) && !INOCN(&i->ps, ps2)) { - if (ADD_PADSTACK_TO_LIST(ps2, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER)) + if (ADD_PADSTACK_TO_LIST(ps2, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER)) longjmp(i->env, 1); } @@ -343,7 +343,7 @@ /* subc intconn jumps */ if ((orig_ps->term != NULL) && (orig_ps->intconn > 0)) - LOC_int_conn_subc(pcb_gobj_parent_subc(orig_ps->parent_type, &orig_ps->parent), orig_ps->intconn, PCB_TYPE_PSTK, orig_ps); + LOC_int_conn_subc(pcb_gobj_parent_subc(orig_ps->parent_type, &orig_ps->parent), orig_ps->intconn, PCB_OBJ_PSTK, orig_ps); /* now all lines, arcs and polygons of the several layers */ for(layer = 0; layer < pcb_max_layer; layer++) { @@ -474,7 +474,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_line(ps, &i->line) && !INOCN(ps, &i->line)) { - if (ADD_PS_TO_LIST(ps, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) + if (ADD_PS_TO_LIST(ps, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -486,7 +486,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_arc(ps, &i->arc) && !INOCN(ps, &i->arc)) { - if (ADD_PS_TO_LIST(ps, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) + if (ADD_PS_TO_LIST(ps, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -498,7 +498,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_poly(ps, &i->polygon) && !INOCN(ps, &i->polygon)) { - if (ADD_PS_TO_LIST(ps, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) + if (ADD_PS_TO_LIST(ps, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } @@ -512,7 +512,7 @@ /* rats can't cause DRC so there is no early exit */ if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_rat(ps, &i->rat)) - ADD_PS_TO_LIST(ps, PCB_TYPE_RATLINE, &i->rat, PCB_FCT_RAT); + ADD_PS_TO_LIST(ps, PCB_OBJ_RAT, &i->rat, PCB_FCT_RAT); return PCB_R_DIR_NOT_FOUND; } @@ -547,7 +547,7 @@ /* subc intconn jumps */ if ((orig_line->term != NULL) && (orig_line->intconn > 0)) - LOC_int_conn_subc(pcb_lobj_parent_subc(orig_line->parent_type, &orig_line->parent), orig_line->intconn, PCB_TYPE_LINE, orig_line); + LOC_int_conn_subc(pcb_lobj_parent_subc(orig_line->parent_type, &orig_line->parent), orig_line->intconn, PCB_OBJ_LINE, orig_line); if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.line, NULL, ps_line_callback, &info, NULL); @@ -564,7 +564,7 @@ /* subc intconn jumps */ if ((orig_arc->term != NULL) && (orig_arc->intconn > 0)) - LOC_int_conn_subc(pcb_lobj_parent_subc(orig_arc->parent_type, &orig_arc->parent), orig_arc->intconn, PCB_TYPE_LINE, orig_arc); + LOC_int_conn_subc(pcb_lobj_parent_subc(orig_arc->parent_type, &orig_arc->parent), orig_arc->intconn, PCB_OBJ_LINE, orig_arc); if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.arc, NULL, ps_arc_callback, &info, NULL); @@ -582,7 +582,7 @@ /* subc intconn jumps */ if ((orig_poly->term != NULL) && (orig_poly->intconn > 0)) - LOC_int_conn_subc(pcb_lobj_parent_subc(orig_poly->parent_type, &orig_poly->parent), orig_poly->intconn, PCB_TYPE_LINE, orig_poly); + LOC_int_conn_subc(pcb_lobj_parent_subc(orig_poly->parent_type, &orig_poly->parent), orig_poly->intconn, PCB_OBJ_LINE, orig_poly); if (setjmp(info.env) == 0) pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.polygon, NULL, ps_poly_callback, &info, NULL); @@ -615,7 +615,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_arc(line, &i->arc) && !INOCN(line, &i->arc)) { - if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) + if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -629,7 +629,7 @@ if (!arc->Thickness) return 0; if (!PCB_FLAG_TEST(TheFlag, arc) && ArcArcIntersect(&i->arc, arc) && !INOCN(&i->arc, arc)) { - if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_ARC, &i->arc, PCB_FCT_COPPER)) + if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -643,12 +643,12 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) && IsRatPointOnArcSpec(&rat->Point1, &i->arc)) { - if (ADD_RAT_TO_LIST(rat, PCB_TYPE_ARC, &i->arc, PCB_FCT_RAT)) + if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT)) longjmp(i->env, 1); } else if ((rat->group2 == i->layer) && IsRatPointOnArcSpec(&rat->Point2, &i->arc)) { - if (ADD_RAT_TO_LIST(rat, PCB_TYPE_ARC, &i->arc, PCB_FCT_RAT)) + if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT)) longjmp(i->env, 1); } } @@ -705,7 +705,7 @@ for(b = pcb_r_first(PCB->Data->Layer[layer].polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) { pcb_poly_t *polygon = (pcb_poly_t *)b; if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_arc_in_poly(Arc, polygon) - && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_ARC, Arc, PCB_FCT_COPPER)) + && ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_ARC, Arc, PCB_FCT_COPPER)) return pcb_true; } pcb_r_end(&it); @@ -721,7 +721,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line) && !INOCN(&i->line, line)) { - if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) + if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -735,7 +735,7 @@ if (!arc->Thickness) return 0; if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc) && !INOCN(&i->line, arc)) { - if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_LINE, &i->line, PCB_FCT_COPPER)) + if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -749,12 +749,12 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) && IsRatPointOnLineSpec(&rat->Point1, &i->line)) { - if (ADD_RAT_TO_LIST(rat, PCB_TYPE_LINE, &i->line, PCB_FCT_RAT)) + if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT)) longjmp(i->env, 1); } else if ((rat->group2 == i->layer) && IsRatPointOnLineSpec(&rat->Point2, &i->line)) { - if (ADD_RAT_TO_LIST(rat, PCB_TYPE_LINE, &i->line, PCB_FCT_RAT)) + if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT)) longjmp(i->env, 1); } } @@ -806,7 +806,7 @@ for(b = pcb_r_first(PCB->Data->Layer[layer].polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) { pcb_poly_t *polygon = (pcb_poly_t *)b; if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_line_in_poly(Line, polygon) - && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_LINE, Line, PCB_FCT_COPPER)) + && ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_LINE, Line, PCB_FCT_COPPER)) return pcb_true; } pcb_r_end(&it); @@ -829,7 +829,7 @@ struct rat_info *i = (struct rat_info *) cl; if (!PCB_FLAG_TEST(TheFlag, line) && IsRatPointOnLineSpec(i->Point, line)) { - if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_RATLINE, &i->Point, PCB_FCT_RAT)) + if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -841,7 +841,7 @@ struct rat_info *i = (struct rat_info *) cl; if (!PCB_FLAG_TEST(TheFlag, arc) && IsRatPointOnArcSpec(i->Point, arc)) { - if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_RATLINE, &i->Point, PCB_FCT_RAT)) + if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -853,7 +853,7 @@ struct rat_info *i = (struct rat_info *) cl; if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && IsRatPointOnPoly(i->Point, polygon)) { - if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_RATLINE, &i->Point, PCB_FCT_RAT)) + if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -899,7 +899,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, line) && pcb_is_line_in_poly(line, &i->polygon) && !INOCN(line, &i->polygon)) { - if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) + if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -913,7 +913,7 @@ if (!arc->Thickness) return 0; if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_is_arc_in_poly(arc, &i->polygon) && !INOCN(arc, &i->polygon)) { - if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) + if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } return 0; @@ -927,7 +927,7 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if (((rat->group1 == i->layer) && IsRatPointOnPoly(&rat->Point1, &i->polygon)) || ((rat->group2 == i->layer) && IsRatPointOnPoly(&rat->Point2, &i->polygon))) { - if (ADD_RAT_TO_LIST(rat, PCB_TYPE_POLY, &i->polygon, PCB_FCT_RAT)) + if (ADD_RAT_TO_LIST(rat, PCB_OBJ_POLY, &i->polygon, PCB_FCT_RAT)) longjmp(i->env, 1); } } @@ -969,7 +969,7 @@ pcb_poly_t *polygon = (pcb_poly_t *)b; if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_poly_in_poly(polygon, Polygon) - && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_POLY, Polygon, PCB_FCT_COPPER)) + && ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_POLY, Polygon, PCB_FCT_COPPER)) return pcb_true; } pcb_r_end(&it); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 15868) +++ trunk/src/find_misc.c (revision 15869) @@ -211,9 +211,9 @@ reassign_no_drc_flags(); type = pcb_search_obj_by_location(PCB_LOOKUP_FIRST, &ptr1, &ptr2, &ptr3, X, Y, Range); - if (type == PCB_TYPE_NONE) { + if (type == PCB_OBJ_VOID) { type = pcb_search_obj_by_location(PCB_LOOKUP_MORE, &ptr1, &ptr2, &ptr3, X, Y, Range); - if (type == PCB_TYPE_NONE) + if (type == PCB_OBJ_VOID) return; if (type & PCB_SILK_TYPE) { /* don't mess with non-conducting objects! */ @@ -262,13 +262,13 @@ unsigned long pcb_obj_type2oldtype(pcb_objtype_t type) { switch(type) { - case PCB_OBJ_LINE: return PCB_TYPE_LINE; - case PCB_OBJ_TEXT: return PCB_TYPE_TEXT; - case PCB_OBJ_POLY: return PCB_TYPE_POLY; - case PCB_OBJ_ARC: return PCB_TYPE_ARC; - case PCB_OBJ_RAT: return PCB_TYPE_RATLINE; - case PCB_OBJ_PSTK: return PCB_TYPE_PSTK; - case PCB_OBJ_SUBC: return PCB_TYPE_SUBC; + case PCB_OBJ_LINE: return PCB_OBJ_LINE; + case PCB_OBJ_TEXT: return PCB_OBJ_TEXT; + case PCB_OBJ_POLY: return PCB_OBJ_POLY; + case PCB_OBJ_ARC: return PCB_OBJ_ARC; + case PCB_OBJ_RAT: return PCB_OBJ_RAT; + case PCB_OBJ_PSTK: return PCB_OBJ_PSTK; + case PCB_OBJ_SUBC: return PCB_OBJ_SUBC; default: return 0; } Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 15868) +++ trunk/src/flag_str.c (revision 15869) @@ -60,34 +60,34 @@ #define N(x) x, sizeof(x)-1 #define FN(x) x, #x pcb_flag_bits_t pcb_object_flagbits[] = { - {FN(PCB_FLAG_PIN), N("pin"), PCB_TYPEMASK_ALL, "If set, this object is a pin. This flag is for internal use only." }, - {FN(PCB_FLAG_VIA), N("via"), PCB_TYPEMASK_ALL, "If set, this object is a via. This flag is for internal use only." }, - {FN(PCB_FLAG_FOUND), N("found"), PCB_TYPEMASK_ALL, "If set, this object has been found by FindConnection()" }, + {FN(PCB_FLAG_PIN), N("pin"), PCB_OBJ_ANY, "If set, this object is a pin. This flag is for internal use only." }, + {FN(PCB_FLAG_VIA), N("via"), PCB_OBJ_ANY, "If set, this object is a via. This flag is for internal use only." }, + {FN(PCB_FLAG_FOUND), N("found"), PCB_OBJ_ANY, "If set, this object has been found by FindConnection()" }, {FN(PCB_FLAG_HOLE), N("hole"), PCB_TYPEMASK_PIN, "For pins and vias, this flag means that the pin or via is a hole without a copper annulus." }, - {FN(PCB_FLAG_RAT), N("rat"), PCB_TYPE_RATLINE, "If set for a line, indicates that this line is a rat line instead of a copper trace." }, + {FN(PCB_FLAG_RAT), N("rat"), PCB_OBJ_RAT, "If set for a line, indicates that this line is a rat line instead of a copper trace." }, {FN(PCB_FLAG_PININPOLY), N("pininpoly"), 0, "For pins and pads, this flag is used internally to indicate that the pin or pad overlaps a polygon on some layer." }, - {FN(PCB_FLAG_CLEARPOLY), N("clearpoly"), PCB_TYPE_POLY, "For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). When clear, polygons will solidly connect to pins and vias. " }, + {FN(PCB_FLAG_CLEARPOLY), N("clearpoly"), PCB_OBJ_POLY, "For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). When clear, polygons will solidly connect to pins and vias. " }, {FN(PCB_FLAG_HIDENAME), N("hidename"), 0, "For elements, when set the name of the element is hidden." }, {FN(PCB_FLAG_DISPLAYNAME), N("showname"), 0, "OBSOLETE: For elements, when set the names of pins are shown." }, - {FN(PCB_FLAG_CLEARLINE), N("clearline"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_PSTK, "For lines and arcs, the line/arc will clear polygons instead of connecting to them." }, - {FN(PCB_FLAG_SELECTED), N("selected"), PCB_TYPEMASK_ALL, "Set when the object is selected."}, - {FN(PCB_FLAG_ONSOLDER), N("onsolder"), PCB_TYPE_TEXT, "For text, indicates that it is on the solder side."}, - {FN(PCB_FLAG_AUTO), N("auto"), PCB_TYPEMASK_ALL, "For lines and vias, indicates that these were created by the autorouter."}, + {FN(PCB_FLAG_CLEARLINE), N("clearline"), PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_TEXT | PCB_OBJ_PSTK, "For lines and arcs, the line/arc will clear polygons instead of connecting to them." }, + {FN(PCB_FLAG_SELECTED), N("selected"), PCB_OBJ_ANY, "Set when the object is selected."}, + {FN(PCB_FLAG_ONSOLDER), N("onsolder"), PCB_OBJ_TEXT, "For text, indicates that it is on the solder side."}, + {FN(PCB_FLAG_AUTO), N("auto"), PCB_OBJ_ANY, "For lines and vias, indicates that these were created by the autorouter."}, {FN(PCB_FLAG_SQUARE), N("square"), 0, "For pins and pads, indicates a square (vs round) pin/pad."}, - {FN(PCB_FLAG_RUBBEREND), N("rubberend"), PCB_TYPE_LINE | PCB_TYPE_ARC, "For lines, used internally for rubber band moves: indicates one end already rubber banding."}, + {FN(PCB_FLAG_RUBBEREND), N("rubberend"), PCB_OBJ_LINE | PCB_OBJ_ARC, "For lines, used internally for rubber band moves: indicates one end already rubber banding."}, {FN(PCB_FLAG_WARN), N("warn"), PCB_TYPEMASK_PIN, "For pins, vias, and pads, set to indicate a warning."}, - {FN(PCB_FLAG_USETHERMAL), N("usetherm"), PCB_TYPEMASK_PIN | PCB_TYPE_LINE | PCB_TYPE_ARC, "Obsolete, indicates that pins/vias should be drawn with thermal fingers."}, + {FN(PCB_FLAG_USETHERMAL), N("usetherm"), PCB_TYPEMASK_PIN | PCB_OBJ_LINE | PCB_OBJ_ARC, "Obsolete, indicates that pins/vias should be drawn with thermal fingers."}, {FN(PCB_FLAG_OCTAGON), N("octagon"), 0, "Draw pins and vias as octagons." }, - {FN(PCB_FLAG_DRC), N("drc"), PCB_TYPEMASK_ALL, "Set for objects that fail DRC: flag like FOUND flag for DRC checking."}, - {FN(PCB_FLAG_LOCK), N("lock"), PCB_TYPEMASK_ALL, "Set for locked objects."}, - {FN(PCB_FLAG_EDGE2), N("edge2"), PCB_TYPEMASK_ALL, "For pads, indicates that the second point is closer to the edge. For pins, indicates that the pin is closer to a horizontal edge and thus pinout text should be vertical. (Padr.Point2 is closer to outside edge also pinout text for pins is vertical)" }, - {FN(PCB_FLAG_FULLPOLY), N("fullpoly"), PCB_TYPE_POLY, "For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one)." }, + {FN(PCB_FLAG_DRC), N("drc"), PCB_OBJ_ANY, "Set for objects that fail DRC: flag like FOUND flag for DRC checking."}, + {FN(PCB_FLAG_LOCK), N("lock"), PCB_OBJ_ANY, "Set for locked objects."}, + {FN(PCB_FLAG_EDGE2), N("edge2"), PCB_OBJ_ANY, "For pads, indicates that the second point is closer to the edge. For pins, indicates that the pin is closer to a horizontal edge and thus pinout text should be vertical. (Padr.Point2 is closer to outside edge also pinout text for pins is vertical)" }, + {FN(PCB_FLAG_FULLPOLY), N("fullpoly"), PCB_OBJ_POLY, "For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one)." }, {FN(PCB_FLAG_NOPASTE), N("nopaste"), 0, "Pad should not receive solderpaste. This is to support fiducials" }, - {FN(PCB_FLAG_NONETLIST), N("nonetlist"), PCB_TYPEMASK_ALL, "subcircuit is not on the netlist and should not interfere with the netlist "}, - {FN(PCB_FLAG_TERMNAME), N("termname"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_TEXT | PCB_TYPE_PSTK | PCB_TYPE_SUBC, "when set the names of pins are shown."}, - {FN(PCB_FLAG_CLEARPOLYPOLY), N("clearpolypoly"), PCB_TYPE_POLY, "For polygons, apply clearance to nearby polygons" }, - {FN(PCB_FLAG_DYNTEXT), N("dyntext"), PCB_TYPE_TEXT, "For text: dynamic string (substitute %patterns%)"}, - {FN(PCB_FLAG_FLOATER), N("floater"), PCB_TYPEMASK_ALL, "subc part can be moved after subc placing"} + {FN(PCB_FLAG_NONETLIST), N("nonetlist"), PCB_OBJ_ANY, "subcircuit is not on the netlist and should not interfere with the netlist "}, + {FN(PCB_FLAG_TERMNAME), N("termname"), PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT | PCB_OBJ_PSTK | PCB_OBJ_SUBC, "when set the names of pins are shown."}, + {FN(PCB_FLAG_CLEARPOLYPOLY), N("clearpolypoly"), PCB_OBJ_POLY, "For polygons, apply clearance to nearby polygons" }, + {FN(PCB_FLAG_DYNTEXT), N("dyntext"), PCB_OBJ_TEXT, "For text: dynamic string (substitute %patterns%)"}, + {FN(PCB_FLAG_FLOATER), N("floater"), PCB_OBJ_ANY, "subc part can be moved after subc placing"} }; #undef N #undef FN @@ -434,7 +434,7 @@ * * Note that this function knows a little about what kinds of flags * will be automatically set by parsing, so it won't (for example in - * the old data model) include the "via" flag for PCB_TYPE_VIAs because + * the old data model) include the "via" flag for PCB_OBJ_VIAs because * it knows those get forcibly set when vias are parsed. */ char *pcb_strflg_common_f2s(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits, unsigned char *intconn) { @@ -448,7 +448,7 @@ #ifndef FLAG_TEST switch (object_type) { - case PCB_TYPE_RATLINE: + case PCB_OBJ_RAT: PCB_FLAG_CLEAR(PCB_FLAG_RAT, &fh); break; } @@ -582,7 +582,7 @@ char *pcb_strflg_board_f2s(pcb_flag_t flags) { - return pcb_strflg_common_f2s(flags, PCB_TYPEMASK_ALL, pcb_flagbits, PCB_ENTRIES(pcb_flagbits), NULL); + return pcb_strflg_common_f2s(flags, PCB_OBJ_ANY, pcb_flagbits, PCB_ENTRIES(pcb_flagbits), NULL); } pcb_flag_t pcb_strflg_board_s2f(const char *flagstring, int (*error) (const char *msg)) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 15868) +++ trunk/src/gui_act.c (revision 15869) @@ -60,7 +60,7 @@ #include "operation.h" #include "obj_subc_op.h" -#define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY +#define CLONE_TYPES PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY /* --------------------------------------------------------------------------- */ /* Toggle actions are kept for compatibility; new code should use the conf system instead */ @@ -416,7 +416,7 @@ pcb_coord_t x, y; pcb_gui->get_coords(_("Click on a subcircuit"), &x, &y); - if ((pcb_search_screen(x, y, PCB_TYPE_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { + if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) { subc = (pcb_subc_t *) ptrtmp; pcb_gui->show_item(subc); } @@ -432,13 +432,13 @@ pcb_gui->get_coords(_("Click on a subcircuit"), &x, &y); /* toggle terminal ID print for subcircuit parts */ - type = pcb_search_screen(x, y, PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART | PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_TEXT, (void **)&ptr1, (void **)&ptr2, (void **)&ptr3); + type = pcb_search_screen(x, y, PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART | PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT, (void **)&ptr1, (void **)&ptr2, (void **)&ptr3); if (type) { pcb_any_obj_t *obj = ptr2; pcb_opctx_t opctx; switch(type) { - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: opctx.chgflag.pcb = PCB; opctx.chgflag.how = PCB_CHGFLG_TOGGLE; opctx.chgflag.flag = PCB_FLAG_TERMNAME; @@ -446,11 +446,11 @@ pcb_undo_inc_serial(); return 0; break; - case PCB_TYPE_LINE: - case PCB_TYPE_ARC: - case PCB_TYPE_POLY: - case PCB_TYPE_TEXT: - case PCB_TYPE_PSTK: + case PCB_OBJ_LINE: + case PCB_OBJ_ARC: + case PCB_OBJ_POLY: + case PCB_OBJ_TEXT: + case PCB_OBJ_PSTK: pcb_obj_invalidate_label(type, ptr1, ptr2, ptr3); break; default: @@ -762,11 +762,11 @@ over++; } - if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_TYPE_LINE) != PCB_TYPE_NONE) { + if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_OBJ_LINE) != PCB_OBJ_VOID) { /* line has two endpoints, check which one is close to the original x;y */ pcb_line_t *l = ptr2; if (close_enough(pcb_tool_note.X, l->Point1.X) && close_enough(pcb_tool_note.Y, l->Point1.Y)) { - pcb_crosshair.AttachedObject.Type = PCB_TYPE_LINE_POINT; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_LINE_POINT; pcb_crosshair.AttachedObject.Ptr1 = ptr1; pcb_crosshair.AttachedObject.Ptr2 = ptr2; pcb_crosshair.AttachedObject.Ptr3 = &l->Point1; @@ -773,7 +773,7 @@ goto switched; } if (close_enough(pcb_tool_note.X, l->Point2.X) && close_enough(pcb_tool_note.Y, l->Point2.Y)) { - pcb_crosshair.AttachedObject.Type = PCB_TYPE_LINE_POINT; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_LINE_POINT; pcb_crosshair.AttachedObject.Ptr1 = ptr1; pcb_crosshair.AttachedObject.Ptr2 = ptr2; pcb_crosshair.AttachedObject.Ptr3 = &l->Point2; @@ -780,11 +780,11 @@ goto switched; } } - else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_TYPE_ARC_POINT) != PCB_TYPE_NONE) { + else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_OBJ_ARC_POINT) != PCB_OBJ_VOID) { pcb_coord_t ex, ey; pcb_arc_get_end((pcb_arc_t *)ptr2, 0, &ex, &ey); if (close_enough(pcb_tool_note.X, ex) && close_enough(pcb_tool_note.Y, ey)) { - pcb_crosshair.AttachedObject.Type = PCB_TYPE_ARC_POINT; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_ARC_POINT; pcb_crosshair.AttachedObject.Ptr1 = ptr1; pcb_crosshair.AttachedObject.Ptr2 = ptr2; pcb_crosshair.AttachedObject.Ptr3 = pcb_arc_start_ptr; @@ -792,7 +792,7 @@ } pcb_arc_get_end((pcb_arc_t *)ptr2, 1, &ex, &ey); if (close_enough(pcb_tool_note.X, ex) && close_enough(pcb_tool_note.Y, ey)) { - pcb_crosshair.AttachedObject.Type = PCB_TYPE_ARC_POINT; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_ARC_POINT; pcb_crosshair.AttachedObject.Ptr1 = ptr1; pcb_crosshair.AttachedObject.Ptr2 = ptr2; pcb_crosshair.AttachedObject.Ptr3 = pcb_arc_end_ptr; @@ -799,8 +799,8 @@ goto switched; } } - else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_TYPE_ARC) != PCB_TYPE_NONE) { - pcb_crosshair.AttachedObject.Type = PCB_TYPE_ARC; + else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_OBJ_ARC) != PCB_OBJ_VOID) { + pcb_crosshair.AttachedObject.Type = PCB_OBJ_ARC; pcb_crosshair.AttachedObject.Ptr1 = ptr1; pcb_crosshair.AttachedObject.Ptr2 = ptr2; pcb_crosshair.AttachedObject.Ptr3 = ptr3; @@ -1060,7 +1060,7 @@ type = pcb_search_screen(x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3); /* set layer current and size from line or arc */ switch (type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: pcb_notify_crosshair_change(pcb_false); set_same_(((pcb_line_t *) ptr2)->Thickness, -1, -1, ((pcb_line_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; @@ -1070,7 +1070,7 @@ pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: pcb_notify_crosshair_change(pcb_false); set_same_(((pcb_arc_t *) ptr2)->Thickness, -1, -1, ((pcb_arc_t *) ptr2)->Clearance / 2, NULL); layer = (pcb_layer_t *) ptr1; @@ -1080,7 +1080,7 @@ pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: layer = (pcb_layer_t *) ptr1; break; Index: trunk/src/insert.h =================================================================== --- trunk/src/insert.h (revision 15868) +++ trunk/src/insert.h (revision 15869) @@ -33,7 +33,7 @@ #include "config.h" -#define PCB_INSERT_TYPES (PCB_TYPE_POLY | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_RATLINE) +#define PCB_INSERT_TYPES (PCB_OBJ_POLY | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_RAT) void *pcb_insert_point_in_object(int Type, void *Ptr1, void *Ptr2, pcb_cardinal_t * Ptr3, pcb_coord_t DX, pcb_coord_t DY, pcb_bool Force, pcb_bool insert_last); Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 15868) +++ trunk/src/move.c (revision 15869) @@ -129,7 +129,7 @@ pcb_draw_inhibit_inc(); switch(Type) { - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: { /* Get the initial arc point positions */ pcb_arc_t * p_arc = ((pcb_arc_t *)pcb_crosshair.AttachedObject.Ptr2); @@ -157,18 +157,18 @@ } break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: pcb_event(PCB_EVENT_RUBBER_MOVE, "icccc", 0, DX, DY, DX, DY); pcb_undo_add_obj_to_move(Type, Ptr1, Ptr2, Ptr3, DX, DY); ptr2 = pcb_object_operation(&MoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3); break; - case PCB_TYPE_LINE_POINT : + case PCB_OBJ_LINE_POINT : pcb_event(PCB_EVENT_RUBBER_MOVE, "icc", 0, DX, DY); ptr2 = pcb_lineop_move_point_with_route(&ctx, Ptr1, Ptr2, Ptr3); break; - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { pcb_coord_t dx1 = DX; pcb_coord_t dy1 = DY; @@ -187,13 +187,13 @@ /* If the line ends have moved indpendently then move the individual points */ if((dx1 != dx2) || (dy1 != dy2)) { /* Move point1 form line */ - pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, + pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Ptr1, line, &line->Point1, dx1, dy1); pcb_lineop_move_point(&ctx, Ptr1, line, &line->Point1); /* Move point2 form line */ - pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, + pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Ptr1, line, &line->Point2, dx2, dy2); ctx.move.dx = dx2; @@ -246,7 +246,7 @@ ctx.move.dst_layer = Target; ctx.move.more_to_come = pcb_true; - changed = pcb_selected_operation(PCB, PCB->Data, &MoveToLayerFunctions, &ctx, pcb_true, PCB_TYPEMASK_ALL); + changed = pcb_selected_operation(PCB, PCB->Data, &MoveToLayerFunctions, &ctx, pcb_true, PCB_OBJ_ANY); /* passing pcb_true to above operation causes Undoserial to auto-increment */ return changed; } Index: trunk/src/move.h =================================================================== --- trunk/src/move.h (revision 15868) +++ trunk/src/move.h (revision 15869) @@ -39,10 +39,10 @@ } #define PCB_MOVE_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_SUBC | \ - PCB_TYPE_POLY | PCB_TYPE_POLY_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT) + (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_SUBC | \ + PCB_OBJ_POLY | PCB_OBJ_POLY_POINT | PCB_OBJ_LINE_POINT | PCB_OBJ_ARC | PCB_OBJ_ARC_POINT) #define PCB_MOVETOLAYER_TYPES \ - (PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY | PCB_TYPE_RATLINE | PCB_TYPE_ARC) + (PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | PCB_OBJ_RAT | PCB_OBJ_ARC) /* undoably moves an object by relative DX and DY. Doesn't bump Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 15868) +++ trunk/src/obj_arc.c (revision 15869) @@ -164,27 +164,27 @@ new_da = 360; new_sa = 0; } - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, a); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); - pcb_undo_add_obj_to_change_angles(PCB_TYPE_ARC, a, a, a); + pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, a, a, a); a->StartAngle = new_sa; a->Delta = new_da; pcb_arc_bbox(a); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) a); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, a); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); } void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height) { - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, a); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); - pcb_undo_add_obj_to_change_radii(PCB_TYPE_ARC, a, a, a); + pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, a, a, a); a->Width = new_width; a->Height = new_height; pcb_arc_bbox(a); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) a); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, a); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a); } @@ -341,7 +341,7 @@ if ((dstly == NULL) || (dstly == srcly)) /* auto layer in dst */ dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)]; - pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_ARC, srcly, arc); + pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_ARC, srcly, arc); pcb_r_delete_entry(srcly->arc_tree, (pcb_box_t *) arc); arclist_remove(arc); @@ -352,7 +352,7 @@ if (!dstly->arc_tree) dstly->arc_tree = pcb_r_create_tree(); pcb_r_insert_entry(dstly->arc_tree, (pcb_box_t *) arc); - pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_TYPE_ARC, dstly, arc); + pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_ARC, dstly, arc); PCB_SET_PARENT(arc, layer, dstly); @@ -367,14 +367,14 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return NULL; if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Arc->Thickness) { - pcb_undo_add_obj_to_size(PCB_TYPE_ARC, Layer, Arc, Arc); + pcb_undo_add_obj_to_size(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); Arc->Thickness = value; pcb_arc_bbox(Arc); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; } @@ -396,14 +396,14 @@ if (ctx->chgsize.value > 0 && value < PCB->Bloat * 2) value = PCB->Bloat * 2 + 2; if (value != Arc->Clearance) { - pcb_undo_add_obj_to_clear_size(PCB_TYPE_ARC, Layer, Arc, Arc); + pcb_undo_add_obj_to_clear_size(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); Arc->Clearance = value; pcb_arc_bbox(Arc); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; } @@ -433,14 +433,14 @@ value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : (*dst) + ctx->chgsize.value; value = MIN(PCB_MAX_ARCSIZE, MAX(value, PCB_MIN_ARCSIZE)); if (value != *dst) { - pcb_undo_add_obj_to_change_radii(PCB_TYPE_ARC, Layer, Arc, Arc); + pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); *dst = value; pcb_arc_bbox(Arc); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; } @@ -472,14 +472,14 @@ value = fmod(value, 360.0); if (value != *dst) { - pcb_undo_add_obj_to_change_angles(PCB_TYPE_ARC, Layer, Arc, Arc); + pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, Layer, Arc, Arc); pcb_arc_invalidate_erase(Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); *dst = value; pcb_arc_bbox(Arc); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; } @@ -493,14 +493,14 @@ return NULL; pcb_arc_invalidate_erase(Arc); if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) { - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_ARC, Layer, Arc, Arc, pcb_false); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_ARC, Layer, Arc, Arc, pcb_false); } pcb_undo_add_obj_to_flag(Arc); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Arc); if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) { - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_ARC, Layer, Arc, Arc, pcb_true); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_ARC, Layer, Arc, Arc, pcb_true); } pcb_arc_invalidate_draw(Layer, Arc); return Arc; @@ -534,7 +534,7 @@ return arc; pcb_arc_copy_meta(arc, Arc); pcb_arc_invalidate_draw(Layer, arc); - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, Layer, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, Layer, arc, arc); return arc; } @@ -555,10 +555,10 @@ void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arcop_move_noclip(ctx, Layer, Arc); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); return Arc; } @@ -566,11 +566,11 @@ { if (ctx->clip.restore) { pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); } if (ctx->clip.clear) { pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); } return Arc; } @@ -606,12 +606,12 @@ pcb_arc_invalidate_draw(Layer, Arc); if (ctx->move.dst_layer == Layer) return Arc; - pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_ARC, Layer, Arc, Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_ARC, Layer, Arc, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); if (Layer->meta.real.vis) pcb_arc_invalidate_erase(Arc); newone = (pcb_arc_t *) pcb_arcop_move_to_layer_low(ctx, Layer, Arc, ctx->move.dst_layer); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, ctx->move.dst_layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, ctx->move.dst_layer, Arc); if (ctx->move.dst_layer->meta.real.vis) pcb_arc_invalidate_draw(ctx->move.dst_layer, newone); return newone; @@ -634,7 +634,7 @@ /* erase from screen */ if (Layer->meta.real.vis) pcb_arc_invalidate_erase(Arc); - pcb_undo_move_obj_to_remove(PCB_TYPE_ARC, Layer, Arc, Arc); + pcb_undo_move_obj_to_remove(PCB_OBJ_ARC, Layer, Arc, Arc); return NULL; } @@ -712,11 +712,11 @@ void *pcb_arcop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_arc_invalidate_erase(Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); pcb_arc_rotate90(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; } @@ -724,9 +724,9 @@ void *pcb_arcop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_arc_invalidate_erase(Arc); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_rotate(Layer, Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina, ctx->rotate.angle); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc); pcb_arc_invalidate_draw(Layer, Arc); return Arc; } @@ -764,7 +764,7 @@ { static pcb_flag_values_t pcb_arc_flags = 0; if (pcb_arc_flags == 0) - pcb_arc_flags = pcb_obj_valid_flags(PCB_TYPE_ARC); + pcb_arc_flags = pcb_obj_valid_flags(PCB_OBJ_ARC); if ((ctx->chgflag.flag & pcb_arc_flags) != ctx->chgflag.flag) return NULL; @@ -773,12 +773,12 @@ pcb_undo_add_obj_to_flag(Arc); if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE) - pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_TYPE_ARC, Arc->parent.layer, Arc); + pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_ARC, Arc->parent.layer, Arc); PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Arc); if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE) - pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_TYPE_ARC, Arc->parent.layer, Arc); + pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_ARC, Arc->parent.layer, Arc); return Arc; } Index: trunk/src/obj_common.c =================================================================== --- trunk/src/obj_common.c (revision 15868) +++ trunk/src/obj_common.c (revision 15869) @@ -63,21 +63,21 @@ int pcb_obj_get_bbox(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res) { switch (Type) { - case PCB_TYPE_LINE: - case PCB_TYPE_ARC: - case PCB_TYPE_TEXT: - case PCB_TYPE_POLY: - case PCB_TYPE_PSTK: + case PCB_OBJ_LINE: + case PCB_OBJ_ARC: + case PCB_OBJ_TEXT: + case PCB_OBJ_POLY: + case PCB_OBJ_PSTK: *res = *(pcb_box_t *)Ptr2; return 0; - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: *res = *(pcb_box_t *)Ptr1; return 0; - case PCB_TYPE_POLY_POINT: - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_POLY_POINT: + case PCB_OBJ_LINE_POINT: *res = *(pcb_box_t *)Ptr3; return 0; - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: return pcb_obj_ui_arc_point_bbox(Type, Ptr1, Ptr2, Ptr3, res); default: pcb_message(PCB_MSG_ERROR, "Request for bounding box of unsupported type %d\n", Type); Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 15868) +++ trunk/src/obj_common.h (revision 15869) @@ -71,7 +71,13 @@ PCB_OBJ_CLASS_HOST = 0x00FF000, /* host types: layers, boards, nets */ PCB_OBJ_CLASS_MASK = 0xFF00000, /* for virtual searches */ PCB_OBJ_CLASS_OBJ = 0x0000000, /* anything with common object fields (pcb_any_obj_t) */ - PCB_OBJ_ANY = 0xFFFFFFF + PCB_OBJ_ANY = 0xFFFFFFF, + +/* TODO: rename these */ + PCB_TYPEMASK_PIN = (PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART), + PCB_TYPEMASK_TERM = (PCB_TYPEMASK_PIN | PCB_OBJ_SUBC_PART | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT), + PCB_TYPEMASK_LOCK = (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_LOCKED) + } pcb_objmask_t; Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 15868) +++ trunk/src/obj_line.c (revision 15869) @@ -197,7 +197,7 @@ /* remove unnecessary points */ if (info.ans) { /* must do this BEFORE getting new line memory */ - pcb_undo_move_obj_to_remove(PCB_TYPE_LINE, Layer, info.ans, info.ans); + pcb_undo_move_obj_to_remove(PCB_OBJ_LINE, Layer, info.ans, info.ans); X1 = info.test.Point1.X; X2 = info.test.Point2.X; Y1 = info.test.Point1.Y; @@ -379,7 +379,7 @@ if ((dstly == NULL) || (dstly == srcly)) /* auto layer in dst */ dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)]; - pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_LINE, srcly, line); + pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_LINE, srcly, line); pcb_r_delete_entry(srcly->line_tree, (pcb_box_t *)line); linelist_remove(line); @@ -390,7 +390,7 @@ if (!dstly->line_tree) dstly->line_tree = pcb_r_create_tree(); pcb_r_insert_entry(dstly->line_tree, (pcb_box_t *)line); - pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_TYPE_LINE, dstly, line); + pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_LINE, dstly, line); PCB_SET_PARENT(line, layer, dstly); @@ -405,14 +405,14 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) 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); + pcb_undo_add_obj_to_size(PCB_OBJ_LINE, Layer, Line, Line); pcb_line_invalidate_erase(Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); - pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); Line->Thickness = value; pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line); - pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); return Line; } @@ -434,14 +434,14 @@ if (ctx->chgsize.value > 0 && value < ctx->chgsize.pcb->Bloat * 2) value = ctx->chgsize.pcb->Bloat * 2 + 2; if (value != Line->Clearance) { - pcb_undo_add_obj_to_clear_size(PCB_TYPE_LINE, Layer, Line, Line); - pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_undo_add_obj_to_clear_size(PCB_OBJ_LINE, Layer, Line, Line); + pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_erase(Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); Line->Clearance = value; pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line); - pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); return Line; } @@ -465,14 +465,14 @@ return NULL; 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(ctx->chgsize.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_LINE, Layer, Line, Line, pcb_false); + pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); } pcb_undo_add_obj_to_flag(Line); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Line); if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_LINE, Layer, Line, Line, pcb_true); - pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_LINE, Layer, Line, Line, pcb_true); + pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line); } pcb_line_invalidate_draw(Layer, Line); return Line; @@ -507,7 +507,7 @@ return line; pcb_line_copy_meta(line, Line); pcb_line_invalidate_draw(Layer, line); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, Layer, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, Layer, line, line); return line; } @@ -525,10 +525,10 @@ void *pcb_lineop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line) { pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); - pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_lineop_move_noclip(ctx, Layer, Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line); - pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); return Line; } @@ -537,12 +537,12 @@ if (ctx->clip.restore) { pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); if (ctx->clip.pcb != NULL) - pcb_poly_restore_to_poly(ctx->clip.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_restore_to_poly(ctx->clip.pcb->Data, PCB_OBJ_LINE, Layer, Line); } if (ctx->clip.clear) { pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line); if (ctx->clip.pcb != NULL) - pcb_poly_clear_from_poly(ctx->clip.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(ctx->clip.pcb->Data, PCB_OBJ_LINE, Layer, Line); } return Line; } @@ -553,12 +553,12 @@ if (Layer) { if (Layer->meta.real.vis) pcb_line_invalidate_erase(Line); - pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); pcb_r_delete_entry(Layer->line_tree, &Line->BoundingBox); PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, &Line->BoundingBox); - pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line); if (Layer->meta.real.vis) pcb_line_invalidate_draw(Layer, Line); return Line; @@ -581,7 +581,7 @@ void *pcb_lineop_move_point_with_route(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point) { if ((conf_core.editor.move_linepoint_uses_route == 0) || !Layer) { - pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, Layer, Line, Point, ctx->move.dx, ctx->move.dy); + pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Layer, Line, Point, ctx->move.dx, ctx->move.dy); return pcb_lineop_move_point(ctx, Layer, Line, Point); } else { @@ -643,7 +643,7 @@ #warning pdstk TODO #21: do not work in comp mode, use a pstk proto - scconfig also has TODO #21, fix it there too if ((ps = pcb_pstk_new_compat_via(PCB->Data, i->X, i->Y, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL) { - pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, ps, ps, ps); + pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); pcb_pstk_invalidate_draw(ps); } longjmp(i->env, 1); @@ -665,13 +665,13 @@ if (ctx->move.dst_layer == Layer) return Line; - pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_LINE, Layer, Line, Line); + pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_LINE, Layer, Line, Line); if (Layer->meta.real.vis) pcb_line_invalidate_erase(Line); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_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); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, ctx->move.dst_layer, newone); if (ctx->move.dst_layer->meta.real.vis) pcb_line_invalidate_draw(ctx->move.dst_layer, newone); if (!conf_core.editor.auto_via || !PCB->ViaOn || ctx->move.more_to_come || @@ -684,7 +684,7 @@ sb.Y1 = newone->Point1.Y - newone->Thickness / 2; sb.Y2 = newone->Point1.Y + newone->Thickness / 2; if ((pcb_search_obj_by_location(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, - newone->Point1.X, newone->Point1.Y, conf_core.design.via_thickness / 2) == PCB_TYPE_NONE)) { + newone->Point1.X, newone->Point1.Y, conf_core.design.via_thickness / 2) == PCB_OBJ_VOID)) { info.X = newone->Point1.X; info.Y = newone->Point1.Y; if (setjmp(info.env) == 0) @@ -696,7 +696,7 @@ sb.Y1 = newone->Point2.Y - newone->Thickness / 2; sb.Y2 = newone->Point2.Y + newone->Thickness / 2; if ((pcb_search_obj_by_location(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, - newone->Point2.X, newone->Point2.Y, conf_core.design.via_thickness / 2) == PCB_TYPE_NONE)) { + newone->Point2.X, newone->Point2.Y, conf_core.design.via_thickness / 2) == PCB_OBJ_VOID)) { info.X = newone->Point2.X; info.Y = newone->Point2.Y; if (setjmp(info.env) == 0) @@ -757,7 +757,7 @@ pcb_r_search(Layer->line_tree, (const pcb_box_t *) Point, NULL, remove_point, &info, NULL); return pcb_lineop_remove(ctx, Layer, Line); } - pcb_move_obj(PCB_TYPE_LINE_POINT, Layer, info.line, info.point, other.X - Point->X, other.Y - Point->Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, Layer, info.line, info.point, other.X - Point->X, other.Y - Point->Y); return (pcb_lineop_remove(ctx, Layer, Line)); } @@ -767,7 +767,7 @@ /* erase from screen */ if (Layer->meta.real.vis) pcb_line_invalidate_erase(Line); - pcb_undo_move_obj_to_remove(PCB_TYPE_LINE, Layer, Line, Line); + pcb_undo_move_obj_to_remove(PCB_OBJ_LINE, Layer, Line, Line); return NULL; } @@ -848,7 +848,7 @@ pcb_line_invalidate_erase(Line); if (Layer) { if (!Layer->is_bound) - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); if (Layer->line_tree != NULL) pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); } @@ -863,7 +863,7 @@ if (Layer->line_tree != NULL) pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line); if (!Layer->is_bound) - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); } else { @@ -910,15 +910,15 @@ return NULL; 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); + pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Layer, Line, &Line->Point2, ctx->insert.x - X, ctx->insert.y - Y); 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); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); Line->Point2.X = ctx->insert.x; Line->Point2.Y = ctx->insert.y; pcb_line_bbox(Line); pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line); pcb_line_invalidate_draw(Layer, Line); /* we must create after playing with Line since creation may * invalidate the line pointer @@ -925,9 +925,9 @@ */ 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); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, Layer, line, line); pcb_line_invalidate_draw(Layer, line); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, Layer, line); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, line); /* creation call adds it to the rtree */ } return line; @@ -937,7 +937,7 @@ { static pcb_flag_values_t pcb_line_flags = 0; if (pcb_line_flags == 0) - pcb_line_flags = pcb_obj_valid_flags(PCB_TYPE_LINE); + pcb_line_flags = pcb_obj_valid_flags(PCB_OBJ_LINE); if ((ctx->chgflag.flag & pcb_line_flags) != ctx->chgflag.flag) return NULL; @@ -946,12 +946,12 @@ pcb_undo_add_obj_to_flag(Line); if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE) - pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_TYPE_LINE, Line->parent.layer, Line); + pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_LINE, Line->parent.layer, Line); PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Line); if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE) - pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_TYPE_LINE, Line->parent.layer, Line); + pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_LINE, Line->parent.layer, Line); return Line; } Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 15868) +++ trunk/src/obj_poly.c (revision 15869) @@ -293,7 +293,7 @@ Layer->polygon_tree = pcb_r_create_tree(); pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon); PCB_SET_PARENT(polygon, layer, Layer); - pcb_poly_clear_from_poly(Layer->parent, PCB_TYPE_POLY, Layer, polygon); + pcb_poly_clear_from_poly(Layer->parent, PCB_OBJ_POLY, Layer, polygon); } /* creates a new polygon on a layer */ @@ -490,14 +490,14 @@ if (ctx->chgsize.value > 0 && value < ctx->chgsize.pcb->Bloat * 2) value = ctx->chgsize.pcb->Bloat * 2 + 2; if (value != poly->Clearance) { - pcb_undo_add_obj_to_clear_size(PCB_TYPE_POLY, Layer, poly, poly); - pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_TYPE_POLY, Layer, poly); + pcb_undo_add_obj_to_clear_size(PCB_OBJ_POLY, Layer, poly, poly); + pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_POLY, Layer, poly); pcb_poly_invalidate_erase(poly); pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *)poly); poly->Clearance = value; pcb_poly_bbox(poly); pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *)poly); - pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_TYPE_POLY, Layer, poly); + pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_POLY, Layer, poly); pcb_poly_invalidate_draw(Layer, poly); return poly; } @@ -520,7 +520,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) return NULL; - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, Polygon, Polygon, pcb_true); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_POLY, Layer, Polygon, Polygon, pcb_true); pcb_undo_add_obj_to_flag(Polygon); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLY, Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); @@ -563,7 +563,7 @@ Polygon->Points[ctx->insert.idx] = save; pcb_board_set_changed_flag(pcb_true); - pcb_undo_add_obj_to_insert_point(PCB_TYPE_POLY_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]); + pcb_undo_add_obj_to_insert_point(PCB_OBJ_POLY_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]); pcb_poly_bbox(Polygon); pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); @@ -583,14 +583,14 @@ return NULL; pcb_poly_invalidate_erase(poly); if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, poly, poly, pcb_false); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_POLY, Layer, poly); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_POLY, Layer, poly, poly, pcb_false); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_POLY, Layer, poly); } pcb_undo_add_obj_to_flag(poly); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLYPOLY, poly); if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, poly, poly, pcb_true); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_POLY, Layer, poly); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_POLY, Layer, poly, poly, pcb_true); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_POLY, Layer, poly); } pcb_poly_invalidate_draw(Layer, poly); return poly; @@ -690,7 +690,7 @@ } if (Layer == ctx->move.dst_layer) return Polygon; - pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_POLY, Layer, Polygon, Polygon); + pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_POLY, Layer, Polygon, Polygon); if (Layer->meta.real.vis) pcb_poly_invalidate_erase(Polygon); @@ -757,7 +757,7 @@ pcb_poly_pprestore(Polygon); if (Layer->meta.real.vis) pcb_poly_invalidate_erase(Polygon); - pcb_undo_move_obj_to_remove(PCB_TYPE_POLY, Layer, Polygon, Polygon); + pcb_undo_move_obj_to_remove(PCB_OBJ_POLY, Layer, Polygon, Polygon); return NULL; } @@ -790,7 +790,7 @@ pcb_poly_invalidate_erase(Polygon); /* Copy the polygon to the undo list */ - pcb_undo_add_obj_to_remove_contour(PCB_TYPE_POLY, Layer, Polygon); + pcb_undo_add_obj_to_remove_contour(PCB_OBJ_POLY, Layer, Polygon); contour_start = (contour == 0) ? 0 : Polygon->HoleIndex[contour - 1]; contour_end = (contour == Polygon->HoleIndexN) ? Polygon->PointN : Polygon->HoleIndex[contour]; @@ -839,7 +839,7 @@ pcb_poly_invalidate_erase(Polygon); /* insert the polygon-point into the undo list */ - pcb_undo_add_obj_to_remove_point(PCB_TYPE_POLY_POINT, Layer, Polygon, point_idx); + pcb_undo_add_obj_to_remove_point(PCB_OBJ_POLY_POINT, Layer, Polygon, point_idx); pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); /* remove point from list, keep point order */ @@ -878,7 +878,7 @@ pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon); pcb_poly_init_clip(PCB->Data, Layer, polygon); pcb_poly_invalidate_draw(Layer, polygon); - pcb_undo_add_obj_to_create(PCB_TYPE_POLY, Layer, polygon, polygon); + pcb_undo_add_obj_to_create(PCB_OBJ_POLY, Layer, polygon, polygon); pcb_poly_ppclear(polygon); return polygon; } @@ -915,7 +915,7 @@ { static pcb_flag_values_t pcb_poly_flags = 0; if (pcb_poly_flags == 0) - pcb_poly_flags = pcb_obj_valid_flags(PCB_TYPE_POLY); + pcb_poly_flags = pcb_obj_valid_flags(PCB_OBJ_POLY); if ((ctx->chgflag.flag & pcb_poly_flags) != ctx->chgflag.flag) return NULL; @@ -925,7 +925,7 @@ if (ctx->chgflag.flag & (PCB_FLAG_CLEARPOLY | PCB_FLAG_CLEARPOLYPOLY)) - pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_TYPE_POLY, Polygon->parent.layer, Polygon); + pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_POLY, Polygon->parent.layer, Polygon); PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Polygon); @@ -933,7 +933,7 @@ pcb_poly_init_clip(ctx->chgflag.pcb->Data, Polygon->parent.layer, Polygon); if (ctx->chgflag.flag & (PCB_FLAG_CLEARPOLY | PCB_FLAG_CLEARPOLYPOLY)) - pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_TYPE_POLY, Polygon->parent.layer, Polygon); + pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_POLY, Polygon->parent.layer, Polygon); return Polygon; } Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 15868) +++ trunk/src/obj_poly.h (revision 15869) @@ -211,7 +211,7 @@ do { \ if (layer->is_bound) layer = layer->meta.bound.real; \ if (PCB_POLY_HAS_CLEARANCE(poly) && (layer != NULL)) \ - pcb_poly_clear_from_poly(layer->parent, PCB_TYPE_POLY, layer, poly); \ + pcb_poly_clear_from_poly(layer->parent, PCB_OBJ_POLY, layer, poly); \ } while(0) /* Let the poly clear sorrunding polys in its layer */ @@ -233,7 +233,7 @@ if ((layer != NULL) && (layer->parent->parent_type == PCB_PARENT_BOARD)) { \ if (layer->is_bound) layer = layer->meta.bound.real; \ if (PCB_POLY_HAS_CLEARANCE(poly) && (layer != NULL)) \ - pcb_poly_restore_to_poly(layer->parent, PCB_TYPE_POLY, layer, poly); \ + pcb_poly_restore_to_poly(layer->parent, PCB_OBJ_POLY, layer, poly); \ } \ } \ } while(0) Index: trunk/src/obj_pstk.c =================================================================== --- trunk/src/obj_pstk.c (revision 15868) +++ trunk/src/obj_pstk.c (revision 15869) @@ -95,7 +95,7 @@ ps->smirror = smirror; pcb_pstk_add(data, ps); pcb_event(PCB_EVENT_NEW_PSTK, "p", ps); - pcb_poly_clear_from_poly(data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps); return ps; } @@ -858,7 +858,7 @@ /* if mirror center is not 0, also move, to emulate that the mirror took place around that point */ if (y_offs != 0) { - pcb_poly_restore_to_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_erase(ps); if (ps->parent.data->padstack_tree != NULL) pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps); @@ -868,7 +868,7 @@ if (ps->parent.data->padstack_tree != NULL) pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_clear_from_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_draw(ps); } } @@ -946,7 +946,7 @@ return -1; } - pcb_poly_restore_to_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_erase(ps); if (ps->parent.data->padstack_tree != NULL) pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps); @@ -964,7 +964,7 @@ pcb_pstk_bbox(ps); if (ps->parent.data->padstack_tree != NULL) pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_clear_from_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_draw(ps); return 0; Index: trunk/src/obj_pstk_op.c =================================================================== --- trunk/src/obj_pstk_op.c (revision 15868) +++ trunk/src/obj_pstk_op.c (revision 15869) @@ -50,7 +50,7 @@ npid = pcb_pstk_proto_insert_dup(ctx->buffer.dst, proto, 1); - pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_PSTK, NULL, ps); pcb_r_delete_entry(ctx->buffer.src->padstack_tree, (pcb_box_t *)ps); padstacklist_remove(ps); @@ -64,7 +64,7 @@ ctx->buffer.dst->padstack_tree = pcb_r_create_tree(); pcb_r_insert_entry(ctx->buffer.dst->padstack_tree, (pcb_box_t *)ps); - pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_PSTK, NULL, ps); PCB_SET_PARENT(ps, data, ctx->buffer.dst); return ps; @@ -87,7 +87,7 @@ pcb_pstk_copy_meta(nps, ps); pcb_pstk_invalidate_draw(nps); - pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, data, nps, nps); + pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, data, nps, nps); return nps; } @@ -105,10 +105,10 @@ assert(ps->parent_type = PCB_PARENT_DATA); pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_restore_to_poly(data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps); pcb_pstkop_move_noclip(ctx, ps); pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_clear_from_poly(data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps); return ps; } @@ -120,12 +120,12 @@ if (ctx->clip.restore) { if (data->padstack_tree != NULL) pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_restore_to_poly(data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps); } if (ctx->clip.clear) { if (data->padstack_tree != NULL) pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_clear_from_poly(data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps); } return ps; @@ -134,7 +134,7 @@ void *pcb_pstkop_remove(pcb_opctx_t *ctx, pcb_pstk_t *ps) { pcb_pstk_invalidate_erase(ps); - pcb_undo_move_obj_to_remove(PCB_TYPE_PSTK, ps, ps, ps); + pcb_undo_move_obj_to_remove(PCB_OBJ_PSTK, ps, ps, ps); return NULL; } @@ -156,14 +156,14 @@ pcb = ctx->chgtherm.pcb; layer = pcb_get_layer(pcb->Data, ctx->chgtherm.lid); - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PSTK, ps, ps, ps, pcb_false); - pcb_poly_restore_to_poly(pcb->Data, PCB_TYPE_PSTK, layer, ps); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_PSTK, ps, ps, ps, pcb_false); + pcb_poly_restore_to_poly(pcb->Data, PCB_OBJ_PSTK, layer, ps); #warning TODO: undo pcb_pstk_set_thermal(ps, ctx->chgtherm.lid, ctx->chgtherm.style); - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PSTK, ps, ps, ps, pcb_true); - pcb_poly_clear_from_poly(pcb->Data, PCB_TYPE_PSTK, layer, ps); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_PSTK, ps, ps, ps, pcb_true); + pcb_poly_clear_from_poly(pcb->Data, PCB_OBJ_PSTK, layer, ps); pcb_pstk_invalidate_draw(ps); return ps; } @@ -176,7 +176,7 @@ return NULL; if (pcb_pstk_flags == 0) - pcb_pstk_flags = pcb_obj_valid_flags(PCB_TYPE_PSTK); + pcb_pstk_flags = pcb_obj_valid_flags(PCB_OBJ_PSTK); if ((ctx->chgflag.flag & pcb_pstk_flags) != ctx->chgflag.flag) return NULL; @@ -207,7 +207,7 @@ pcb_coord_t nx = ps->x, ny = ps->y; - pcb_poly_restore_to_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_erase(ps); pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps); @@ -217,7 +217,7 @@ pcb_pstk_bbox(ps); pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps); - pcb_poly_clear_from_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); pcb_pstk_invalidate_draw(ps); return ps; Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 15868) +++ trunk/src/obj_rat.c (revision 15869) @@ -158,16 +158,16 @@ ctx->insert.x, ctx->insert.y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags); if (!newone) return newone; - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, newone, newone); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, newone, newone); pcb_rat_invalidate_erase(Rat); 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); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, newone, newone); pcb_line_invalidate_draw(CURRENT, newone); } - pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, Rat, Rat, Rat); + pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, Rat, Rat, Rat); return newone; } @@ -181,10 +181,10 @@ conf_set_editor(clear_line, 1); if (!newone) return NULL; - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, ctx->move.dst_layer, newone, newone); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, ctx->move.dst_layer, newone, newone); if (PCB->RatOn) pcb_rat_invalidate_erase(Rat); - pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, Rat, Rat, Rat); + pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, Rat, Rat, Rat); pcb_line_invalidate_draw(ctx->move.dst_layer, newone); return newone; } @@ -205,7 +205,7 @@ /* erase from screen and memory */ if (PCB->RatOn) pcb_rat_invalidate_erase(Rat); - pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, Rat, Rat, Rat); + pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, Rat, Rat, Rat); return NULL; } Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 15868) +++ trunk/src/obj_subc.c (revision 15869) @@ -912,22 +912,22 @@ linelist_foreach(&sl->Line, &it, line) { - pcb_object_operation(opfunc, ctx, PCB_TYPE_LINE, sl, line, line); + pcb_object_operation(opfunc, ctx, PCB_OBJ_LINE, sl, line, line); pcb_box_bump_box_noflt(&sc->BoundingBox, &line->BoundingBox); } arclist_foreach(&sl->Arc, &it, arc) { - pcb_object_operation(opfunc, ctx, PCB_TYPE_ARC, sl, arc, arc); + pcb_object_operation(opfunc, ctx, PCB_OBJ_ARC, sl, arc, arc); pcb_box_bump_box_noflt(&sc->BoundingBox, &arc->BoundingBox); } textlist_foreach(&sl->Text, &it, text) { - pcb_object_operation(opfunc, ctx, PCB_TYPE_TEXT, sl, text, text); + pcb_object_operation(opfunc, ctx, PCB_OBJ_TEXT, sl, text, text); pcb_box_bump_box_noflt(&sc->BoundingBox, &text->BoundingBox); } polylist_foreach(&sl->Polygon, &it, poly) { - pcb_object_operation(opfunc, ctx, PCB_TYPE_POLY, sl, poly, poly); + pcb_object_operation(opfunc, ctx, PCB_OBJ_POLY, sl, poly, poly); pcb_box_bump_box_noflt(&sc->BoundingBox, &poly->BoundingBox); } @@ -940,7 +940,7 @@ gdl_iterator_t it; padstacklist_foreach(&sc->data->padstack, &it, ps) { - pcb_object_operation(opfunc, ctx, PCB_TYPE_PSTK, ps, ps, ps); + pcb_object_operation(opfunc, ctx, PCB_OBJ_PSTK, ps, ps, ps); pcb_box_bump_box_noflt(&sc->BoundingBox, &ps->BoundingBox); } } @@ -960,7 +960,7 @@ sc = pcb_subc_dup_at(PCB, PCB->Data, src, ctx->copy.DeltaX, ctx->copy.DeltaY, pcb_false); - pcb_undo_add_obj_to_create(PCB_TYPE_SUBC, sc, sc, sc); + pcb_undo_add_obj_to_create(PCB_OBJ_SUBC, sc, sc, sc); if (ctx->copy.from_outside && conf_core.editor.show_solder_side) { uundo_serial_t last; @@ -1078,7 +1078,7 @@ linelist_foreach(&sl->Line, &it, line) { if (src_has_real_layer) { - pcb_poly_restore_to_poly(src_data, PCB_TYPE_LINE, sl, line); + pcb_poly_restore_to_poly(src_data, PCB_OBJ_LINE, sl, line); pcb_r_delete_entry(sl->line_tree, (pcb_box_t *)line); chg++; } @@ -1088,12 +1088,12 @@ chg++; } if (dst_is_pcb && (dl != NULL)) - pcb_poly_clear_from_poly(dst_data, PCB_TYPE_LINE, dl, line); + pcb_poly_clear_from_poly(dst_data, PCB_OBJ_LINE, dl, line); } arclist_foreach(&sl->Arc, &it, arc) { if (src_has_real_layer) { - pcb_poly_restore_to_poly(src_data, PCB_TYPE_ARC, sl, arc); + pcb_poly_restore_to_poly(src_data, PCB_OBJ_ARC, sl, arc); pcb_r_delete_entry(sl->arc_tree, (pcb_box_t *)arc); chg++; } @@ -1103,12 +1103,12 @@ chg++; } if (dst_is_pcb && (dl != NULL)) - pcb_poly_clear_from_poly(dst_data, PCB_TYPE_ARC, dl, arc); + pcb_poly_clear_from_poly(dst_data, PCB_OBJ_ARC, dl, arc); } textlist_foreach(&sl->Text, &it, text) { if (src_has_real_layer) { - pcb_poly_restore_to_poly(src_data, PCB_TYPE_LINE, sl, text); + pcb_poly_restore_to_poly(src_data, PCB_OBJ_LINE, sl, text); pcb_r_delete_entry(sl->text_tree, (pcb_box_t *)text); chg++; } @@ -1118,7 +1118,7 @@ chg++; } if (dst_is_pcb && (dl != NULL)) - pcb_poly_clear_from_poly(dst_data, PCB_TYPE_TEXT, dl, text); + pcb_poly_clear_from_poly(dst_data, PCB_OBJ_TEXT, dl, text); } polylist_foreach(&sl->Polygon, &it, poly) { @@ -1158,7 +1158,7 @@ padstacklist_foreach(&sc->data->padstack, &it, ps) { const pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); assert(proto != NULL); /* the prototype must be accessible at the source else we can't add it in the dest */ - pcb_poly_restore_to_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); if (sc->data->padstack_tree != NULL) pcb_r_delete_entry(sc->data->padstack_tree, (pcb_box_t *)ps); PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, ps); @@ -1169,7 +1169,7 @@ ps->protoi = -1; ps->parent.data = new_parent; if (dst_is_pcb) - pcb_poly_clear_from_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps); + pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps); chg++; } @@ -1393,7 +1393,7 @@ void *pcb_subcop_remove(pcb_opctx_t *ctx, pcb_subc_t *sc) { EraseSubc(sc); - pcb_undo_move_obj_to_remove(PCB_TYPE_SUBC, sc, sc, sc); + pcb_undo_move_obj_to_remove(PCB_OBJ_SUBC, sc, sc, sc); return NULL; } @@ -1415,7 +1415,7 @@ { static pcb_flag_values_t pcb_subc_flags = 0; if (pcb_subc_flags == 0) - pcb_subc_flags = pcb_obj_valid_flags(PCB_TYPE_SUBC); + pcb_subc_flags = pcb_obj_valid_flags(PCB_OBJ_SUBC); if (ctx->chgflag.flag == PCB_FLAG_FLOATER) { #warning subc TODO: subc-in-subc: can a whole subc be a floater? - add undo! @@ -1497,7 +1497,7 @@ newsc2 = pcb_subc_dup_at(pcb, data, newsc, 0, 0, pcb_true); newsc2->ID = newsc->ID; PCB_SET_PARENT(newsc2, data, data); - pcb_undo_add_subc_to_otherside(PCB_TYPE_SUBC, newsc2, newsc2, newsc2, yoff); + pcb_undo_add_subc_to_otherside(PCB_OBJ_SUBC, newsc2, newsc2, newsc2, yoff); *subc = newsc2; pcb_subc_free(newsc); Index: trunk/src/obj_subc_parent.h =================================================================== --- trunk/src/obj_subc_parent.h (revision 15868) +++ trunk/src/obj_subc_parent.h (revision 15869) @@ -77,7 +77,7 @@ return pcb_lobj_parent_subc(obj->parent_type, &obj->parent); #if 0 - case PCB_OBJ_RATLINE: + case PCB_OBJ_RAT: /* easy case: can not be in a subc at all */ return 0; #endif Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 15868) +++ trunk/src/obj_text.c (revision 15869) @@ -390,7 +390,7 @@ dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)]; pcb_r_delete_entry(srcly->text_tree, (pcb_box_t *) text); - pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_TEXT, srcly, text); + pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_TEXT, srcly, text); textlist_remove(text); textlist_append(&dstly->Text, text); @@ -398,7 +398,7 @@ if (!dstly->text_tree) dstly->text_tree = pcb_r_create_tree(); pcb_r_insert_entry(dstly->text_tree, (pcb_box_t *) text); - pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_TYPE_TEXT, dstly, text); + pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_TEXT, dstly, text); PCB_SET_PARENT(text, layer, dstly); @@ -414,14 +414,14 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return NULL; if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE && value != Text->Scale) { - pcb_undo_add_obj_to_size(PCB_TYPE_TEXT, Layer, Text, Text); + pcb_undo_add_obj_to_size(PCB_OBJ_TEXT, Layer, Text, Text); pcb_text_invalidate_erase(Layer, Text); pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); Text->Scale = value; pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; } @@ -438,13 +438,13 @@ return NULL; pcb_text_invalidate_erase(Layer, Text); pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); Text->TextString = ctx->chgname.new_name; /* calculate size of the bounding box */ pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text); pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return old; } @@ -456,14 +456,14 @@ return NULL; pcb_text_invalidate_erase(Layer, Text); if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_TEXT, Layer, Text, Text, pcb_false); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_TEXT, Layer, Text, Text, pcb_false); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); } pcb_undo_add_obj_to_flag(Text); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Text); if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_TEXT, Layer, Text, Text, pcb_true); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_undo_add_obj_to_clear_poly(PCB_OBJ_TEXT, Layer, Text, Text, pcb_true); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); } pcb_text_invalidate_draw(Layer, Text); return Text; @@ -494,7 +494,7 @@ Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, PCB_FLAG_FOUND)); pcb_text_copy_meta(text, Text); pcb_text_invalidate_draw(Layer, text); - pcb_undo_add_obj_to_create(PCB_TYPE_TEXT, Layer, text, text); + pcb_undo_add_obj_to_create(PCB_OBJ_TEXT, Layer, text, text); return text; } @@ -514,10 +514,10 @@ void *pcb_textop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_textop_move_noclip(ctx, Layer, Text); pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); return Text; } @@ -525,11 +525,11 @@ { if (ctx->clip.restore) { pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); } if (ctx->clip.clear) { pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); } return Text; } @@ -538,7 +538,7 @@ /* moves a text object between layers; lowlevel routines */ void *pcb_textop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_text_t * text, pcb_layer_t * Destination) { - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Source, text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Source, text); pcb_r_delete_entry(Source->text_tree, (pcb_box_t *) text); textlist_remove(text); @@ -554,7 +554,7 @@ if (!Destination->text_tree) Destination->text_tree = pcb_r_create_tree(); pcb_r_insert_entry(Destination->text_tree, (pcb_box_t *) text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Destination, text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Destination, text); PCB_SET_PARENT(text, layer, Destination); @@ -569,7 +569,7 @@ return NULL; } if (ctx->move.dst_layer != layer) { - pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_TEXT, layer, text, text); + pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_TEXT, layer, text, text); if (layer->meta.real.vis) pcb_text_invalidate_erase(layer, text); text = pcb_textop_move_to_layer_low(ctx, layer, text, ctx->move.dst_layer); @@ -598,7 +598,7 @@ pcb_text_invalidate_erase(Layer, Text); pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text); } - pcb_undo_move_obj_to_remove(PCB_TYPE_TEXT, Layer, Text, Text); + pcb_undo_move_obj_to_remove(PCB_OBJ_TEXT, Layer, Text, Text); return NULL; } @@ -638,11 +638,11 @@ void *pcb_textop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) { pcb_text_invalidate_erase(Layer, Text); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); pcb_text_rotate90(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; } @@ -651,7 +651,7 @@ { int steps; pcb_text_invalidate_erase(Layer, Text); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); steps = (int)ctx->rotate.angle / 90; @@ -662,7 +662,7 @@ pcb_text_bbox(NULL, Text); pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text); pcb_text_invalidate_draw(Layer, Text); return Text; } @@ -681,12 +681,12 @@ void pcb_text_set_font(pcb_layer_t *layer, pcb_text_t *text, pcb_font_id_t fid) { - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, layer, text); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, layer, text); pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text); text->fid = fid; pcb_text_bbox(pcb_font(PCB, text->fid, 1), text); pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, layer, text); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, layer, text); } void pcb_text_update(pcb_layer_t *layer, pcb_text_t *text) @@ -697,11 +697,11 @@ if (pcb == NULL) return; - pcb_poly_restore_to_poly(data, PCB_TYPE_TEXT, layer, text); + pcb_poly_restore_to_poly(data, PCB_OBJ_TEXT, layer, text); pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text); pcb_text_bbox(pcb_font(pcb, text->fid, 1), text); pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text); - pcb_poly_clear_from_poly(data, PCB_TYPE_TEXT, layer, text); + pcb_poly_clear_from_poly(data, PCB_OBJ_TEXT, layer, text); } void *pcb_textop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text) @@ -708,7 +708,7 @@ { static pcb_flag_values_t pcb_text_flags = 0; if (pcb_text_flags == 0) - pcb_text_flags = pcb_obj_valid_flags(PCB_TYPE_TEXT); + pcb_text_flags = pcb_obj_valid_flags(PCB_OBJ_TEXT); if ((ctx->chgflag.flag & pcb_text_flags) != ctx->chgflag.flag) return NULL; @@ -717,12 +717,12 @@ pcb_undo_add_obj_to_flag(Text); if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE) - pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_TYPE_TEXT, Text->parent.layer, Text); + pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_TEXT, Text->parent.layer, Text); PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Text); if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE) - pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_TYPE_TEXT, Text->parent.layer, Text); + pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_TEXT, Text->parent.layer, Text); return Text; } Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 15868) +++ trunk/src/object_act.c (revision 15869) @@ -128,7 +128,7 @@ if (n_found == 0) { void *ptrtmp; pcb_gui->get_coords(_("Click on a subcircuit"), &x, &y); - if ((pcb_search_screen(x, y, PCB_TYPE_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) + if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) s = (pcb_subc_t *)ptrtmp; else { pcb_message(PCB_MSG_ERROR, _("No subcircuit found there\n")); @@ -259,7 +259,7 @@ oy = (subc->BoundingBox.Y1 + subc->BoundingBox.Y2)/2; } disperse_obj(PCB, (pcb_any_obj_t *)subc, ox, oy, &dx, &dy, &minx, &miny, &maxy); - pcb_move_obj(PCB_TYPE_SUBC, subc, subc, subc, dx, dy); + pcb_move_obj(PCB_OBJ_SUBC, subc, subc, subc, dx, dy); } } PCB_END_LOOP; @@ -301,7 +301,7 @@ if (function) { switch (pcb_funchash_get(function, NULL)) { case F_Object: - if ((pcb_search_screen(x, y, PCB_TYPE_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { + if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) { pcb_subc_t *subc = (pcb_subc_t *)ptrtmp; pcb_undo_save_serial(); pcb_subc_change_side(&subc, 2 * pcb_crosshair.Y - PCB->MaxHeight); @@ -356,7 +356,7 @@ nx = pcb_get_value(x_str, units, &absolute2, NULL); type = pcb_search_screen(x, y, PCB_MOVE_TYPES, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_NONE) { + if (type == PCB_OBJ_VOID) { pcb_message(PCB_MSG_ERROR, _("Nothing found under crosshair\n")); return 1; } @@ -367,7 +367,7 @@ pcb_event(PCB_EVENT_RUBBER_RESET, NULL); if (conf_core.editor.rubber_band_mode) pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); - if (type == PCB_TYPE_SUBC) + if (type == PCB_OBJ_SUBC) pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); pcb_move_obj_and_rubberband(type, ptr1, ptr2, ptr3, nx, ny); pcb_board_set_changed_flag(pcb_true); @@ -399,7 +399,7 @@ void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_MOVETOLAYER_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if ((type = pcb_search_screen(x, y, PCB_MOVETOLAYER_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) if (pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, CURRENT, pcb_false)) pcb_board_set_changed_flag(pcb_true); break; @@ -723,7 +723,7 @@ PCB_LINE_ALL_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_AUTO, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) { - pcb_remove_object(PCB_TYPE_LINE, layer, line, line); + pcb_remove_object(PCB_OBJ_LINE, layer, line, line); changed = pcb_true; } } @@ -731,7 +731,7 @@ PCB_ARC_ALL_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_AUTO, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) { - pcb_remove_object(PCB_TYPE_ARC, layer, arc, arc); + pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc); changed = pcb_true; } } @@ -740,7 +740,7 @@ PCB_PADSTACK_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_AUTO, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) { - pcb_remove_object(PCB_TYPE_PSTK, padstack, padstack, padstack); + pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack); changed = pcb_true; } } @@ -756,7 +756,7 @@ { if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) { - pcb_remove_object(PCB_TYPE_LINE, layer, line, line); + pcb_remove_object(PCB_OBJ_LINE, layer, line, line); changed = pcb_true; } } @@ -766,7 +766,7 @@ { if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) { - pcb_remove_object(PCB_TYPE_PSTK, padstack, padstack, padstack); + pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack); changed = pcb_true; } } @@ -820,7 +820,7 @@ if (!PCB_FLAGS_TEST(flags, padstack)) continue; if (padstack->Clearance < value) { - pcb_chg_obj_clear_size(PCB_TYPE_PSTK, padstack, 0, 0, value, 1); + pcb_chg_obj_clear_size(PCB_OBJ_PSTK, padstack, 0, 0, value, 1); pcb_undo_restore_serial(); } } @@ -831,7 +831,7 @@ if (!PCB_FLAGS_TEST(flags, line)) continue; if ((line->Clearance != 0) && (line->Clearance < value)) { - pcb_chg_obj_clear_size(PCB_TYPE_LINE, layer, line, 0, value, 1); + pcb_chg_obj_clear_size(PCB_OBJ_LINE, layer, line, 0, value, 1); pcb_undo_restore_serial(); } } @@ -841,7 +841,7 @@ if (!PCB_FLAGS_TEST(flags, arc)) continue; if ((arc->Clearance != 0) && (arc->Clearance < value)) { - pcb_chg_obj_clear_size(PCB_TYPE_ARC, layer, arc, 0, value, 1); + pcb_chg_obj_clear_size(PCB_OBJ_ARC, layer, arc, 0, value, 1); pcb_undo_restore_serial(); } } @@ -851,7 +851,7 @@ if (!PCB_FLAGS_TEST(flags, polygon)) continue; if ((polygon->Clearance != 0) && (polygon->Clearance < value)) { - pcb_chg_obj_clear_size(PCB_TYPE_POLY, layer, polygon, 0, value, 1); + pcb_chg_obj_clear_size(PCB_OBJ_POLY, layer, polygon, 0, value, 1); pcb_undo_restore_serial(); } } Index: trunk/src/operation.c =================================================================== --- trunk/src/operation.c (revision 15868) +++ trunk/src/operation.c (revision 15869) @@ -42,52 +42,52 @@ void *pcb_object_operation(pcb_opfunc_t *F, pcb_opctx_t *ctx, int Type, void *Ptr1, void *Ptr2, void *Ptr3) { switch (Type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: if (F->Line) return (F->Line(ctx, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2)); break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: if (F->Arc) return (F->Arc(ctx, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2)); break; - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_LINE_POINT: if (F->LinePoint) return (F->LinePoint(ctx, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3)); break; - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: if (F->ArcPoint) return (F->ArcPoint(ctx, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, (int *) Ptr3)); break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: if (F->Text) return (F->Text(ctx, (pcb_layer_t *) Ptr1, (pcb_text_t *) Ptr2)); break; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: if (F->Polygon) return (F->Polygon(ctx, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2)); break; - case PCB_TYPE_POLY_POINT: + case PCB_OBJ_POLY_POINT: if (F->Point) return (F->Point(ctx, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2, (pcb_point_t *) Ptr3)); break; - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: if (F->subc) return (F->subc(ctx, (pcb_subc_t *) Ptr2)); break; - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: if (F->padstack) return (F->padstack(ctx, (pcb_pstk_t *)Ptr2)); break; - case PCB_TYPE_RATLINE: + case PCB_OBJ_RAT: if (F->Rat) return (F->Rat(ctx, (pcb_rat_t *) Ptr2)); break; @@ -106,7 +106,7 @@ pcb_bool changed = pcb_false; /* check lines */ - if (type & PCB_TYPE_LINE && F->Line) { + if (type & PCB_OBJ_LINE && F->Line) { PCB_LINE_VISIBLE_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { @@ -122,7 +122,7 @@ } /* check arcs */ - if (type & PCB_TYPE_ARC && F->Arc) { + if (type & PCB_OBJ_ARC && F->Arc) { PCB_ARC_VISIBLE_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc)) { @@ -138,7 +138,7 @@ } /* check text */ - if (type & PCB_TYPE_TEXT && F->Text) { + if (type & PCB_OBJ_TEXT && F->Text) { PCB_TEXT_ALL_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) && pcb_text_is_visible(PCB, layer, text)) { @@ -154,7 +154,7 @@ } /* check polygons */ - if (type & PCB_TYPE_POLY && F->Polygon) { + if (type & PCB_OBJ_POLY && F->Polygon) { PCB_POLY_VISIBLE_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) { @@ -169,7 +169,7 @@ PCB_ENDALL_LOOP; } - if (type & PCB_TYPE_SUBC && F->subc) { + if (type & PCB_OBJ_SUBC && F->subc) { PCB_SUBC_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)) { @@ -190,7 +190,7 @@ /* process padstacks */ - if (type & PCB_TYPE_PSTK && pcb->ViaOn && F->padstack) { + if (type & PCB_OBJ_PSTK && pcb->ViaOn && F->padstack) { PCB_PADSTACK_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack)) { @@ -206,7 +206,7 @@ } /* and rat-lines */ - if (type & PCB_TYPE_RATLINE && pcb->RatOn && F->Rat) { + if (type & PCB_OBJ_RAT && pcb->RatOn && F->Rat) { PCB_RAT_LOOP(data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) { Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 15868) +++ trunk/src/polygon.c (revision 15869) @@ -852,7 +852,7 @@ static int inited = 0; if (!inited) { - lin.type = PCB_TYPE_LINE; + lin.type = PCB_OBJ_LINE; lin.Flags = pcb_no_flags(); PCB_FLAG_SET(PCB_FLAG_CLEARLINE, &lin); lin.Thickness = 0; @@ -1278,7 +1278,7 @@ line.Point2 = Polygon->Points[next]; line.Thickness = 0; if (pcb_is_point_on_line(p->X, p->Y, 0.0, &line)) { - pcb_remove_object(PCB_TYPE_POLY_POINT, Layer, Polygon, p); + pcb_remove_object(PCB_OBJ_POLY_POINT, Layer, Polygon, p); changed = pcb_true; } } @@ -1453,7 +1453,7 @@ pcb_added_lines = 0; /* add to undo list */ - pcb_undo_add_obj_to_create(PCB_TYPE_POLY, layer, polygon, polygon); + pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, polygon, polygon); pcb_undo_inc_serial(); } @@ -1508,7 +1508,7 @@ pcb_undo_save_serial(); Flags = ((pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2)->Flags; pcb_poly_to_polygons_on_layer(PCB->Data, (pcb_layer_t *) pcb_crosshair.AttachedObject.Ptr1, result, Flags); - pcb_remove_object(PCB_TYPE_POLY, + pcb_remove_object(PCB_OBJ_POLY, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); pcb_undo_restore_serial(); pcb_undo_inc_serial(); @@ -1557,19 +1557,19 @@ if (!Polygon->Clipped) return 0; switch (type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: SubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon); Polygon->NoHolesValid = 0; return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: SubtractLine((pcb_line_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: SubtractArc((pcb_arc_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: if (ptr2 != Polygon) { SubtractPolyPoly((pcb_poly_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; @@ -1576,7 +1576,7 @@ return PCB_R_DIR_FOUND_CONTINUE; } break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: SubtractText((pcb_text_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return PCB_R_DIR_FOUND_CONTINUE; @@ -1587,22 +1587,22 @@ static pcb_r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2) { switch (type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: UnsubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon); return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: UnsubtractLine((pcb_line_t *) ptr2, Layer, Polygon); return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon); return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: if (ptr2 != Polygon) { UnsubtractPolyPoly((pcb_poly_t *) ptr2, Polygon); return PCB_R_DIR_FOUND_CONTINUE; } break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: UnsubtractText((pcb_text_t *) ptr2, Layer, Polygon); return PCB_R_DIR_FOUND_CONTINUE; } @@ -1659,7 +1659,7 @@ info.data = Data; info.callback = call_back; switch (type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: if (Data->parent_type != PCB_PARENT_BOARD) return 0; if (ptr1 == NULL) { /* no layer specified: run on all layers */ @@ -1678,19 +1678,19 @@ if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (pcb_pstk_t *)ptr2)) return 0; goto doit; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: if (!PCB_POLY_HAS_CLEARANCE((pcb_poly_t *) ptr2)) return 0; goto doit; - case PCB_TYPE_LINE: - case PCB_TYPE_ARC: + case PCB_OBJ_LINE: + case PCB_OBJ_ARC: /* the cast works equally well for lines and arcs */ if (!PCB_NONPOLY_HAS_CLEARANCE((pcb_line_t *) ptr2)) return 0; goto doit; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: /* text has no clearance property */ if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (pcb_line_t *) ptr2)) return 0; @@ -1718,7 +1718,7 @@ dt = dt->parent.subc->parent.data; if ((dt == NULL) || (dt->parent_type != PCB_PARENT_BOARD)) /* clear/restore only on boards */ return; - if (type == PCB_TYPE_POLY) + if (type == PCB_OBJ_POLY) pcb_poly_init_clip(dt, (pcb_layer_t *) ptr1, (pcb_poly_t *) ptr2); pcb_poly_plows(dt, type, ptr1, ptr2, add_plow); } @@ -1730,7 +1730,7 @@ dt = dt->parent.subc->parent.data; if ((dt == NULL) || (dt->parent_type != PCB_PARENT_BOARD)) /* clear/restore only on boards */ return; - if (type == PCB_TYPE_POLY) + if (type == PCB_OBJ_POLY) pcb_poly_init_clip(dt, (pcb_layer_t *) ptr1, (pcb_poly_t *) ptr2); pcb_poly_plows(dt, type, ptr1, ptr2, subtract_plow); } @@ -1908,7 +1908,7 @@ newone->BoundingBox.X2 = p->contours->xmax + 1; newone->BoundingBox.Y1 = p->contours->ymin; newone->BoundingBox.Y2 = p->contours->ymax + 1; - pcb_undo_add_obj_to_create(PCB_TYPE_POLY, layer, newone, newone); + pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, newone, newone); newone->Clipped = p; p = p->f; /* go to next pline */ newone->Clipped->b = newone->Clipped->f = newone->Clipped; /* unlink from others */ @@ -2017,7 +2017,7 @@ pcb_poly_invalidate_draw(Layer, Polygon); /* add to undo list */ - pcb_undo_add_obj_to_create(PCB_TYPE_POLY, Layer, Polygon, Polygon); + pcb_undo_add_obj_to_create(PCB_OBJ_POLY, Layer, Polygon, Polygon); } while ((pa = pa->f) != Input); Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 15868) +++ trunk/src/polygon_act.c (revision 15869) @@ -76,7 +76,7 @@ void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_TYPE_POLY, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_OBJ_POLY, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { pcb_poly_morph((pcb_layer_t *) ptr1, (pcb_poly_t *) ptr3); pcb_draw(); pcb_undo_inc_serial(); Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 15868) +++ trunk/src/rats.c (revision 15869) @@ -687,7 +687,7 @@ firstpoint->group, secondpoint->group, conf_core.appearance.rat_thickness, pcb_no_flags())) != NULL) { if (distance == 0) PCB_FLAG_SET(PCB_FLAG_VIA, line); - pcb_undo_add_obj_to_create(PCB_TYPE_RATLINE, line, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_RAT, line, line, line); pcb_rat_invalidate_draw(line); changed = pcb_true; } @@ -887,9 +887,9 @@ && pcb_crosshair.AttachedLine.Point1.Y == pcb_crosshair.AttachedLine.Point2.Y) return NULL; - found = pcb_search_obj_by_location(PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART, &ptr1, &ptr2, &ptr3, + found = pcb_search_obj_by_location(PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 5); - if (found == PCB_TYPE_NONE) { + if (found == PCB_OBJ_VOID) { pcb_message(PCB_MSG_ERROR, _("No pad/pin under rat line\n")); return NULL; } @@ -906,9 +906,9 @@ /* will work for pins to since the FLAG is common */ group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_any_obj_t *) ptr2) ? Sgrp : Cgrp); strcpy(name1, pcb_connection_name(ptr2)); - found = pcb_search_obj_by_location(PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART, &ptr1, &ptr2, &ptr3, + found = pcb_search_obj_by_location(PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, 5); - if (found == PCB_TYPE_NONE) { + if (found == PCB_OBJ_VOID) { pcb_message(PCB_MSG_ERROR, _("No pad/pin under rat line\n")); return NULL; } Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 15868) +++ trunk/src/remove.c (revision 15869) @@ -78,7 +78,7 @@ ctx.remove.pcb = PCB; ctx.remove.destroy_target = NULL; - if (pcb_selected_operation(PCB, PCB->Data, &RemoveFunctions, &ctx, pcb_false, PCB_TYPEMASK_ALL)) { + if (pcb_selected_operation(PCB, PCB->Data, &RemoveFunctions, &ctx, pcb_false, PCB_OBJ_ANY)) { pcb_undo_inc_serial(); pcb_draw(); return pcb_true; Index: trunk/src/remove.h =================================================================== --- trunk/src/remove.h (revision 15868) +++ trunk/src/remove.h (revision 15869) @@ -34,8 +34,8 @@ #include "config.h" #define PCB_REMOVE_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_SUBC | \ - PCB_TYPE_POLY_POINT | PCB_TYPE_POLY | PCB_TYPE_RATLINE | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT) + (PCB_OBJ_PSTK | PCB_OBJ_LINE_POINT | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_SUBC | \ + PCB_OBJ_POLY_POINT | PCB_OBJ_POLY | PCB_OBJ_RAT | PCB_OBJ_ARC | PCB_OBJ_ARC_POINT) pcb_bool pcb_remove_selected(void); Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 15868) +++ trunk/src/rotate.c (revision 15869) @@ -99,7 +99,7 @@ pcb_event(PCB_EVENT_RUBBER_ROTATE90, "ipppccip", Type, Ptr1, Ptr2, Ptr2, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.number, &changed); - if (Type != PCB_TYPE_PSTK) /* padstack has its own way doing the rotation-undo */ + if (Type != PCB_OBJ_PSTK) /* padstack has its own way doing the rotation-undo */ pcb_undo_add_obj_to_rotate90(Type, Ptr1, Ptr2, Ptr3, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.number); ptr2 = pcb_object_operation(&Rotate90Functions, &ctx, Type, Ptr1, Ptr2, Ptr3); changed |= (ptr2 != NULL); @@ -124,7 +124,7 @@ pcb_event(PCB_EVENT_RUBBER_ROTATE, "ipppccip", Type, Ptr1, Ptr2, Ptr2, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.angle, &changed); - if (Type != PCB_TYPE_PSTK) /* padstack has its own way doing the rotation-undo */ + if (Type != PCB_OBJ_PSTK) /* padstack has its own way doing the rotation-undo */ pcb_undo_add_obj_to_rotate(Type, Ptr1, Ptr2, Ptr3, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.angle); ptr2 = pcb_object_operation(&RotateFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3); changed |= (ptr2 != NULL); @@ -139,7 +139,7 @@ { int type; void *ptr1, *ptr2, *ptr3; - if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); return; @@ -147,7 +147,7 @@ pcb_event(PCB_EVENT_RUBBER_RESET, NULL); if (conf_core.editor.rubber_band_mode) pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); - if (type == PCB_TYPE_SUBC) + if (type == PCB_OBJ_SUBC) pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); pcb_obj_rotate90(type, ptr1, ptr2, ptr3, X, Y, Steps); pcb_board_set_changed_flag(pcb_true); @@ -158,7 +158,7 @@ { int type; void *ptr1, *ptr2, *ptr3; - if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) { pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); return; @@ -166,7 +166,7 @@ pcb_event(PCB_EVENT_RUBBER_RESET, NULL); if (conf_core.editor.rubber_band_mode) pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3); - if (type == PCB_TYPE_SUBC) + if (type == PCB_OBJ_SUBC) pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3); pcb_obj_rotate(type, ptr1, ptr2, ptr3, X, Y, angle); pcb_board_set_changed_flag(pcb_true); Index: trunk/src/rotate.h =================================================================== --- trunk/src/rotate.h (revision 15868) +++ trunk/src/rotate.h (revision 15869) @@ -51,7 +51,7 @@ } \ } while(0) -#define PCB_ROTATE_TYPES (PCB_TYPE_PSTK | PCB_TYPE_SUBC | PCB_TYPE_TEXT | PCB_TYPE_ARC | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_POLY) +#define PCB_ROTATE_TYPES (PCB_OBJ_PSTK | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_ARC | PCB_OBJ_LINE_POINT | PCB_OBJ_LINE | PCB_OBJ_POLY) /* rotates an object passed; * the center of rotation is determined by the current cursor location Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 15868) +++ trunk/src/route.c (revision 15869) @@ -119,7 +119,7 @@ p_object->point1 = *point1; p_object->point2 = *point2; p_object->layer = layer; - p_object->type = PCB_TYPE_LINE; + p_object->type = PCB_OBJ_LINE; } void @@ -134,7 +134,7 @@ p_object->delta_angle = delta; p_object->radius = radius; p_object->layer = layer; - p_object->type = PCB_TYPE_ARC; + p_object->type = PCB_OBJ_ARC; } @@ -450,7 +450,7 @@ switch(p_obj->type) { - case PCB_TYPE_LINE : + case PCB_OBJ_LINE : /* If the route is being applied to an existing line then the existing line will be used as the first line in the route. This maintains the ID of the line and line points. This is especially useful if the @@ -459,7 +459,7 @@ if(apply_to_line) { /* Move the existing line points to the position of the route line. */ if((p_obj->point1.X != apply_to_line->Point1.X) || (p_obj->point1.Y != apply_to_line->Point1.Y)) - pcb_undo_add_obj_to_move( PCB_TYPE_LINE_POINT, + pcb_undo_add_obj_to_move( PCB_OBJ_LINE_POINT, apply_to_line_layer, apply_to_line, &apply_to_line->Point1, @@ -467,7 +467,7 @@ p_obj->point1.Y - apply_to_line->Point1.Y ); if((p_obj->point2.X != apply_to_line->Point2.X) || (p_obj->point2.Y != apply_to_line->Point2.Y)) - pcb_undo_add_obj_to_move( PCB_TYPE_LINE_POINT, + pcb_undo_add_obj_to_move( PCB_OBJ_LINE_POINT, apply_to_line_layer, apply_to_line, &apply_to_line->Point2, @@ -477,7 +477,7 @@ /* Move the existing line point/s */ 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); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, apply_to_line_layer, apply_to_line); apply_to_line->Point1.X = p_obj->point1.X; apply_to_line->Point1.Y = p_obj->point1.Y; apply_to_line->Point2.X = p_obj->point2.X; @@ -484,7 +484,7 @@ apply_to_line->Point2.Y = p_obj->point2.Y; pcb_line_bbox(apply_to_line); pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) apply_to_line); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, layer, apply_to_line); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, layer, apply_to_line); pcb_line_invalidate_draw(layer, apply_to_line); apply_to_line_layer = layer; @@ -508,13 +508,13 @@ pcb_added_lines++; pcb_obj_add_attribs(line, PCB->pen_attr); pcb_line_invalidate_draw(layer, line); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, layer, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, line, line); applied = 1; } } break; - case PCB_TYPE_ARC : + case PCB_OBJ_ARC : { /* Create a new arc */ pcb_arc_t * arc = pcb_arc_new( layer, @@ -530,7 +530,7 @@ if(arc) { pcb_added_lines++; pcb_obj_add_attribs(arc, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, layer, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, layer, arc, arc); pcb_arc_invalidate_draw(layer, arc); applied = 1; } @@ -604,11 +604,11 @@ pcb_gui->set_color(GC,layer->meta.real.color); switch(p_obj->type) { - case PCB_TYPE_LINE : + case PCB_OBJ_LINE : pcb_draw_wireframe_line(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->point2.X,p_obj->point2.Y,p_route->thickness, 0); break; - case PCB_TYPE_ARC : + case PCB_OBJ_ARC : pcb_route_draw_arc(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->start_angle,p_obj->delta_angle,p_obj->radius,p_route->thickness); break; @@ -633,11 +633,11 @@ const pcb_route_object_t * p_obj = &p_route->objects[i]; switch(p_obj->type) { - case PCB_TYPE_LINE : + case PCB_OBJ_LINE : pcb_draw_wireframe_line(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->point2.X,p_obj->point2.Y,thickness, 0); break; - case PCB_TYPE_ARC : + case PCB_OBJ_ARC : pcb_route_draw_arc(GC,p_obj->point1.X,p_obj->point1.Y,p_obj->start_angle,p_obj->delta_angle,p_obj->radius,thickness); break; Index: trunk/src/route.h =================================================================== --- trunk/src/route.h (revision 15868) +++ trunk/src/route.h (revision 15869) @@ -35,7 +35,7 @@ #define ROUTE_SMALL_DATA_SIZE 4 typedef struct { - pcb_obj_type_t type; + pcb_objtype_t type; pcb_point_t point1; /* Line: Start Point, Arc: Center Point */ pcb_point_t point2; /* Line: End Point */ pcb_coord_t radius; /* Arc */ Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 15868) +++ trunk/src/route_style.c (revision 15869) @@ -202,9 +202,9 @@ switch (funcid) { case F_Object: switch (type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: return pcb_get_style_size(F_SelectedLines, out, 0, size_id); - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: return pcb_get_style_size(F_SelectedArcs, out, 0, size_id); } pcb_message(PCB_MSG_ERROR, _("Sorry, can't fetch the style of that object type (%x)\n"), type); Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 15868) +++ trunk/src/search.c (revision 15869) @@ -51,8 +51,8 @@ static pcb_layer_t *SearchLayer; /* --------------------------------------------------------------------------- - * The first parameter includes PCB_TYPE_LOCKED if we - * want to include locked object in the search and PCB_TYPE_SUBC_PART if + * The first parameter includes PCB_OBJ_LOCKED if we + * want to include locked object in the search and PCB_OBJ_SUBC_PART if * objects that are part of a subcircuit should be found. */ static pcb_bool SearchLineByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_line_t **, pcb_line_t **); @@ -72,9 +72,9 @@ do { \ if ((req_flag != 0) && (!PCB_FLAG_TEST(req_flag, obj))) \ reject; \ - if (!(objst & PCB_TYPE_SUBC_PART) && (pcb_ ## locality ## obj_parent_subc(obj->parent_type, &obj->parent))) \ + if (!(objst & PCB_OBJ_SUBC_PART) && (pcb_ ## locality ## obj_parent_subc(obj->parent_type, &obj->parent))) \ reject; \ - if (!(objst & PCB_TYPE_LOCKED) && (PCB_FLAG_TEST(objst & PCB_FLAG_LOCK, locked_obj))) \ + if (!(objst & PCB_OBJ_LOCKED) && (PCB_FLAG_TEST(objst & PCB_FLAG_LOCK, locked_obj))) \ reject; \ } while(0) @@ -439,7 +439,7 @@ dt = polygon->parent.layer->parent; /* polygon -> layer -> data */ if ((dt != NULL) && (dt->parent_type == PCB_PARENT_SUBC)) { /* do not find subc part poly points if not explicitly requested */ - if (!(ctx->Type & PCB_TYPE_SUBC_PART)) + if (!(ctx->Type & PCB_OBJ_SUBC_PART)) return PCB_R_DIR_NOT_FOUND; /* don't find subc poly points even as subc part unless we are editing a subc */ @@ -1069,7 +1069,7 @@ * searches for any kind of object or for a set of object types * the calling routine passes two pointers to allocated memory for storing * the results. - * A type value is returned too which is PCB_TYPE_NONE if no objects has been found. + * A type value is returned too which is PCB_OBJ_VOID if no objects has been found. * A set of object types is passed in. * The object is located by it's position. * @@ -1076,10 +1076,10 @@ * The layout is checked in the following order: * polygon-point, padstack, line, text, polygon, subcircuit * - * Note that if Type includes PCB_TYPE_LOCKED, then the search includes + * Note that if Type includes PCB_OBJ_LOCKED, then the search includes * locked items. Otherwise, locked items are ignored. - * Note that if Type includes PCB_TYPE_SUBC_PART, then the search includes + * Note that if Type includes PCB_OBJ_SUBC_PART, then the search includes * objects that are part of subcircuits, else they are ignored. */ static int pcb_search_obj_by_location_(unsigned long Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, unsigned long req_flag) @@ -1088,8 +1088,8 @@ void **pr1 = &r1, **pr2 = &r2, **pr3 = &r3; int i; double HigherBound = 0; - int HigherAvail = PCB_TYPE_NONE; - int objst = Type & (PCB_TYPE_LOCKED | PCB_TYPE_SUBC_PART); + int HigherAvail = PCB_OBJ_VOID; + int objst = Type & (PCB_OBJ_LOCKED | PCB_OBJ_SUBC_PART); /* setup variables used by local functions */ PosX = X; @@ -1106,36 +1106,36 @@ } if (conf_core.editor.only_names) { - Type &= PCB_TYPE_TEXT; + Type &= PCB_OBJ_TEXT; } if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) { - Type &= ~PCB_TYPE_POLY; + Type &= ~PCB_OBJ_POLY; } - if (Type & PCB_TYPE_RATLINE && PCB->RatOn && + if (Type & PCB_OBJ_RAT && PCB->RatOn && SearchRatLineByLocation(objst, req_flag, (pcb_rat_t **) Result1, (pcb_rat_t **) Result2, (pcb_rat_t **) Result3)) - return PCB_TYPE_RATLINE; + return PCB_OBJ_RAT; - if (Type & PCB_TYPE_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 1)) - return PCB_TYPE_PSTK; + if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 1)) + return PCB_OBJ_PSTK; - if (Type & PCB_TYPE_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0)) - return PCB_TYPE_PSTK; + if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0)) + return PCB_OBJ_PSTK; - if (!HigherAvail && (Type & PCB_TYPE_SUBC_FLOATER) && (Type & PCB_TYPE_TEXT) && + if (!HigherAvail && (Type & PCB_OBJ_FLOATER) && (Type & PCB_OBJ_TEXT) && SearchSubcFloaterByLocation(objst, req_flag, (pcb_subc_t **)pr1, (pcb_text_t **) pr2, pr3, pcb_false)) { *Result1 = ((pcb_text_t *)r2)->parent.layer; *Result2 = r2; *Result3 = r3; - return PCB_TYPE_TEXT; + return PCB_OBJ_TEXT; } - if (!HigherAvail && Type & PCB_TYPE_SUBC && PCB->SubcOn && + if (!HigherAvail && Type & PCB_OBJ_SUBC && PCB->SubcOn && SearchSubcByLocation(objst, req_flag, (pcb_subc_t **) pr1, (pcb_subc_t **) pr2, (pcb_subc_t **) pr3, pcb_false)) { pcb_box_t *box = &((pcb_subc_t *) r1)->BoundingBox; HigherBound = (double) (box->X2 - box->X1) * (double) (box->Y2 - box->Y1); - HigherAvail = PCB_TYPE_SUBC; + HigherAvail = PCB_OBJ_SUBC; } for (i = -1; i < pcb_max_layer + 1; i++) { @@ -1152,34 +1152,34 @@ continue; } if (SearchLayer->meta.real.vis) { - if ((HigherAvail & (PCB_TYPE_PSTK)) == 0 && - Type & PCB_TYPE_POLY_POINT && + if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && + Type & PCB_OBJ_POLY_POINT && SearchPointByLocation(Type, objst, req_flag, (pcb_layer_t **) Result1, (pcb_poly_t **) Result2, (pcb_point_t **) Result3)) - return PCB_TYPE_POLY_POINT; + return PCB_OBJ_POLY_POINT; - if ((HigherAvail & (PCB_TYPE_PSTK)) == 0 && - Type & PCB_TYPE_LINE_POINT && + if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && + Type & PCB_OBJ_LINE_POINT && SearchLinePointByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_line_t **) Result2, (pcb_point_t **) Result3)) - return PCB_TYPE_LINE_POINT; + return PCB_OBJ_LINE_POINT; - if ((HigherAvail & (PCB_TYPE_PSTK)) == 0 && - Type & PCB_TYPE_ARC_POINT && + if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && + Type & PCB_OBJ_ARC_POINT && SearchArcPointByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_arc_t **) Result2, (int **) Result3)) - return PCB_TYPE_ARC_POINT; + return PCB_OBJ_ARC_POINT; - if ((HigherAvail & (PCB_TYPE_PSTK)) == 0 && Type & PCB_TYPE_LINE + if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && Type & PCB_OBJ_LINE && SearchLineByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_line_t **) Result2, (pcb_line_t **) Result3)) - return PCB_TYPE_LINE; + return PCB_OBJ_LINE; - if ((HigherAvail & (PCB_TYPE_PSTK)) == 0 && Type & PCB_TYPE_ARC && + if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && Type & PCB_OBJ_ARC && SearchArcByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_arc_t **) Result2, (pcb_arc_t **) Result3)) - return PCB_TYPE_ARC; + return PCB_OBJ_ARC; - if ((HigherAvail & (PCB_TYPE_PSTK)) == 0 && Type & PCB_TYPE_TEXT + if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && Type & PCB_OBJ_TEXT && SearchTextByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_text_t **) Result2, (pcb_text_t **) Result3)) - return PCB_TYPE_TEXT; + return PCB_OBJ_TEXT; - if (Type & PCB_TYPE_POLY && + if (Type & PCB_OBJ_POLY && SearchPolygonByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_poly_t **) Result2, (pcb_poly_t **) Result3)) { if (HigherAvail) { pcb_box_t *box = &(*(pcb_poly_t **) Result2)->BoundingBox; @@ -1187,51 +1187,51 @@ if (HigherBound < area) break; else - return PCB_TYPE_POLY; + return PCB_OBJ_POLY; } else - return PCB_TYPE_POLY; + return PCB_OBJ_POLY; } } } /* return any previously found objects */ - if (HigherAvail & PCB_TYPE_PSTK) { + if (HigherAvail & PCB_OBJ_PSTK) { *Result1 = r1; *Result2 = r2; *Result3 = r3; - return PCB_TYPE_PSTK; + return PCB_OBJ_PSTK; } - if (HigherAvail & PCB_TYPE_SUBC) { + if (HigherAvail & PCB_OBJ_SUBC) { *Result1 = r1; *Result2 = r2; *Result3 = r3; - return PCB_TYPE_SUBC; + return PCB_OBJ_SUBC; } /* search the 'invisible objects' last */ if (!PCB->InvisibleObjectsOn) - return PCB_TYPE_NONE; + return PCB_OBJ_VOID; - if ((Type & PCB_TYPE_SUBC_FLOATER) && (Type & PCB_TYPE_TEXT) && + if ((Type & PCB_OBJ_FLOATER) && (Type & PCB_OBJ_TEXT) && SearchSubcFloaterByLocation(objst, req_flag, (pcb_subc_t **)pr1, (pcb_text_t **) pr2, pr3, pcb_true)) { *Result1 = ((pcb_text_t *)r2)->parent.layer; *Result2 = r2; *Result3 = r3; - return PCB_TYPE_TEXT; + return PCB_OBJ_TEXT; } - if (Type & PCB_TYPE_SUBC && PCB->SubcOn && + if (Type & PCB_OBJ_SUBC && PCB->SubcOn && SearchSubcByLocation(objst, req_flag, (pcb_subc_t **) Result1, (pcb_subc_t **) Result2, (pcb_subc_t **) Result3, pcb_true)) - return PCB_TYPE_SUBC; + return PCB_OBJ_SUBC; - return PCB_TYPE_NONE; + return PCB_OBJ_VOID; } int pcb_search_obj_by_location(unsigned long Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius) { int res = pcb_search_obj_by_location_(Type, Result1, Result2, Result3, X, Y, Radius, 0); - if ((res != PCB_TYPE_NONE) && (res != PCB_TYPE_SUBC)) + if ((res != PCB_OBJ_VOID) && (res != PCB_OBJ_SUBC)) return res; /* found a subc because it was still the best option over all the plain @@ -1240,10 +1240,10 @@ if ((!conf_core.editor.lock_names) && (!conf_core.editor.hide_names)) { int fres; void *fr1, *fr2, *fr3; - Type &= ~PCB_TYPE_SUBC; - Type |= PCB_TYPE_SUBC_PART; + Type &= ~PCB_OBJ_SUBC; + Type |= PCB_OBJ_SUBC_PART; fres = pcb_search_obj_by_location_(Type, &fr1, &fr2, &fr3, X, Y, Radius, PCB_FLAG_FLOATER); - if (fres != PCB_TYPE_NONE) { + if (fres != PCB_OBJ_VOID) { *Result1 = fr1; *Result2 = fr2; *Result3 = fr3; @@ -1261,66 +1261,66 @@ * buffer or on the remove list. * The calling routine passes two pointers to allocated memory for storing * the results. - * A type value is returned too which is PCB_TYPE_NONE if no objects has been found. + * A type value is returned too which is PCB_OBJ_VOID if no objects has been found. */ static int pcb_search_obj_by_id_(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type) { - if (type == PCB_TYPE_LINE || type == PCB_TYPE_LINE_POINT) { + if (type == PCB_OBJ_LINE || type == PCB_OBJ_LINE_POINT) { PCB_LINE_ALL_LOOP(Base); { if (line->ID == ID) { *Result1 = (void *) layer; *Result2 = *Result3 = (void *) line; - return PCB_TYPE_LINE; + return PCB_OBJ_LINE; } if (line->Point1.ID == ID) { *Result1 = (void *) layer; *Result2 = (void *) line; *Result3 = (void *) &line->Point1; - return PCB_TYPE_LINE_POINT; + return PCB_OBJ_LINE_POINT; } if (line->Point2.ID == ID) { *Result1 = (void *) layer; *Result2 = (void *) line; *Result3 = (void *) &line->Point2; - return PCB_TYPE_LINE_POINT; + return PCB_OBJ_LINE_POINT; } } PCB_ENDALL_LOOP; } - if (type == PCB_TYPE_ARC || type == PCB_TYPE_ARC_POINT) { + if (type == PCB_OBJ_ARC || type == PCB_OBJ_ARC_POINT) { PCB_ARC_ALL_LOOP(Base); { if (arc->ID == ID) { *Result1 = (void *) layer; *Result2 = *Result3 = (void *) arc; - return PCB_TYPE_ARC; + return PCB_OBJ_ARC; } } PCB_ENDALL_LOOP; } - if (type == PCB_TYPE_TEXT) { + if (type == PCB_OBJ_TEXT) { PCB_TEXT_ALL_LOOP(Base); { if (text->ID == ID) { *Result1 = (void *) layer; *Result2 = *Result3 = (void *) text; - return PCB_TYPE_TEXT; + return PCB_OBJ_TEXT; } } PCB_ENDALL_LOOP; } - if (type == PCB_TYPE_POLY || type == PCB_TYPE_POLY_POINT) { + if (type == PCB_OBJ_POLY || type == PCB_OBJ_POLY_POINT) { PCB_POLY_ALL_LOOP(Base); { if (polygon->ID == ID) { *Result1 = (void *) layer; *Result2 = *Result3 = (void *) polygon; - return PCB_TYPE_POLY; + return PCB_OBJ_POLY; } - if (type == PCB_TYPE_POLY_POINT) + if (type == PCB_OBJ_POLY_POINT) PCB_POLY_POINT_LOOP(polygon); { if (point->ID == ID) { @@ -1327,7 +1327,7 @@ *Result1 = (void *) layer; *Result2 = (void *) polygon; *Result3 = (void *) point; - return PCB_TYPE_POLY_POINT; + return PCB_OBJ_POLY_POINT; } } PCB_END_LOOP; @@ -1335,35 +1335,35 @@ PCB_ENDALL_LOOP; } - if (type == PCB_TYPE_PSTK) { + if (type == PCB_OBJ_PSTK) { PCB_PADSTACK_LOOP(Base); { if (padstack->ID == ID) { *Result1 = *Result2 = *Result3 = (void *)padstack; - return PCB_TYPE_PSTK; + return PCB_OBJ_PSTK; } } PCB_END_LOOP; } - if (type == PCB_TYPE_RATLINE || type == PCB_TYPE_LINE_POINT) { + if (type == PCB_OBJ_RAT || type == PCB_OBJ_LINE_POINT) { PCB_RAT_LOOP(Base); { if (line->ID == ID) { *Result1 = *Result2 = *Result3 = (void *) line; - return PCB_TYPE_RATLINE; + return PCB_OBJ_RAT; } if (line->Point1.ID == ID) { *Result1 = (void *) NULL; *Result2 = (void *) line; *Result3 = (void *) &line->Point1; - return PCB_TYPE_LINE_POINT; + return PCB_OBJ_LINE_POINT; } if (line->Point2.ID == ID) { *Result1 = (void *) NULL; *Result2 = (void *) line; *Result3 = (void *) &line->Point2; - return PCB_TYPE_LINE_POINT; + return PCB_OBJ_LINE_POINT; } } PCB_END_LOOP; @@ -1373,26 +1373,26 @@ PCB_SUBC_LOOP(Base); { int res; - if (type == PCB_TYPE_SUBC) { + if (type == PCB_OBJ_SUBC) { if (subc->ID == ID) { *Result1 = *Result2 = *Result3 = (void *)subc; - return PCB_TYPE_SUBC; + return PCB_OBJ_SUBC; } } res = pcb_search_obj_by_id_(subc->data, Result1, Result2, Result3, ID, type); - if (res != PCB_TYPE_NONE) + if (res != PCB_OBJ_VOID) return res; } PCB_END_LOOP; - return PCB_TYPE_NONE; + return PCB_OBJ_VOID; } int pcb_search_obj_by_id(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type) { int res = pcb_search_obj_by_id_(Base, Result1, Result2, Result3, ID, type); - if (res == PCB_TYPE_NONE) + if (res == PCB_OBJ_VOID) pcb_message(PCB_MSG_ERROR, "hace: Internal error, search for ID %d failed\n", ID); return res; } Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 15868) +++ trunk/src/select.c (revision 15869) @@ -67,18 +67,18 @@ pcb_bool changed = pcb_true; - type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_SELECT_TYPES | PCB_LOOSE_SUBC | PCB_TYPE_SUBC_FLOATER, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_NONE || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) + type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_SELECT_TYPES | PCB_LOOSE_SUBC | PCB_OBJ_FLOATER, &ptr1, &ptr2, &ptr3); + if (type == PCB_OBJ_VOID || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) return pcb_false; switch (type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: pcb_undo_add_obj_to_flag(ptr1); PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pstk_t *) ptr1); pcb_pstk_invalidate_draw((pcb_pstk_t *) ptr1); break; - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { pcb_line_t *line = (pcb_line_t *) ptr2; @@ -89,7 +89,7 @@ break; } - case PCB_TYPE_RATLINE: + case PCB_OBJ_RAT: { pcb_rat_t *rat = (pcb_rat_t *) ptr2; @@ -99,7 +99,7 @@ break; } - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: { pcb_arc_t *arc = (pcb_arc_t *) ptr2; @@ -110,7 +110,7 @@ break; } - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: { pcb_text_t *text = (pcb_text_t *) ptr2; @@ -121,7 +121,7 @@ break; } - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: { pcb_poly_t *poly = (pcb_poly_t *) ptr2; @@ -133,7 +133,7 @@ break; } - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: pcb_subc_select(pcb, (pcb_subc_t *) ptr1, PCB_CHGFLG_TOGGLE, 1); break; } @@ -231,7 +231,7 @@ PCB_RAT_LOOP(pcb->Data); { if (PCB_LINE_NEAR_BOX((pcb_line_t *) line, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) { - append(PCB_TYPE_RATLINE, line, line); + append(PCB_OBJ_RAT, line, line); if (pcb->RatOn) pcb_rat_invalidate_draw(line); } @@ -259,7 +259,7 @@ if (PCB_LINE_NEAR_BOX(line, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) { - append(PCB_TYPE_LINE, layer, line); + append(PCB_OBJ_LINE, layer, line); if (layer->meta.real.vis) pcb_line_invalidate_draw(layer, line); } @@ -270,7 +270,7 @@ if (PCB_ARC_NEAR_BOX(arc, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc) != Flag) { - append(PCB_TYPE_ARC, layer, arc); + append(PCB_OBJ_ARC, layer, arc); if (layer->meta.real.vis) pcb_arc_invalidate_draw(layer, arc); } @@ -282,7 +282,7 @@ if (PCB_TEXT_NEAR_BOX(text, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, text) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) { - append(PCB_TYPE_TEXT, layer, text); + append(PCB_OBJ_TEXT, layer, text); if (pcb_text_is_visible(PCB, layer, text)) pcb_text_invalidate_draw(layer, text); } @@ -294,7 +294,7 @@ if (PCB_POLYGON_NEAR_BOX(polygon, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, polygon) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon) != Flag) { - append(PCB_TYPE_POLY, layer, polygon); + append(PCB_OBJ_POLY, layer, polygon); if (layer->meta.real.vis) pcb_poly_invalidate_draw(layer, polygon); } @@ -335,7 +335,7 @@ if (pcb_pstk_near_box(padstack, Box, NULL) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack) != Flag) { - append(PCB_TYPE_PSTK, padstack, padstack); + append(PCB_OBJ_PSTK, padstack, padstack); if (pcb->ViaOn) pcb_pstk_invalidate_draw(padstack); } Index: trunk/src/select.h =================================================================== --- trunk/src/select.h (revision 15868) +++ trunk/src/select.h (revision 15869) @@ -33,8 +33,8 @@ #include "operation.h" #define PCB_SELECT_TYPES \ - (PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY | PCB_TYPE_SUBC | \ - PCB_TYPE_PSTK | PCB_TYPE_RATLINE | PCB_TYPE_ARC) + (PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | PCB_OBJ_SUBC | \ + PCB_OBJ_PSTK | PCB_OBJ_RAT | PCB_OBJ_ARC) pcb_bool pcb_select_object(pcb_board_t *pcb); pcb_bool pcb_select_block(pcb_board_t *pcb, pcb_box_t *Box, pcb_bool flag, pcb_bool vis_only); Index: trunk/src/tool.c =================================================================== --- trunk/src/tool.c (revision 15868) +++ trunk/src/tool.c (revision 15869) @@ -176,28 +176,28 @@ static void get_grid_lock_coordinates(int type, void *ptr1, void *ptr2, void *ptr3, pcb_coord_t * x, pcb_coord_t * y) { switch (type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: *x = ((pcb_line_t *) ptr2)->Point1.X; *y = ((pcb_line_t *) ptr2)->Point1.Y; break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: *x = ((pcb_text_t *) ptr2)->X; *y = ((pcb_text_t *) ptr2)->Y; break; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: *x = ((pcb_poly_t *) ptr2)->Points[0].X; *y = ((pcb_poly_t *) ptr2)->Points[0].Y; break; - case PCB_TYPE_LINE_POINT: - case PCB_TYPE_POLY_POINT: + case PCB_OBJ_LINE_POINT: + case PCB_OBJ_POLY_POINT: *x = ((pcb_point_t *) ptr3)->X; *y = ((pcb_point_t *) ptr3)->Y; break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: pcb_arc_get_end((pcb_arc_t *) ptr2, 0, x, y); break; - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: if (ptr3 != NULL) /* need to check because: if snap off, there's no known endpoint (leave x;y as is, then) */ pcb_arc_get_end((pcb_arc_t *) ptr2, ((*(int **)ptr3) != pcb_arc_start_ptr), x, y); break; @@ -237,9 +237,9 @@ if (do_rubberband && conf_core.editor.rubber_band_mode) pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); if (do_rubberband && - (pcb_crosshair.AttachedObject.Type == PCB_TYPE_SUBC || - pcb_crosshair.AttachedObject.Type == PCB_TYPE_PSTK || - pcb_crosshair.AttachedObject.Type == PCB_TYPE_LINE || pcb_crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT)) + (pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC || + pcb_crosshair.AttachedObject.Type == PCB_OBJ_PSTK || + pcb_crosshair.AttachedObject.Type == PCB_OBJ_LINE || pcb_crosshair.AttachedObject.Type == PCB_OBJ_LINE_POINT)) pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); } Index: trunk/src/tool_arc.c =================================================================== --- trunk/src/tool_arc.c (revision 15868) +++ trunk/src/tool_arc.c (revision 15869) @@ -91,7 +91,7 @@ pcb_arc_get_end(arc, 1, &pcb_crosshair.AttachedBox.Point2.X, &pcb_crosshair.AttachedBox.Point2.Y); pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X; pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y; - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, CURRENT, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, CURRENT, arc, arc); pcb_undo_inc_serial(); pcb_added_lines++; pcb_arc_invalidate_draw(CURRENT, arc); @@ -149,7 +149,7 @@ if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) { void *ptr1, *ptr2, *ptr3; /* guaranteed to succeed */ - pcb_search_obj_by_location(PCB_TYPE_ARC, &ptr1, &ptr2, &ptr3, + pcb_search_obj_by_location(PCB_OBJ_ARC, &ptr1, &ptr2, &ptr3, pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point1.Y, 0); pcb_arc_get_end((pcb_arc_t *) ptr2, 0, &pcb_crosshair.AttachedBox.Point2.X, &pcb_crosshair.AttachedBox.Point2.Y); pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X; Index: trunk/src/tool_arrow.c =================================================================== --- trunk/src/tool_arrow.c (revision 15868) +++ trunk/src/tool_arrow.c (revision 15869) @@ -128,7 +128,7 @@ * (pcb_tool_note.Moving) or clicked on a MOVE_TYPE * (pcb_tool_note.Hit) */ - for (test = (PCB_SELECT_TYPES | PCB_MOVE_TYPES | PCB_TYPE_SUBC_FLOATER | PCB_LOOSE_SUBC) & ~PCB_TYPE_RATLINE; test; test &= ~type) { + for (test = (PCB_SELECT_TYPES | PCB_MOVE_TYPES | PCB_OBJ_FLOATER | PCB_LOOSE_SUBC) & ~PCB_OBJ_RAT; test; test &= ~type) { type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, test, &ptr1, &ptr2, &ptr3); if (!pcb_tool_note.Hit && (type & PCB_MOVE_TYPES) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) { pcb_tool_note.Hit = type; @@ -138,7 +138,7 @@ } if (!pcb_tool_note.Moving && (type & (PCB_SELECT_TYPES | PCB_LOOSE_SUBC)) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_any_obj_t *) ptr2)) pcb_tool_note.Moving = pcb_true; - if ((pcb_tool_note.Hit && pcb_tool_note.Moving) || type == PCB_TYPE_NONE) + if ((pcb_tool_note.Hit && pcb_tool_note.Moving) || type == PCB_OBJ_VOID) return; } } Index: trunk/src/tool_buffer.c =================================================================== --- trunk/src/tool_buffer.c (revision 15868) +++ trunk/src/tool_buffer.c (revision 15869) @@ -52,8 +52,8 @@ pcb_subc_t *orig_subc = NULL; if (pcb_gui->shift_is_pressed()) { - int type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPE_SUBC, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_SUBC) { + int type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3); + if (type == PCB_OBJ_SUBC) { orig_subc = (pcb_subc_t *) ptr1; pcb_subc_remove(orig_subc); } @@ -62,8 +62,8 @@ pcb_board_set_changed_flag(pcb_true); if (orig_subc != NULL) { - int type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPE_SUBC, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_SUBC && (ptr1 != NULL)) { + int type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3); + if (type == PCB_OBJ_SUBC && (ptr1 != NULL)) { int n; pcb_attribute_list_t *dst = &(((pcb_subc_t *)ptr1)->Attributes), *src = &orig_subc->Attributes; for (n = 0; n < src->Number; n++) Index: trunk/src/tool_copy.c =================================================================== --- trunk/src/tool_copy.c (revision 15868) +++ trunk/src/tool_copy.c (revision 15869) @@ -53,7 +53,7 @@ pcb_crosshair.AttachedObject.Type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, types, &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3); - if (pcb_crosshair.AttachedObject.Type != PCB_TYPE_NONE) { + if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { pcb_tool_attach_for_copy(pcb_tool_note.X, pcb_tool_note.Y, pcb_false); } break; @@ -62,7 +62,7 @@ /* second notify, move or copy object */ case PCB_CH_STATE_SECOND: - if ((PCB->is_footprint) && (pcb_crosshair.AttachedObject.Type == PCB_TYPE_SUBC)) { + if ((PCB->is_footprint) && (pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC)) { pcb_message(PCB_MSG_WARNING, "Can not copy subcircuit in the footprint edit mode\n"); } else { @@ -74,7 +74,7 @@ } /* reset identifiers */ - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; break; } Index: trunk/src/tool_insert.c =================================================================== --- trunk/src/tool_insert.c (revision 15868) +++ trunk/src/tool_insert.c (revision 15869) @@ -62,16 +62,16 @@ pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_INSERT_TYPES, &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3); - if (pcb_crosshair.AttachedObject.Type != PCB_TYPE_NONE) { + if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2)) { pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; break; } else { /* get starting point of nearest segment */ - if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_POLY) { + if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_POLY) { fake.poly = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2; polyIndex = pcb_poly_get_lowest_distance_point(fake.poly, pcb_tool_note.X, pcb_tool_note.Y); fake.line.Point1 = fake.poly->Points[polyIndex]; @@ -87,8 +87,8 @@ /* second notify, insert new point into object */ case PCB_CH_STATE_SECOND: - if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_POLY) - pcb_insert_point_in_object(PCB_TYPE_POLY, + if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_POLY) + pcb_insert_point_in_object(PCB_OBJ_POLY, pcb_crosshair.AttachedObject.Ptr1, fake.poly, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); else @@ -98,7 +98,7 @@ pcb_board_set_changed_flag(pcb_true); /* reset identifiers */ - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; break; } Index: trunk/src/tool_line.c =================================================================== --- trunk/src/tool_line.c (revision 15868) +++ trunk/src/tool_line.c (revision 15869) @@ -62,7 +62,7 @@ /* creates points of a line (when clicked) */ static void notify_line(void) { - int type = PCB_TYPE_NONE; + int type = PCB_OBJ_VOID; void *ptr1, *ptr2, *ptr3; if (!pcb_marked.status || conf_core.editor.local_ref) @@ -70,15 +70,15 @@ switch (pcb_crosshair.AttachedLine.State) { case PCB_CH_STATE_FIRST: /* first point */ #warning subc TODO: this should work on heavy terminals too! - if (PCB->RatDraw && pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART, &ptr1, &ptr1, &ptr1) == PCB_TYPE_NONE) { + if (PCB->RatDraw && pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr1, &ptr1) == PCB_OBJ_VOID) { pcb_gui->beep(); break; } if (conf_core.editor.auto_drc) { - type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART, &ptr1, &ptr2, &ptr3); + type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3); pcb_lookup_conn(pcb_crosshair.X, pcb_crosshair.Y, pcb_true, 1, PCB_FLAG_FOUND); } - if (type == PCB_TYPE_PSTK) { + if (type == PCB_OBJ_PSTK) { pcb_pstk_t *pstk = (pcb_pstk_t *)ptr2; pcb_crosshair.AttachedLine.Point1.X = pstk->x; pcb_crosshair.AttachedLine.Point1.Y = pstk->y; @@ -122,7 +122,7 @@ pcb_rat_t *line; if ((line = pcb_rat_add_net())) { pcb_added_lines++; - pcb_undo_add_obj_to_create(PCB_TYPE_RATLINE, line, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_RAT, line, line, line); pcb_undo_inc_serial(); pcb_rat_invalidate_draw(line); pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X; @@ -144,7 +144,7 @@ pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, conf_core.design.via_thickness / 2) == - PCB_TYPE_NONE + PCB_OBJ_VOID && (pcb_layer_flags_(CURRENT) & PCB_LYT_COPPER) && (pcb_layer_flags_(last_layer) & PCB_LYT_COPPER) && (!PCB->is_footprint) @@ -155,7 +155,7 @@ conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL)) { pcb_obj_add_attribs(ps, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, ps, ps, ps); + pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); } /* Add the route to the design */ @@ -224,7 +224,7 @@ pcb_added_lines++; pcb_obj_add_attribs(line, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, 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 @@ -237,7 +237,7 @@ && pcb_search_obj_by_location(PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, - conf_core.design.via_thickness / 2) == PCB_TYPE_NONE + conf_core.design.via_thickness / 2) == PCB_OBJ_VOID #warning pdstk TODO #21: do not work in comp mode, use a pstk proto - scconfig also has TODO #21, fix it there too && ((ps = pcb_pstk_new_compat_via(PCB->Data, pcb_crosshair.AttachedLine.Point1.X, @@ -245,7 +245,7 @@ conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL)) { pcb_obj_add_attribs(ps, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, ps, ps, ps); + pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); pcb_pstk_invalidate_draw(ps); } /* copy the coordinates */ @@ -266,7 +266,7 @@ (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) { pcb_added_lines++; pcb_obj_add_attribs(line, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, line); pcb_undo_inc_serial(); pcb_line_invalidate_draw(CURRENT, line); /* move to new start point */ @@ -354,7 +354,7 @@ pcb_line_t *ptr2; ptrtmp = &pcb_crosshair.AttachedLine; /* a workaround for the line undo bug */ /* this search is guaranteed to succeed */ - pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, + pcb_search_obj_by_location(PCB_OBJ_LINE | PCB_OBJ_RAT, &ptr1, &ptrtmp, &ptr3, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 0); ptr2 = (pcb_line_t *) ptrtmp; @@ -376,7 +376,7 @@ /* check if an intermediate point was removed */ if (type & PCB_UNDO_REMOVE) { /* this search should find the restored line */ - pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, + pcb_search_obj_by_location(PCB_OBJ_LINE | PCB_OBJ_RAT, &ptr1, &ptrtmp, &ptr3, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, 0); ptr2 = (pcb_line_t *) ptrtmp; if (conf_core.editor.auto_drc) { @@ -395,7 +395,7 @@ } else { /* this search is guaranteed to succeed too */ - pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, + pcb_search_obj_by_location(PCB_OBJ_LINE | PCB_OBJ_RAT, &ptr1, &ptrtmp, &ptr3, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 0); ptr2 = (pcb_line_t *) ptrtmp; last_layer = (pcb_layer_t *) ptr1; Index: trunk/src/tool_lock.c =================================================================== --- trunk/src/tool_lock.c (revision 15868) +++ trunk/src/tool_lock.c (revision 15869) @@ -51,15 +51,15 @@ type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPEMASK_LOCK, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_SUBC) { + if (type == PCB_OBJ_SUBC) { pcb_subc_t *subc = (pcb_subc_t *)ptr2; - pcb_flag_change(PCB, PCB_CHGFLG_TOGGLE, PCB_FLAG_LOCK, PCB_TYPE_SUBC, ptr1, ptr2, ptr3); + pcb_flag_change(PCB, PCB_CHGFLG_TOGGLE, PCB_FLAG_LOCK, PCB_OBJ_SUBC, ptr1, ptr2, ptr3); DrawSubc(subc); pcb_draw(); pcb_hid_actionl("Report", "Subc", NULL); } - else if (type != PCB_TYPE_NONE) { + else if (type != PCB_OBJ_VOID) { pcb_text_t *thing = (pcb_text_t *) ptr3; PCB_FLAG_TOGGLE(PCB_FLAG_LOCK, thing); if (PCB_FLAG_TEST(PCB_FLAG_LOCK, thing) Index: trunk/src/tool_move.c =================================================================== --- trunk/src/tool_move.c (revision 15868) +++ trunk/src/tool_move.c (revision 15869) @@ -54,10 +54,10 @@ pcb_crosshair.AttachedObject.Type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, types, &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3); - if (pcb_crosshair.AttachedObject.Type != PCB_TYPE_NONE) { + if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) pcb_crosshair.AttachedObject.Ptr2)) { pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; } else pcb_tool_attach_for_copy(pcb_tool_note.X, pcb_tool_note.Y, pcb_true); @@ -76,7 +76,7 @@ pcb_board_set_changed_flag(pcb_true); /* reset identifiers */ - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; break; } Index: trunk/src/tool_polyhole.c =================================================================== --- trunk/src/tool_polyhole.c (revision 15868) +++ trunk/src/tool_polyhole.c (revision 15869) @@ -51,10 +51,10 @@ case PCB_CH_STATE_FIRST: pcb_crosshair.AttachedPolygon_pts = 0; pcb_crosshair.AttachedObject.Type = - pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPE_POLY, + pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_POLY, &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3); - if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_NONE) { + if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_VOID) { pcb_message(PCB_MSG_WARNING, "The first point of a polygon hole must be on a polygon.\n"); break; /* don't start doing anything if clicket out of polys */ } @@ -62,7 +62,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2)) { pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); - pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; + pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; break; } else Index: trunk/src/tool_rectangle.c =================================================================== --- trunk/src/tool_rectangle.c (revision 15868) +++ trunk/src/tool_rectangle.c (revision 15869) @@ -73,7 +73,7 @@ 2 * conf_core.design.clearance, pcb_flag_make(flags))) != NULL) { pcb_obj_add_attribs(polygon, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_POLY, layer, polygon, polygon); + pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, polygon, polygon); pcb_undo_inc_serial(); pcb_poly_invalidate_draw(layer, polygon); pcb_draw(); Index: trunk/src/tool_remove.c =================================================================== --- trunk/src/tool_remove.c (revision 15868) +++ trunk/src/tool_remove.c (revision 15869) @@ -51,13 +51,13 @@ pcb_any_obj_t *obj; int type; - if ((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_REMOVE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_REMOVE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) { pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n")); return; } - if (type == PCB_TYPE_SUBC) { + if (type == PCB_OBJ_SUBC) { if(PCB->is_footprint) { pcb_message(PCB_MSG_WARNING, "Can not remove the subcircuit being edited in the footprint edit mode\n"); return; Index: trunk/src/tool_text.c =================================================================== --- trunk/src/tool_text.c (revision 15868) +++ trunk/src/tool_text.c (revision 15869) @@ -60,7 +60,7 @@ flag |= PCB_FLAG_ONSOLDER; if ((text = pcb_text_new(pcb_loose_subc_layer(PCB, CURRENT), pcb_font(PCB, conf_core.design.text_font_id, 1), pcb_tool_note.X, pcb_tool_note.Y, 0, conf_core.design.text_scale, string, pcb_flag_make(flag))) != NULL) { - pcb_undo_add_obj_to_create(PCB_TYPE_TEXT, CURRENT, text, text); + pcb_undo_add_obj_to_create(PCB_OBJ_TEXT, CURRENT, text, text); pcb_undo_inc_serial(); pcb_text_invalidate_draw(CURRENT, text); pcb_draw(); Index: trunk/src/tool_thermal.c =================================================================== --- trunk/src/tool_thermal.c (revision 15868) +++ trunk/src/tool_thermal.c (revision 15869) @@ -85,7 +85,7 @@ newth = cycle[0]; /* new thermal, use default */ } - pcb_chg_obj_thermal(PCB_TYPE_PSTK, ps, ps, ps, newth, lid); + pcb_chg_obj_thermal(PCB_OBJ_PSTK, ps, ps, ps, newth, lid); } @@ -94,9 +94,9 @@ void *ptr1, *ptr2, *ptr3; int type; - if (((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) + if (((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) && !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_any_obj_t *) ptr3)) { - if (type == PCB_TYPE_PSTK) + if (type == PCB_OBJ_PSTK) pcb_tool_thermal_on_pstk((pcb_pstk_t *)ptr2, INDEXOFCURRENT); } } Index: trunk/src/tool_via.c =================================================================== --- trunk/src/tool_via.c (revision 15868) +++ trunk/src/tool_via.c (revision 15869) @@ -67,7 +67,7 @@ return; pcb_obj_add_attribs(ps, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, ps, ps, ps); + pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps); if (pcb_gui->shift_is_pressed()) pcb_tool_thermal_on_pstk(ps, INDEXOFCURRENT); Index: trunk/src/undo_old.c =================================================================== --- trunk/src/undo_old.c (revision 15868) +++ trunk/src/undo_old.c (revision 15869) @@ -150,7 +150,7 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { pcb_obj_rotate90(type, ptr1, ptr2, ptr3, Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, (4 - Entry->Data.Rotate.Steps) & 0x03); Entry->Data.Rotate.Steps = (4 - Entry->Data.Rotate.Steps) & 0x03; @@ -170,7 +170,7 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { pcb_obj_rotate(type, ptr1, ptr2, ptr3, Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, -(Entry->Data.Angle)); Entry->Data.Angle = -(Entry->Data.Angle); return pcb_true; @@ -188,7 +188,7 @@ int type; type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { if (Entry->Data.ClearPoly.Clear) pcb_poly_restore_to_poly(PCB->Data, type, Entry->Data.ClearPoly.Layer, ptr3); else @@ -210,7 +210,7 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_name(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name)); return pcb_true; } @@ -228,7 +228,7 @@ /* lookup entry by ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type == PCB_TYPE_ARC) { + if (type == PCB_OBJ_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; pcb_arc_t *a = (pcb_arc_t *) ptr2; pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); @@ -259,7 +259,7 @@ /* lookup entry by ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type == PCB_TYPE_ARC) { + if (type == PCB_OBJ_ARC) { pcb_layer_t *Layer = (pcb_layer_t *) ptr1; pcb_arc_t *a = (pcb_arc_t *) ptr2; pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); @@ -290,7 +290,7 @@ /* lookup entry by ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { swap = ((pcb_line_t *) ptr2)->Clearance; pcb_poly_restore_to_poly(PCB->Data, type, ptr1, ptr2); if (pcb_undo_and_draw) @@ -318,7 +318,7 @@ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); ptr1e = ptr1; - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { /* Size change for lines and arcs can. Text has it's own mechanism */ swap = ((pcb_line_t *) ptr2)->Thickness; pcb_poly_restore_to_poly(PCB->Data, type, ptr1, ptr2); @@ -346,7 +346,7 @@ /* lookup entry by ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { pcb_flag_t f1, f2; pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2; @@ -387,7 +387,7 @@ /* lookup entry by ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type == PCB_TYPE_SUBC) { + if (type == PCB_OBJ_SUBC) { pcb_subc_t *subc = (pcb_subc_t *)ptr3; if (pcb_undo_and_draw) EraseSubc(subc); @@ -411,7 +411,7 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { if (!pcb_removelist) pcb_removelist = pcb_buffer_new(NULL); if (pcb_undo_and_draw) @@ -435,7 +435,7 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { pcb_move_obj(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY); Entry->Data.Move.DX *= -1; Entry->Data.Move.DY *= -1; @@ -457,10 +457,10 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { if (r->p_subc_id > 0) { /* need to use a subc layer - putting back a floater */ void *p1, *p2, *p3; - if (pcb_search_obj_by_id(PCB->Data, &p1, &p2, &p3, r->p_subc_id, PCB_TYPE_SUBC) != 0) { + if (pcb_search_obj_by_id(PCB->Data, &p1, &p2, &p3, r->p_subc_id, PCB_OBJ_SUBC) != 0) { pcb_subc_t *subc = p2; if (r->p_subc_layer < subc->data->LayerN) { data = subc->data; @@ -489,7 +489,7 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind); - if (type != PCB_TYPE_NONE) { + if (type != PCB_OBJ_VOID) { swap = pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1); pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true); Entry->Data.MoveToLayer.OriginalLayer = swap; @@ -510,15 +510,15 @@ int type; /* lookup entry (polygon not point was saved) by it's ID */ - assert(Entry->Kind == PCB_TYPE_POLY); + assert(Entry->Kind == PCB_OBJ_POLY); type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, &ptr3, Entry->ID, Entry->Kind); switch (type) { - case PCB_TYPE_POLY: /* restore the removed point */ + case PCB_OBJ_POLY: /* restore the removed point */ { /* recover the point */ if (pcb_undo_and_draw && layer->meta.real.vis) pcb_poly_invalidate_erase(polygon); - pcb_insert_point_in_object(PCB_TYPE_POLY, layer, polygon, + pcb_insert_point_in_object(PCB_OBJ_POLY, layer, polygon, &Entry->Data.RemovedPoint.Index, Entry->Data.RemovedPoint.X, Entry->Data.RemovedPoint.Y, pcb_true, Entry->Data.RemovedPoint.last_in_contour); @@ -528,7 +528,7 @@ pcb_poly_invalidate_draw(layer, polygon); Entry->Type = PCB_UNDO_INSERT_POINT; Entry->ID = Entry->Data.RemovedPoint.ID; - Entry->Kind = PCB_TYPE_POLY_POINT; + Entry->Kind = PCB_OBJ_POLY_POINT; return pcb_true; } @@ -551,11 +551,11 @@ pcb_cardinal_t hole; pcb_bool last_in_contour = pcb_false; - assert(Entry->Kind == PCB_TYPE_POLY_POINT); + assert(Entry->Kind == PCB_OBJ_POLY_POINT); /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, (void **) &pnt, Entry->ID, Entry->Kind); switch (type) { - case PCB_TYPE_POLY_POINT: /* removes an inserted polygon point */ + case PCB_OBJ_POLY_POINT: /* removes an inserted polygon point */ { if (pcb_undo_and_draw && layer->meta.real.vis) pcb_poly_invalidate_erase(polygon); @@ -576,10 +576,10 @@ Entry->Data.RemovedPoint.Y = pnt->Y; Entry->Data.RemovedPoint.ID = pnt->ID; Entry->ID = polygon->ID; - Entry->Kind = PCB_TYPE_POLY; + Entry->Kind = PCB_OBJ_POLY; Entry->Type = PCB_UNDO_REMOVE_POINT; Entry->Data.RemovedPoint.Index = point_idx; - pcb_destroy_object(PCB->Data, PCB_TYPE_POLY_POINT, layer, polygon, pnt); + pcb_destroy_object(PCB->Data, PCB_OBJ_POLY_POINT, layer, polygon, pnt); if (pcb_undo_and_draw && layer->meta.real.vis) pcb_poly_invalidate_draw(layer, polygon); return pcb_true; @@ -600,11 +600,11 @@ /* lookup entry by it's ID */ type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, Entry->Data.CopyID, Entry->Kind); - if (type == PCB_TYPE_NONE) + if (type == PCB_OBJ_VOID) return pcb_false; type = pcb_search_obj_by_id(PCB->Data, &ptr1b, &ptr2b, &ptr3b, Entry->ID, Entry->Kind); - if (type == PCB_TYPE_NONE) + if (type == PCB_OBJ_VOID) return pcb_false; obj = (pcb_any_obj_t *) ptr2; @@ -620,7 +620,7 @@ DrawRecoveredObject((pcb_any_obj_t *)ptr2); obj = (pcb_any_obj_t *) pcb_move_obj_to_buffer(PCB, PCB->Data, pcb_removelist, type, ptr1, ptr2, ptr3); - if (Entry->Kind == PCB_TYPE_POLY) + if (Entry->Kind == PCB_OBJ_POLY) pcb_poly_init_clip(PCB->Data, (pcb_layer_t *) ptr1b, (pcb_poly_t *) obj); return pcb_true; } @@ -631,7 +631,7 @@ */ static pcb_bool UndoRemoveContour(UndoListTypePtr Entry) { - assert(Entry->Kind == PCB_TYPE_POLY); + assert(Entry->Kind == PCB_OBJ_POLY); return UndoSwapCopiedObject(Entry); } @@ -641,7 +641,7 @@ */ static pcb_bool UndoInsertContour(UndoListTypePtr Entry) { - assert(Entry->Kind == PCB_TYPE_POLY); + assert(Entry->Kind == PCB_OBJ_POLY); return UndoSwapCopiedObject(Entry); } @@ -936,12 +936,12 @@ if (!Locked) { switch (Type) { - case PCB_TYPE_POLY_POINT: + case PCB_OBJ_POLY_POINT: { /* save the ID of the parent object; else it will be * impossible to recover the point */ - undo = GetUndoSlot(PCB_UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_TYPE_POLY); + undo = GetUndoSlot(PCB_UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_OBJ_POLY); undo->Data.RemovedPoint.X = polygon->Points[index].X; undo->Data.RemovedPoint.Y = polygon->Points[index].Y; undo->Data.RemovedPoint.ID = polygon->Points[index].ID; @@ -1081,13 +1081,13 @@ if (!Locked) { undo = GetUndoSlot(PCB_UNDO_CHANGESIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: undo->Data.Size = ((pcb_line_t *) ptr2)->Thickness; break; - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: undo->Data.Size = ((pcb_text_t *) ptr2)->Scale; break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: undo->Data.Size = ((pcb_arc_t *) ptr2)->Thickness; break; } @@ -1104,10 +1104,10 @@ if (!Locked) { undo = GetUndoSlot(PCB_UNDO_CHANGECLEARSIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: undo->Data.Size = ((pcb_line_t *) ptr2)->Clearance; break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: undo->Data.Size = ((pcb_arc_t *) ptr2)->Clearance; break; } @@ -1268,7 +1268,7 @@ break; case PCB_UNDO_REMOVE: type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, ptr->ID, ptr->Kind); - if (type != PCB_TYPE_NONE) + if (type != PCB_OBJ_VOID) pcb_destroy_object(pcb_removelist, type, ptr1, ptr2, ptr3); break; default: Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 15868) +++ trunk/src_plugins/autocrop/autocrop.c (revision 15869) @@ -114,31 +114,31 @@ PCB_SUBC_LOOP(PCB->Data); { pcb_subc_move(subc, dx, dy, pcb_true); - pcb_undo_add_obj_to_move(PCB_TYPE_SUBC, NULL, NULL, subc, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, subc, dx, dy); } PCB_END_LOOP; PCB_PADSTACK_LOOP(PCB->Data); { pcb_pstk_move(padstack, dx, dy, pcb_true); - pcb_undo_add_obj_to_move(PCB_TYPE_PSTK, NULL, NULL, padstack, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_PSTK, NULL, NULL, padstack, dx, dy); } PCB_END_LOOP; PCB_LINE_ALL_LOOP(PCB->Data); { MyMoveLineLowLevel(PCB->Data, layer, line, dx, dy); - pcb_undo_add_obj_to_move(PCB_TYPE_LINE, NULL, NULL, line, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_LINE, NULL, NULL, line, dx, dy); } PCB_ENDALL_LOOP; PCB_ARC_ALL_LOOP(PCB->Data); { MyMoveArcLowLevel(PCB->Data, layer, arc, dx, dy); - pcb_undo_add_obj_to_move(PCB_TYPE_ARC, NULL, NULL, arc, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_ARC, NULL, NULL, arc, dx, dy); } PCB_ENDALL_LOOP; PCB_TEXT_ALL_LOOP(PCB->Data); { MyMoveTextLowLevel(layer, text, dx, dy); - pcb_undo_add_obj_to_move(PCB_TYPE_TEXT, NULL, NULL, text, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_TEXT, NULL, NULL, text, dx, dy); } PCB_ENDALL_LOOP; PCB_POLY_ALL_LOOP(PCB->Data); @@ -149,7 +149,7 @@ * XXX tree activity. */ Mypcb_poly_move(PCB->Data, layer, polygon, dx, dy); - pcb_undo_add_obj_to_move(PCB_TYPE_POLY, NULL, NULL, polygon, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_POLY, NULL, NULL, polygon, dx, dy); } PCB_ENDALL_LOOP; } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 15868) +++ trunk/src_plugins/autoroute/autoroute.c (revision 15869) @@ -1368,13 +1368,13 @@ pcb_undo_add_obj_to_create(csl, line, line); if (b.Y1 != b.Y2) { line = pcb_line_new(csl, b.X1, b.Y2, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, csl, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, csl, line, line); } line = pcb_line_new(csl, b.X1, b.Y1, b.X1, b.Y2, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, csl, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, csl, line, line); if (b.X1 != b.X2) { line = pcb_line_new(csl, b.X2, b.Y1, b.X2, b.Y2, thickness, 0, pcb_flag_make(0)); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, csl, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, csl, line, line); } } #endif @@ -4098,13 +4098,13 @@ if (rb->type == LINE && rb->livedraw_obj.line) { pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.grp[rb->group].lid[0]); pcb_line_invalidate_erase(rb->livedraw_obj.line); - pcb_destroy_object(PCB->Data, PCB_TYPE_LINE, layer, rb->livedraw_obj.line, NULL); + pcb_destroy_object(PCB->Data, PCB_OBJ_LINE, layer, rb->livedraw_obj.line, NULL); rb->livedraw_obj.line = NULL; } if (rb->type == VIA && rb->livedraw_obj.via) { pcb_pstk_invalidate_erase(rb->livedraw_obj.via); - pcb_destroy_object(PCB->Data, PCB_TYPE_PSTK, rb->livedraw_obj.via, NULL, NULL); + pcb_destroy_object(PCB->Data, PCB_OBJ_PSTK, rb->livedraw_obj.via, NULL, NULL); rb->livedraw_obj.via = NULL; } } @@ -4432,11 +4432,11 @@ } else { *ps_out = info.ps; - return PCB_TYPE_PSTK; + return PCB_OBJ_PSTK; } *ps_out = NULL; - return PCB_TYPE_NONE; + return PCB_OBJ_VOID; } @@ -4489,7 +4489,7 @@ p->style->Thick, p->style->Clearance * 2, pcb_flag_make(PCB_FLAG_AUTO | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0))); if (p->parent.line) { - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, layer, p->parent.line, p->parent.line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, p->parent.line, p->parent.line); changed = pcb_true; } } @@ -4509,7 +4509,7 @@ assert(pp->parent.via); PCB_FLAG_SET(PCB_FLAG_AUTO, pp->parent.via); if (pp->parent.via) { - pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, pp->parent.via, pp->parent.via, pp->parent.via); + pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, pp->parent.via, pp->parent.via, pp->parent.via); changed = pcb_true; } } @@ -4535,11 +4535,11 @@ int type = FindPin(&p->box, &pin); if (pin) { pcb_undo_add_obj_to_clear_poly(type, pin->parent.data, pin, pin, pcb_false); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PSTK, LAYER_PTR(p->layer), pin); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_PSTK, LAYER_PTR(p->layer), pin); pcb_undo_add_obj_to_flag(pin); PCB_FLAG_THERM_ASSIGN(p->layer, PCB->ThermStyle, pin); pcb_undo_add_obj_to_clear_poly(type, pin->parent.data, pin, pin, pcb_true); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_PSTK, LAYER_PTR(p->layer), pin); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_PSTK, LAYER_PTR(p->layer), pin); changed = pcb_true; } } Index: trunk/src_plugins/boardflip/boardflip.c =================================================================== --- trunk/src_plugins/boardflip/boardflip.c (revision 15868) +++ trunk/src_plugins/boardflip/boardflip.c (revision 15869) @@ -69,7 +69,7 @@ { PCB_LINE_LOOP(layer); { - pcb_poly_restore_to_poly(data, PCB_TYPE_LINE, layer, line); + pcb_poly_restore_to_poly(data, PCB_OBJ_LINE, layer, line); pcb_r_delete_entry(layer->line_tree, (pcb_box_t *)line); XFLIP(line->Point1.X); XFLIP(line->Point2.X); @@ -77,12 +77,12 @@ YFLIP(line->Point2.Y); pcb_line_bbox(line); pcb_r_insert_entry(layer->line_tree, (pcb_box_t *)line); - pcb_poly_clear_from_poly(data, PCB_TYPE_LINE, layer, line); + pcb_poly_clear_from_poly(data, PCB_OBJ_LINE, layer, line); } PCB_END_LOOP; PCB_TEXT_LOOP(layer); { - pcb_poly_restore_to_poly(data, PCB_TYPE_TEXT, layer, text); + pcb_poly_restore_to_poly(data, PCB_OBJ_TEXT, layer, text); pcb_r_delete_entry(layer->text_tree, (pcb_box_t *)text); XFLIP(text->X); YFLIP(text->Y); @@ -90,7 +90,7 @@ PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); pcb_text_bbox(pcb_font(PCB, text->fid, 1), text); pcb_r_insert_entry(layer->text_tree, (pcb_box_t *)text); - pcb_poly_clear_from_poly(data, PCB_TYPE_TEXT, layer, text); + pcb_poly_clear_from_poly(data, PCB_OBJ_TEXT, layer, text); } PCB_END_LOOP; PCB_POLY_LOOP(layer); @@ -121,7 +121,7 @@ PCB_END_LOOP; PCB_ARC_LOOP(layer); { - pcb_poly_restore_to_poly(data, PCB_TYPE_ARC, layer, arc); + pcb_poly_restore_to_poly(data, PCB_OBJ_ARC, layer, arc); pcb_r_delete_entry(layer->arc_tree, (pcb_box_t *)arc); XFLIP(arc->X); YFLIP(arc->Y); @@ -130,7 +130,7 @@ NEG(arc->Delta); pcb_arc_bbox(arc); pcb_r_insert_entry(layer->arc_tree, (pcb_box_t *)arc); - pcb_poly_clear_from_poly(data, PCB_TYPE_ARC, layer, arc); + pcb_poly_clear_from_poly(data, PCB_OBJ_ARC, layer, arc); } PCB_END_LOOP; } @@ -138,12 +138,12 @@ PCB_PADSTACK_LOOP(data); { pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)padstack); - pcb_poly_restore_to_poly(data, PCB_TYPE_PSTK, padstack, padstack); + pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, padstack, padstack); XFLIP(padstack->x); YFLIP(padstack->y); pcb_pstk_bbox(padstack); pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)padstack); - pcb_poly_clear_from_poly(data, PCB_TYPE_PSTK, padstack, padstack); + pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, padstack, padstack); } PCB_END_LOOP; PCB_SUBC_LOOP(data); Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 15868) +++ trunk/src_plugins/diag/diag.c (revision 15869) @@ -403,7 +403,7 @@ } #define PCB_FORCECOLOR_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC | PCB_TYPE_RATLINE) + (PCB_OBJ_PSTK | PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC | PCB_OBJ_RAT) static const char forcecolor_syntax[] = "forcecolor(#RRGGBB)\n"; static const char forcecolor_help[] = "change selected objects' color to #RRGGBB, reset if does not start with '#'"; @@ -416,7 +416,7 @@ pcb_gui->get_coords("Click on object to change", &x, &y); - if ((type = pcb_search_screen(x, y, PCB_FORCECOLOR_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE){ + if ((type = pcb_search_screen(x, y, PCB_FORCECOLOR_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID){ strncpy(((pcb_any_obj_t *)ptr2)->override_color, new_color, sizeof(((pcb_any_obj_t *)ptr2)->override_color)-1); } return 0; Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 15868) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 15869) @@ -40,8 +40,8 @@ } fe_ctx_t; #define PCB_FLAGEDIT_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_POLY | \ - PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_ARC) + (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_POLY | \ + PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_ARC) static void fe_attr_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { @@ -89,7 +89,7 @@ type = pcb_search_screen(x, y, PCB_FLAGEDIT_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3); ctx.ptr1 = ptr1; ctx.obj = (pcb_any_obj_t *)ptr2; - ctx.obj_type = (type & 0xFFFF) | (type & PCB_TYPE_PSTK); + ctx.obj_type = (type & 0xFFFF) | (type & PCB_OBJ_PSTK); } else PCB_ACT_FAIL(FlagEdit); Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 15868) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 15869) @@ -201,8 +201,8 @@ int type; void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords("Click on object to change size of", &x, &y); - type = pcb_search_screen(x, y, PCB_TYPE_SUBC, &ptr1, &ptr2, &ptr3); - if (type != PCB_TYPE_SUBC) { + type = pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3); + if (type != PCB_OBJ_SUBC) { pcb_message(PCB_MSG_ERROR, "No subc under the cursor\n"); return -1; } Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 15868) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 15869) @@ -500,8 +500,8 @@ void *ptr1, *ptr2 = NULL, *ptr3; long type; pcb_gui->get_coords("Click on a padstack to edit", &x, &y); - type = pcb_search_screen(x, y, PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3); - if (type != PCB_TYPE_PSTK) { + type = pcb_search_screen(x, y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3); + if (type != PCB_OBJ_PSTK) { pcb_message(PCB_MSG_ERROR, "Need a padstack.\n"); return 1; } Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 15868) +++ trunk/src_plugins/distalign/distalign.c (revision 15869) @@ -350,7 +350,7 @@ else dx = 0; pcb_subc_move(subc, dx, dy, 1); - pcb_undo_add_obj_to_move(PCB_TYPE_SUBC, NULL, NULL, subc, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, subc, dx, dy); changed = 1; } } @@ -515,7 +515,7 @@ else dx = 0; pcb_subc_move(subc, dx, dy, 1); - pcb_undo_add_obj_to_move(PCB_TYPE_SUBC, NULL, NULL, subc, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, subc, dx, dy); changed = 1; } /* in gaps mode, accumulate part widths */ Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 15868) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 15869) @@ -377,7 +377,7 @@ dy = 0; else dx = 0; - pcb_move_obj(PCB_TYPE_TEXT, text->parent.layer, text, text, dx, dy); + pcb_move_obj(PCB_OBJ_TEXT, text->parent.layer, text, text, dx, dy); changed = 1; } } PCB_ENDALL_LOOP; @@ -405,7 +405,7 @@ dy = 0; else dx = 0; - pcb_move_obj(PCB_TYPE_TEXT, layer, text, text, dx, dy); + pcb_move_obj(PCB_OBJ_TEXT, layer, text, text, dx, dy); changed = 1; } } @@ -577,7 +577,7 @@ else dx = 0; pcb_text_move(text, dx, dy); - pcb_undo_add_obj_to_move(PCB_TYPE_TEXT, NULL, NULL, text, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_TEXT, NULL, NULL, text, dx, dy); changed = 1; } /* in gaps mode, accumulate part widths */ Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 15868) +++ trunk/src_plugins/djopt/djopt.c (revision 15869) @@ -437,7 +437,7 @@ from = (char *) linelist_first(&lyr->Line); nl = pcb_line_new(PCB->Data->Layer + layer, x1, y1, x2, y2, thick, clear, flags); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, lyr, nl, nl); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, lyr, nl, nl); to = (char *) linelist_first(&lyr->Line); if (from != to) { @@ -483,7 +483,7 @@ pcb_line_t *nl; dprintf ("New line \033[35m%#mD to %#mD from l%d t%#mS c%#mS f%s\033[0m\n", - s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, pcb_strflg_f2s(example->Flags, PCB_TYPE_LINE, NULL)); + s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, pcb_strflg_f2s(example->Flags, PCB_OBJ_LINE, NULL)); nl = create_pcb_line(layer, s->x, s->y, e->x, e->y, example->Thickness, example->Clearance, example->Flags); if (!nl) @@ -638,13 +638,13 @@ ls = LAYER_PTR(l->layer); ld = LAYER_PTR(layer); - pcb_move_obj_to_layer(PCB_TYPE_LINE, ls, l->line, 0, ld, 0); + pcb_move_obj_to_layer(PCB_OBJ_LINE, ls, l->line, 0, ld, 0); l->layer = layer; } static void remove_via_at(corner_s * c) { - pcb_remove_object(PCB_TYPE_PSTK, c->via, 0, 0); + pcb_remove_object(PCB_OBJ_PSTK, c->via, 0, 0); c->via = 0; } @@ -709,7 +709,7 @@ c->y = y; via = c->via; if (via) { - pcb_move_obj(PCB_TYPE_PSTK, via, via, via, x - via->x, y - via->y); + pcb_move_obj(PCB_OBJ_PSTK, via, via, via, x - via->x, y - via->y); dprintf("via move %#mD to %#mD\n", via->x, via->y, x, y); } for (i = 0; i < c->n_lines; i++) { @@ -716,10 +716,10 @@ pcb_line_t *tl = c->lines[i]->line; if (tl) { if (c->lines[i]->s == c) { - pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y)); + pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y)); } else { - pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y)); + pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y)); } dprintf("Line %p moved to %#mD %#mD\n", (void *) tl, tl->Point1.X, tl->Point1.Y, tl->Point2.X, tl->Point2.Y); } @@ -811,7 +811,7 @@ add_line_to_corner(l, c); add_line_to_corner(ls, c); - pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2, + pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2, c->x - (l->line->Point2.X), c->y - (l->line->Point2.Y)); return 1; @@ -2120,7 +2120,7 @@ c[ci]->lines[li]->s->x, c[ci]->lines[li]->s->y, c[ci]->lines[li]->e->x, c[ci]->lines[li]->e->y, c[ci]->lines[li]->line->Thickness, - c[ci]->lines[li]->line->Clearance, pcb_strflg_f2s(c[ci]->lines[li]->line->Flags, PCB_TYPE_LINE, NULL)); + c[ci]->lines[li]->line->Clearance, pcb_strflg_f2s(c[ci]->lines[li]->line->Flags, PCB_OBJ_LINE, NULL)); /* Pads are disqualified, as we want to mimic a trace line. */ if (c[ci]->lines[li]->line == (pcb_line_t *) c[ci]->pad) { dprintf(" bad, pad\n"); Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 15868) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 15869) @@ -205,7 +205,7 @@ } else { switch(fontsel_txt_type) { - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: pcb_text_set_font(fontsel_layer, fontsel_txt, fid); break; } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 15868) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 15869) @@ -431,7 +431,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, pin)) { pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND); pcb_clear_flag_on_pins_vias_pads(pcb_true, PCB_FLAG_FOUND); - pcb_lookup_conn_by_pin(PCB_TYPE_PIN, pin); + pcb_lookup_conn_by_pin(PCB_OBJ_PIN, pin); sprintf(nodename, "%s-%s", element->Name[1].TextString, pin->Number); netname = pcb_netnode_to_netname(nodename); /* pcb_message(PCB_MSG_INFO, "Netname: %s\n", netname->Name +2); */ @@ -449,7 +449,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, pad)) { pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND); pcb_clear_flag_on_pins_vias_pads(pcb_true, PCB_FLAG_FOUND); - pcb_lookup_conn_by_pin(PCB_TYPE_PAD, pad); + pcb_lookup_conn_by_pin(PCB_OBJ_PAD, pad); sprintf(nodename, "%s-%s", element->Name[1].TextString, pad->Number); netname = pcb_netnode_to_netname(nodename); /* pcb_message(PCB_MSG_INFO, "Netname: %s\n", netname->Name +2); */ @@ -470,7 +470,7 @@ if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, via)) { pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND); pcb_clear_flag_on_pins_vias_pads(pcb_true, PCB_FLAG_FOUND); - pcb_lookup_conn_by_pin(PCB_TYPE_PIN, via); + pcb_lookup_conn_by_pin(PCB_OBJ_PIN, via); strcpy(net, "N/C"); IPCD356_WriteNet(fp, net); } Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 15868) +++ trunk/src_plugins/extedit/extedit.c (revision 15869) @@ -70,13 +70,13 @@ } extedit_method_t; static extedit_method_t methods[] = { - {"pcb-rnd", PCB_TYPE_SUBC, EEF_LIHATA, "pcb-rnd \"%f\""}, - {"editor", PCB_TYPE_SUBC, EEF_LIHATA, "xterm -e editor \"%f\""}, + {"pcb-rnd", PCB_OBJ_SUBC, EEF_LIHATA, "pcb-rnd \"%f\""}, + {"editor", PCB_OBJ_SUBC, EEF_LIHATA, "xterm -e editor \"%f\""}, {NULL, 0, 0, NULL} }; /* accept these objects for external editing */ -#define EXTEDIT_TYPES (PCB_TYPE_SUBC) +#define EXTEDIT_TYPES (PCB_OBJ_SUBC) #include "extedit_dad.c" Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c (revision 15868) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c (revision 15869) @@ -73,7 +73,7 @@ line = pcb_line_new(layer, x1, y1, x2, y2, thickness, clearance, get_flags(flags)); if (line != NULL) { - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, layer, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, line, line); return line; } return NULL; @@ -96,7 +96,7 @@ pin = pcb_via_new(PCB->Data, x, y, thickness, clearance, mask, hole, name, get_flags(flags)); if (pin != NULL) { - pcb_undo_add_obj_to_create(PCB_TYPE_VIA, pin, pin, pin); + pcb_undo_add_obj_to_create(PCB_OBJ_VIA, pin, pin, pin); return pin; } return NULL; @@ -113,7 +113,7 @@ void *arc; arc = pcb_arc_new(layer, x, y, width, height, sa, dir, thickness, clearance, get_flags(flags)); if (arc != NULL) { - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, layer, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, layer, arc, arc); return 0; } return NULL; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 15868) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 15869) @@ -97,7 +97,7 @@ case OM_LINE: switch(coord) { case OC_OBJ: - pcb_move_obj(PCB_TYPE_LINE_POINT, ly, obj->obj.l, &(obj->obj.l->Point2), dx, dy); + pcb_move_obj(PCB_OBJ_LINE_POINT, ly, obj->obj.l, &(obj->obj.l->Point2), dx, dy); /* intended falltrough */ case OC_P1X: case OC_P1Y: what = &(obj->obj.l->Point1); break; @@ -106,21 +106,21 @@ default: /* we do not handle anything else for now */ ; } - pcb_move_obj(PCB_TYPE_LINE_POINT, ly, obj->obj.l, what, dx, dy); + pcb_move_obj(PCB_OBJ_LINE_POINT, ly, obj->obj.l, what, dx, dy); return 0; case OM_TEXT: - pcb_move_obj(PCB_TYPE_TEXT, ly, obj->obj.t, obj->obj.t, dx, dy); + pcb_move_obj(PCB_OBJ_TEXT, ly, obj->obj.t, obj->obj.t, dx, dy); return 0; case OM_VIA: - pcb_move_obj(PCB_TYPE_VIA, obj->obj.v, obj->obj.v, obj->obj.v, dx, dy); + pcb_move_obj(PCB_OBJ_VIA, obj->obj.v, obj->obj.v, obj->obj.v, dx, dy); return 0; case OM_PIN: - pcb_move_obj(PCB_TYPE_PIN, obj->obj.pin, obj->obj.pin, obj->obj.pin, dx, dy); + pcb_move_obj(PCB_OBJ_PIN, obj->obj.pin, obj->obj.pin, obj->obj.pin, dx, dy); return 0; case OM_ARC: switch(coord) { case OC_OBJ: - pcb_move_obj(PCB_TYPE_ARC, ly, obj->obj.a, obj->obj.a, dx, dy); + pcb_move_obj(PCB_OBJ_ARC, ly, obj->obj.a, obj->obj.a, dx, dy); return 0; default: /* we do not handle anything else for now */ ; @@ -129,7 +129,7 @@ break; case OM_POLYGON: if (obj->layer != -1) { - pcb_move_obj(PCB_TYPE_POLY, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy); + pcb_move_obj(PCB_OBJ_POLY, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy); return 0; } } Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 15868) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 15869) @@ -1706,7 +1706,7 @@ int type; void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { /* pcb_undo_save_serial();*/ lesstif_show_fontsel_edit(ptr1, ptr2, type); } Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 15868) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 15869) @@ -174,7 +174,7 @@ PCB_LINE_VISIBLE_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) - pcb_remove_object(PCB_TYPE_LINE, layer, line, line); + pcb_remove_object(PCB_OBJ_LINE, layer, line, line); } PCB_ENDALL_LOOP; @@ -181,7 +181,7 @@ PCB_ARC_VISIBLE_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) - pcb_remove_object(PCB_TYPE_ARC, layer, arc, arc); + pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc); } PCB_ENDALL_LOOP; @@ -189,7 +189,7 @@ PCB_PADSTACK_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) - pcb_remove_object(PCB_TYPE_PSTK, padstack, padstack, padstack); + pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack); } PCB_END_LOOP; } Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 15868) +++ trunk/src_plugins/import_dsn/dsn.c (revision 15869) @@ -98,7 +98,7 @@ if (pn > 0) { /*pcb_line_t *line = */pcb_line_new_merge(layer, lx, PCB->MaxHeight - ly, x, PCB->MaxHeight - y, thick, clear, pcb_flag_make(PCB_FLAG_AUTO | PCB_FLAG_CLEARLINE)); -/* pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, layer, line);*/ +/* pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, layer, line);*/ /* pcb_printf("LINE: %$mm %$mm .. %$mm %$mm\n", lx, ly, x, y);*/ } lx = x; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 15868) +++ trunk/src_plugins/io_lihata/read.c (revision 15869) @@ -66,10 +66,10 @@ static int rdver; #warning padstack TODO #22: flags: old pins/pads had more flags (e.g. square) -#define PCB_TYPE_VIA PCB_TYPE_PSTK -#define PCB_TYPE_PIN PCB_TYPE_PSTK -#define PCB_TYPE_PAD PCB_TYPE_PSTK -#define PCB_TYPE_ELEMENT PCB_TYPE_SUBC +#define PCB_OBJ_VIA PCB_OBJ_PSTK +#define PCB_OBJ_PIN PCB_OBJ_PSTK +#define PCB_OBJ_PAD PCB_OBJ_PSTK +#define PCB_OBJ_ELEMENT PCB_OBJ_SUBC static pcb_data_t *parse_data(pcb_board_t *pcb, pcb_data_t *dst, lht_node_t *nd, pcb_data_t *subc_parent); @@ -489,7 +489,7 @@ line->ID = 0; else parse_id(&line->ID, obj, 5); - parse_flags(&line->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_LINE, &intconn, 0); + parse_flags(&line->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_LINE, &intconn, 0); pcb_attrib_compat_set_intconn(&line->Attributes, intconn); parse_attributes(&line->Attributes, lht_dom_hash_get(obj, "attributes")); @@ -525,7 +525,7 @@ int tmp; parse_id(&rat.ID, obj, 4); - parse_flags(&rat.Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_LINE, NULL, 0); + parse_flags(&rat.Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_LINE, NULL, 0); parse_attributes(&rat.Attributes, lht_dom_hash_get(obj, "attributes")); parse_coord(&rat.Point1.X, lht_dom_hash_get(obj, "x1")); @@ -561,7 +561,7 @@ return -1; parse_id(&arc->ID, obj, 4); - parse_flags(&arc->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_ARC, &intconn, 0); + parse_flags(&arc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ARC, &intconn, 0); pcb_attrib_compat_set_intconn(&arc->Attributes, intconn); parse_attributes(&arc->Attributes, lht_dom_hash_get(obj, "attributes")); @@ -595,7 +595,7 @@ unsigned char intconn = 0; parse_id(&poly->ID, obj, 8); - parse_flags(&poly->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_POLY, &intconn, 0); + parse_flags(&poly->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_POLY, &intconn, 0); pcb_attrib_compat_set_intconn(&poly->Attributes, intconn); parse_attributes(&poly->Attributes, lht_dom_hash_get(obj, "attributes")); @@ -666,7 +666,7 @@ parse_id(&text->ID, obj, 5); - parse_flags(&text->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_TEXT, &intconn, 0); + parse_flags(&text->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_TEXT, &intconn, 0); pcb_attrib_compat_set_intconn(&text->Attributes, intconn); parse_attributes(&text->Attributes, lht_dom_hash_get(obj, "attributes")); parse_int(&text->Scale, lht_dom_hash_get(obj, "scale")); @@ -821,7 +821,7 @@ ps = pcb_pstk_alloc(dt); parse_id(&ps->ID, obj, 13); - parse_flags(&ps->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_PSTK, &intconn, 0); + parse_flags(&ps->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_PSTK, &intconn, 0); pcb_attrib_compat_set_intconn(&ps->Attributes, intconn); parse_attributes(&ps->Attributes, lht_dom_hash_get(obj, "attributes")); @@ -890,7 +890,7 @@ if (dt == NULL) return -1; - parse_flags(&flg, fln=lht_dom_hash_get(obj, "flags"), PCB_TYPE_VIA, &intconn, 1); + parse_flags(&flg, fln=lht_dom_hash_get(obj, "flags"), PCB_OBJ_VIA, &intconn, 1); parse_coord(&Thickness, lht_dom_hash_get(obj, "thickness")); parse_coord(&Clearance, lht_dom_hash_get(obj, "clearance")); parse_coord(&Mask, lht_dom_hash_get(obj, "mask")); @@ -931,7 +931,7 @@ pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance, Mask; char *Name = NULL, *Number = NULL; - parse_flags(&flg, lht_dom_hash_get(obj, "flags"), PCB_TYPE_PAD, &intconn, 0); + parse_flags(&flg, lht_dom_hash_get(obj, "flags"), PCB_OBJ_PAD, &intconn, 0); parse_coord(&Thickness, lht_dom_hash_get(obj, "thickness")); parse_coord(&Clearance, lht_dom_hash_get(obj, "clearance")); @@ -973,7 +973,7 @@ pcb_add_subc_to_data(dt, subc); parse_id(&subc->ID, obj, 8); - parse_flags(&subc->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_ELEMENT, NULL, 0); + parse_flags(&subc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ELEMENT, NULL, 0); parse_attributes(&subc->Attributes, lht_dom_hash_get(obj, "attributes")); parse_coord(&ox, lht_dom_hash_get(obj, "x")); parse_coord(&oy, lht_dom_hash_get(obj, "y")); @@ -1046,7 +1046,7 @@ int n; parse_id(&sc->ID, obj, 5); - parse_flags(&sc->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_ELEMENT, &intconn, 0); + parse_flags(&sc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ELEMENT, &intconn, 0); pcb_attrib_compat_set_intconn(&sc->Attributes, intconn); parse_attributes(&sc->Attributes, lht_dom_hash_get(obj, "attributes")); parse_minuid(sc->uid, lht_dom_hash_get(obj, "uid")); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 15868) +++ trunk/src_plugins/io_lihata/write.c (revision 15869) @@ -59,10 +59,10 @@ /*#define CFMT "%$$mn"*/ #warning padstack TODO #22: flags: old pins/pads had more flags (e.g. square) -#define PCB_TYPE_VIA PCB_TYPE_PSTK -#define PCB_TYPE_PIN PCB_TYPE_PSTK -#define PCB_TYPE_PAD PCB_TYPE_PSTK -#define PCB_TYPE_ELEMENT PCB_TYPE_SUBC +#define PCB_OBJ_VIA PCB_OBJ_PSTK +#define PCB_OBJ_PIN PCB_OBJ_PSTK +#define PCB_OBJ_PAD PCB_OBJ_PSTK +#define PCB_OBJ_ELEMENT PCB_OBJ_SUBC static int io_lihata_full_tree = 0; static int wrver; @@ -258,7 +258,7 @@ if (!simple) { lht_dom_hash_put(obj, build_attributes(&line->Attributes)); - lht_dom_hash_put(obj, build_flags(&line->Flags, PCB_TYPE_LINE, line->intconn)); + lht_dom_hash_put(obj, build_flags(&line->Flags, PCB_OBJ_LINE, line->intconn)); lht_dom_hash_put(obj, build_textf("clearance", CFMT, line->Clearance)); } @@ -315,7 +315,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&rat->Attributes)); - lht_dom_hash_put(obj, build_flags(&rat->Flags, PCB_TYPE_LINE, rat->intconn)); + lht_dom_hash_put(obj, build_flags(&rat->Flags, PCB_OBJ_LINE, rat->intconn)); lht_dom_hash_put(obj, build_textf("x1", CFMT, rat->Point1.X)); lht_dom_hash_put(obj, build_textf("y1", CFMT, rat->Point1.Y)); lht_dom_hash_put(obj, build_textf("x2", CFMT, rat->Point2.X)); @@ -335,7 +335,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&arc->Attributes)); - lht_dom_hash_put(obj, build_flags(&arc->Flags, PCB_TYPE_ARC, arc->intconn)); + lht_dom_hash_put(obj, build_flags(&arc->Flags, PCB_OBJ_ARC, arc->intconn)); lht_dom_hash_put(obj, build_textf("thickness", CFMT, arc->Thickness)); lht_dom_hash_put(obj, build_textf("clearance", CFMT, arc->Clearance)); lht_dom_hash_put(obj, build_textf("x", CFMT, arc->X+dx)); @@ -371,7 +371,7 @@ flg = pcb_pstk_compat_pinvia_flag(ps, cshape); lht_dom_hash_put(obj, build_attributes(&ps->Attributes)); - lht_dom_hash_put(obj, build_flags(&flg, PCB_TYPE_VIA, ps->intconn)); + lht_dom_hash_put(obj, build_flags(&flg, PCB_OBJ_VIA, ps->intconn)); lht_dom_hash_put(obj, build_textf("thickness", CFMT, pad_dia)); lht_dom_hash_put(obj, build_textf("clearance", CFMT, clearance)); lht_dom_hash_put(obj, build_textf("mask", CFMT, mask)); @@ -408,7 +408,7 @@ flg.f |= PCB_FLAG_NOPASTE; lht_dom_hash_put(obj, build_attributes(&ps->Attributes)); - lht_dom_hash_put(obj, build_flags(&flg, PCB_TYPE_PAD, ps->intconn)); + lht_dom_hash_put(obj, build_flags(&flg, PCB_OBJ_PAD, ps->intconn)); lht_dom_hash_put(obj, build_textf("thickness", CFMT, thickness)); lht_dom_hash_put(obj, build_textf("clearance", CFMT, clearance)); lht_dom_hash_put(obj, build_textf("mask", CFMT, mask)); @@ -431,7 +431,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&poly->Attributes)); - lht_dom_hash_put(obj, build_flags(&poly->Flags, PCB_TYPE_POLY, poly->intconn)); + lht_dom_hash_put(obj, build_flags(&poly->Flags, PCB_OBJ_POLY, poly->intconn)); if ((wrver >= 3) && (poly->Clearance > 0)) lht_dom_hash_put(obj, build_textf("clearance", CFMT, poly->Clearance)); @@ -473,7 +473,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&text->Attributes)); - lht_dom_hash_put(obj, build_flags(&text->Flags, PCB_TYPE_TEXT, text->intconn)); + lht_dom_hash_put(obj, build_flags(&text->Flags, PCB_OBJ_TEXT, text->intconn)); lht_dom_hash_put(obj, build_text("string", text->TextString)); lht_dom_hash_put(obj, build_textf("fid", "%ld", text->fid)); lht_dom_hash_put(obj, build_textf("scale", "%d", text->Scale)); @@ -506,7 +506,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&subc->Attributes)); - lht_dom_hash_put(obj, build_flags(&subc->Flags, PCB_TYPE_ELEMENT, 0)); + lht_dom_hash_put(obj, build_flags(&subc->Flags, PCB_OBJ_ELEMENT, 0)); /* build drawing primitives */ lst = lht_dom_node_alloc(LHT_LIST, "objects"); @@ -596,7 +596,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&sc->Attributes)); - lht_dom_hash_put(obj, build_flags(&sc->Flags, PCB_TYPE_SUBC, 0)); + lht_dom_hash_put(obj, build_flags(&sc->Flags, PCB_OBJ_SUBC, 0)); lht_dom_hash_put(obj, build_data(sc->data)); lht_dom_hash_put(obj, build_minuid("uid", sc->uid)); @@ -701,7 +701,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&ps->Attributes)); - lht_dom_hash_put(obj, build_flags(&ps->Flags, PCB_TYPE_PSTK, ps->intconn)); + lht_dom_hash_put(obj, build_flags(&ps->Flags, PCB_OBJ_PSTK, ps->intconn)); lht_dom_hash_put(obj, build_textf("proto", "%ld", (long int)ps->proto)); lht_dom_hash_put(obj, build_textf("x", CFMT, ps->x)); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 15868) +++ trunk/src_plugins/io_pcb/file.c (revision 15869) @@ -73,11 +73,11 @@ #include "src_plugins/lib_compat_help/elem_rot.h" #warning padstack TODO #22: flags: old pins/pads had more flags (e.g. square) -#define PCB_TYPE_VIA PCB_TYPE_PSTK -#define PCB_TYPE_PIN PCB_TYPE_PSTK -#define PCB_TYPE_PAD PCB_TYPE_PSTK -#define PCB_TYPE_ELEMENT PCB_TYPE_SUBC -#define PCB_TYPE_ELEMENT_NAME PCB_TYPE_TEXT +#define PCB_OBJ_VIA PCB_OBJ_PSTK +#define PCB_OBJ_PIN PCB_OBJ_PSTK +#define PCB_OBJ_PAD PCB_OBJ_PSTK +#define PCB_OBJ_ELEMENT PCB_OBJ_SUBC +#define PCB_OBJ_ELEMENT_NAME PCB_OBJ_TEXT pcb_unit_style_t pcb_io_pcb_usty_seen; @@ -361,7 +361,7 @@ pcb_fprintf(FP, "Via[%[0] %[0] %[0] %[0] %[0] %[0] ", x, y, pad_dia, clearance*2, mask, drill_dia); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(name)); - fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape), PCB_TYPE_VIA, NULL)); + fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape), PCB_OBJ_VIA, NULL)); } } @@ -374,7 +374,7 @@ ratlist_foreach(&PCB->Data->Rat, &it, line) { pcb_fprintf(FP, "Rat[%[0] %[0] %d %[0] %[0] %d ", line->Point1.X, line->Point1.Y, line->group1, line->Point2.X, line->Point2.Y, line->group2); - fprintf(FP, " %s]\n", F2S(line, PCB_TYPE_RATLINE)); + fprintf(FP, " %s]\n", F2S(line, PCB_OBJ_RAT)); } } @@ -441,13 +441,13 @@ ry = oy; } - fprintf(FP, "\nElement[%s ", F2S(sc, PCB_TYPE_ELEMENT)); + fprintf(FP, "\nElement[%s ", F2S(sc, PCB_OBJ_ELEMENT)); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&sc->Attributes, "footprint"))); fputc(' ', FP); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&sc->Attributes, "refdes"))); fputc(' ', FP); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&sc->Attributes, "value"))); - pcb_fprintf(FP, " %[0] %[0] %[0] %[0] %d %d %s]\n(\n", ox, oy, rx, ry, rdir, rscale, trefdes != NULL ? F2S(trefdes, PCB_TYPE_ELEMENT_NAME) : "\"\""); + pcb_fprintf(FP, " %[0] %[0] %[0] %[0] %d %d %s]\n(\n", ox, oy, rx, ry, rdir, rscale, trefdes != NULL ? F2S(trefdes, PCB_OBJ_ELEMENT_NAME) : "\"\""); WriteAttributeList(FP, &sc->Attributes, "\t"); padstacklist_foreach(&sc->data->padstack, &it, ps) { @@ -460,7 +460,7 @@ pcb_print_quoted_string(FP, (char *)PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "name"))); fprintf(FP, " "); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "term"))); - fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape), PCB_TYPE_PIN, &ic)); + fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape), PCB_OBJ_PIN, &ic)); } else if (pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) { unsigned long fl = (square ? PCB_FLAG_SQUARE : 0) | (nopaste ? PCB_FLAG_NOPASTE : 0); @@ -469,7 +469,7 @@ pcb_print_quoted_string(FP, (char *)PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "name"))); fprintf(FP, " "); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "term"))); - fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_flag_make(fl), PCB_TYPE_PAD, &ic)); + fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_flag_make(fl), PCB_OBJ_PAD, &ic)); } else pcb_io_incompat_save(sc->data, (pcb_any_obj_t *)ps, "Padstack can not be exported as pin or pad", "use simpler padstack; for pins, all copper layers must have the same shape and there must be no paste; for pads, use a line or a rectangle; paste and mask must match the copper shape"); @@ -554,22 +554,22 @@ linelist_foreach(&layer->Line, &it, line) { pcb_fprintf(FP, "\tLine[%[0] %[0] %[0] %[0] %[0] %[0] %s]\n", line->Point1.X, line->Point1.Y, - line->Point2.X, line->Point2.Y, line->Thickness, line->Clearance, F2S(line, PCB_TYPE_LINE)); + line->Point2.X, line->Point2.Y, line->Thickness, line->Clearance, F2S(line, PCB_OBJ_LINE)); } arclist_foreach(&layer->Arc, &it, arc) { pcb_fprintf(FP, "\tArc[%[0] %[0] %[0] %[0] %[0] %[0] %ma %ma %s]\n", arc->X, arc->Y, arc->Width, - arc->Height, arc->Thickness, arc->Clearance, arc->StartAngle, arc->Delta, F2S(arc, PCB_TYPE_ARC)); + arc->Height, arc->Thickness, arc->Clearance, arc->StartAngle, arc->Delta, F2S(arc, PCB_OBJ_ARC)); } textlist_foreach(&layer->Text, &it, text) { pcb_fprintf(FP, "\tText[%[0] %[0] %d %d ", text->X, text->Y, text->Direction, text->Scale); pcb_print_quoted_string(FP, (char *) PCB_EMPTY(text->TextString)); - fprintf(FP, " %s]\n", F2S(text, PCB_TYPE_TEXT)); + fprintf(FP, " %s]\n", F2S(text, PCB_OBJ_TEXT)); } textlist_foreach(&layer->Polygon, &it, polygon) { int p, i = 0; pcb_cardinal_t hole = 0; - fprintf(FP, "\tPolygon(%s)\n\t(", F2S(polygon, PCB_TYPE_POLY)); + fprintf(FP, "\tPolygon(%s)\n\t(", F2S(polygon, PCB_OBJ_POLY)); for (p = 0; p < polygon->PointN; p++) { pcb_point_t *point = &polygon->Points[p]; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 15868) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 15869) @@ -2419,7 +2419,7 @@ " line: %i\n" " description: 'ignored polygon (< 3 points in a contour)'\n", yyfilename, pcb_lineno); - pcb_destroy_object(yyData, PCB_TYPE_POLY, Layer, Polygon, Polygon); + pcb_destroy_object(yyData, PCB_OBJ_POLY, Layer, Polygon, Polygon); } else { Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 15868) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 15869) @@ -1199,7 +1199,7 @@ " line: %i\n" " description: 'ignored polygon (< 3 points in a contour)'\n", yyfilename, pcb_lineno); - pcb_destroy_object(yyData, PCB_TYPE_POLY, Layer, Polygon, Polygon); + pcb_destroy_object(yyData, PCB_OBJ_POLY, Layer, Polygon, Polygon); } else { Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 15868) +++ trunk/src_plugins/jostle/jostle.c (revision 15869) @@ -264,7 +264,7 @@ line = pcb_line_new(layer, a[0], a[1], b[0], b[1], thickness, clearance, flags); if (line) { - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, layer, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, line, line); } return line; } Index: trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 15868) +++ trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 15869) @@ -59,7 +59,7 @@ /* check if there are any pins or pads at that position */ type = pcb_search_obj_by_location(PCB_TYPEMASK_TERM, &ptr1, &ptr2, &ptr3, X, Y, Range); - if (type == PCB_TYPE_NONE) + if (type == PCB_OBJ_VOID) return NULL; /* don't mess with silk objects! */ Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 15868) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 15869) @@ -215,7 +215,7 @@ void *ptr1, *ptr2, *ptr3; found_type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, object_id, object_type); - if (found_type == PCB_TYPE_NONE) { + if (found_type == PCB_OBJ_VOID) { pcb_message(PCB_MSG_WARNING, _("Object ID %i identified during DRC was not found. Stale DRC window?\n"), object_id); continue; } @@ -222,9 +222,9 @@ pcb_undo_add_obj_to_flag(ptr2); PCB_FLAG_SET(PCB_FLAG_FOUND, (pcb_any_obj_t *) ptr2); switch (violation->object_type_list[i]) { - case PCB_TYPE_LINE: - case PCB_TYPE_ARC: - case PCB_TYPE_POLY: + case PCB_OBJ_LINE: + case PCB_OBJ_ARC: + case PCB_OBJ_POLY: pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true); } pcb_draw_obj((pcb_any_obj_t *)ptr2); Index: trunk/src_plugins/lib_gtk_common/dlg_fontsel.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fontsel.c (revision 15868) +++ trunk/src_plugins/lib_gtk_common/dlg_fontsel.c (revision 15869) @@ -71,7 +71,7 @@ dlg_fontsel_global_latch = 1; } else { - if (type != PCB_TYPE_TEXT) + if (type != PCB_OBJ_TEXT) return; if (!modal) { pcb_message(PCB_MSG_ERROR, "text-targeted fontsel dialogs must be modal because of the global-var API on the txt object.\n"); Index: trunk/src_plugins/lib_gtk_common/dlg_fontsel.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fontsel.h (revision 15868) +++ trunk/src_plugins/lib_gtk_common/dlg_fontsel.h (revision 15869) @@ -3,6 +3,6 @@ #include "hid.h" #include "glue.h" -/* type is PCB_TYPE_TEXT or PCB_TYPE_ELEMENT_NAME */ +/* type is PCB_OBJ_TEXT or PCB_OBJ_ELEMENT_NAME */ void pcb_gtk_dlg_fontsel(pcb_gtk_common_t *com, pcb_layer_t *txtly, pcb_text_t *txt, int type, int modal); Index: trunk/src_plugins/lib_gtk_common/dlg_netlist.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_netlist.c (revision 15868) +++ trunk/src_plugins/lib_gtk_common/dlg_netlist.c (revision 15869) @@ -524,7 +524,7 @@ PCB_LINE_VISIBLE_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) - pcb_remove_object(PCB_TYPE_LINE, layer, line, line); + pcb_remove_object(PCB_OBJ_LINE, layer, line, line); } PCB_ENDALL_LOOP; @@ -531,7 +531,7 @@ PCB_ARC_VISIBLE_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) - pcb_remove_object(PCB_TYPE_ARC, layer, arc, arc); + pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc); } PCB_ENDALL_LOOP; @@ -539,7 +539,7 @@ PCB_PADSTACK_LOOP(PCB->Data); { if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) - pcb_remove_object(PCB_TYPE_PSTK, padstack, padstack, padstack); + pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack); } PCB_END_LOOP; } Index: trunk/src_plugins/lib_gtk_hid/actions.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/actions.c (revision 15868) +++ trunk/src_plugins/lib_gtk_hid/actions.c (revision 15869) @@ -93,7 +93,7 @@ int type; void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) { /* pcb_undo_save_serial();*/ pcb_gtk_dlg_fontsel(&ghidgui->common, ptr1, ptr2, type, 1); } Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 15868) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 15869) @@ -42,7 +42,7 @@ #include "hid.h" #define VALID_TYPE(obj) (((obj)->type == PCB_OBJ_ARC) || ((obj)->type == PCB_OBJ_LINE)) -#define CONT_TYPE (PCB_TYPE_LINE | PCB_TYPE_ARC) +#define CONT_TYPE (PCB_OBJ_LINE | PCB_OBJ_ARC) #define NEAR(x1, x2, y1, y2) (((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2)) < 4) Index: trunk/src_plugins/millpath/toolpath.c =================================================================== --- trunk/src_plugins/millpath/toolpath.c (revision 15868) +++ trunk/src_plugins/millpath/toolpath.c (revision 15869) @@ -63,7 +63,7 @@ } else line_tmp.Clearance = 1; - pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_TYPE_LINE, &line_tmp); + pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_LINE, &line_tmp); } pcb_r_end(&it); @@ -76,13 +76,13 @@ } else arc_tmp.Clearance = 1; - pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_TYPE_ARC, &arc_tmp); + pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_ARC, &arc_tmp); } pcb_r_end(&it); #warning TODO: centerline for(text = (pcb_text_t *)pcb_r_first(layer->text_tree, &it); text != NULL; text = (pcb_text_t *)pcb_r_next(&it)) - pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_TYPE_ARC, text); + pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_ARC, text); pcb_r_end(&it); #warning TODO: subs poly: not supported by core @@ -108,7 +108,7 @@ for(ps = (pcb_pstk_t *)pcb_r_first(pcb->Data->padstack_tree, &it); ps != NULL; ps = (pcb_pstk_t *)pcb_r_next(&it)) { memcpy(&ps_tmp, ps, sizeof(ps_tmp)); ps_tmp.Clearance = 1; - pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_TYPE_PSTK, &ps_tmp); + pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_PSTK, &ps_tmp); } pcb_r_end(&it); } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 15868) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 15869) @@ -81,7 +81,7 @@ short_conn_t *s; #warning find.c TODO: will not be needed after the big rewrite - if (from_type == PCB_TYPE_RATLINE) /* rat line is often rat point and has no ID */ + if (from_type == PCB_OBJ_RAT) /* rat line is often rat point and has no ID */ from = NULL; s = malloc(sizeof(short_conn_t)); @@ -161,12 +161,12 @@ parent = NULL; switch (n->to_type) { - case PCB_TYPE_LINE: typ = "line"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; - case PCB_TYPE_ARC: typ = "arc"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; - case PCB_TYPE_POLY: typ = "polygon"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; - case PCB_TYPE_TEXT: typ = "text"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; - case PCB_TYPE_PSTK: typ = "padstack"; parent = pcb_gobj_parent_subc(o->parent_type, &o->parent); break; - case PCB_TYPE_SUBC: typ = "subcircuit"; parent = pcb_gobj_parent_subc(o->parent_type, &o->parent); break; + case PCB_OBJ_LINE: typ = "line"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; + case PCB_OBJ_ARC: typ = "arc"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; + case PCB_OBJ_POLY: typ = "polygon"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; + case PCB_OBJ_TEXT: typ = "text"; parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break; + case PCB_OBJ_PSTK: typ = "padstack"; parent = pcb_gobj_parent_subc(o->parent_type, &o->parent); break; + case PCB_OBJ_SUBC: typ = "subcircuit"; parent = pcb_gobj_parent_subc(o->parent_type, &o->parent); break; default: typ = ""; parent = NULL; break; } if (parent != NULL) { @@ -242,7 +242,7 @@ /* connection to a pin/pad is slightly stronger than the strongest obj-obj conn; obj-obj conns are weaker at junctions where many objects connect */ - if ((n->from_type == PCB_TYPE_PSTK) || (n->to_type == PCB_TYPE_PSTK)) + if ((n->from_type == PCB_OBJ_PSTK) || (n->to_type == PCB_OBJ_PSTK)) weight = maxedges * 2 + 2; else weight = maxedges * 2 - n->edges - from->edges + 1; Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 15868) +++ trunk/src_plugins/propedit/propsel.c (revision 15869) @@ -236,10 +236,10 @@ if (set_common(st, (pcb_any_obj_t *)line)) return; if (st->is_trace && st->c_valid && (strcmp(pn, "thickness") == 0) && - pcb_chg_obj_1st_size(PCB_TYPE_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_1st_size(PCB_OBJ_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE; if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) && - pcb_chg_obj_clear_size(PCB_TYPE_LINE, layer, line, NULL, st->c*2, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_OBJ_LINE, layer, line, NULL, st->c*2, st->c_absolute)) DONE; } static void set_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc) @@ -257,24 +257,24 @@ if (set_common(st, (pcb_any_obj_t *)arc)) return; if (st->is_trace && st->c_valid && (strcmp(pn, "thickness") == 0) && - pcb_chg_obj_1st_size(PCB_TYPE_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_1st_size(PCB_OBJ_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE; if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) && - pcb_chg_obj_clear_size(PCB_TYPE_ARC, layer, arc, NULL, st->c*2, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_OBJ_ARC, layer, arc, NULL, st->c*2, st->c_absolute)) DONE; pn = st->name + 6; if (!st->is_trace && st->c_valid && (strcmp(pn, "width") == 0) && - pcb_chg_obj_radius(PCB_TYPE_ARC, layer, arc, NULL, 0, st->c, st->c_absolute)) DONE; + pcb_chg_obj_radius(PCB_OBJ_ARC, layer, arc, NULL, 0, st->c, st->c_absolute)) DONE; if (!st->is_trace && st->c_valid && (strcmp(pn, "height") == 0) && - pcb_chg_obj_radius(PCB_TYPE_ARC, layer, arc, NULL, 1, st->c, st->c_absolute)) DONE; + pcb_chg_obj_radius(PCB_OBJ_ARC, layer, arc, NULL, 1, st->c, st->c_absolute)) DONE; if (!st->is_trace && st->d_valid && (strcmp(pn, "angle/start") == 0) && - pcb_chg_obj_angle(PCB_TYPE_ARC, layer, arc, NULL, 0, st->d, st->d_absolute)) DONE; + pcb_chg_obj_angle(PCB_OBJ_ARC, layer, arc, NULL, 0, st->d, st->d_absolute)) DONE; if (!st->is_trace && st->d_valid && (strcmp(pn, "angle/delta") == 0) && - pcb_chg_obj_angle(PCB_TYPE_ARC, layer, arc, NULL, 1, st->d, st->d_absolute)) DONE; + pcb_chg_obj_angle(PCB_OBJ_ARC, layer, arc, NULL, 1, st->d, st->d_absolute)) DONE; } static void set_text_cb_any(void *ctx, pcb_board_t *pcb, int type, void *layer_or_element, pcb_text_t *text) @@ -318,7 +318,7 @@ static void set_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text) { - set_text_cb_any(ctx, pcb, PCB_TYPE_TEXT, layer, text); + set_text_cb_any(ctx, pcb, PCB_OBJ_TEXT, layer, text); } @@ -332,7 +332,7 @@ if (set_common(st, (pcb_any_obj_t *)poly)) return; if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) && - pcb_chg_obj_clear_size(PCB_TYPE_POLY, layer, poly, NULL, st->c*2, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_OBJ_POLY, layer, poly, NULL, st->c*2, st->c_absolute)) DONE; if (st->is_attr) { set_attr(st, &poly->Attributes); @@ -381,13 +381,13 @@ proto = pcb_pstk_get_proto(ps); if (st->c_valid && (strcmp(pn, "clearance") == 0) && - pcb_chg_obj_clear_size(PCB_TYPE_PSTK, ps, ps, NULL, st->c, st->c_absolute)) DONE; + pcb_chg_obj_clear_size(PCB_OBJ_PSTK, ps, ps, NULL, st->c, st->c_absolute)) DONE; if (st->d_valid && (strcmp(pn, "rotation") == 0)) { if (st->d_absolute) { - if (pcb_obj_rotate(PCB_TYPE_PSTK, ps, ps, NULL, ps->x, ps->y, st->d - ps->rot)) DONE; + if (pcb_obj_rotate(PCB_OBJ_PSTK, ps, ps, NULL, ps->x, ps->y, st->d - ps->rot)) DONE; } else { - if (pcb_obj_rotate(PCB_TYPE_PSTK, ps, ps, NULL, ps->x, ps->y, st->d)) DONE; + if (pcb_obj_rotate(PCB_OBJ_PSTK, ps, ps, NULL, ps->x, ps->y, st->d)) DONE; } return; } Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 15868) +++ trunk/src_plugins/puller/puller.c (revision 15869) @@ -444,7 +444,7 @@ x = the_arc->X - the_arc->Width * cos(d2r(arc_angle)) + 0.5; y = the_arc->Y + the_arc->Height * sin(d2r(arc_angle)) + 0.5; - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y); pcb_gui->invalidate_all(); pcb_undo_inc_serial(); @@ -558,8 +558,8 @@ #define ARC2EXTRA(a) ((Extra *)g_hash_table_lookup (arcs, a)) #define EXTRA2LINE(e) (e->parent.line) #define EXTRA2ARC(e) (e->parent.arc) -#define EXTRA_IS_LINE(e) (e->type == PCB_TYPE_LINE) -#define EXTRA_IS_ARC(e) (e->type == PCB_TYPE_ARC) +#define EXTRA_IS_LINE(e) (e->type == PCB_OBJ_LINE) +#define EXTRA_IS_ARC(e) (e->type == PCB_OBJ_ARC) static void unlink_end(Extra * x, Extra ** e) { @@ -794,7 +794,7 @@ Extra *extra = g_slice_new0(Extra); g_hash_table_insert(lines, line, extra); extra->parent.line = line; - extra->type = PCB_TYPE_LINE; + extra->type = PCB_OBJ_LINE; return extra; } @@ -803,7 +803,7 @@ Extra *extra = g_slice_new0(Extra); g_hash_table_insert(arcs, arc, extra); extra->parent.arc = arc; - extra->type = PCB_TYPE_ARC; + extra->type = PCB_OBJ_ARC; return extra; } @@ -1043,8 +1043,8 @@ x = line->Point1.X; y = line->Point1.Y; #if 1 - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y); - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y); #else /* In theory, we should be using the above so that undo works. */ line->Point1.X = line->Point2.X; @@ -1438,7 +1438,7 @@ #endif pcb_line_t *line = pcb_line_new(CURRENT, x1, y1, x2, y2, sample->Thickness, sample->Clearance, sample->Flags); - pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); + pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, line); #if TRACE1 e = @@ -1466,7 +1466,7 @@ if (arc == 0) { arc = pcb_arc_new(CURRENT, x, y, r, r, sa, da * 2, sample->Thickness, sample->Clearance, sample->Flags); } - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, CURRENT, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, CURRENT, arc, arc); if (!arc) longjmp(abort_buf, 1); @@ -1547,8 +1547,8 @@ fprintf(stderr, "double neg move?\n"); abort(); } - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y); - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y); #endif } @@ -1828,11 +1828,11 @@ pcb_arc_set_angles(CURRENT, start_arc, start_arc->StartAngle, new_delta); fix_arc_extra(start_arc, sarc_extra); - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point1), sarc_extra->end.x - start_line->Point1.X, sarc_extra->end.y - start_line->Point1.Y); if (del_arc) { - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point1), sarc_extra->start.x - start_line->Point1.X, sarc_extra->start.y - start_line->Point1.Y); mark_arc_for_deletion(start_arc); } @@ -1894,17 +1894,17 @@ pcb_arc_set_angles(CURRENT, end_arc, end_arc->StartAngle, new_delta); fix_arc_extra(end_arc, earc_extra); - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2), earc_extra->end.x - start_line->Point2.X, earc_extra->end.y - start_line->Point2.Y); if (del_arc) { - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2), earc_extra->start.x - start_line->Point2.X, earc_extra->start.y - start_line->Point2.Y); mark_arc_for_deletion(end_arc); } } else { - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2), end_line->Point2.X - start_line->Point2.X, end_line->Point2.Y - start_line->Point2.Y); } mark_line_for_deletion(end_line); @@ -1938,7 +1938,7 @@ #if TRACE1 pcb_printf("new point %#mS\n", ex, ey); #endif - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y); + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y); /* Step 4: Split start_line at the obstacle and insert a zero-delta arc at it. */ @@ -1951,7 +1951,7 @@ if (end_arc) earc_extra = ARC2EXTRA(end_arc); - pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), + pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2), new_aextra->start.x - start_line->Point2.X, new_aextra->start.y - start_line->Point2.Y); new_line = create_line(start_line, new_aextra->end.x, new_aextra->end.y, ex, ey); Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 15868) +++ trunk/src_plugins/renumber/renumber.c (revision 15869) @@ -295,9 +295,9 @@ is[c_cnt] = pcb_strdup(tmps); c_cnt++; - pcb_undo_add_obj_to_change_name(PCB_TYPE_SUBC, NULL, NULL, subc_list[i], or_empty(subc_list[i]->refdes)); + pcb_undo_add_obj_to_change_name(PCB_OBJ_SUBC, NULL, NULL, subc_list[i], or_empty(subc_list[i]->refdes)); - pcb_chg_obj_name(PCB_TYPE_SUBC, subc_list[i], NULL, NULL, tmps); + pcb_chg_obj_name(PCB_OBJ_SUBC, subc_list[i], NULL, NULL, tmps); changed = pcb_true; /* we don't free tmps in this case because it is used */ Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 15868) +++ trunk/src_plugins/renumber/renumberblock.c (revision 15869) @@ -69,9 +69,9 @@ memcpy(new_ref, old_ref, refdes_split - old_ref); strcpy(new_ref + (refdes_split - old_ref), num_buf); - pcb_undo_add_obj_to_change_name(PCB_TYPE_SUBC, NULL, NULL, subc, subc->refdes); + pcb_undo_add_obj_to_change_name(PCB_OBJ_SUBC, NULL, NULL, subc, subc->refdes); - pcb_chg_obj_name(PCB_TYPE_SUBC, subc, subc, subc, new_ref); + pcb_chg_obj_name(PCB_OBJ_SUBC, subc, subc, subc, new_ref); } PCB_END_LOOP; pcb_undo_inc_serial(); @@ -114,7 +114,7 @@ memcpy(new_ref, old_ref, refdes_split - old_ref); strcpy(new_ref + (refdes_split - old_ref), num_buf); - pcb_chg_obj_name(PCB_TYPE_SUBC, subc, subc, subc, new_ref); + pcb_chg_obj_name(PCB_OBJ_SUBC, subc, subc, subc, new_ref); } PCB_END_LOOP; Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 15868) +++ trunk/src_plugins/report/report.c (revision 15869) @@ -154,14 +154,14 @@ if ((argv != NULL) && (argv[0] != NULL)) { if (pcb_strncasecmp(argv[0], "Subc", 4) == 0) - type = PCB_TYPE_SUBC; + type = PCB_OBJ_SUBC; } type = pcb_search_screen(x, y, type, &ptr1, &ptr2, &ptr3); - if (type == PCB_TYPE_NONE) - type = pcb_search_screen(x, y, REPORT_TYPES | PCB_TYPE_LOCKED, &ptr1, &ptr2, &ptr3); + if (type == PCB_OBJ_VOID) + type = pcb_search_screen(x, y, REPORT_TYPES | PCB_OBJ_LOCKED, &ptr1, &ptr2, &ptr3); switch (type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: { pcb_pstk_t *ps; pcb_pstk_proto_t *proto; @@ -178,7 +178,7 @@ gds_init(&tmp); pcb_append_printf(&tmp, "%m+PADSTACK ID# %ld; Flags:%s\n" - "(X,Y) = %$mD.\n", USER_UNITMASK, ps->ID, pcb_strflg_f2s(ps->Flags, PCB_TYPE_PSTK, NULL), + "(X,Y) = %$mD.\n", USER_UNITMASK, ps->ID, pcb_strflg_f2s(ps->Flags, PCB_OBJ_PSTK, NULL), ps->x, ps->y); if ((proto != NULL) && (proto->hdia > 0)) @@ -190,7 +190,7 @@ break; } - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { pcb_line_t *line; #ifndef NDEBUG @@ -209,7 +209,7 @@ "and has name \"%s\".\n" "%s" "%s%s%s", USER_UNITMASK, - line->ID, pcb_strflg_f2s(line->Flags, PCB_TYPE_LINE, NULL), + line->ID, pcb_strflg_f2s(line->Flags, PCB_OBJ_LINE, NULL), line->Point1.X, line->Point1.Y, line->Point1.ID, line->Point2.X, line->Point2.Y, line->Point2.ID, line->Thickness, line->Clearance / 2, @@ -217,7 +217,7 @@ PCB_UNKNOWN(line->Number), gen_locked(line), gen_term(line)); break; } - case PCB_TYPE_RATLINE: + case PCB_OBJ_RAT: { pcb_rat_t *line; #ifndef NDEBUG @@ -232,12 +232,12 @@ "connects to layer group #%d (%s).\n" "SecondPoint(X,Y) = %$mD; ID = %ld; " "connects to layer group #%d (%s).\n", - USER_UNITMASK, line->ID, pcb_strflg_f2s(line->Flags, PCB_TYPE_LINE, NULL), + USER_UNITMASK, line->ID, pcb_strflg_f2s(line->Flags, PCB_OBJ_LINE, NULL), line->Point1.X, line->Point1.Y, line->Point1.ID, line->group1, grpname(line->group1), line->Point2.X, line->Point2.Y, line->Point2.ID, line->group2, grpname(line->group2)); break; } - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: { pcb_arc_t *Arc; pcb_box_t box; @@ -260,7 +260,7 @@ "That makes the end points at %$mD and %$mD.\n" "It is on layer %d.\n" "%s" - "%s%s%s", USER_UNITMASK, Arc->ID, pcb_strflg_f2s(Arc->Flags, PCB_TYPE_ARC, NULL), + "%s%s%s", USER_UNITMASK, Arc->ID, pcb_strflg_f2s(Arc->Flags, PCB_OBJ_ARC, NULL), Arc->X, Arc->Y, Arc->Thickness, Arc->Clearance / 2, Arc->Width, Arc->StartAngle, Arc->Delta, @@ -271,7 +271,7 @@ pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), gen_locked(Arc), gen_term(Arc)); break; } - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: { pcb_poly_t *Polygon; const char *aunit; @@ -304,7 +304,7 @@ "Its unclipped area is %f square %s.\n" "%s" "%s%s%s", USER_UNITMASK, Polygon->ID, - pcb_strflg_f2s(Polygon->Flags, PCB_TYPE_POLY, NULL), + pcb_strflg_f2s(Polygon->Flags, PCB_OBJ_POLY, NULL), Polygon->BoundingBox.X1, Polygon->BoundingBox.Y1, Polygon->BoundingBox.X2, Polygon->BoundingBox.Y2, Polygon->PointN, Polygon->PointMax - Polygon->PointN, @@ -314,7 +314,7 @@ gen_locked(Polygon), gen_term(Polygon)); break; } - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: { pcb_subc_t *subc; #ifndef NDEBUG @@ -328,7 +328,7 @@ "BoundingBox %$mD %$mD.\n" "Refdes \"%s\".\n" "%s", USER_UNITMASK, - subc->ID, pcb_strflg_f2s(subc->Flags, PCB_TYPE_SUBC, NULL), + subc->ID, pcb_strflg_f2s(subc->Flags, PCB_OBJ_SUBC, NULL), subc->BoundingBox.X1, subc->BoundingBox.Y1, subc->BoundingBox.X2, subc->BoundingBox.Y2, PCB_EMPTY(subc->refdes), @@ -335,7 +335,7 @@ gen_locked(subc)); break; } - case PCB_TYPE_TEXT: + case PCB_OBJ_TEXT: #ifndef NDEBUG if (pcb_gui->shift_is_pressed()) { pcb_layer_t *layer = (pcb_layer_t *) ptr1; @@ -343,8 +343,8 @@ return 0; } #endif - case PCB_TYPE_LINE_POINT: - case PCB_TYPE_POLY_POINT: + case PCB_OBJ_LINE_POINT: + case PCB_OBJ_POLY_POINT: { pcb_point_t *point = (pcb_point_t *) ptr2; report = pcb_strdup_printf("%m+POINT ID# %ld.\n" @@ -351,10 +351,10 @@ "Located at (X,Y) = %$mD.\n" "It belongs to a %s on layer %d.\n", USER_UNITMASK, point->ID, point->X, point->Y, - (type == PCB_TYPE_LINE_POINT) ? "line" : "polygon", pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1)); + (type == PCB_OBJ_LINE_POINT) ? "line" : "polygon", pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1)); break; } - case PCB_TYPE_NONE: + case PCB_OBJ_VOID: report = NULL; break; @@ -601,8 +601,8 @@ pcb_gui->get_coords("Click on a copper line", &x, &y); - type = pcb_search_screen(x, y, PCB_TYPE_LINE, &r1, &r2, &r3); - if (type != PCB_TYPE_LINE) { + type = pcb_search_screen(x, y, PCB_OBJ_LINE, &r1, &r2, &r3); + if (type != PCB_OBJ_LINE) { pcb_message(PCB_MSG_ERROR, "can't find a line to split\n"); return -1; } Index: trunk/src_plugins/report/report.h =================================================================== --- trunk/src_plugins/report/report.h (revision 15868) +++ trunk/src_plugins/report/report.h (revision 15869) @@ -32,8 +32,8 @@ #include "config.h" #define REPORT_TYPES \ - (PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY | \ - PCB_TYPE_ARC | PCB_TYPE_RATLINE | PCB_TYPE_POLY_POINT | \ - PCB_TYPE_LINE_POINT | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC) + (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | \ + PCB_OBJ_ARC | PCB_OBJ_RAT | PCB_OBJ_POLY_POINT | \ + PCB_OBJ_LINE_POINT | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC) #endif Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 15868) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 15869) @@ -360,13 +360,13 @@ rubber_ctx_t *rbnd = i->rbnd; switch (i->type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: if (rat->Point1.X == i->pstk->x && rat->Point1.Y == i->pstk->y) pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 0,i->delta_index); else if (rat->Point2.X == i->pstk->x && rat->Point2.Y == i->pstk->y) pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 1,i->delta_index); break; - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_LINE_POINT: if (rat->group1 == i->group && rat->Point1.X == i->point->X && rat->Point1.Y == i->point->Y) pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 0,i->delta_index); else if (rat->group2 == i->group && rat->Point2.X == i->point->X && rat->Point2.Y == i->point->Y) @@ -382,7 +382,7 @@ { struct rinfo info; - info.type = PCB_TYPE_PSTK; + info.type = PCB_OBJ_PSTK; info.pstk = pstk; info.rbnd = rbnd; info.delta_index = 0; @@ -394,7 +394,7 @@ struct rinfo info; info.group = pcb_layer_get_group_(Layer); info.point = Point; - info.type = PCB_TYPE_LINE_POINT; + info.type = PCB_OBJ_LINE_POINT; info.rbnd = rbnd; info.delta_index = 0; @@ -870,11 +870,11 @@ * is connected */ switch (Type) { - case PCB_TYPE_PSTK: + case PCB_OBJ_PSTK: CheckPadStackForRubberbandConnection(rbnd,(pcb_pstk_t *)Ptr1); break; - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: { pcb_subc_t * subc = (pcb_subc_t *)Ptr1; pcb_data_it_t it; @@ -898,7 +898,7 @@ break; } - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { pcb_layer_t *layer = (pcb_layer_t *) Ptr1; pcb_line_t *line = (pcb_line_t *) Ptr2; @@ -907,21 +907,21 @@ break; } - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_LINE_POINT: CheckLinePointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3,0); if(conf_rbo.plugins.rubberband_orig.enable_rubberband_arcs != 0) CheckLinePointForRubberbandArcConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true); break; - case PCB_TYPE_ARC_POINT: + case PCB_OBJ_ARC_POINT: CheckArcPointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, (int *) Ptr3, pcb_true); break; - case PCB_TYPE_ARC: + case PCB_OBJ_ARC: CheckArcForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, pcb_true); break; - case PCB_TYPE_POLY: + case PCB_OBJ_POLY: CheckPolygonForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2); break; } @@ -931,7 +931,7 @@ { switch (Type) { - case PCB_TYPE_SUBC: + case PCB_OBJ_SUBC: { pcb_subc_t *subc = (pcb_subc_t *) Ptr1; @@ -943,7 +943,7 @@ break; } - case PCB_TYPE_LINE: + case PCB_OBJ_LINE: { pcb_layer_t *layer = (pcb_layer_t *) Ptr1; pcb_line_t *line = (pcb_line_t *) Ptr2; @@ -953,7 +953,7 @@ break; } - case PCB_TYPE_LINE_POINT: + case PCB_OBJ_LINE_POINT: CheckLinePointForRat(rbnd, (pcb_layer_t *) Ptr1, (pcb_point_t *) Ptr3); break; @@ -1042,7 +1042,7 @@ rubber_ctx_t *rbnd = user_data; pcb_rubberband_t *ptr; void *ptr1 = argv[1].d.p, *ptr2 = argv[2].d.p, *ptr3 = argv[3].d.p; - int i, type = PCB_TYPE_SUBC; + int i, type = PCB_OBJ_SUBC; rbnd->RubberbandN = 0; pcb_rubber_band_lookup_rat_lines(rbnd, type, ptr1, ptr2, ptr3); @@ -1051,7 +1051,7 @@ if (PCB->RatOn) pcb_rat_invalidate_erase((pcb_rat_t *) ptr->Line); - pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line); + pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, ptr->Line, ptr->Line, ptr->Line); ptr++; } } @@ -1103,7 +1103,7 @@ ctx.move.dy = argv[argi+1].d.i; if(direct) { - pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point1, ctx.move.dx, ctx.move.dy); + pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point1, ctx.move.dx, ctx.move.dy); pcb_lineop_move_point(&ctx, ptr->Layer, ptr->Line, &ptr->Line->Point1); } else @@ -1118,7 +1118,7 @@ ctx.move.dy = argv[argi+1].d.i; if(direct) { - pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point2, ctx.move.dx, ctx.move.dy); + pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point2, ctx.move.dx, ctx.move.dy); pcb_lineop_move_point(&ctx, ptr->Layer, ptr->Line, &ptr->Line->Point2); } else @@ -1254,13 +1254,13 @@ *changed = 1; if(dindex1 >= 0) - pcb_undo_add_obj_to_rotate90(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point1, cx, cy, steps); + pcb_undo_add_obj_to_rotate90(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point1, cx, cy, steps); if(dindex2 >= 0) - pcb_undo_add_obj_to_rotate90(PCB_TYPE_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point2, cx, cy, steps); + pcb_undo_add_obj_to_rotate90(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point2, cx, cy, steps); pcb_line_invalidate_erase(ptr->Line); if (ptr->Layer) { - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, ptr->Layer, ptr->Line); + pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, ptr->Layer, ptr->Line); pcb_r_delete_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line); } else @@ -1275,7 +1275,7 @@ pcb_line_bbox(ptr->Line); if (ptr->Layer) { pcb_r_insert_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_LINE, ptr->Layer, ptr->Line); + pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, ptr->Layer, ptr->Line); pcb_line_invalidate_draw(ptr->Layer, ptr->Line); } else { @@ -1302,7 +1302,7 @@ #warning TODO: rewrite this for subc #if 0 - if (type == PCB_TYPE_ELEMENT) { + if (type == PCB_OBJ_ELEMENT) { pcb_rubberband_t *ptr; int i; @@ -1313,7 +1313,7 @@ for (i = 0; i < rbnd->RubberbandN; i++, ptr++) { if (PCB->RatOn) pcb_rat_invalidate_erase((pcb_rat_t *) ptr->Line); - pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line); + pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, ptr->Line, ptr->Line, ptr->Line); } pcb_undo_inc_serial(); pcb_draw(); Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 15868) +++ trunk/src_plugins/shape/shape.c (revision 15869) @@ -192,7 +192,7 @@ if (data != PCB->Data) { pcb_buffer_clear(PCB, PCB_PASTEBUFFER); - pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_TYPE_POLY, CURRENT, p, p); + pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_POLY, CURRENT, p, p); pcb_r_delete_entry(CURRENT->polygon_tree, (pcb_box_t *)p); pcb_poly_free_fields(p); pcb_poly_free(p); @@ -237,11 +237,11 @@ l = pcb_line_new(layer, cx, cy, cx, cy, dia, conf_core.design.clearance*2, pcb_flag_make(flags)); if (l != NULL) { if ((conf_core.editor.clear_line) && (data == PCB->Data)) - pcb_poly_clear_from_poly(data, PCB_TYPE_LINE, layer, l); + pcb_poly_clear_from_poly(data, PCB_OBJ_LINE, layer, l); if (data != PCB->Data) { pcb_buffer_clear(PCB, PCB_PASTEBUFFER); - pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_TYPE_LINE, CURRENT, l, l); + pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_LINE, CURRENT, l, l); pcb_r_delete_entry(CURRENT->line_tree, (pcb_box_t *)l); pcb_line_free(l); pcb_crosshair_set_mode(PCB_MODE_PASTE_BUFFER); Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 15868) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 15869) @@ -78,7 +78,7 @@ } pcb_subc_move(sc, dx, dy, 1); - pcb_undo_add_obj_to_move(PCB_TYPE_SUBC, NULL, NULL, sc, dx, dy); + pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, sc, dx, dy); /* keep track of how tall this row is */ minx += sc->BoundingBox.X2 - sc->BoundingBox.X1 + GAP; Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 15868) +++ trunk/src_plugins/teardrops/teardrops.c (revision 15869) @@ -161,7 +161,7 @@ arc = pcb_arc_new(lay, (int) ax, (int) ay, (int) radius, (int) radius, (int) theta + 90 + aoffset, delta - aoffset, l->Thickness, l->Clearance, l->Flags); if (arc) - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, lay, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, lay, arc, arc); ax = lx + dy * (x + t); ay = ly - dx * (x + t); @@ -169,7 +169,7 @@ arc = pcb_arc_new(lay, (int) ax, (int) ay, (int) radius, (int) radius, (int) theta - 90 - aoffset, -delta + aoffset, l->Thickness, l->Clearance, l->Flags); if (arc) - pcb_undo_add_obj_to_create(PCB_TYPE_ARC, lay, arc, arc); + pcb_undo_add_obj_to_create(PCB_OBJ_ARC, lay, arc, arc); radius += t * 1.9; aoffset = acos((double) adist / radius) * 180.0 / M_PI; Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 15868) +++ trunk/src_plugins/vendordrill/vendor.c (revision 15869) @@ -319,7 +319,7 @@ target = vendorDrillMap(proto->hdia); if (proto->hdia != target) { - if (pcb_chg_obj_2nd_size(PCB_TYPE_PSTK, pstk, pstk, pstk, target, pcb_true, pcb_false)) + if (pcb_chg_obj_2nd_size(PCB_OBJ_PSTK, pstk, pstk, pstk, target, pcb_true, pcb_false)) res = 1; else { pcb_message(PCB_MSG_WARNING, _ Index: trunk/tests/strflags/tester.c =================================================================== --- trunk/tests/strflags/tester.c (revision 15868) +++ trunk/tests/strflags/tester.c (revision 15869) @@ -77,7 +77,7 @@ int otype; unsigned char intconn; - otype = PCB_TYPEMASK_ALL; + otype = PCB_OBJ_ANY; fh.Flags = empty_flags; for (i = 0; i < PCB_ENTRIES(pcb_object_flagbits); i++) { if (PCB_FLAG_TEST(pcb_object_flagbits[i].mask, &fh)) @@ -117,7 +117,7 @@ int i; int otype; - otype = PCB_TYPEMASK_ALL; + otype = PCB_OBJ_ANY; fh.Flags = empty_flags; for (i = 0; i < PCB_ENTRIES(pcb_flagbits); i++) { if (PCB_FLAG_TEST(pcb_flagbits[i].mask, &fh))